fastlane 1.20.0 → 1.21.0

data/lib/fastlane/helper/git_helper.rb

@@ -0,0 +1,27 @@
+module Fastlane
+  module Actions
+    # Get the author name of the last git commit
+    def self.git_author
+      s = `git log --name-status HEAD^..HEAD`
+      s = s.match(/Author:.*<(.*)>/)[1]
+      return s if s.to_s.length > 0
+      return nil
+    rescue
+      return nil
+    end
+
+    def self.last_git_commit
+      s = `git log -1 --pretty=%B`.strip
+      return s if s.to_s.length > 0
+      nil
+    end
+
+    # Returns the current git branch - can be replaced using the environment variable `GIT_BRANCH`
+    def self.git_branch
+      return ENV['GIT_BRANCH'] if ENV['GIT_BRANCH'].to_s.length > 0 # set by Jenkins
+      s = `git rev-parse --abbrev-ref HEAD`
+      return s.to_s.strip if s.to_s.length > 0
+      nil
+    end
+  end
+end

data/lib/fastlane/helper/sh_helper.rb

@@ -0,0 +1,48 @@
+module Fastlane
+  module Actions
+    # Execute a shell command
+    # This method will output the string and execute it
+    # Just an alias for sh_no_action
+    # @param log [boolean] should fastlane print out the executed command
+    def self.sh(command, log: true)
+      sh_no_action(command, log: log)
+    end
+
+    def self.sh_no_action(command, log: true)
+      # Set the encoding first, the user might have set it wrong
+      previous_encoding = [Encoding.default_external, Encoding.default_internal]
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = Encoding::UTF_8
+
+      command = command.join(' ') if command.kind_of?(Array) # since it's an array of one element when running from the Fastfile
+      Helper.log.info ['[SHELL COMMAND]', command.yellow].join(': ') if log
+
+      result = ''
+      if Helper.test?
+        result << command # only for the tests
+      else
+        exit_status = nil
+        IO.popen(command, err: [:child, :out]) do |io|
+          io.each do |line|
+            Helper.log.info ['[SHELL]', line.strip].join(': ')
+            result << line
+          end
+          io.close
+          exit_status = $?.exitstatus
+        end
+
+        if exit_status != 0
+          # this will also append the output to the exception
+          raise "Exit status of command '#{command}' was #{exit_status} instead of 0. \n#{result}"
+        end
+      end
+
+      result
+    rescue => ex
+      raise ex
+    ensure
+      Encoding.default_external = previous_encoding.first
+      Encoding.default_internal = previous_encoding.last
+    end
+  end
+end

data/lib/fastlane/junit_generator.rb

@@ -21,7 +21,7 @@ module Fastlane
           end
         end
       end
-      result = builder.to_xml.gsub('system_', 'system-').gsub("", ' ') # Jenkins can not parse 'ESC' symbol
+      result = builder.to_xml.gsub('system_', 'system-').delete("\e") # Jenkins can not parse 'ESC' symbol
 
       File.write(path, result)
 

data/lib/fastlane/lane.rb

@@ -15,15 +15,15 @@ module Fastlane
     attr_accessor :is_private
 
     def initialize(platform: nil, name: nil, description: nil, block: nil, is_private: false)
-      raise "description must be an array" unless description.kind_of?Array
-      raise "lane name must not contain any spaces".red if name.to_s.include?" "
-      raise "lane name must start with :".red unless name.kind_of?Symbol
+      raise "description must be an array" unless description.kind_of? Array
+      raise "lane name must not contain any spaces".red if name.to_s.include? " "
+      raise "lane name must start with :".red unless name.kind_of? Symbol
 
       if self.class.black_list.include?(name.to_s)
         Helper.log.error "Lane Name '#{name}' can not be one of the followings: #{self.class.black_list}".red
         raise "Name '#{name}' is already taken"
       end
-      
+
       self.platform = platform
       self.name = name
       self.description = description
@@ -43,8 +43,8 @@ module Fastlane
 
     class << self
       def black_list
-        %w{run init new_action lanes list docs action actions help}
+        %w(run init new_action lanes list docs action actions help)
       end
     end
   end
-end
+end

data/lib/fastlane/lane_list.rb

@@ -2,7 +2,6 @@ module Fastlane
   class LaneList
     # Print out the result of `generate`
     def self.output(path)
-
       puts generate(path)
 
       puts "Execute using `fastlane [lane_name]`".yellow
@@ -11,29 +10,29 @@ module Fastlane
     def self.generate(path)
       ff = Fastlane::FastFile.new(path)
       output = ""
-      
-      all_keys = ff.runner.lanes.keys.reject(&:nil?) 
+
+      all_keys = ff.runner.lanes.keys.reject(&:nil?)
       all_keys.unshift(nil) # because we want root elements on top. always! They have key nil
 
       all_keys.each do |platform|
         next if (ff.runner.lanes[platform] || []).count == 0
