fastlane_core 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4e0e0dfd2c77a1169ff2dcb62cf7f353f71938
-  data.tar.gz: 5c439e39a2d28893b40eee0fde61967d11688783
+  metadata.gz: 1b43d0fb739ccee6fcedec6856d38d00f10bcbfe
+  data.tar.gz: 664c10324aeb625a85039f1d11c9b8db4c66fdfc
 SHA512:
-  metadata.gz: f3a670a6ab99b201705a0344cdcc589639050213b301acd6611f674960fe0d8d7b148f0777e31337a6d072c8fe60c61e3ad1ce2c2ecd1ca0131ce018e2451c73
-  data.tar.gz: 56c7324933a6ef4f17312a785f353b33d5388ef0bd58a27bfbc54cfea462c7280d1f6a510942cffd1552e2a97c8c0e543d791d3a023edba4a1f8373bdfdf7a51
+  metadata.gz: e8268978937c954fede5259007736560abbba4d52e05ae04947acf8c4eb9d7eedbb803933b0b2d2b330406509293158811433ff130c48eeadd7f6c672145ba37
+  data.tar.gz: 7b19622020da636ff3940da9ffc37ec0cf2393596addf246f62f94ff721e6f645e056e04b438f60322e1a1d316c3771268a825eddb486d9f1a3013950af1866e

data/lib/fastlane_core/configuration/config_item.rb

@@ -1,6 +1,6 @@
 module FastlaneCore
   class ConfigItem
-    attr_accessor :key, :env_name, :description, :short_option, :default_value, :verify_block, :optional
+    attr_accessor :key, :env_name, :description, :short_option, :default_value, :verify_block, :optional, :conflicting_options, :conflict_block
 
     # Creates a new option
     # @param key (Symbol) the key which is used as command paramters or key in the fastlane tools
@@ -14,7 +14,9 @@ module FastlaneCore
     # @param is_string *DEPRECATED: Use `type` instead* (Boolean) is that parameter a string? Defaults to true. If it's true, the type string will be verified.
     # @param type (Class) the data type of this config item. Takes precedence over `is_string`
     # @param optional (Boolean) is false by default. If set to true, also string values will not be asked to the user
-    def initialize(key: nil, env_name: nil, description: nil, short_option: nil, default_value: nil, verify_block: nil, is_string: true, type: nil, optional: false)
+    # @param conflicting_options ([]) array of conflicting option keys(@param key). This allows to resolve conflicts intelligently
+    # @param conflict_block an optional block which is called when options conflict happens
+    def initialize(key: nil, env_name: nil, description: nil, short_option: nil, default_value: nil, verify_block: nil, is_string: true, type: nil, optional: false, conflicting_options: nil, conflict_block: nil)
       raise "key must be a symbol" unless key.kind_of? Symbol
       raise "env_name must be a String" unless (env_name || '').kind_of? String
 
@@ -29,6 +31,12 @@ module FastlaneCore
         raise "Type '#{type}' for key '#{key}' requires a short option"
       end
 
+      if conflicting_options
+        conflicting_options.each do |conflicting_option_key|
+          raise "Conflicting option key must be a symbol" unless conflicting_option_key.kind_of? Symbol
+        end
+      end
+
       @key = key
       @env_name = env_name
       @description = description
@@ -38,6 +46,8 @@ module FastlaneCore
       @is_string = is_string
       @data_type = type
       @optional = optional
+      @conflicting_options = conflicting_options
+      @conflict_block = conflict_block
     end
 
     # This will raise an exception if the value is not valid

data/lib/fastlane_core/configuration/configuration.rb

@@ -38,6 +38,7 @@ module FastlaneCore
       verify_input_types
       verify_value_exists
       verify_no_duplicates
+      verify_conflicts
       verify_default_value_matches_verify_block
     end
 
@@ -76,6 +77,36 @@ module FastlaneCore
       end
     end
 
+    def verify_conflicts
+      option_keys = @values.keys
+
+      option_keys.each do |current|
+        index = @available_options.find_index { |item| item.key == current }
+        current = @available_options[index]
+
+        next if current.conflicting_options.nil?
+
+        conflicts = current.conflicting_options & option_keys
+        next if conflicts.nil?
+
+        conflicts.each do |conflicting_option_key|
+          index = @available_options.find_index { |item| item.key == conflicting_option_key }
+          conflicting_option = @available_options[index]
+
+          if current.conflict_block
+            begin
+              current.conflict_block.call(conflicting_option)
+            rescue => ex
+              Helper.log.fatal "Error resolving conflict between options: '#{current.key}' and '#{conflicting_option.key}'".red
+              raise ex
+            end
+          else
+            raise "Unresolved conflict between options: '#{current.key}' and '#{conflicting_option.key}'".red
+          end
+        end
+      end
+    end
+
     # Verifies the default value is also valid
     def verify_default_value_matches_verify_block
       @available_options.each do |item|
@@ -112,7 +143,9 @@ module FastlaneCore
       return if paths.count == 0
 
       path = paths.first
-      ConfigurationFile.new(self, path, block_for_missing)
+      configuration_file = ConfigurationFile.new(self, path, block_for_missing)
+      verify_conflicts # important, since user can set conflicting options in configuration file
+      configuration_file
     end
 
     #####################################################

data/lib/fastlane_core/project.rb

@@ -198,9 +198,9 @@ module FastlaneCore
     end
 
     # Returns the build settings and sets the default scheme to the options hash
-    def default_build_settings(key: nil, optional: true, silent: false)
+    def default_build_settings(key: nil, optional: true)
       options[:scheme] = schemes.first if is_workspace
-      build_settings(key: key, optional: optional, silent: silent)
+      build_settings(key: key, optional: optional)
     end
 
     def raw_info(silent: false)

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.34.0"
+  VERSION = "0.35.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools