fastlane_core 0.29.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4159006b340c635d1d3eee49239db32a6c4da1cd
-  data.tar.gz: 4166e741e399b1fc503902f7f1145cd3462d142e
+  metadata.gz: f765af55f0a11a0983c37094f5d3ef3152fe1ae4
+  data.tar.gz: 185c80d69c241ad8ba747f783566da2030de6470
 SHA512:
-  metadata.gz: e2aa321316da4eb336f78f1f6ef7912f958591c1b81afe0a2747fd4444ce8911e91e2afd91ec91c3cbdc9968d0a6278ccb57bd1b970a62baa9a5cc0287c5c700
-  data.tar.gz: 956b0c49699f9fd0b056fe094c6fcf04e7cc0dc4d57f30623f3f1a3d9d5f0ff6c2cd1c3eacd89787d4826ebecaecb4174b691b75e9d81ab653c51f14e0f8f702
+  metadata.gz: 231898cba50047e62739d620452e69f28e4c4a41ce96ac43caac3d0f41e285cb0a45a08c746632092a95a7b031ffa58a8b6c72c739ce059c03ca43bf1aeceda8
+  data.tar.gz: 71c2c7bb47ba0afdd4159ff0e05b389b119f9bfd51bdc227a50414a26d34ed4894b622dfd4906e67888606fe012c29a1e39bb6df3e15d3b7d6af6e9a7bd43919

data/lib/assets/XMLTemplate.xml.erb

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://apple.com/itunes/importer" version="software4.7">
-  <software_assets apple_id="<%= @data[:apple_id] %>">
+<package xmlns="http://apple.com/itunes/importer" version="software5.4">
+  <software_assets apple_id="<%= @data[:apple_id] %>" app_platform="<%= data[:platform] %>">
     <asset type="bundle">
       <data_file>
         <size><%= @data[:file_size] %></size>

data/lib/fastlane_core/command_executor.rb

@@ -44,7 +44,11 @@ module FastlaneCore
           output << ex.to_s
           o = output.join("\n")
           puts o
-          error.call(o, nil)
+          if error
+            error.call(o, nil)
+          else
+            raise ex
+          end
         end
 
         # Exit status for build command, should be 0 if build succeeded
@@ -53,7 +57,11 @@ module FastlaneCore
           o = output.join("\n")
           puts o # the user has the right to see the raw output
           UI.error "Exit status: #{status}"
-          error.call(o, status)
+          if error
+            error.call(o, status)
+          else
+            raise "Exit status: #{status}"
+          end
         end
 
         return output.join("\n")

data/lib/fastlane_core/configuration/commander_generator.rb

@@ -13,8 +13,8 @@ module FastlaneCore
       options.each do |option|
         next if option.description.to_s.length == 0 # "private" options
 
-        appendix = (option.is_string ? "STRING" : "")
-        type = (option.is_string ? String : nil)
+        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

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, :is_string, :optional
+    attr_accessor :key, :env_name, :description, :short_option, :default_value, :verify_block, :optional
 
     # Creates a new option
     # @param key (Symbol) the key which is used as command paramters or key in the fastlane tools
@@ -11,11 +11,13 @@ module FastlaneCore
     # @param verify_block an optional block which is called when a new value is set.
     #   Check value is valid. This could be type checks or if a folder/file exists
     #   You have to raise a specific exception if something goes wrong. Append .red after the string
-    # @param is_string (String) is that parameter a string? Defaults to true. If it's true, the type string will be verified.
+    # @param is_string *DEPRECATED* (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, optional: false)
+    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)
       raise "key must be a symbol" unless key.kind_of? Symbol
       raise "env_name must be a String" unless (env_name || '').kind_of? String
+
       if short_option
         raise "short_option must be a String of length 1" unless short_option.kind_of? String and short_option.delete('-').length == 1
       end
@@ -23,6 +25,10 @@ module FastlaneCore
         raise "Do not let descriptions end with a '.', since it's used for user inputs as well".red if description[-1] == '.'
       end
 
+      if type.to_s.length > 0 and short_option.to_s.length == 0
+        raise "Type '#{type}' for key '#{key}' requires a short option"
+      end
+
       @key = key
       @env_name = env_name
       @description = description
@@ -30,6 +36,7 @@ module FastlaneCore
       @default_value = default_value
       @verify_block = verify_block
       @is_string = is_string
+      @data_type = type
       @optional = optional
     end
 
@@ -44,7 +51,7 @@ module FastlaneCore
     def valid?(value)
       # we also allow nil values, which do not have to be verified.
       if value
-        if @is_string
+        if string?
           raise "'#{self.key}' value must be a String! Found #{value.class} instead.".red unless value.kind_of? String
         end
 
@@ -63,14 +70,40 @@ module FastlaneCore
 
     # Returns an updated value type (if necessary)
     def auto_convert_value(value)
-      # Special treatment if the user specififed true, false or YES, NO
-      if %w(YES yes true).include?(value)
-        value = true
-      elsif %w(NO no false).include?(value)
-        value = false
+      # Weird because of https://stackoverflow.com/questions/9537895/using-a-class-object-in-case-statement
+
+      case
+      when data_type == Array
+        return value.split(',') if value.kind_of?(String)
+      when data_type == Integer
+        return value.to_i
+      when data_type == Float
+        return value.to_f
+      else
+        # Special treatment if the user specififed true, false or YES, NO
+        # There is no boolean typoe, so we just do it here
+        if %w(YES yes true).include?(value)
+          return true
+        elsif %w(NO no false).include?(value)
+          return false
+        end
       end
 
-      return value
+      return value # fallback to not doing anything
+    end
+
+    # Determines the defined data type of this ConfigItem
+    def data_type
+      if @data_type
+        @data_type
+      else
+        (@is_string ? String : nil)
+      end
+    end
+
+    # Replaces the attr_accessor, but maintains the same interface
+    def string?
+      data_type == String
     end
 
     def to_s

data/lib/fastlane_core/configuration/configuration.rb

@@ -120,7 +120,8 @@ module FastlaneCore
     #####################################################
 
     # Returns the value for a certain key. fastlane_core tries to fetch the value from different sources
-    def fetch(key)
+    # if 'ask' is true and the value is not present, the user will be prompted to provide a value
+    def fetch(key, ask: true)
       raise "Key '#{key}' must be a symbol. Example :app_id.".red unless key.kind_of?(Symbol)
 
       option = option_for_key(key)
@@ -132,12 +133,12 @@ module FastlaneCore
 
       # `if value == nil` instead of ||= because false is also a valid value
       if value.nil? and option.env_name and ENV[option.env_name]
-        value = ENV[option.env_name].dup
+        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.is_string # by default boolean flags are false
+      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
@@ -150,7 +151,7 @@ module FastlaneCore
         raise "No value found for '#{key}'"
       end
 
-      while value.nil?
+      while ask && value.nil?
         Helper.log.info "To not be asked about this value, you can specify it using '#{option.key}'".yellow
         value = ask("#{option.description}: ")
         # Also store this value to use it from now on

data/lib/fastlane_core/ipa_upload_package_builder.rb

@@ -7,7 +7,7 @@ module FastlaneCore
 
     attr_accessor :package_path
 
-    def generate(app_id: nil, ipa_path: nil, package_path: nil)
+    def generate(app_id: nil, ipa_path: nil, package_path: nil, platform: nil)
       self.package_path = File.join(package_path, "#{app_id}.itmsp")
       FileUtils.rm_rf self.package_path if File.directory?(self.package_path)
       FileUtils.mkdir_p self.package_path
@@ -19,7 +19,8 @@ module FastlaneCore
         apple_id: app_id,
         file_size: File.size(ipa_path),
         ipa_path: File.basename(ipa_path), # this is only the base name as the ipa is inside the package
