fastlane_core 0.42.1 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6ae47502eb6f4fd060ccff03860f7be861d26af
-  data.tar.gz: 57fa04e37deddbe98fa6b528c2208078d0633c4f
+  metadata.gz: 3e1f8f4483072a22729df956093d77ccb7038a42
+  data.tar.gz: c7f140b5b470fb9cdc552fb51f4403073fbb2178
 SHA512:
-  metadata.gz: 60e64b52867a8338f2a67effd996e23266766bf5ae95a8030d423bd2000a0c7707fab04b02391a7d7e1bac930e74af2e3251a8faaf5db14390d2f5f9642609c2
-  data.tar.gz: b6facb77b2a12c5d31ce062c7827ea12e079105bcb8ba596b39b7fc98e970369662036291b8c1f3e46930cc158d88dc287cdedb9a4c824bd25b8a9f135fee4e2
+  metadata.gz: 222d88fa8160bb9ec77d991c772007862e0959066a14fbf18bdd1f46f6f2ddbbcf76356d46e6c533fdbf4868cb83f81980167d94be539f08d1e565befaa1fe7d
+  data.tar.gz: 50d7d27a770fa0dce3c36a5841079afcb00ea5c6e914439406606950edb62a95ed963bca7f65f435112728e5a22ce628f2daa271ec005235d54f945246d4e01f

data/lib/fastlane_core/cert_checker.rb

@@ -73,7 +73,7 @@ module FastlaneCore
         keychains = Helper.backticks(command, print: $verbose).split("\n")
         unless keychains.empty?
           # Select first keychain name from returned keychains list
-          return keychains[0].strip.tr('"', '').split(File::SEPARATOR)[-1]
+          return keychains[0].strip.tr('"', '')
         end
       end
       return ""

data/lib/fastlane_core/itunes_transporter.rb

@@ -12,6 +12,10 @@ module FastlaneCore
   class TransporterTransferError < StandardError
   end
 
+  # Used internally
+  class TransporterRequiresApplicationSpecificPasswordError < StandardError
+  end
+
   # Base class for executing the iTMSTransporter
   class TransporterExecutor
     ERROR_REGEX = />\s*ERROR:\s+(.+)/
@@ -61,6 +65,10 @@ module FastlaneCore
         UI.important(@warnings.join("\n"))
       end
 
+      if @errors.join("").include?("Sign in with the app-specific")
+        raise TransporterRequiresApplicationSpecificPasswordError
+      end
+
       if @errors.count > 0
         UI.error(@errors.join("\n"))
       end
@@ -85,7 +93,7 @@ module FastlaneCore
 
         # 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"
+           $1.include? "This Apple ID has been locked for security reasons"
 
           unless Helper.is_test?
             CredentialsManager::AccountManager.new(user: @user).invalid_credentials
@@ -245,6 +253,8 @@ module FastlaneCore
   end
 
   class ItunesTransporter
+    TWO_STEP_HOST_PREFIX = "deliver.appspecific"
+
     # This will be called from the Deliverfile, and disables the logging of the transporter output
     def self.hide_transporter_output
       @hide_transporter_output = !$verbose
@@ -265,10 +275,22 @@ module FastlaneCore
       # we can't default to using the better direct Java invocation strategy for those versions.
       use_shell_script ||= Helper.xcode_version.start_with?('6.')
       use_shell_script ||= !ENV['FASTLANE_ITUNES_TRANSPORTER_USE_SHELL_SCRIPT'].nil?
-      data = CredentialsManager::AccountManager.new(user: user, password: password)
 
+      # First, see if we have an application specific password
+      data = CredentialsManager::AccountManager.new(user: user,
+                                                  prefix: TWO_STEP_HOST_PREFIX)
       @user = data.user
-      @password = data.password
+      @password ||= data.password(ask_if_missing: false)
+
+      if @password.to_s.length == 0
+        # No specific password found, just using the iTC/Dev Portal one
+        # default to the given password here
+        data = CredentialsManager::AccountManager.new(user: user,
+                                                  password: password)
+        @user = data.user
+        @password ||= data.password
+      end
+
       @transporter_executor = use_shell_script ? ShellScriptTransporterExecutor.new : JavaTransporterExecutor.new
     end
 
@@ -285,7 +307,13 @@ module FastlaneCore
       command = @transporter_executor.build_download_command(@user, @password, app_id, dir)
       UI.verbose(@transporter_executor.build_download_command(@user, 'YourPassword', app_id, dir))
 
-      result = @transporter_executor.execute(command, ItunesTransporter.hide_transporter_output?)
+      begin
+        result = @transporter_executor.execute(command, ItunesTransporter.hide_transporter_output?)
+      rescue TransporterRequiresApplicationSpecificPasswordError => ex
+        handle_two_step_failure(ex)
+        return download(app_id, dir)
+      end
+
       return result if Helper.is_test?
 
       itmsp_path = File.join(dir, "#{app_id}.itmsp")
@@ -307,23 +335,27 @@ module FastlaneCore
     # @raise [Deliver::TransporterTransferError] when something went wrong
     #   when transfering
     def upload(app_id, dir)
-      dir = File.join(dir, "#{app_id}.itmsp")
+      actual_dir = File.join(dir, "#{app_id}.itmsp")
 
       UI.message("Going to upload updated app to iTunes Connect")
       UI.success("This might take a few minutes, please don't interrupt the script")
 
-      command = @transporter_executor.build_upload_command(@user, @password, dir)
-
-      UI.verbose(@transporter_executor.build_upload_command(@user, 'YourPassword', dir))
+      command = @transporter_executor.build_upload_command(@user, @password, actual_dir)
+      UI.verbose(@transporter_executor.build_upload_command(@user, 'YourPassword', actual_dir))
 
-      result = @transporter_executor.execute(command, ItunesTransporter.hide_transporter_output?)
+      begin
+        result = @transporter_executor.execute(command, ItunesTransporter.hide_transporter_output?)
+      rescue TransporterRequiresApplicationSpecificPasswordError => ex
+        handle_two_step_failure(ex)
+        return upload(app_id, dir)
+      end
 
       if result
         UI.success("-" * 102)
         UI.success("Successfully uploaded package to iTunes Connect. It might take a few minutes until it's visible online.")
         UI.success("-" * 102)
 
-        FileUtils.rm_rf(dir) unless Helper.is_test? # we don't need the package any more, since the upload was successful
+        FileUtils.rm_rf(actual_dir) unless Helper.is_test? # we don't need the package any more, since the upload was successful
       else
         handle_error(@password)
       end
@@ -333,6 +365,25 @@ module FastlaneCore
 
     private
 
+    # Tells the user how to get an application specific password
+    def handle_two_step_failure(ex)
+      a = CredentialsManager::AccountManager.new(user: @user,
+                                               prefix: TWO_STEP_HOST_PREFIX)
+      if a.password(ask_if_missing: false).to_s.length > 0
+        # user already entered one.. delete the old one
+        UI.error("Application specific password seems wrong")
+        UI.error("Please make sure to follow the instructions")
+        a.remove_from_keychain
+      end
+      UI.error("Your account has 2 step verification enabled")
+      UI.error("Please go to https://appleid.apple.com/account/manage")
+      UI.error("and generate an application specific password for")
+      UI.error("the iTunes Transporter, which is used to upload builds")
+      @password = a.password # to ask the user for the missing value
+
+      return true
+    end
+
     def handle_error(password)
       @transporter_executor.handle_error(password)
     end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.42.1".freeze
+  VERSION = "0.43.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.43.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -180,7 +180,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools