fastlane 2.69.0.beta.20171208010004 → 2.69.0.beta.20171209010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3c2b5cbef74d7bad0828ec4fe2decf402fc5fa
-  data.tar.gz: d0ac8dcc81ba78412ed83ca48a65028dd763b919
+  metadata.gz: cbfa8d3d26ee4860fef743149e93dc768eef5061
+  data.tar.gz: ba67896158ebdc6f33944aaea9fe5c3c683f44d2
 SHA512:
-  metadata.gz: 3f09cb8afd547b0c4f3750774e6ac16c2054feda350ab4dab37ff32cbf58c39f320d0f4112c10c100b76ec86ea2d7b63717b07546420442a4371986d468c53f0
-  data.tar.gz: cca562e98a5de53bc8de2287ed060ede6a441dabf9348d614896ebc8ddfa703192780137d5a899bf20e105a19a28218fdff81a06e1564ad2cebc95e1d6cedbda
+  metadata.gz: be8e9616aa60ec5b6cdaa5db729b3b4ccd217224e16f6d8a9f7b5e11f1314e65b8e490e5aa88e442cd00572113742b2a469238978a9cf12ba83322fd18f5d908
+  data.tar.gz: 56b8ccaad3121ae3c778dbcceb569db50cccb0456030de4039873f63c5d8d55773aa976b9bb7801896b8e883a1d54043d1a322c95c35fc9e368105ab17b5d07a

data/fastlane/lib/fastlane/action.rb

@@ -1,4 +1,5 @@
 require 'fastlane/actions/actions_helper'
+require 'forwardable'
 
 module Fastlane
   class Action
@@ -20,6 +21,11 @@ module Fastlane
 
     class << self
       attr_accessor :runner
+
+      extend Forwardable
+
+      # to allow a simple `sh` in the custom actions
+      def_delegator Actions, :sh_control_output, :sh
     end
 
     def self.run(params)
@@ -93,11 +99,6 @@ module Fastlane
       self.action_name
     end
 
-    # to allow a simple `sh` in the custom actions
-    def self.sh(*command, print_command: true, print_command_output: true, error_callback: nil)
-      Fastlane::Actions.sh_control_output(*command, print_command: print_command, print_command_output: print_command_output, error_callback: error_callback)
-    end
-
     # Documentation category, available values defined in AVAILABLE_CATEGORIES
     def self.category
       :undefined

data/fastlane/lib/fastlane/actions/download_dsyms.rb

@@ -160,7 +160,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :platform,
                                        short_option: "-p",
                                        env_name: "DOWNLOAD_DSYMS_PLATFORM",
-                                       description: "The app platform for dSYMs you wish to download",
+                                       description: "The app platform for dSYMs you wish to download (ios, appletvos)",
                                        optional: true,
                                        default_value: :ios),
           FastlaneCore::ConfigItem.new(key: :version,

data/fastlane/lib/fastlane/fast_file.rb

@@ -174,10 +174,10 @@ module Fastlane
     end
 
     # Execute shell command
-    def sh(*command, log: true, error_callback: nil)
+    def sh(*command, log: true, error_callback: nil, &b)
       command_header = log ? Actions.shell_command_from_args(*command) : "shell command"
       Actions.execute_action(command_header) do
-        Actions.sh_no_action(*command, log: log, error_callback: error_callback)
+        Actions.sh_no_action(*command, log: log, error_callback: error_callback, &b)
       end
     end
 

data/fastlane/lib/fastlane/helper/sh_helper.rb

@@ -8,18 +8,22 @@ module Fastlane
     # When running this in tests, it will return the actual command instead of executing it
     # @param log [Boolean] should fastlane print out the executed command
     # @param error_callback [Block] a callback invoked with the command output if there is a non-zero exit status
-    def self.sh(*command, log: true, error_callback: nil)
-      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback)
+    def self.sh(*command, log: true, error_callback: nil, &b)
+      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback, &b)
     end
 
-    def self.sh_no_action(*command, log: true, error_callback: nil)
-      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback)
+    def self.sh_no_action(*command, log: true, error_callback: nil, &b)
+      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback, &b)
     end
 
     # @param command The command to be executed (variadic)
     # @param print_command [Boolean] Should we print the command that's being executed
     # @param print_command_output [Boolean] Should we print the command output during execution
     # @param error_callback [Block] A block that's called if the command exits with a non-zero status
+    # @yield [status, result, cmd] The return status of the command, all output from the command and an equivalent shell command
+    # @yieldparam [Process::Status] status A Process::Status indicating the status of the completed command
+    # @yieldparam [String] result The complete output to stdout and stderr of the completed command
+    # @yieldparam [String] cmd A shell command equivalent to the arguments passed
     def self.sh_control_output(*command, print_command: true, print_command_output: true, error_callback: nil)
       print_command = print_command_output = true if $troubleshoot
       # Set the encoding first, the user might have set it wrong
@@ -31,8 +35,8 @@ module Fastlane
       UI.command(shell_command) if print_command
 
       result = ''
+      exit_status = nil
       if Helper.sh_enabled?
-        exit_status = nil
 
         # The argument list is passed directly to Open3.popen2e, which
         # handles the variadic argument list in the same way as Kernel#spawn.
@@ -48,20 +52,25 @@ module Fastlane
             UI.command_output(line.strip) if print_command_output
             result << line
           end
-          exit_status = thread.value.exitstatus
+          exit_status = thread.value
         end
 
-        if exit_status != 0
+        # Checking Process::Status#exitstatus instead of #success? makes for more
+        # testable code. (Tests mock exitstatus only.) This is also consistent
+        # with previous implementations of sh and... probably portable to all
+        # relevant platforms.
+        if exit_status.exitstatus != 0
           message = if print_command
-                      "Exit status of command '#{shell_command}' was #{exit_status} instead of 0."
+                      "Exit status of command '#{shell_command}' was #{exit_status.exitstatus} instead of 0."
                     else
-                      "Shell command exited with exit status #{exit_status} instead of 0."
+                      "Shell command exited with exit status #{exit_status.exitstatus} instead of 0."
                     end
           message += "\n#{result}" if print_command_output
 
-          if error_callback
+          if error_callback || block_given?
             UI.error(message)
-            error_callback.call(result)
+            # block notified below, on success or failure
+            error_callback && error_callback.call(result)
           else
             UI.shell_error!(message)
           end
@@ -70,6 +79,12 @@ module Fastlane
         result << shell_command # only for the tests
       end
 
+      if block_given?
+        # Avoid yielding nil in tests. $? will be meaningless, but calls to
+        # it will not crash. There is no Process::Status.new. The alternative
+        # is to move this inside the sh_enabled? check and not yield in tests.
+        return yield exit_status || $?, result, shell_command
+      end
       result
     rescue => ex
       raise ex

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.69.0.beta.20171208010004'.freeze
+  VERSION = '2.69.0.beta.20171209010003'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.69.0.beta.20171208010004
+  version: 2.69.0.beta.20171209010003
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier