fastlane_core 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b29d03afc47d99f8307af6334b31c80122d99e3
-  data.tar.gz: a6721f2c4c4dab2e60ed29e5ec6e485cf0a74480
+  metadata.gz: 0c1dc4d0e0d9f0f48fe5d64fde77445887be2e66
+  data.tar.gz: 0170691330d6ef38ade863094e66ff2c6416665f
 SHA512:
-  metadata.gz: 7e3f59b8888a6124b1afc818b55c31c825a33837a66bb2472c52fb44b61c9781420e5c12c7cc9d8f70965ef23cfbcb7399eddc9b9296d6a5860c0f3fde7b3e3f
-  data.tar.gz: 6f018ceb1f21192592a7fa917fbbe6574df7e4361374b128ffc9480646de8540a6f49485e34a0796680f39f3b70d0a59ecc51a9a71560e201bd890cff013d466
+  metadata.gz: 7c9d72203666a1f9b39d00fcfae0f60690cb495822e3ec1a4327ce8c3b66204ad8f080ca7ab4cff9b1c776178bb758d8b05d935d80a9fcf490974abe89b1a40b
+  data.tar.gz: b159acddf91ad141c70e7cd3da36d7fb2e9b326145220e56149a4d0c5b07e89d2554e13eb8470fbca3e868dd6e360fa773637547e7f7c6ac9a04d7ce589f5dd6

data/lib/fastlane_core.rb

@@ -16,5 +16,4 @@ require 'colored'
 require 'commander'
 
 module FastlaneCore
-
 end

data/lib/fastlane_core/cert_checker.rb

@@ -1,21 +1,31 @@
 module FastlaneCore
   # This class checks if a specific certificate is installed on the current mac
   class CertChecker
-    def self.is_installed?(path)
-      raise "Could not find file '#{path}'".red unless File.exists?(path)
+    def self.installed?(path)
+      raise "Could not find file '#{path}'".red unless File.exist?(path)
 
       ids = installed_identies
       finger_print = sha1_fingerprint(path)
 
-      return ids.include?finger_print
+      return ids.include? finger_print
+    end
+
+    # Legacy Method, use `installed?` instead
+    # rubocop:disable Style/PredicateName
+    def self.is_installed?(path)
+      installed?(path)
     end
+    # rubocop:enable Style/PredicateName
 
     def self.installed_identies
       available = `security find-identity -v -p codesigning`
       ids = []
       available.split("\n").each do |current|
-        unless current.include?"REVOKED"
-          (ids << current.match(/.*\) (.*) \".*/)[1]) rescue nil # the last line does not match
+        next if current.include? "REVOKED"
+        begin
+          (ids << current.match(/.*\) (.*) \".*/)[1])
+        rescue
+          # the last line does not match
         end
       end
 
@@ -26,12 +36,12 @@ module FastlaneCore
       result = `openssl x509 -in "#{path}" -inform der -noout -sha1 -fingerprint`
       begin
         result = result.match(/SHA1 Fingerprint=(.*)/)[1]
-        result.gsub!(":", "")
+        result.delete!(':')
         return result
-      rescue => ex
+      rescue
         Helper.log.info result
         raise "Error parsing certificate '#{path}'"
       end
     end
   end
-end
+end

data/lib/fastlane_core/configuration/commander_generator.rb

@@ -12,11 +12,11 @@ module FastlaneCore
         type = (option.is_string ? String : nil)
         short_option = option.short_option || "-#{option.key.to_s[0]}"
 
-        raise "Short option #{short_option} already taken for key #{option.key}".red if short_codes.include?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_codes << short_option
 
         # Example Call
@@ -29,4 +29,4 @@ module FastlaneCore
       end
     end
   end
-end
+end

data/lib/fastlane_core/configuration/config_item.rb

@@ -8,16 +8,16 @@ module FastlaneCore
     # @param description (String) A description shown to the user
     # @param short_option (String) A string of length 1 which is used for the command parameters (e.g. -f)
     # @param default_value the value which is used if there was no given values and no environment values
-    # @param verify_block an optional block which is called when a new value is set. 
+    # @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 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)
-      raise "key must be a symbol" unless key.kind_of?Symbol
-      raise "env_name must be a String" unless (env_name || '').kind_of?String
+      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.gsub('-', '').length == 1)
+        raise "short_option must be a String of length 1" unless short_option.kind_of? String and short_option.delete('-').length == 1
       end
       if description
         raise "Do not let descriptions end with a '.', since it's used for user inputs as well".red if (description[-1] == '.')
@@ -33,26 +33,25 @@ module FastlaneCore
       @optional = optional
     end
 
-
     # This will raise an exception if the value is not valid
     def verify!(value)
-      raise "Invalid value '#{value}' for option '#{self}'".red unless is_valid?value
+      raise "Invalid value '#{value}' for option '#{self}'".red unless valid? value
       true
     end
 
     # Make sure, the value is valid (based on the verify block)
     # Returns false if that's not the case
-    def is_valid?(value)
-      # we also allow nil values, which do not have to be verified. 
+    def valid?(value)
+      # we also allow nil values, which do not have to be verified.
       if value
         if @is_string
-          raise "'#{self.key}' value must be a String! Found #{value.class} instead.".red unless value.kind_of?String
+          raise "'#{self.key}' value must be a String! Found #{value.class} instead.".red unless value.kind_of? String
         end
-        
+
         if @verify_block
           begin
             @verify_block.call(value)
-          rescue Exception => ex
+          rescue => ex
             Helper.log.fatal "Error setting value '#{value}' for option '#{@key}'".red
             raise ex
           end
@@ -66,4 +65,4 @@ module FastlaneCore
       [@key, @description].join(": ")
     end
   end
-end
+end

data/lib/fastlane_core/configuration/configuration.rb

@@ -22,33 +22,35 @@ module FastlaneCore
     #####################################################
     # @!group Setting up the configuration
     #####################################################
-    
+
     def initialize(available_options, values)
       self.available_options = available_options || []
       self.values = values || {}
 
-      verify_input_types      
+      verify_input_types
       verify_value_exists
       verify_no_duplicates
       verify_default_value_matches_verify_block
     end
 
     def verify_input_types
-      raise "available_options parameter must be an array of ConfigItems but is #{@available_options.class}".red unless @available_options.kind_of?Array
+      raise "available_options parameter must be an array of ConfigItems but is #{@available_options.class}".red unless @available_options.kind_of? Array
       @available_options.each do |item|
-        raise "available_options parameter must be an array of ConfigItems. Found #{item.class}.".red unless item.kind_of?ConfigItem
+        raise "available_options parameter must be an array of ConfigItems. Found #{item.class}.".red unless item.kind_of? ConfigItem
       end
-      raise "values parameter must be a hash".red unless @values.kind_of?Hash
+      raise "values parameter must be a hash".red unless @values.kind_of? Hash
     end
 
     def verify_value_exists
       # 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
           option.verify!(value) # Call the verify block for it too
         else
-          raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect { |a| a.key }.join(', ')}".red
+          raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}".red
         end
       end
     end
