fastlane 2.65.0.beta.20171120010003 → 2.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3865bcfea9b0ead797e826dd670f62f305a122a
-  data.tar.gz: 5038f17469e4ff69909b9e6d8b63646c4c1fdd3d
+  metadata.gz: e6b2a78c9b6e3e48a30f9433cfda1c683e6a3ce6
+  data.tar.gz: d6efe4c63a4b99dbc604001a97be4b5b1c5991c6
 SHA512:
-  metadata.gz: e51c87b35fc4e519038a0af39982549abcf0e7c7abef50b7628776d473efb72f093da801b109b4e48ecd74147f7deb1c86ff5aaae46c606bf0b66ffb5c269370
-  data.tar.gz: 24548404cc2220ae9727da2429511bc067444e9240910fa0d78a4bed605fd399b5824b9d3a0adf3196669a6992e35132f4448226199b6a0229a900cf22c75e08
+  metadata.gz: a71be3e1dc14441c66ca144644c91ef2b672745e7ff273e47a605ff24c3093ec7785c4c83c2b25b85fe782e2cabdd5e9d5140b5afe2fe0dc6324172f61af492c
+  data.tar.gz: 89a89b2265e85b4e2c3edc6826628d22e0df9aa79561a71576e7a848ae4601155495615556225cb5059a848c785f6aa39119ce0719008028bb2cd84fedd715c9

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.65.0.beta.20171120010003'.freeze
+  VERSION = '2.65.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane_core/lib/fastlane_core/configuration/configuration.rb

@@ -14,6 +14,9 @@ module FastlaneCore
     # @return [String] The name of the configuration file (not the path). Optional!
     attr_accessor :config_file_name
 
+    # @return [Hash] Options that were set from a config file using load_configuration_file. Optional!
+    attr_accessor :config_file_options
+
     def self.create(available_options, values)
       UI.user_error!("values parameter must be a hash") unless values.kind_of?(Hash)
       v = values.dup
@@ -43,6 +46,7 @@ module FastlaneCore
     def initialize(available_options, values)
       self.available_options = available_options || []
       self.values = values || {}
+      self.config_file_options = {}
 
       # used for pushing and popping values to provide nesting configuration contexts
       @values_stack = []
@@ -75,14 +79,10 @@ module FastlaneCore
       # Make sure the given value keys exist
       @values.each do |key, value|
         next if key == :trace # special treatment
-        option = option_for_key(key)
-        if option
-          @values[key] = option.auto_convert_value(value)
-          UI.deprecated("Using deprecated option: '--#{key}' (#{option.deprecated})") if option.deprecated
-          option.verify!(@values[key]) # Call the verify block for it too
-        else
-          UI.user_error!("Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}")
-        end
+        option = self.verify_options_key!(key)
+        @values[key] = option.auto_convert_value(value)
+        UI.deprecated("Using deprecated option: '--#{key}' (#{option.deprecated})") if option.deprecated
+        option.verify!(@values[key]) # Call the verify block for it too
       end
     end
 
@@ -171,8 +171,28 @@ module FastlaneCore
       return if paths.count == 0
 
       path = paths.first
-      configuration_file = ConfigurationFile.new(self, path, block_for_missing, skip_printing_values)
+      begin
+        configuration_file = ConfigurationFile.new(self, path, block_for_missing, skip_printing_values)
+        options = configuration_file.options
+      rescue FastlaneCore::ConfigurationFile::ExceptionWhileParsingError => e
+        options = e.recovered_options
+        wrapped_exception = e.wrapped_exception
+      end
+
+      # Make sure all the values set in the config file pass verification
+      options.each do |key, val|
+        option = self.verify_options_key!(key)
+        option.verify!(val)
+      end
+
+      # Merge the new options into the old ones, keeping all previously set keys
+      self.config_file_options = options.merge(self.config_file_options)
+
       verify_conflicts # important, since user can set conflicting options in configuration file
+
+      # Now that everything is verified, re-raise an exception that was raised in the config file
+      raise wrapped_exception unless wrapped_exception.nil?
+
       configuration_file
     end
 
@@ -185,33 +205,22 @@ module FastlaneCore
     def fetch(key, ask: true)
       UI.user_error!("Key '#{key}' must be a symbol. Example :app_id.") unless key.kind_of?(Symbol)
 
-      option = option_for_key(key)
-      UI.user_error!("Could not find option for key :#{key}. Available keys: #{@available_options.collect(&:key).join(', ')}") unless option
+      option = verify_options_key!(key)
 
-      value = @values[key]
+      # Same order as https://docs.fastlane.tools/advanced/#priorities-of-parameters-and-options
+      value = if @values.key?(key) and !@values[key].nil?
+                @values[key]
+              elsif option.env_name and !ENV[option.env_name].nil?
+                ENV[option.env_name].dup
+              elsif self.config_file_options.key?(key)
+                self.config_file_options[key]
+              else
+                option.default_value
+              end
 
       value = option.auto_convert_value(value)
-
-      # `if value == nil` instead of ||= because false is also a valid value
-      if value.nil? and option.env_name and ENV[option.env_name]
-
-        # We want to inform the user that we took the value
-        # from an environment variable
-        # however we don't print the actual value, as it may contain sensitive information
-        # The user can easily find the actual value by print out the environment
-        UI.verbose("Taking value for '#{key}' from environment variable '#{option.env_name}'")
-
-        value = option.auto_convert_value(ENV[option.env_name].dup)
-        option.verify!(value) if value
-      end
-
-      value = option.default_value if value.nil?
       value = nil if value.nil? and !option.string? # by default boolean flags are false
