lib/gym/detect_values.rb in gym-1.2.0 vs lib/gym/detect_values.rb in gym-1.3.0

@@ -4,16 +4,19 @@
     # This is needed as these are more complex default values
     # Returns the finished config object
     def self.set_additional_default_values
       config = Gym.config
 
-      FastlaneCore::Project.detect_projects(config)
+      # First, try loading the Gymfile from the current directory
+      config.load_configuration_file(Gym.gymfile_name)
 
+      # Detect the project
+      FastlaneCore::Project.detect_projects(config)
       Gym.project = FastlaneCore::Project.new(config)
       detect_provisioning_profile
 
-      # Go into the project's folder
+      # Go into the project's folder, as there might be a Gymfile there
       Dir.chdir(File.expand_path("..", Gym.project.path)) do
         config.load_configuration_file(Gym.gymfile_name)
       end
 
       config[:use_legacy_build_api] = true if Xcode.pre_7?
@@ -71,10 +74,10 @@
       return if configurations.count == 0 # this is an optional value anyway
 
       if config[:configuration]
         # Verify the configuration is available
         unless configurations.include?(config[:configuration])
-          Helper.log.error "Couldn't find specified configuration '#{config[:configuration]}'.".red
+          UI.error "Couldn't find specified configuration '#{config[:configuration]}'."
           config[:configuration] = nil
         end
       end
     end
   end