@@ -56,11 +58,11 @@ module FastlaneCore
     def verify_no_duplicates
       # Make sure a key was not used multiple times
       @available_options.each do |current|
-        count = @available_options.select { |option| option.key == current.key }.count
+        count = @available_options.count { |option| option.key == current.key }
         raise "Multiple entries for configuration key '#{current.key}' found!".red if count > 1
 
         unless current.short_option.to_s.empty?
-          count = @available_options.select { |option| option.short_option == current.short_option }.count
+          count = @available_options.count { |option| option.short_option == current.short_option }
           raise "Multiple entries for short_option '#{current.short_option}' found!".red if count > 1
         end
       end
@@ -69,13 +71,13 @@ module FastlaneCore
     # Verifies the default value is also valid
     def verify_default_value_matches_verify_block
       @available_options.each do |item|
-        if item.verify_block and item.default_value
-          begin
-            item.verify_block.call(item.default_value)
-          rescue => ex
-            Helper.log.fatal ex
-            raise "Invalid default value for #{item.key}, doesn't match verify_block".red
-          end
+        next unless item.verify_block && item.default_value
+
+        begin
+          item.verify_block.call(item.default_value)
+        rescue => ex
+          Helper.log.fatal ex
+          raise "Invalid default value for #{item.key}, doesn't match verify_block".red
         end
       end
     end
@@ -83,7 +85,7 @@ module FastlaneCore
     # This method takes care of parsing and using the configuration file as values
     # Call this once you know where the config file might be located
     # Take a look at how `gym` uses this method
-    # 
+    #
     # @param config_file_name [String] The name of the configuration file to use (optional)
     # @param block_for_missing [Block] A ruby block that is called when there is an unkonwn method
     #   in the configuration file
@@ -93,7 +95,7 @@ module FastlaneCore
       self.config_file_name = config_file_name
 
       paths = Dir["./fastlane/#{self.config_file_name}"] + Dir["./#{self.config_file_name}"]
-      paths = paths + Dir["./spec/fixtures/#{self.config_file_name}"] if Helper.is_test?
+      paths += Dir["./spec/fixtures/#{self.config_file_name}"] if Helper.is_test?
       return if paths.count == 0
 
       path = paths.first
@@ -106,25 +108,24 @@ module FastlaneCore
 
     # Returns the value for a certain key. fastlane_core tries to fetch the value from different sources
     def fetch(key)
-      raise "Key '#{key}' must be a symbol. Example :app_id.".red unless key.kind_of?Symbol
+      raise "Key '#{key}' must be a symbol. Example :app_id.".red unless key.kind_of? Symbol
 
       option = option_for_key(key)
-      raise "Could not find option for key :#{key}. Available keys: #{@available_options.collect { |a| a.key }.join(', ')}".red unless option
+      raise "Could not find option for key :#{key}. Available keys: #{@available_options.collect(&:key).join(', ')}".red unless option
 
       value = @values[key]
-      
+
       # `if value == nil` instead of ||= because false is also a valid value
-      if value == nil and option.env_name and ENV[option.env_name]
+      if value.nil? and option.env_name and ENV[option.env_name]
         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 not option.is_string) # by default boolean flags are false
+      value = option.default_value if value.nil?
+      value = nil if value.nil? and !option.is_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
-      
 
       if Helper.is_test? or Helper.is_ci?
         # Since we don't want to be asked on tests, we'll just call the verify block with no value
@@ -134,13 +135,13 @@ module FastlaneCore
         raise "No value found for '#{key}'"
       end
 
-      while value == nil
+      while 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
         begin
           set(key, value)
-        rescue Exception => ex
+        rescue => ex
           puts ex
           value = nil
         end
@@ -152,11 +153,11 @@ module FastlaneCore
     # Overwrites or sets a new value for a given key
     # @param key [Symbol] Must be a symbol
     def set(key, value)
-      raise "Key '#{key}' must be a symbol. Example :#{key}.".red unless key.kind_of?Symbol
+      raise "Key '#{key}' must be a symbol. Example :#{key}.".red unless key.kind_of? Symbol
       option = option_for_key(key)
-      
+
       unless option
-        raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect { |a| a.key }.join(', ')}".red
+        raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}".red
       end
 
       option.verify!(value)
@@ -174,7 +175,7 @@ module FastlaneCore
     end
 
     def all_keys
-      @available_options.collect { |o| o.key }
+      @available_options.collect(&:key)
     end
 
     # Returns the config_item object for a given key
@@ -186,4 +187,4 @@ module FastlaneCore
     alias_method :[], :fetch
     alias_method :[]=, :set
   end
-end
+end

data/lib/fastlane_core/configuration/configuration_file.rb

@@ -10,12 +10,14 @@ module FastlaneCore
       self.config = config
       @block_for_missing = block_for_missing
 
+      # rubocop:disable Lint/Eval
       eval(File.read(path))
+      # rubocop:enable Lint/Eval
     end
 
     def method_missing(method_sym, *arguments, &block)
       # First, check if the key is actually available
-      if self.config.all_keys.include?method_sym
+      if self.config.all_keys.include? method_sym
         value = arguments.first || (block.call if block_given?) # this is either a block or a value
         if value
           self.config[method_sym] = value
@@ -32,4 +34,4 @@ module FastlaneCore
       end
     end
   end
-end
+end

data/lib/fastlane_core/helper.rb

@@ -2,7 +2,6 @@ require 'logger'
 
 module FastlaneCore
   module Helper
-
     # Logging happens using this method
     def self.log
       if is_test?
@@ -49,38 +48,40 @@ module FastlaneCore
       defined?SpecHelper
     end
 
-    # Use Helper.test? instead
-    def self.is_test?
-      self.test?
-    end
-
-    def self.is_ci?
-      ci?
-    end
-
     # @return [boolean] true if building in a known CI environment
     def self.ci?
       # Check for Jenkins, Travis CI, ... environment variables
       ['JENKINS_URL', 'TRAVIS', 'CIRCLECI', 'CI'].each do |current|
-        return true if ENV.has_key?(current)
+        return true if ENV.key?(current)
       end
       return false
     end
 
-    # @return the full path to the Xcode developer tools of the currently
-    #  running system
-    def self.xcode_path
-      return "" if self.is_test? and not self.is_mac?
-      `xcode-select -p`.gsub("\n", '') + "/"
+    # Is the currently running computer a Mac?
+    def self.mac?
+      (/darwin/ =~ RUBY_PLATFORM) != nil
+    end
+
+    # Use Helper.test? and Helper.ci? instead (legacy calls)
+    # rubocop:disable Style/PredicateName
+    def self.is_test?
+      self.test?
+    end
+
+    def self.is_ci?
+      ci?
     end
 
     def self.is_mac?
       self.mac?
     end
+    # rubocop:enable Style/PredicateName
 
-    # Is the currently running computer a Mac?
-    def self.mac?
-      (/darwin/ =~ RUBY_PLATFORM) != nil
+    # @return the full path to the Xcode developer tools of the currently
+    #  running system
+    def self.xcode_path
+      return "" if self.is_test? and !self.is_mac?
+      `xcode-select -p`.delete("\n") + "/"
     end
 
     # @return the full path to the iTMSTransporter executable
@@ -92,19 +93,19 @@ module FastlaneCore
         "../Applications/Application Loader.app/Contents/itms/bin/iTMSTransporter"
       ].each do |path|
         result = File.join(self.xcode_path, path)
-        return result if File.exists?(result)
+        return result if File.exist?(result)
       end
       raise "Could not find transporter at #{self.xcode_path}. Please make sure you set the correct path to your Xcode installation.".red
     end
 
     def self.fastlane_enabled?
       # This is called from the root context on the first start
-      @@enabled ||= File.directory?"./fastlane"
+      @@enabled ||= File.directory? "./fastlane"
     end
 
     # Path to the installed gem to load resources (e.g. resign.sh)
     def self.gem_path(gem_name)
-      if not Helper.is_test? and Gem::Specification::find_all_by_name(gem_name).any?
+      if !Helper.is_test? and Gem::Specification.find_all_by_name(gem_name).any?
         return Gem::Specification.find_by_name(gem_name).gem_dir
       else
         return './'

data/lib/fastlane_core/ipa_file_analyser.rb

@@ -20,22 +20,22 @@ module FastlaneCore
     def self.fetch_info_plist_file(path)
       Zip::File.open(path) do |zipfile|
         zipfile.each do |file|
-          if file.name.include?'.plist' and not ['.bundle', '.framework'].any? { |a| file.name.include?a }
-            # We can not be completely sure, that's the correct plist file, so we have to try
-            begin
-              # The XML file has to be properly unpacked first
-              tmp_path = "/tmp/deploytmp.plist"
-              File.write(tmp_path, zipfile.read(file))
-              system("plutil -convert xml1 #{tmp_path}")
-              result = Plist::parse_xml(tmp_path)
-              File.delete(tmp_path)
+          next unless file.name.include? '.plist' and !['.bundle', '.framework'].any? { |a| file.name.include? a }
 
-              if result['CFBundleIdentifier'] or result['CFBundleVersion']
-                return result
-              end
-            rescue
-              # We don't really care, look for another XML file
+          # We can not be completely sure, that's the correct plist file, so we have to try
+          begin
+            # The XML file has to be properly unpacked first
+            tmp_path = "/tmp/deploytmp.plist"
+            File.write(tmp_path, zipfile.read(file))
+            system("plutil -convert xml1 #{tmp_path}")
+            result = Plist.parse_xml(tmp_path)
+            File.delete(tmp_path)
+
+            if result['CFBundleIdentifier'] or result['CFBundleVersion']
+              return result
             end
+          rescue
+            # We don't really care, look for another XML file
           end
         end
       end
@@ -43,4 +43,4 @@ module FastlaneCore
       nil
     end
   end
-end
+end

data/lib/fastlane_core/itunes_connect/itunes_connect.rb

@@ -3,7 +3,6 @@ require 'capybara/poltergeist'
 require 'credentials_manager/password_manager'
 require 'phantomjs/poltergeist' # this will download and store phantomjs
 
-
 require 'fastlane_core/itunes_connect/itunes_connect_helper.rb'
 require 'fastlane_core/itunes_connect/itunes_connect_login.rb'
 require 'fastlane_core/itunes_connect/itunes_connect_apple_id.rb'
@@ -11,11 +10,11 @@ require 'fastlane_core/itunes_connect/itunes_connect_apple_id.rb'
 module FastlaneCore
   # Everything that can't be achived using the {FastlaneCore::ItunesTransporter}
   # will be scripted using the iTunesConnect frontend.
-  # 
+  #
   # Every method you call here, might take a time
   class ItunesConnect
     # This error occurs only if there is something wrong with the given login data
-    class ItunesConnectLoginError < StandardError 
+    class ItunesConnectLoginError < StandardError
     end
 
     # This error can occur for many reaons. It is
@@ -32,12 +31,12 @@ module FastlaneCore
     BUTTON_STRING_SUBMIT_FOR_REVIEW = "Submit for Review"
 
     WAITING_FOR_REVIEW = "Waiting For Review"
-    
+
     def initialize
       super
 
       return if Helper.is_test?
-      
+
       Capybara.run_server = false
       Capybara.default_driver = :poltergeist
       Capybara.javascript_driver = :poltergeist

data/lib/fastlane_core/itunes_connect/itunes_connect_apple_id.rb

@@ -1,4 +1,4 @@
-module FastlaneCore  
+module FastlaneCore
   # Find the Apple ID based on the App Identifier
   class ItunesConnect
     LIST_APPLE_IDS_URL = "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa/ra/apps/manageyourapps/summary"
@@ -12,4 +12,4 @@ module FastlaneCore
       # Do nothing right now...
     end
   end
-end
+end

data/lib/fastlane_core/itunes_connect/itunes_connect_helper.rb