-
-      return value unless value.nil? # we already have a value
-      return value if option.optional # as this value is not required, just return what we have
-
-      return value unless ask
+      return value unless value.nil? and !option.optional and ask
 
       # fallback to asking
       if Helper.is_test? or !UI.interactive?
@@ -298,5 +307,11 @@ module FastlaneCore
     # Aliases `[key]` to `fetch(key)` because Ruby can do it.
     alias [] fetch
     alias []= set
+
+    def verify_options_key!(key)
+      option = option_for_key(key)
+      UI.user_error!("Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}") unless option
+      option
+    end
   end
 end

data/fastlane_core/lib/fastlane_core/configuration/configuration_file.rb

@@ -1,17 +1,31 @@
 module FastlaneCore
   # Responsible for loading configuration files
   class ConfigurationFile
-    # A reference to the actual configuration
-    attr_accessor :config
+    class ExceptionWhileParsingError < RuntimeError
+      attr_reader :wrapped_exception
+      attr_reader :recovered_options
+
+      def initialize(wrapped_ex, options)
+        @wrapped_exception = wrapped_ex
+        @recovered_options = options
+      end
+    end
+
+    # Available keys from the config file
+    attr_accessor :available_keys
+
+    # After loading, contains all the found options
+    attr_accessor :options
 
     # Path to the config file represented by the current object
     attr_accessor :configfile_path
 
-    # @param config [FastlaneCore::Configuration] is stored to save the resulting values
+    # @param config [FastlaneCore::Configuration] is used to gather required information about the configuration
     # @param path [String] The path to the configuration file to use
     def initialize(config, path, block_for_missing, skip_printing_values = false)
-      self.config = config
+      self.available_keys = config.all_keys
       self.configfile_path = path
+      self.options = {}
 
       @block_for_missing = block_for_missing
       content = File.read(path)
@@ -33,6 +47,8 @@ module FastlaneCore
       rescue SyntaxError => ex
         line = ex.to_s.match(/\(eval\):(\d+)/)[1]
         UI.user_error!("Syntax error in your configuration file '#{path}' on line #{line}: #{ex}")
+      rescue => ex
+        raise ExceptionWhileParsingError.new(ex, self.options), "Error while parsing config file at #{path}"
       end
     end
 
@@ -63,9 +79,9 @@ module FastlaneCore
 
     def method_missing(method_sym, *arguments, &block)
       # First, check if the key is actually available
-      if self.config.all_keys.include?(method_sym)
-        # This silently prevents a value from having its value set more than once.
-        return unless self.config._values[method_sym].to_s.empty?
+      return if self.options.key?(method_sym)
+
+      if self.available_keys.include?(method_sym)
 
         value = arguments.first
         value = yield if value.nil? && block_given?
@@ -101,7 +117,7 @@ module FastlaneCore
           # Nothing specific to do here, if we can't dupe, we just
           # deal with it (boolean values can't be from env variables anyway)
         end
-        self.config[method_sym] = value
+        self.options[method_sym] = value
       else
         # We can't set this value, maybe the tool using this configuration system has its own
         # way of handling this block, as this might be a special block (e.g. ipa block) that's only
@@ -109,7 +125,7 @@ module FastlaneCore
         if @block_for_missing
           @block_for_missing.call(method_sym, arguments, block)
         else
-          self.config[method_sym] = '' # important, since this will raise a good exception for free
+          self.options[method_sym] = '' # important, since this will raise a good exception for free
         end
       end
     end
@@ -149,11 +165,12 @@ module FastlaneCore
     # (once) again. Those values are then merged into the surrounding
     # configuration as the block completes
     def with_a_clean_config_merged_when_complete
-      self.config.push_values!
+      previous_config = self.options.dup
+      self.options = {}
       begin
         yield
       ensure
-        self.config.pop_values!
+        self.options = previous_config.merge(self.options)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.65.0.beta.20171120010003
+  version: 2.65.0
 platform: ruby
 authors:
 - Felix Krause
@@ -808,6 +808,7 @@ files:
 - credentials_manager/lib/credentials_manager/appfile_config.rb
 - credentials_manager/lib/credentials_manager/cli.rb
 - deliver/README.md
+- deliver/lib/.DS_Store
 - deliver/lib/assets/DeliverfileDefault
 - deliver/lib/assets/ScreenshotsHelp
 - deliver/lib/assets/summary.html.erb
@@ -1362,6 +1363,7 @@ files:
 - sigh/lib/sigh/resign.rb
 - sigh/lib/sigh/runner.rb
 - snapshot/README.md
+- snapshot/lib/.DS_Store
 - snapshot/lib/assets/SnapfileTemplate
 - snapshot/lib/assets/SnapshotHelper.swift
 - snapshot/lib/assets/SnapshotHelperXcode8.swift
@@ -1504,24 +1506,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- supply/lib
-- screengrab/lib
+- cert/lib
+- credentials_manager/lib
+- deliver/lib
+- fastlane/lib
+- fastlane_core/lib
+- frameit/lib
+- gym/lib
 - match/lib
+- pem/lib
+- pilot/lib
 - precheck/lib
-- sigh/lib
 - produce/lib
 - scan/lib
-- gym/lib
+- screengrab/lib
+- sigh/lib
 - snapshot/lib
-- frameit/lib
-- fastlane/lib
-- cert/lib
-- pilot/lib
 - spaceship/lib
-- credentials_manager/lib
-- deliver/lib
-- fastlane_core/lib
-- pem/lib
+- supply/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1529,14 +1531,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and
   Android apps
 test_files: []
+has_rdoc: