fastlane_core 0.41.2 → 0.41.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7a618468b31d828fe31bccc19aba85306c5c17
-  data.tar.gz: 9e3a24d90de9e34ed39cbfc822f5562a7f974357
+  metadata.gz: 3501dde8a99eaa2d37c5f5052a5835ff93a09384
+  data.tar.gz: 9802e017e03259a343f54976ff928b936bdb482c
 SHA512:
-  metadata.gz: 6ad82711a64a3bddd7737e0c04724e4a22cdcbce13d192804efe52dce48016f068ff3a188bb4a0f2a649f4db60d9dfc64ce9dba818c3567ecee5c9541ac218f3
-  data.tar.gz: 75f974ac1727bb8c7c778f6f350f4f5e79ffe2e80fa13931991267072284549f7659a5f9929fd19b9f67400057f45f5f73d4c1725e9f9073aef0bd17d10f5441
+  metadata.gz: 3da7e12d5a745ad709035348a8b2dd1d5b9d1b8e2b1bb76634283f891bd1f12a042a28ec0d75aaa6ec8126eca4e4a565b93a370fb2ee01bf9d98c72f46c42159
+  data.tar.gz: b7b51581a819640271b43f15599ebb7121c7b10de4d1f8ffd13b8bffb2f5e2207d5eb7adaa365a2a69be72dc9d1497e60c523b41fbcaa287e37e3aa956b07412

data/lib/fastlane_core/cert_checker.rb

@@ -48,7 +48,8 @@ module FastlaneCore
 
     def self.wwdr_certificate_installed?
       certificate_name = "Apple Worldwide Developer Relations Certification Authority"
-      response = Helper.backticks("security find-certificate -c '#{certificate_name}'", print: $verbose)
+      keychain = wwdr_keychain
+      response = Helper.backticks("security find-certificate -c '#{certificate_name}' #{keychain}", print: $verbose)
       return response.include?("attributes:")
     end
 
@@ -56,11 +57,28 @@ module FastlaneCore
       Dir.chdir('/tmp') do
         url = 'https://developer.apple.com/certificationauthority/AppleWWDRCA.cer'
         filename = File.basename(url)
-        `curl -O #{url} && security import #{filename} -k login.keychain`
+        keychain = wwdr_keychain
+        keychain.prepend("-k ") unless keychain.empty?
+        `curl -O #{url} && security import #{filename} #{keychain}`
         UI.user_error!("Could not install WWDR certificate") unless $?.success?
       end
     end
 
+    def self.wwdr_keychain
+      priority = [
+        "security list-keychains -d user",
+        "security default-keychain -d user"
+      ]
+      priority.each do |command|
+        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]
+        end
+      end
+      return ""
+    end
+
     def self.sha1_fingerprint(path)
       result = `openssl x509 -in "#{path}" -inform der -noout -sha1 -fingerprint`
       begin

data/lib/fastlane_core/helper.rb

@@ -151,6 +151,7 @@ module FastlaneCore
 
     # @return the full path to the iTMSTransporter executable
     def self.itms_path
+      return ENV["FASTLANE_ITUNES_TRANSPORTER_PATH"] if ENV["FASTLANE_ITUNES_TRANSPORTER_PATH"]
       return '' unless self.is_mac? # so tests work on Linx too
 
       [

data/lib/fastlane_core/itunes_transporter.rb

@@ -37,25 +37,35 @@ module FastlaneCore
 
       begin
         PTY.spawn(command) do |stdin, stdout, pid|
-          stdin.each do |line|
-            parse_line(line, hide_output) # this is where the parsing happens
+          begin
+            stdin.each do |line|
+              parse_line(line, hide_output) # this is where the parsing happens
+            end
+          rescue Errno::EIO
+            # Exception ignored intentionally.
+            # https://stackoverflow.com/questions/10238298/ruby-on-linux-pty-goes-away-without-eof-raises-errnoeio
+          ensure
+            Process.wait(pid)
           end
         end
       rescue => ex
-        UI.error(ex.to_s)
         @errors << ex.to_s
       end
 
+      exit_status = $?.exitstatus
+      unless exit_status.zero?
+        @errors << "The call to the iTMSTransporter completed with a non-zero exit status: #{exit_status}. This indicates a failure."
+      end
+
       if @warnings.count > 0
         UI.important(@warnings.join("\n"))
       end
 
       if @errors.count > 0
         UI.error(@errors.join("\n"))
-        return false
       end
 
-      true
+      @errors.count.zero?
     end
 
     private
@@ -139,6 +149,18 @@ module FastlaneCore
       ].join(' ')
     end
 
+    def handle_error(password)
+      # rubocop:disable Style/CaseEquality
+      unless /^[0-9a-zA-Z\.\$\_]*$/ === password
+        UI.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."
+        ].join(' '))
+      end
+      # rubocop:enable Style/CaseEquality
+      UI.error("Could not download/upload from iTunes Connect! It's probably related to your password or your internet connection.")
+    end
+
     private
 
     def shell_escaped_password(password)
@@ -204,6 +226,14 @@ module FastlaneCore
       ].join(' ')
     end
 
+    def handle_error(password)
+      unless File.exist?(Helper.transporter_java_jar_path)
+        UI.error("The iTMSTransporter Java app was not found at '#{Helper.transporter_java_jar_path}'.")
+        UI.error("If you're using Xcode 6, please select the shell script executor by setting the environment variable "\
+          "FASTLANE_ITUNES_TRANSPORTER_USE_SHELL_SCRIPT=1")
+      end
+    end
+
     def execute(command, hide_output)
       # The Java command needs to be run starting in a working directory in the iTMSTransporter
       # file area. The shell script takes care of changing directories over to there, but we'll
@@ -301,15 +331,7 @@ module FastlaneCore
     private
 
     def handle_error(password)
-      # rubocop:disable Style/CaseEquality
-      unless /^[0-9a-zA-Z\.\$\_]*$/ === password
-        UI.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."
-        ].join(' '))
-      end
-      # rubocop:enable Style/CaseEquality
-      UI.error("Could not download/upload from iTunes Connect! It's probably related to your password or your internet connection.")
+      @transporter_executor.handle_error(password)
     end
   end
 end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.41.2".freeze
+  VERSION = "0.41.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.41.2
+  version: 0.41.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json