@@ -1,11 +1,13 @@
-module FastlaneCore  
+module FastlaneCore
   class ItunesConnect
     # All the private helpers
+
     private
+
       # Opens the app details page of the given app.
       # @param app (Deliver::App) the app that should be opened
       # @return (bool) true if everything worked fine
-      # @raise [ItunesConnectGeneralError] General error while executing 
+      # @raise [ItunesConnectGeneralError] General error while executing
       #  this action
       # @raise [ItunesConnectLoginError] Login data is wrong
       def open_app_page(app)
@@ -18,7 +20,7 @@ module FastlaneCore
         wait_for_elements('.page-subnav')
         sleep 5
 
-        if current_url.include?"wa/defaultError" # app could not be found
+        if current_url.include? "wa/defaultError" # app could not be found
           raise "Could not open app details for app '#{app}'. Make sure you're using the correct Apple ID and the correct Apple developer account (#{CredentialsManager::PasswordManager.shared_manager.username}).".red
         end
 
@@ -27,9 +29,8 @@ module FastlaneCore
         error_occured(ex)
       end
 
-      
       def verify_app(app)
-        raise ItunesConnectGeneralError.new("No valid Deliver::App given") unless app.kind_of?Deliver::App
+        raise ItunesConnectGeneralError.new("No valid Deliver::App given") unless app.kind_of? Deliver::App
         raise ItunesConnectGeneralError.new("App is missing information (apple_id not given)") unless (app.apple_id || '').to_s.length > 5
       end
 
@@ -40,7 +41,9 @@ module FastlaneCore
 
       def snap
         path = File.expand_path("Error#{Time.now.to_i}.png")
-        save_screenshot(path, :full => true)
+        # rubocop:disable Lint/Debugger
+        save_screenshot(path, full: true)
+        # rubocop:enable Lint/Debugger
         system("open '#{path}'") unless ENV['SIGH_DISABLE_OPEN_ERROR']
       end
 
@@ -49,11 +52,11 @@ module FastlaneCore
         started = Time.now
 
         # Wait, while iTunesConnect is processing the uploaded file
-        while (page.has_content?"Uploaded")
+        while page.has_content? "Uploaded"
           # iTunesConnect is super slow... so we have to wait...