+
         plat_text = platform
         plat_text = "general" if platform.to_s.empty?
         output += "\n--------- #{plat_text}---------\n".yellow
-      
+
         value = ff.runner.lanes[platform]
-        
-        if value
-          value.each do |lane_name, lane|
-            next if lane.is_private
-            
-            output += "----- fastlane #{lane.pretty_name}".green
-            output += "\n" + lane.description.join("\n") + "\n\n" if lane.description.count > 0
-          end
+        next unless value
+
+        value.each do |lane_name, lane|
+          next if lane.is_private
+
+          output += "----- fastlane #{lane.pretty_name}".green
+          output += "\n" + lane.description.join("\n") + "\n\n" if lane.description.count > 0
         end
       end
 
       output
     end
   end
-end
+end

data/lib/fastlane/lane_manager.rb

@@ -5,23 +5,29 @@ module Fastlane
     # @param parameters [Hash] The parameters passed from the command line to the lane
     # @param env Dot Env Information
     def self.cruise_lane(platform, lane, parameters = nil, env = nil)
-      raise 'lane must be a string' unless (lane.is_a?(String) or lane.nil?)
-      raise 'platform must be a string' unless (platform.is_a?(String) or platform.nil?)
-      raise 'parameters must be a hash' unless (parameters.is_a?(Hash) or parameters.nil?)
+      raise 'lane must be a string' unless lane.kind_of?(String) or lane.nil?
+      raise 'platform must be a string' unless platform.kind_of?(String) or platform.nil?
+      raise 'parameters must be a hash' unless parameters.kind_of?(Hash) or parameters.nil?
 
       ff = Fastlane::FastFile.new(File.join(Fastlane::FastlaneFolder.path, 'Fastfile'))
 
-      unless (ff.is_platform_block?lane rescue false) # rescue, because this raises an exception if it can't be found at all
+      is_platform = false
+      begin
+        is_platform = ff.is_platform_block? lane
+      rescue
+      end
+
+      unless is_platform # rescue, because this raises an exception if it can't be found at all
         # maybe the user specified a default platform
         # We'll only do this, if the lane specified isn't a platform, as we want to list all platforms then
 
         platform ||= Actions.lane_context[Actions::SharedValues::DEFAULT_PLATFORM]
       end
 
-      if not platform and lane
+      if !platform and lane
         # Either, the user runs a specific lane in root or want to auto complete the available lanes for a platform
         # e.g. `fastlane ios` should list all available iOS actions
-        if ff.is_platform_block?lane
+        if ff.is_platform_block? lane
           platform = lane
           lane = nil
         end
@@ -57,15 +63,15 @@ module Fastlane
       Fastlane::JUnitGenerator.generate(Fastlane::Actions.executed_actions)
       print_table(Fastlane::Actions.executed_actions)
 
-      unless error
+      if error
+        Helper.log.fatal 'fastlane finished with errors'.red
+        raise error
+      else
         if duration > 5
           Helper.log.info "fastlane.tools just saved you #{duration} minutes! 🎉".green
         else
           Helper.log.info 'fastlane.tools finished successfully 🎉'.green
         end
-      else
-        Helper.log.fatal 'fastlane finished with errors'.red
-        raise error
       end
     end
 
@@ -100,7 +106,7 @@ module Fastlane
         end
 
         i = $stdin.gets.strip.to_i - 1
-        if i >= 0 and (available[i] rescue nil)
+        if i >= 0 and available[i]
           selection = available[i]
           Helper.log.info "Driving the lane #{selection}. Next time launch fastlane using `fastlane #{selection}`".yellow
           platform = selection.split(' ')[0]

data/lib/fastlane/new_action.rb

@@ -10,7 +10,7 @@ module Fastlane
       puts "Must be lower case, and use a '_' between words. Do not use '.'".green
       puts "examples: 'testflight', 'upload_to_s3'".green
       name = ask('Name of your action: ')
-      while !name_valid?(name)
+      until name_valid?(name)
         puts 'Name invalid!'
         name = ask('Name of your action: ')
       end

data/lib/fastlane/runner.rb

@@ -18,13 +18,14 @@ module Fastlane
     # @param lane_name The name of the lane to execute
     # @param platform The name of the platform to execute
     # @param parameters [Hash] The parameters passed from the command line to the lane
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize
     def execute(lane, platform = nil, parameters = nil)
       raise "No lane given" unless lane
 
       self.current_lane = lane.to_sym
       self.current_platform = (platform ? platform.to_sym : nil)
 
-
       lane_obj = lanes.fetch(current_platform, {}).fetch(current_lane, nil)
 
       raise "Could not find lane '#{full_lane_name}'. Available lanes: #{available_lanes.join(', ')}".red unless lane_obj
@@ -32,7 +33,7 @@ module Fastlane
 
       ENV["FASTLANE_LANE_NAME"] = current_lane.to_s
       ENV["FASTLANE_PLATFORM_NAME"] = (current_platform ? current_platform.to_s : nil)
-      
+
       Actions.lane_context[Actions::SharedValues::PLATFORM_NAME] = current_platform
       Actions.lane_context[Actions::SharedValues::LANE_NAME] = full_lane_name
 
@@ -43,17 +44,16 @@ module Fastlane
       path_to_use = Fastlane::FastlaneFolder.path || Dir.pwd
       begin
         Dir.chdir(path_to_use) do # the file is located in the fastlane folder
-
           # Call the platform specific before_all block and then the general one
-          before_all_blocks[current_platform].call(current_lane) if (before_all_blocks[current_platform] and current_platform)
+          before_all_blocks[current_platform].call(current_lane) if before_all_blocks[current_platform] && current_platform
           before_all_blocks[nil].call(current_lane) if before_all_blocks[nil]
-          
+
           return_val = lane_obj.call(parameters || {}) # by default no parameters
-          
+
           # `after_all` is only called if no exception was raised before
           # Call the platform specific before_all block and then the general one
-          after_all_blocks[current_platform].call(current_lane) if (after_all_blocks[current_platform] and current_platform)
-          after_all_blocks[nil].call(current_lane) if (after_all_blocks[nil])
+          after_all_blocks[current_platform].call(current_lane) if after_all_blocks[current_platform] && current_platform
+          after_all_blocks[nil].call(current_lane) if after_all_blocks[nil]
         end
 
         return return_val
