fastlane 2.147.0 → 2.150.0.rc1

data/fastlane/lib/fastlane/actions/hipchat.rb

@@ -25,7 +25,7 @@ module Fastlane
 
         message = options[:message]
         if (message_format == "html") && (options[:include_html_header] == true)
-          message = "<table><tr><td><img src='https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png' width='50' height='50'></td><td>#{message[0..9999]}</td></tr></table>"
+          message = "<table><tr><td><img src='https://fastlane.tools/assets/img/fastlane_icon.png' width='50' height='50'></td><td>#{message[0..9999]}</td></tr></table>"
         end
 
         if api_version.to_i == 1

data/fastlane/lib/fastlane/actions/push_to_git_remote.rb

@@ -5,7 +5,7 @@ module Fastlane
       def self.run(params)
         local_branch = params[:local_branch]
         local_branch ||= Actions.git_branch.gsub(%r{#{params[:remote]}\/}, '') if Actions.git_branch
-        local_branch ||= 'master'
+        UI.user_error!('Failed to get the current branch.') unless local_branch
 
         remote_branch = params[:remote_branch] || local_branch
 

data/fastlane/lib/fastlane/actions/slack.rb

@@ -105,7 +105,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :icon_url,
                                        env_name: "FL_SLACK_ICON_URL",
                                        description: "Overrides the webhook's image property if use_webhook_configured_username_and_icon is false",
-                                       default_value: "https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png",
+                                       default_value: "https://fastlane.tools/assets/img/fastlane_icon.png",
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :payload,
@@ -159,7 +159,7 @@ module Fastlane
               "Build Date" => Time.new.to_s,
               "Built by" => "Jenkins",
             },
-            default_payloads: [:git_branch, :git_author], # Optional, lets you specify a whitelist of default payloads to include. Pass an empty array to suppress all the default payloads.
+            default_payloads: [:git_branch, :git_author], # Optional, lets you specify an allowlist of default payloads to include. Pass an empty array to suppress all the default payloads.
                                                           # Don\'t add this key, or pass nil, if you want all the default payloads. The available default payloads are: `lane`, `test_result`, `git_branch`, `git_author`, `last_git_commit`, `last_git_commit_hash`.
             attachment_properties: { # Optional, lets you specify any other properties available for attachments in the slack API (see https://api.slack.com/docs/attachments).
                                      # This hash is deep merged with the existing properties set using the other properties above. This allows your own fields properties to be appended to the existing fields that were created using the `payload` property for instance.

data/fastlane/lib/fastlane/actions/slather.rb

@@ -1,7 +1,7 @@
 module Fastlane
   module Actions
     class SlatherAction < Action
-      # https://github.com/SlatherOrg/slather/blob/v2.4.2/lib/slather/command/coverage_command.rb
+      # https://github.com/SlatherOrg/slather/blob/v2.4.9/lib/slather/command/coverage_command.rb
       ARGS_MAP = {
           travis: '--travis',
           travis_pro: '--travispro',
@@ -14,6 +14,7 @@ module Fastlane
           simple_output: '--simple-output',
           gutter_json: '--gutter-json',
           cobertura_xml: '--cobertura-xml',
+          sonarqube_xml: '--sonarqube-xml',
           llvm_cov: '--llvm-cov',
           html: '--html',
           show: '--show',
@@ -213,6 +214,12 @@ module Fastlane
                                        is_string: false,
                                        type: Boolean,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :sonarqube_xml,
+                                       env_name: "FL_SLATHER_SONARQUBE_XML_ENABLED",
+                                       description: "Tell slather that it should output results as SonarQube Generic XML format",
+                                       is_string: false,
+                                       type: Boolean,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :llvm_cov,
                                        env_name: "FL_SLATHER_LLVM_COV_ENABLED",
                                        description: "Tell slather that it should output results as llvm-cov show format",

data/fastlane/lib/fastlane/actions/spm.rb

@@ -8,6 +8,7 @@ module Fastlane
         cmd << "--build-path #{params[:build_path]}" if params[:build_path]
         cmd << "--package-path #{params[:package_path]}" if params[:package_path]
         cmd << "--configuration #{params[:configuration]}" if params[:configuration]
+        cmd << "--disable-sandbox" if params[:disable_sandbox]
         cmd << "--verbose" if params[:verbose]
         cmd << params[:command] if package_commands.include?(params[:command])
         if params[:xcconfig]
@@ -63,6 +64,12 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass a valid configuration: (debug|release)") unless valid_configurations.include?(value)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :disable_sandbox,
+                                       env_name: "FL_SPM_DISABLE_SANDBOX",
+                                       description: "Disable using the sandbox when executing subprocesses",
+                                       optional: true,
+                                       is_string: false,
+                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :xcpretty_output,
                                        env_name: "FL_SPM_XCPRETTY_OUTPUT",
                                        description: "Specifies the output type for xcpretty. eg. 'test', or 'simple'",

data/fastlane/lib/fastlane/actions/swiftlint.rb

@@ -88,11 +88,13 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :mode,
+                                       env_name: "FL_SWIFTLINT_MODE",
                                        description: "SwiftLint mode: :lint, :autocorrect or :analyze",
                                        is_string: false,
                                        default_value: :lint,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :path,
+                                       env_name: "FL_SWIFTLINT_PATH",
                                        description: "Specify path to lint",
                                        is_string: true,
                                        optional: true,
@@ -100,22 +102,27 @@ module Fastlane
                                          UI.user_error!("Couldn't find path '#{File.expand_path(value)}'") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :output_file,
+                                       env_name: "FL_SWIFTLINT_OUTPUT_FILE",
                                        description: 'Path to output SwiftLint result',
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :config_file,
+                                       env_name: "FL_SWIFTLINT_CONFIG_FILE",
                                        description: 'Custom configuration file of SwiftLint',
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :strict,
+                                       env_name: "FL_SWIFTLINT_STRICT",
                                        description: 'Fail on warnings? (true/false)',
                                        default_value: false,
                                        is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :files,
+                                       env_name: "FL_SWIFTLINT_FILES",
                                        description: 'List of files to process',
                                        is_string: false,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :ignore_exit_status,
+                                       env_name: "FL_SWIFTLINT_IGNORE_EXIT_STATUS",
                                        description: "Ignore the exit status of the SwiftLint command, so that serious violations \
                                                     don't fail the build (true/false)",
                                        default_value: false,
@@ -123,6 +130,7 @@ module Fastlane
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :raise_if_swiftlint_error,
+                                       env_name: "FL_SWIFTLINT_RAISE_IF_SWIFTLINT_ERROR",
                                        description: "Raises an error if swiftlint fails, so you can fail CI/CD jobs if necessary \
                                                     (true/false)",
                                        default_value: false,
@@ -130,6 +138,7 @@ module Fastlane
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :reporter,
+                                       env_name: "FL_SWIFTLINT_REPORTER",
                                        description: "Choose output reporter. Available: xcode, json, csv, checkstyle, junit, html, \
                                                      emoji, sonarqube, markdown, github-actions-logging",
                                        is_string: true,
@@ -139,28 +148,33 @@ module Fastlane
                                          UI.user_error!("Available values are '#{available.join("', '")}'") unless available.include?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :quiet,
+                                       env_name: "FL_SWIFTLINT_QUIET",
                                        description: "Don't print status logs like 'Linting <file>' & 'Done linting'",
                                        default_value: false,
                                        is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :executable,
+                                       env_name: "FL_SWIFTLINT_EXECUTABLE",
                                        description: "Path to the `swiftlint` executable on your machine",
                                        is_string: true,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :format,
+                                       env_name: "FL_SWIFTLINT_FORMAT",
                                        description: "Format code when mode is :autocorrect",
                                        default_value: false,
                                        is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :no_cache,
+                                       env_name: "FL_SWIFTLINT_NO_CACHE",
                                        description: "Ignore the cache when mode is :autocorrect or :lint",
                                        default_value: false,
                                        is_string: false,
                                        type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :compiler_log_path,
+                                       env_name: "FL_SWIFTLINT_COMPILER_LOG_PATH",
                                        description: "Compiler log path when mode is :analyze",
                                        is_string: true,
                                        optional: true,

data/fastlane/lib/fastlane/actions/sync_code_signing.rb

@@ -83,7 +83,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        platform == :ios
+        [:ios, :mac].include?(platform)
       end
 
       def self.example_code

data/fastlane/lib/fastlane/actions/upload_symbols_to_crashlytics.rb

@@ -45,44 +45,13 @@ module Fastlane
       # @param current_path this is a path to either a dSYM or a zipped dSYM
       #   this might also be either nested or not, we're flexible
       def self.handle_dsym(params, current_path, max_worker_threads)
-        if current_path.end_with?(".dSYM")
+        if current_path.end_with?(".dSYM", ".zip")
           upload_dsym(params, current_path)
-        elsif current_path.end_with?(".zip")
-          UI.message("Extracting '#{current_path}'...")
-
-          current_path = File.expand_path(current_path)
-          Dir.mktmpdir do |dir|
-            Dir.chdir(dir) do
-              Actions.sh("unzip -qo #{current_path.shellescape}")
-              work_q = Queue.new
-              Dir["*.dSYM"].each do |sub|
-                work_q.push(sub)
-              end
-              execute_uploads(params, max_worker_threads, work_q)
-            end
-          end
         else
           UI.error("Don't know how to handle '#{current_path}'")
         end
       end
 
-      def self.execute_uploads(params, max_worker_threads, work_q)
-        number_of_threads = [max_worker_threads, work_q.size].min
-        workers = (0...number_of_threads).map do
-          Thread.new do
-            begin
-              while work_q.size > 0
-                current_path = work_q.pop(true)
-                upload_dsym(params, current_path)
-              end
-            rescue => ex
-              UI.error(ex.to_s)
-            end
-          end
-        end
-        workers.map(&:join)
-      end
-
       def self.upload_dsym(params, path)
         UI.message("Uploading '#{path}'...")
         command = []
@@ -119,7 +88,7 @@ module Fastlane
       end
 
       def self.find_gsp_path(params)
-        return if params[:api_token]
+        return if params[:api_token] && params[:gsp_path].nil?
 
         if params[:gsp_path].to_s.length > 0
           params[:gsp_path] = File.expand_path(params[:gsp_path])
@@ -130,7 +99,7 @@ module Fastlane
       end
 
       def self.find_binary_path(params)
-        params[:binary_path] ||= (Dir["/Applications/Fabric.app/**/upload-symbols"] + Dir["./Pods/Fabric/upload-symbols"] + Dir["./Pods/FirebaseCrashlytics/upload-symbols"]).last
+        params[:binary_path] ||= (Dir["/Applications/Fabric.app/**/upload-symbols"] + Dir["./Pods/Fabric/upload-symbols"] + Dir["./scripts/upload-symbols"] + Dir["./Pods/FirebaseCrashlytics/upload-symbols"]).last
         UI.user_error!("Failed to find Fabric's upload_symbols binary at /Applications/Fabric.app/**/upload-symbols or ./Pods/**/upload-symbols. Please specify the location of the binary explicitly by using the binary_path option") unless params[:binary_path]
 
         params[:binary_path] = File.expand_path(params[:binary_path])

data/fastlane/lib/fastlane/actions/xcodebuild.rb

@@ -307,10 +307,10 @@ module Fastlane
           export_options[:teamID] = CredentialsManager::AppfileConfig.try_fetch_value(:team_id) if !export_options[:teamID] && CredentialsManager::AppfileConfig.try_fetch_value(:team_id)
           export_options[:onDemandResourcesAssetPacksBaseURL] = URI.escape(export_options[:onDemandResourcesAssetPacksBaseURL]) if export_options[:onDemandResourcesAssetPacksBaseURL]
           if export_options[:manifest]
-            export_options[:manifest][:appURL] = URI.escape(export_options[:manifest][:appURL]) if export_options[:manifest][:appURL]
-            export_options[:manifest][:displayImageURL] = URI.escape(export_options[:manifest][:displayImageURL]) if export_options[:manifest][:displayImageURL]
-            export_options[:manifest][:fullSizeImageURL] = URI.escape(export_options[:manifest][:fullSizeImageURL]) if export_options[:manifest][:fullSizeImageURL]
-            export_options[:manifest][:assetPackManifestURL] = URI.escape(export_options[:manifest][:assetPackManifestURL]) if export_options[:manifest][:assetPackManifestURL]
+            export_options[:manifest][:appURL] = URI.encode_www_form_component(export_options[:manifest][:appURL]) if export_options[:manifest][:appURL]
+            export_options[:manifest][:displayImageURL] = URI.encode_www_form_component(export_options[:manifest][:displayImageURL]) if export_options[:manifest][:displayImageURL]
+            export_options[:manifest][:fullSizeImageURL] = URI.encode_www_form_component(export_options[:manifest][:fullSizeImageURL]) if export_options[:manifest][:fullSizeImageURL]
+            export_options[:manifest][:assetPackManifestURL] = URI.encode_www_form_component(export_options[:manifest][:assetPackManifestURL]) if export_options[:manifest][:assetPackManifestURL]
           end
 
           # Saves options to plist

data/fastlane/lib/fastlane/cli_tools_distributor.rb

@@ -44,6 +44,12 @@ module Fastlane
         else
           require "fastlane"
         end
+
+        # Loading any .env files before any lanes are called since
+        # variables like FASTLANE_HIDE_CHANGELOG, SKIP_SLOW_FASTLANE_WARNING
+        # and FASTLANE_DISABLE_COLORS need to be set early on in execution
+        load_dot_env
+
         # We want to avoid printing output other than the version number if we are running `fastlane -v`
         unless running_version_command? || running_init_command?
           print_bundle_exec_warning(is_slow: (Time.now - before_import_time > 3))
@@ -59,12 +65,6 @@ module Fastlane
           end
         end
 
-        # Loading any .env files before any lanes are called since
-        # variables like FASTLANE_HIDE_CHANGELOG and FASTLANE_DISABLE_COLORS
-        # need to be set early on in execution
-        require 'fastlane/helper/dotenv_helper'
-        Fastlane::Helper::DotenvHelper.load_dot_env(nil)
-
         # Needs to go after load_dot_env for variable FASTLANE_SKIP_UPDATE_CHECK
         FastlaneCore::UpdateChecker.start_looking_for_update('fastlane')
 
@@ -122,6 +122,28 @@ module Fastlane
         FastlaneCore::UpdateChecker.show_update_status('fastlane', Fastlane::VERSION)
       end
 
+      # Since loading dotenv should respect additional environments passed using
+      # --env, we must extrat the arguments out of ARGV and process them before
+      # calling into commander. This is required since the ENV must be configured
+      # before running any other commands in order to correclty respect variables
+      # like FASTLANE_HIDE_CHANGELOG and FASTLANE_DISABLE_COLORS
+      def load_dot_env
+        env_cl_param = lambda do
+          index = ARGV.index("--env")
+          return nil if index.nil?
+          ARGV.delete_at(index)
+
+          return nil if ARGV[index].nil?
+          value = ARGV[index]
+          ARGV.delete_at(index)
+
+          value
+        end
+
+        require 'fastlane/helper/dotenv_helper'
+        Fastlane::Helper::DotenvHelper.load_dot_env(env_cl_param.call)
+      end
+
       # Since fastlane also supports the rocket and biceps emoji as executable
       # we need to map those to the appropriate tools
       def process_emojis(tool_name)

data/fastlane/lib/fastlane/commands_generator.rb

@@ -93,13 +93,13 @@ module Fastlane
         FastlaneCore::Globals.verbose = true
       end
       global_option('--troubleshoot', 'Enables extended verbose mode. Use with caution, as this even includes ALL sensitive data. Cannot be used on CI.')
+      global_option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
 
       always_trace!
 
       command :trigger do |c|
         c.syntax = 'fastlane [lane]'
         c.description = 'Run a specific lane. Pass the lane name and optionally the platform first.'
-        c.option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
         c.option('--disable_runner_upgrades', 'Prevents fastlane from attempting to update FastlaneRunner swift project')
         c.option('--swift_server_port INT', 'Set specific port to communicate between fastlane and FastlaneRunner')
 

data/fastlane/lib/fastlane/documentation/actions_list.rb

@@ -176,7 +176,7 @@ module Fastlane
         # them as broken actions in the table, regardless of platform specification
         next if platform && action.respond_to?(:is_supported?) && !action.is_supported?(platform.to_sym)
 
-        name = symbol.to_s.gsub('Action', '').fastlane_underscore
+        name = symbol.to_s.gsub(/Action$/, '').fastlane_underscore
         yield(action, name)
       end
     end

data/fastlane/lib/fastlane/lane.rb

@@ -41,8 +41,8 @@ module Fastlane
     class << self
       # Makes sure the lane name is valid
       def verify_lane_name(name)
-        if self.black_list.include?(name.to_s)
-          UI.error("Lane name '#{name}' is invalid! Invalid names are #{self.black_list.join(', ')}.")
+        if self.deny_list.include?(name.to_s)
+          UI.error("Lane name '#{name}' is invalid! Invalid names are #{self.deny_list.join(', ')}.")
           UI.user_error!("Lane name '#{name}' is invalid")
         end
 
@@ -59,7 +59,7 @@ module Fastlane
         self.ensure_name_not_conflicts(name.to_s)
       end
 
-      def black_list
+      def deny_list
         %w(
           run
           init

data/fastlane/lib/fastlane/lane_manager.rb

@@ -7,7 +7,6 @@ module Fastlane
     # @param parameters [Hash] The parameters passed from the command line to the lane
     # @param env Dot Env Information
     # @param A custom Fastfile path, this is used by fastlane.ci
-    # rubocop:disable Metrics/PerceivedComplexity
     def self.cruise_lane(platform, lane, parameters = nil, env = nil, fastfile_path = nil)
       UI.user_error!("lane must be a string") unless lane.kind_of?(String) || lane.nil?
       UI.user_error!("platform must be a string") unless platform.kind_of?(String) || platform.nil?
@@ -42,14 +41,6 @@ module Fastlane
 
       platform, lane = choose_lane(ff, platform) unless lane
 
-      # xcodeproj has a bug in certain versions that causes it to change directories
-      # and not return to the original working directory
-      # https://github.com/CocoaPods/Xcodeproj/issues/426
-      # Setting this environment variable causes xcodeproj to work around the problem
-      ENV["FORK_XCODE_WRITING"] = "true" unless platform == 'android'
-
-      Fastlane::Helper::DotenvHelper.load_dot_env(env)
-
       started = Time.now
       e = nil
       begin
@@ -77,7 +68,6 @@ module Fastlane
 
       return ff
     end
-    # rubocop:enable Metrics/PerceivedComplexity
 
     def self.skip_docs?
       Helper.test? || FastlaneCore::Env.truthy?("FASTLANE_SKIP_DOCS")

data/fastlane/lib/fastlane/plugins/plugin_manager.rb

@@ -159,7 +159,7 @@ module Fastlane
       require 'json'
       url = "https://rubygems.org/api/v1/gems/#{gem_name}.json"
       begin
-        JSON.parse(open(url).read)
+        JSON.parse(URI.open(url).read)
       rescue
         nil
       end
@@ -215,7 +215,7 @@ module Fastlane
       # Bundler.with_clean_env solves this problem by resetting Bundler state before the
       # exec'd call gets merged into this process.
 
-      Bundler.with_clean_env do
+      Bundler.with_original_env do
         yield if block_given?
       end
     end
@@ -375,7 +375,7 @@ module Fastlane
       references = Fastlane.const_get(module_name).all_classes.collect do |path|
         next unless File.dirname(path).include?("/actions") # we only want to match actions
 
-        File.basename(path).gsub("_action", "").gsub(".rb", "").to_sym # the _action is optional
+        File.basename(path).gsub(".rb", "").gsub(/_action$/, '').to_sym # the _action is optional
       end
       references.compact!
 

data/fastlane/lib/fastlane/plugins/template/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Test
+
+on:
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile') }}
+        restore-keys: |
+          ${{ runner.os }}-gem-
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.4
+    - name: Install dependencies
+      run: bundle check || bundle install --jobs=4 --retry=3 --path vendor/bundle
+    - name: Run tests
+      run: bundle exec rake
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: test-results
+        path: test-results