-          Helper.log.info("Sorry, we have to wait for iTunesConnect, since it's still processing the uploaded ipa file\n" + 
-            "If this takes longer than 45 minutes, you have to re-upload the ipa file again.\n" + 
-            "You can always open the browser page yourself: '#{current_url}'\n" +
+          Helper.log.info("Sorry, we have to wait for iTunesConnect, since it's still processing the uploaded ipa file\n" \
+            "If this takes longer than 45 minutes, you have to re-upload the ipa file again.\n" \
+            "You can always open the browser page yourself: '#{current_url}'\n" \
             "Passed time: ~#{((Time.now - started) / 60.0).to_i} minute(s)")
           sleep 30
           visit current_url
@@ -64,7 +67,7 @@ module FastlaneCore
       def wait_for_elements(name)
         counter = 0
         results = all(name)
-        while results.count == 0      
+        while results.count == 0
           # Helper.log.debug "Waiting for #{name}"
           sleep 0.2
 
@@ -79,4 +82,4 @@ module FastlaneCore
         return results
       end
   end
-end
+end

data/lib/fastlane_core/itunes_connect/itunes_connect_login.rb

@@ -1,15 +1,15 @@
-module FastlaneCore  
+module FastlaneCore
   # Login code
   class ItunesConnect
     # Loggs in a user with the given login data on the iTC Frontend.
     # You don't need to pass a username and password. It will
     # Automatically be fetched using the {CredentialsManager::PasswordManager}.
-    # This method will also automatically be called when triggering other 
+    # This method will also automatically be called when triggering other
     # actions like {#open_app_page}
     # @param user (String) (optional) The username/email address
     # @param password (String) (optional) The password
     # @return (bool) true if everything worked fine
-    # @raise [ItunesConnectGeneralError] General error while executing 
+    # @raise [ItunesConnectGeneralError] General error while executing
     #  this action
     # @raise [ItunesConnectLoginError] Login data is wrong
     def login(user = nil, password = nil)
@@ -22,15 +22,15 @@ module FastlaneCore
       raise "Could not open iTunesConnect" unless result['status'] == 'success'
 
       sleep 3
-      
-      if page.has_content?"My Apps"
+
+      if page.has_content? "My Apps"
         # Already logged in
         return true
       end
 
       begin
         wait_for_elements('#accountpassword')
-      rescue => ex
+      rescue
         # when the user is already logged in, this will raise an exception
       end
 
@@ -40,13 +40,13 @@ module FastlaneCore
       begin
         page.evaluate_script "appleConnectForm.submit()"
         sleep 7
-        
-        if page.has_content?"My Apps"
+
+        if page.has_content? "My Apps"
           # Everything looks good
         else
           visit current_url # iTC sometimes is super buggy, try reloading the site
           sleep 3
-          unless page.has_content?"My Apps"
+          unless page.has_content? "My Apps"
             raise ItunesConnectLoginError.new("Looks like your login data was correct, but you do not have access to the apps.".red)
           end
         end
@@ -62,4 +62,4 @@ module FastlaneCore
       error_occured(ex)
     end
   end
-end
+end

data/lib/fastlane_core/itunes_search_api.rb

@@ -7,25 +7,27 @@ module FastlaneCore
 
     # Fetch all information you can get from a specific AppleID of an app
     # @param id (int) The AppleID of the given app. This usually consists of 9 digits.
-    # @return (Hash) the response of the first result from Apple (https://itunes.apple.com/lookup?id=284882215)
-    # @example Response of Facebook App: https://itunes.apple.com/lookup?id=284882215
-    #  { 
+    # @param country (string) The optional ISO-2A country code
+    # @return (Hash) the response of the first result from Apple (https://itunes.apple.com/lookup?id=284882215[&country=FR])
+    # @example Response of Facebook App: https://itunes.apple.com/lookup?id=284882215[&country=FR]
+    #  {
     #   ...
     #   artistName: "Facebook, Inc.",
     #   price: 0,
     #   version: "14.9",
     #   ...
     #  }
-    def self.fetch(id)
-      # Example: https://itunes.apple.com/lookup?id=284882215
-      fetch_url("https://itunes.apple.com/lookup?id=#{id.to_s}")
+    def self.fetch(id, country = nil)
+      # Example: https://itunes.apple.com/lookup?id=284882215[&country=FR]
+      suffix = country.nil? ? nil : "&country=#{country}"
+      fetch_url("https://itunes.apple.com/lookup?id=#{id}#{suffix}")
     end
 
-    def self.fetch_by_identifier(app_identifier)
-      # Example: http://itunes.apple.com/lookup?bundleId=net.sunapps.1
-      fetch_url("https://itunes.apple.com/lookup?bundleId=#{app_identifier}")
+    def self.fetch_by_identifier(app_identifier, country = nil)
+      # Example: http://itunes.apple.com/lookup?bundleId=net.sunapps.1[&country=FR]
+      suffix = country.nil? ? nil : "&country=#{country}"
+      fetch_url("https://itunes.apple.com/lookup?bundleId=#{app_identifier}#{suffix}")
     end
-      
 
     # This method only fetches the bundle identifier of a given app
     # @param id (int) The AppleID of the given app. This usually consists of 9 digits.
@@ -34,15 +36,14 @@ module FastlaneCore
       self.fetch(id)['bundleId']
     end
 
-    private
-      def self.fetch_url(url)
-        response = JSON.parse(open(url).read)
-        return nil if response['resultCount'] == 0
+    def self.fetch_url(url)
+      response = JSON.parse(open(url).read)
+      return nil if response['resultCount'] == 0
 
-        return response['results'].first
-      rescue
-        Helper.log.error "Could not find object '#{url}' using the iTunes API"
-        nil
-      end
+      return response['results'].first
+    rescue
+      Helper.log.error "Could not find object '#{url}' using the iTunes API"
+      nil
+    end
   end
-end
+end

data/lib/fastlane_core/itunes_transporter.rb

@@ -2,7 +2,6 @@ require 'pty'
 require 'shellwords'
 require 'credentials_manager/password_manager'
 
-
 module FastlaneCore
   # The TransporterInputError occurs when you passed wrong inputs to the {Deliver::ItunesTransporter}
   class TransporterInputError < StandardError
@@ -18,7 +17,7 @@ module FastlaneCore
     OUTPUT_REGEX = />\s+(.+)/
     RETURN_VALUE_REGEX = />\sDBG-X:\sReturning\s+(\d+)/
 
-    SKIP_ERRORS = [ "ERROR: An exception has occurred: Scheduling automatic restart in 1 minute" ]
+    SKIP_ERRORS = ["ERROR: An exception has occurred: Scheduling automatic restart in 1 minute"]
 
     private_constant :ERROR_REGEX, :WARNING_REGEX, :OUTPUT_REGEX, :RETURN_VALUE_REGEX, :SKIP_ERRORS
 
@@ -53,12 +52,14 @@ module FastlaneCore
       result = execute_transporter(command)
 
       itmsp_path = File.join(dir, "#{app_id}.itmsp")
-      if result and File.directory?itmsp_path
+      if result and File.directory? itmsp_path
         Helper.log.info "Successfully downloaded the latest package from iTunesConnect.".green
       else
+        # rubocop:disable Style/CaseEquality
         unless /^[0-9a-zA-Z\.\$\_]*$/ === @password
           Helper.log.error "Password contains special characters, which may not be handled properly by iTMSTransporter. If you experience problems uploading to iTunes Connect, please consider changing your password to something with only alphanumeric characters."
         end
+        # rubocop:enable Style/CaseEquality
         Helper.log.fatal "Could not download metadata from iTunes Connect! It's probably related to your password or your internet connection."
       end
 
@@ -94,115 +95,116 @@ module FastlaneCore
     end
 
     private
-      def execute_transporter(command)
-        @errors = []
-        @warnings = []
-
-        if defined?@@hide_transporter_output
-          # Show a one time message instead
-          Helper.log.info "Waiting for iTunes Connect transporter to be finished.".green
-          Helper.log.info "iTunes Transporter progress... this might take a few minutes...".green
-        end
 
-        begin
-          PTY.spawn(command) do |stdin, stdout, pid|
-            stdin.each do |line|
-              parse_line(line) # this is where the parsing happens
-            end
-          end
-        rescue => ex
-          Helper.log.fatal(ex.to_s)
-          @errors << ex.to_s
-        end
+    def execute_transporter(command)
+      @errors = []
+      @warnings = []
 
-        if @warnings.count > 0
-          Helper.log.warn(@warnings.join("\n"))
-        end
+      if defined?@@hide_transporter_output
+        # Show a one time message instead
+        Helper.log.info "Waiting for iTunes Connect transporter to be finished.".green
+        Helper.log.info "iTunes Transporter progress... this might take a few minutes...".green
+      end
 
-        if @errors.count > 0
-          Helper.log.error(@errors.join("\n"))
-          return false
+      begin
+        PTY.spawn(command) do |stdin, stdout, pid|
+          stdin.each do |line|
+            parse_line(line) # this is where the parsing happens
+          end
         end
+      rescue => ex
+        Helper.log.fatal(ex.to_s)
+        @errors << ex.to_s
+      end
 
-        true
+      if @warnings.count > 0
+        Helper.log.warn(@warnings.join("\n"))
       end
 
-      def parse_line(line)
-        # Taken from https://github.com/sshaw/itunes_store_transporter/blob/master/lib/itunes/store/transporter/output_parser.rb
+      if @errors.count > 0
+        Helper.log.error(@errors.join("\n"))
+        return false
+      end
 
-        output_done = false
+      true
+    end
 
-        re = Regexp.union(SKIP_ERRORS)
-        if line.match(re)
-          # Those lines will not be handle like errors or warnings
+    def parse_line(line)
+      # Taken from https://github.com/sshaw/itunes_store_transporter/blob/master/lib/itunes/store/transporter/output_parser.rb
 
-        elsif line =~ ERROR_REGEX
-          @errors << $1
-          Helper.log.error "[Transporter Error Output]: #{$1}".red
+      output_done = false
 
-          # Check if it's a login error
-          if $1.include?"Your Apple ID or password was entered incorrectly" or
-             $1.include?"This Apple ID has been locked for security reasons"
+      re = Regexp.union(SKIP_ERRORS)
+      if line.match(re)
+        # Those lines will not be handle like errors or warnings
 
-            CredentialsManager::PasswordManager.shared_manager.password_seems_wrong unless Helper.is_test?
-          elsif $1.include?"Redundant Binary Upload. There already exists a binary upload with build"
-            Helper.log.fatal $1
-            Helper.log.fatal "You have to change the build number of your app to upload your ipa file"
-          end
+      elsif line =~ ERROR_REGEX
+        @errors << $1
+        Helper.log.error "[Transporter Error Output]: #{$1}".red
 
-          output_done = true
-        elsif line =~ WARNING_REGEX
-          @warnings << $1
-          Helper.log.warn "[Transporter Warning Output]: #{$1}".yellow
-          output_done = true
-        end
+        # Check if it's a login error
+        if $1.include? "Your Apple ID or password was entered incorrectly" or
+           $1.include? "This Apple ID has been locked for security reasons"
 
-        if line =~ RETURN_VALUE_REGEX
-          if $1.to_i != 0
-            Helper.log.fatal "Transporter transfer failed.".red
-            Helper.log.warn(@warnings.join("\n").yellow)
-            Helper.log.error(@errors.join("\n").red)
-            raise "Return status of iTunes Transporter was #{$1}: #{@errors.join('\n')}".red
-          else
-            Helper.log.info "iTunes Transporter successfully finished its job".green
-          end
+          CredentialsManager::PasswordManager.shared_manager.password_seems_wrong unless Helper.is_test?
+        elsif $1.include? "Redundant Binary Upload. There already exists a binary upload with build"
+          Helper.log.fatal $1
+          Helper.log.fatal "You have to change the build number of your app to upload your ipa file"
         end
 
-        if not defined?@@hide_transporter_output and line =~ OUTPUT_REGEX
-          # General logging for debug purposes
-          unless output_done
-            Helper.log.debug "[Transporter]: #{$1}"
-          end
-        end
+        output_done = true
+      elsif line =~ WARNING_REGEX
+        @warnings << $1
+        Helper.log.warn "[Transporter Warning Output]: #{$1}".yellow
+        output_done = true
       end
 
-      def build_download_command(username, password, apple_id, destination = "/tmp")
-        [
-          '"' + Helper.transporter_path + '"',
-          "-m lookupMetadata",
-          "-u \"#{username}\"",
-          "-p '#{escaped_password(password)}'",
-          "-apple_id #{apple_id}",
-          "-destination '#{destination}'"
-        ].join(' ')
+      if line =~ RETURN_VALUE_REGEX
+        if $1.to_i != 0
+          Helper.log.fatal "Transporter transfer failed.".red
+          Helper.log.warn(@warnings.join("\n").yellow)
+          Helper.log.error(@errors.join("\n").red)
+          raise "Return status of iTunes Transporter was #{$1}: #{@errors.join('\n')}".red
+        else
+          Helper.log.info "iTunes Transporter successfully finished its job".green
+        end
       end
 
-      def build_upload_command(username, password, source = "/tmp")
-        [
-          '"' + Helper.transporter_path + '"',
-          "-m upload",
-          "-u \"#{username}\"",
-          "-p '#{escaped_password(password)}'",
-          "-f '#{source}'",
-          ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"], # that's here, because the user might overwrite the -t option
-          "-t 'Signiant'",
-          "-k 100000"
-        ].join(' ')
+      if !defined?@@hide_transporter_output and line =~ OUTPUT_REGEX
+        # General logging for debug purposes
+        unless output_done
+          Helper.log.debug "[Transporter]: #{$1}"
+        end
       end
+    end
 
-      def escaped_password(password)
-        Shellwords.escape(password)
-      end
+    def build_download_command(username, password, apple_id, destination = "/tmp")
+      [
+        '"' + Helper.transporter_path + '"',
+        "-m lookupMetadata",
+        "-u \"#{username}\"",
+        "-p '#{escaped_password(password)}'",
+        "-apple_id #{apple_id}",
+        "-destination '#{destination}'"
+      ].join(' ')
+    end
+
+    def build_upload_command(username, password, source = "/tmp")
+      [
+        '"' + Helper.transporter_path + '"',
+        "-m upload",
+        "-u \"#{username}\"",
+        "-p '#{escaped_password(password)}'",
+        "-f '#{source}'",
+        ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"], # that's here, because the user might overwrite the -t option
+        "-t 'Signiant'",
+        "-k 100000"
+      ].join(' ')
+    end
+
+    def escaped_password(password)
+      Shellwords.escape(password)
+    end
 
   end
 end

data/lib/fastlane_core/languages.rb

@@ -3,4 +3,4 @@ module FastlaneCore
     # These are all the languages which are available to use to upload app metadata and screenshots
     ALL_LANGUAGES = ["da-DK", "de-DE", "el-GR", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi-FI", "fr-CA", "fr-FR", "id-ID", "it-IT", "ja-JP", "ko-KR", "ms-MY", "nl-NL", "no-NO", "pt-BR", "pt-PT", "ru-RU", "sv-SE", "th-TH", "tr-TR", "vi-VI", "cmn-Hans", "cmn-Hant"]
   end
-end
+end

data/lib/fastlane_core/provisioning_profile.rb

@@ -24,7 +24,7 @@ module FastlaneCore
       def parse(path)
         require 'plist'
 
-        plist = Plist::parse_xml(`security cms -D -i '#{path}'`)
+        plist = Plist.parse_xml(`security cms -D -i '#{path}'`)
         if (plist || []).count > 5
           plist
         else
@@ -57,9 +57,9 @@ module FastlaneCore
             raise "Failed installation of provisioning profile at location: '#{destination}'".red
           end
         end
-        
+
         true
       end
     end
   end
-end
+end

data/lib/fastlane_core/update_checker.rb

@@ -11,7 +11,7 @@ module FastlaneCore
       return if ENV["FASTLANE_SKIP_UPDATE_CHECK"]
 
       @start_time = Time.now
-      
+
       Thread.new do
         begin
           server_results[gem_name] = fetch_latest(gem_name)
@@ -34,7 +34,7 @@ module FastlaneCore
         begin
           finished_running(gem_name)
         rescue
-           # we don't want to show a stack trace if something goes wrong
+          # we don't want to show a stack trace if something goes wrong
         end
       end
 
@@ -69,4 +69,4 @@ module FastlaneCore
       Excon.post(url)
     end
   end
-end
+end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.15.1"
+  VERSION = "0.15.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json