@@ -62,19 +62,21 @@ module Fastlane
           # Provide error block exception without colour code
           error_ex = ex.exception(ex.message.gsub(/\033\[\d+m/, ''))
 
-          error_blocks[current_platform].call(current_lane, error_ex) if (error_blocks[current_platform] and current_platform)
+          error_blocks[current_platform].call(current_lane, error_ex) if error_blocks[current_platform] && current_platform
           error_blocks[nil].call(current_lane, error_ex) if error_blocks[nil]
         end
         raise ex
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize
 
     # @param filter_platform: Filter, to only show the lanes of a given platform
     # @return an array of lanes (platform lane_name) to print them out to the user
     def available_lanes(filter_platform = nil)
       all = []
       lanes.each do |platform, platform_lanes|
-        next if (filter_platform and filter_platform.to_s != platform.to_s) # skip actions that don't match
+        next if filter_platform && filter_platform.to_s != platform.to_s # skip actions that don't match
 
         platform_lanes.each do |lane_name, lane|
           all << [platform, lane_name].reject(&:nil?).join(' ') unless lane.is_private
@@ -83,9 +85,9 @@ module Fastlane
       all
     end
 
-    # 
+    #
     # All the methods that are usually called on execution
-    # 
+    #
 
     def try_switch_to_lane(new_lane, parameters)
       block = lanes.fetch(current_platform, {}).fetch(new_lane, nil)
@@ -94,7 +96,7 @@ module Fastlane
         original_full = full_lane_name
         original_lane = current_lane
 
-        raise "Parameters for a lane must always be a hash".red unless (parameters.first || {}).kind_of?Hash
+        raise "Parameters for a lane must always be a hash".red unless (parameters.first || {}).kind_of? Hash
 
         pretty = [new_lane]
         pretty = [current_platform, new_lane] if current_platform
@@ -102,10 +104,10 @@ module Fastlane
         Helper.log.info "Cruising over to lane '#{pretty.join(' ')}' 🚖".green
 
         # Actually switch lane now
-        current_lane = new_lane
+        self.current_lane = new_lane
         collector.did_launch_action(:lane_switch)
         result = block.call(parameters.first || {}) # to always pass a hash
-        current_lane = original_lane
+        self.current_lane = original_lane
 
         Helper.log.info "Cruising back to lane '#{original_full}' 🚘".green
         return result
@@ -119,9 +121,6 @@ module Fastlane
     def execute_action(method_sym, class_ref, arguments)
       collector.did_launch_action(method_sym)
 
-      step_name = class_ref.step_text rescue nil
-      step_name = method_sym.to_s unless step_name
-
       verify_supported_os(method_sym, class_ref)
 
       begin
@@ -129,11 +128,11 @@ module Fastlane
           Actions.execute_action(class_ref.step_text) do
             # arguments is an array by default, containing an hash with the actual parameters
             # Since we usually just need the passed hash, we'll just use the first object if there is only one
-            if arguments.count == 0 
+            if arguments.count == 0
               arguments = ConfigurationHelper.parse(class_ref, {}) # no parameters => empty hash
-            elsif arguments.count == 1 and arguments.first.kind_of?Hash
+            elsif arguments.count == 1 and arguments.first.kind_of? Hash
               arguments = ConfigurationHelper.parse(class_ref, arguments.first) # Correct configuration passed
-            elsif not class_ref.available_options
+            elsif !class_ref.available_options
               # This action does not use the new action format
               # Just passing the arguments to this method
             else
@@ -156,7 +155,7 @@ module Fastlane
           platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
 
           unless class_ref.is_supported?(platform)
-            raise "Action '#{name}' doesn't support required operating system '#{platform}'.".red 
+            raise "Action '#{name}' doesn't support required operating system '#{platform}'.".red
           end
         end
       end
@@ -172,7 +171,7 @@ module Fastlane
     end
 
     # Called internally to setup the runner object
-    # 
+    #
 
     # @param lane [Lane] A lane object
     def add_lane(lane, override = false)
@@ -181,7 +180,7 @@ module Fastlane
       if !override and lanes[lane.platform][lane.name]
         raise "Lane '#{lane.name}' was defined multiple times!".red
       end
-      
+
       lanes[lane.platform][lane.name] = lane
     end
 

data/lib/fastlane/setup.rb

@@ -1,9 +1,11 @@
-# rubocop:disable Metrics/LineLength
-
 module Fastlane
   class Setup
+
+    # the tools that are already enabled
+    attr_reader :tools
+
     def run
-      if (FastlaneFolder.setup? and not Helper.is_test?)
+      if FastlaneFolder.setup? and !Helper.is_test?
         Helper.log.info "Fastlane already set up at path #{folder}".yellow
         return
       end
@@ -14,6 +16,7 @@ module Fastlane
       response = agree('Do you have everything commited in version control? If not please do so! (y/n)'.yellow, true)
       return unless response
 
+      # rubocop:disable Lint/RescueException
       begin
         FastlaneFolder.create_folder! unless Helper.is_test?
         copy_existing_files
@@ -31,6 +34,7 @@ module Fastlane
         restore_previous_state
         raise ex
       end
+      # rubocop:enable Lint/RescueException
     end
 
     def show_infos
@@ -66,7 +70,7 @@ module Fastlane
     def generate_app_metadata
       Helper.log.info '------------------------------'
       Helper.log.info 'To not re-enter your username and app identifier every time you run one of the fastlane tools or fastlane, these will be stored from now on.'.green
-      
+
       app_identifier = ask('App Identifier (com.krausefx.app): '.yellow)
       apple_id = ask('Your Apple ID (fastlane@krausefx.com): '.yellow)
 
@@ -88,14 +92,7 @@ module Fastlane
     end
 
     def ask_to_enable_other_tools
-      unless @tools[:deliver]
-        if agree("Do you want to setup 'deliver', which is used to upload app screenshots, app metadata and app updates to the App Store or Apple TestFlight? (y/n)".yellow, true)
-          Helper.log.info "Loading up 'deliver', this might take a few seconds"
-          require 'deliver'
-          Deliver::DeliverfileCreator.create(folder)
-          @tools[:deliver] = true
-        end
-      else
+      if @tools[:deliver]
         # deliver already enabled
         Helper.log.info '-------------------------------------------------------------------------------------------'
         Helper.log.info 'Since all files are moved into the `fastlane` subfolder, you have to adapt your Deliverfile'.yellow
@@ -103,6 +100,13 @@ module Fastlane
         Helper.log.info "e.g. `system('cd ..; ipa build')`".yellow
         Helper.log.info 'Please read the above carefully and hit Enter to confirm.'.green
         STDIN.gets unless Helper.is_test?
+      else
+        if agree("Do you want to setup 'deliver', which is used to upload app screenshots, app metadata and app updates to the App Store or Apple TestFlight? (y/n)".yellow, true)
+          Helper.log.info "Loading up 'deliver', this might take a few seconds"
+          require 'deliver'
+          Deliver::DeliverfileCreator.create(folder)
+          @tools[:deliver] = true
+        end
       end
 
       unless @tools[:snapshot]
@@ -129,7 +133,6 @@ module Fastlane
         template.gsub!('[[SCHEME]]', "")
       end
 
-
       template.gsub!('deliver', '# deliver') unless @tools[:deliver]
       template.gsub!('snapshot', '# snapshot') unless @tools[:snapshot]
       template.gsub!('sigh', '# sigh') unless @tools[:sigh]
@@ -151,10 +154,6 @@ module Fastlane
       FastlaneFolder.path
     end
 
-    def tools
-      @tools
-    end
-
     def restore_previous_state
       # Move all moved files back
       files_to_copy.each do |current|