-        md5: Digest::MD5.hexdigest(File.read(ipa_path))
+        md5: Digest::MD5.hexdigest(File.read(ipa_path)),
+        platform: (platform || "ios") # pass "appletvos" for Apple TV's IPA
       }
 
       xml_path = File.join(lib_path, "lib/assets/XMLTemplate.xml.erb")

data/lib/fastlane_core/print_table.rb

@@ -8,7 +8,7 @@ module FastlaneCore
         rows = []
 
         config.available_options.each do |config_item|
-          value = config._values[config_item.key] # using `_values` here to not ask the user for missing values at this point
+          value = config.fetch(config_item.key, ask: false) # Don't ask the user for missing values at this point
           next if value.nil?
           next if value.to_s == ""
           next if hide_keys.include?(config_item.key)

data/lib/fastlane_core/ui/implementations/shell.rb

@@ -67,6 +67,40 @@ module FastlaneCore
       Helper.log.info(("-" * i).green)
     end
 
+    #####################################################
+    # @!group Errors: Inputs
+    #####################################################
+
+    def interactive?
+      interactive = true
+      interactive = false if $stdout.isatty == false
+      interactive = false if Helper.ci?
+      return interactive
+    end
+
+    def input(message)
+      verify_interactive!(message)
+      ask(message)
+    end
+
+    def confirm(message)
+      verify_interactive!(message)
+      agree("#{message} (y/n)", true)
+    end
+
+    def select(message, options)
+      verify_interactive!(message)
+
+      important(message)
+      choose(*(options))
+    end
+
+    def password(message)
+      verify_interactive!(message)
+
+      ask(message.yellow) { |q| q.echo = "*" }
+    end
+
     #####################################################
     # @!group Errors: Different kinds of exceptions
     #####################################################
@@ -88,7 +122,7 @@ module FastlaneCore
     end
 
     def user_error!(error_message)
-      error_message = "[!] #{error_message}".red
+      error_message = "\n[!] #{error_message}".red
       if $verbose
         # On verbose we want to see the full stack trace
         raise error_message
@@ -96,5 +130,13 @@ module FastlaneCore
         abort(error_message)
       end
     end
+
+    private
+
+    def verify_interactive!(message)
+      return if interactive?
+      important(message)
+      crash!("Could not retrieve response as fastlane runs in non-interactive mode")
+    end
   end
 end

data/lib/fastlane_core/ui/interface.rb

@@ -69,6 +69,37 @@ module FastlaneCore
       not_implemented(__method__)
     end
 
+    #####################################################
+    # @!group Errors: Inputs
+    #####################################################
+
+    # Is is possible to ask the user questions?
+    def interactive?(_message)
+      not_implemented(__method__)
+    end
+
+    # get a standard text input (single line)
+    def input(_message)
+      not_implemented(__method__)
+    end
+
+    # A simple yes or no question
+    def confirm(_message)
+      not_implemented(__method__)
+    end
+
+    # Let the user select one out of x items
+    # return value is the value of the option the user chose
+    def select(_message, _options)
+      not_implemented(__method__)
+    end
+
+    # Password input for the user, text field shouldn't show
+    # plain text
+    def password(_message)
+      not_implemented(__method__)
+    end
+
     #####################################################
     # @!group Errors: Different kinds of exceptions
     #####################################################

data/lib/fastlane_core/ui/ui.rb

@@ -7,13 +7,11 @@ module FastlaneCore
     end
 
     def self.method_missing(method_sym, *args, &_block)
-      raise "Only pass exactly one parameter to UI".red if args.length != 1
-
       # not using `responds` beacuse we don't care about methods like .to_s and so on
       interface_methods = Interface.instance_methods - Object.instance_methods
       raise "Unknown method '#{method_sym}', supported #{interface_methods}" unless interface_methods.include?(method_sym)
 
-      self.current.send(method_sym, args.first)
+      self.current.send(method_sym, *args)
     end
   end
 end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.29.1"
+  VERSION = "0.30.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json