fastlane_core 0.36.9 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb03c52b6d68f1d13b5470c5921b9dbe50b88053
-  data.tar.gz: 85e09706d35029e07617b279fb6bc8b724fd98c9
+  metadata.gz: 69d9a797fc7e20a98839ae7e0296d7215f95e08c
+  data.tar.gz: de39a88d7fd8c42a6d1988c291376d5eba49603f
 SHA512:
-  metadata.gz: 93150dbe3b09b674fc298418aed928a461e1ed5b3328d3e1c5a1d9b41396970399419961c4adebfebc13ff579c813f651a3de616e43d0fb8140ce2daea096bb7
-  data.tar.gz: 78dfc200e172ba6ade3ce3eed598e503aac40ec6eaeafebbb23b158224e1bf30fa3f10595e00e8b6147a1d77782b0fd1185dd8fcf997d551d8140a873a45dea4
+  metadata.gz: 44ece7894fb065c92ab2909d63d53760bb00386da1e836eeaa2ca74200363aa57170f5ba6790dbbe9d0cad4e7721426706e0a06728937e5c706daf6eba402ed9
+  data.tar.gz: 73a778016cf3e8dcb98a9bd4360c7b1a2b7891f1824718fca1c79d8fd08fdf92d269333b1c80791c2cc3db4c03ef2a7e1994487d47e1bd9df4f3ddff0b409ca1

data/lib/fastlane_core/configuration/commander_generator.rb

@@ -9,30 +9,66 @@ module FastlaneCore
       # First, enable `always_trace`, to show the stack trace
       always_trace!
 
-      short_codes = []
+      used_switches = []
       options.each do |option|
-        next if option.description.to_s.length == 0 # "private" options
+        next if option.description.to_s.empty? # "private" options
 
-        appendix = (option.string? ? "STRING" : "")
-        type = option.data_type
-        short_option = option.short_option
-
-        raise "Short option #{short_option} already taken for key #{option.key}".red if short_codes.include? short_option
-        raise "-v is already used for the version (key #{option.key})".red if short_option == "-v"
-        raise "-h is already used for the help screen (key #{option.key})".red if short_option == "-h"
-        raise "-t is already used for the trace screen (key #{option.key})".red if short_option == "-t"
+        short_switch = option.short_option
+        validate_short_switch(used_switches, short_switch)
 
-        short_codes << short_option if short_option
+        type = option.data_type
 
-        # Example Call
-        # c.option '-p', '--pattern STRING', String, 'Description'
+        # This is an important bit of trickery to solve the boolean option situation.
+        #
+        # Typically, boolean command line flags do not accept trailing values. If the flag
+        # is present, the value is true, if it is missing, the value is false. fastlane
+        # supports this style of flag. For example, you can specify a flag like `--clean`,
+        # and the :clean option will be true.
+        #
+        # However, fastlane also supports another boolean flag style that accepts trailing
+        # values much like options for Strings and other value types. That looks like
+        # `--include_bitcode false` The problem is that this does not work out of the box
+        # for Commander and OptionsParser. So, we need to get tricky.
+        #
+        # The value_appendix below acts as a placeholder in the switch definition that
+        # states that we expect to have a trailing value for our options. When an option
+        # declares a data type, we use the name of that data type in all caps like:
+        # "--devices ARRAY". When the data type is nil, this implies that we're going
+        # to be doing some special handling on that value. One special thing we do
+        # automatically in Configuration is to coerce special Strings into boolean values.
+        #
+        # If the data type is nil, the trick we do is to specify a value placeholder, but
+        # we wrap it in [] brackets to mark it as optional. That means that the trailing
+        # value may or may not be present for this flag. If the flag is present, but the
+        # value is not, we get a value of `true`. Perfect for the boolean flag base-case!
+        # If the value is there, we'll actually get it back as a String, which we can
+        # later coerce into a boolean.
+        #
+        # In this way we support handling boolean flags with or without trailing values.
+        value_appendix = (type || '[VALUE]').to_s.upcase
+        long_switch = "--#{option.key} #{value_appendix}"
 
-        flag = "--#{option.key} #{appendix}"
         description = option.description
-        description += " (#{option.env_name})" if option.env_name.to_s.length > 0
+        description += " (#{option.env_name})" unless option.env_name.to_s.empty?
 
-        global_option short_option, flag, type, description
+        # This is the sole call to Commander to set up the option we've been building.
+        #
+        # If we don't have a data type for this option, we tell it to act like a String.
+        # This allows us to get a reasonable value for boolean options that can be
+        # automatically coerced or otherwise handled by the ConfigItem for others.
+        global_option(short_switch, long_switch, (type || String), description)
       end
     end
+
+    def validate_short_switch(used_switches, short_switch)
+      return if short_switch.nil?
+
+      raise "Short option #{short_switch} already taken for key #{option.key}".red if used_switches.include?(short_switch)
+      raise "-v is already used for the version (key #{option.key})".red if short_switch == "-v"
+      raise "-h is already used for the help screen (key #{option.key})".red if short_switch == "-h"
+      raise "-t is already used for the trace screen (key #{option.key})".red if short_switch == "-t"
+
+      used_switches << short_switch
+    end
   end
 end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.36.9".freeze
+  VERSION = "0.37.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.36.9
+  version: 0.37.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -385,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools