fastlane 2.238.0 → 2.241.0

data/fastlane/lib/fastlane/actions/notification.rb

@@ -43,10 +43,11 @@ module Fastlane
                                        description: "Bundle identifier of application to be opened when the notification is clicked",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :app_icon,
-                                       description: "The URL of an image to display instead of the application icon (Mavericks+ only)",
+                                       deprecated: true,
+                                       description: "The URL of an image to display instead of the application icon",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :content_image,
-                                       description: "The URL of an image to display attached to the notification (Mavericks+ only)",
+                                       description: "The local path of an image to display attached to the notification (Mavericks+)",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :open,
                                        description: "URL of the resource to be opened when the notification is clicked",

data/fastlane/lib/fastlane/actions/oclint.rb

@@ -37,16 +37,16 @@ module Fastlane
         exclude_regex = ensure_regex_is_not_string!(exclude_regex)
 
         files = JSON.parse(File.read(compile_commands)).map do |compile_command|
-          file = compile_command['file']
+          # Paths taken from xcodebuild's output escape spaces with a backslash
+          file = compile_command['file'].gsub('\ ', ' ')
           File.exist?(file) ? file : File.join(compile_command['directory'], file)
         end
 
         files.uniq!
         files.select! do |file|
-          file_ruby = file.gsub('\ ', ' ')
-          File.exist?(file_ruby) and
-            (!select_regex or file_ruby =~ select_regex) and
-            (!exclude_regex or file_ruby !~ exclude_regex)
+          File.exist?(file) and
+            (!select_regex or file =~ select_regex) and
+            (!exclude_regex or file !~ exclude_regex)
         end
 
         command_prefix = [
@@ -58,7 +58,7 @@ module Fastlane
         report_type = params[:report_type]
         report_path = params[:report_path] ? params[:report_path] : 'oclint_report.' + report_type
 
-        oclint_args = ["-report-type=#{report_type}", "-o=#{report_path}"]
+        oclint_args = ["-report-type=#{report_type}", "-o=#{report_path.shellescape}"]
 
         oclint_args << "-list-enabled-rules" if params[:list_enabled_rules]
 
@@ -85,9 +85,9 @@ module Fastlane
 
         command = [
           command_prefix,
-          oclint_path,
+          oclint_path.shellescape,
           oclint_args,
-          '"' + files.join('" "') + '"'
+          files.shelljoin
         ].join(' ')
 
         Actions.lane_context[SharedValues::FL_OCLINT_REPORT_PATH] = File.expand_path(report_path)

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

@@ -3,22 +3,27 @@ module Fastlane
     # Push local changes to the remote branch
     class PushToGitRemoteAction < Action
       def self.run(params)
-        # Find the local git branch using HEAD or fallback to CI's ENV git branch if you're in detached HEAD state
+        # Find the current branch, or on a detached HEAD the branch CI names in its environment variables
         local_git_branch = Actions.git_branch_name_using_HEAD
-        local_git_branch = Actions.git_branch unless local_git_branch && local_git_branch != "HEAD"
+        detached_head = local_git_branch == "HEAD"
+        local_git_branch = Actions.git_branch unless local_git_branch && !detached_head
 
         local_branch = params[:local_branch]
         local_branch ||= local_git_branch.gsub(%r{#{params[:remote]}\/}, '') if local_git_branch
         UI.user_error!('Failed to get the current branch.') unless local_branch
 
         remote_branch = params[:remote_branch] || local_branch
+        UI.user_error!("HEAD is detached and no branch name was found in the CI environment variables; pass remote_branch") if remote_branch == "HEAD"
+
+        # On a detached HEAD the branch name comes from CI, and its local branch does not have the commits made on HEAD
+        source = params[:local_branch] || (detached_head ? "HEAD" : local_branch)
 
         # construct our command as an array of components
         command = [
           'git',
           'push',
           params[:remote],
-          "#{local_branch.shellescape}:#{remote_branch.shellescape}"
+          "#{source.shellescape}:#{remote_branch.shellescape}"
         ]
 
         # optionally add the tags component
@@ -37,7 +42,7 @@ module Fastlane
         command << '--set-upstream' if params[:set_upstream]
 
         # optionally add the --push_options components
-        params[:push_options].each { |push_option| command << "--push-option=#{push_option}" } if params[:push_options]
+        params[:push_options].each { |push_option| command << "--push-option=#{push_option.shellescape}" } if params[:push_options]
 
         # execute our command
         return command.join(' ') if Helper.test?

data/fastlane/lib/fastlane/actions/register_device.rb

@@ -4,7 +4,7 @@ module Fastlane
   module Actions
     class RegisterDeviceAction < Action
       def self.is_supported?(platform)
-        platform == :ios
+        [:ios, :mac].include?(platform)
       end
 
       def self.run(params)

data/fastlane/lib/fastlane/actions/say.rb

@@ -2,15 +2,13 @@ module Fastlane
   module Actions
     class SayAction < Action
       def self.run(params)
-        text = params[:text]
-        text = text.join(' ')
-        text = text.tr("'", '"')
+        text = params[:text].join(' ')
 
         if params[:mute]
           UI.message(text)
           return text
         else
-          Actions.sh("say '#{text}'")
+          Actions.sh('say', text)
         end
       end
 

data/fastlane/lib/fastlane/actions/set_pod_key.rb

@@ -8,9 +8,9 @@ module Fastlane
         cmd << ['bundle exec'] if params[:use_bundle_exec] && shell_out_should_use_bundle_exec?
         cmd << ['pod keys set']
 
-        cmd << ["\"#{params[:key]}\""]
-        cmd << ["\"#{params[:value]}\""]
-        cmd << ["\"#{params[:project]}\""] if params[:project]
+        cmd << [params[:key].shellescape]
+        cmd << [params[:value].shellescape]
+        cmd << [params[:project].shellescape] if params[:project]
 
         Actions.sh(cmd.join(' '))
       end

data/fastlane/lib/fastlane/actions/sonar.rb

@@ -11,22 +11,22 @@ module Fastlane
         ].join(' ')
 
         sonar_scanner_args = []
-        sonar_scanner_args << "-Dproject.settings=\"#{params[:project_configuration_path]}\"" if params[:project_configuration_path]
-        sonar_scanner_args << "-Dsonar.projectKey=\"#{params[:project_key]}\"" if params[:project_key]
-        sonar_scanner_args << "-Dsonar.projectName=\"#{params[:project_name]}\"" if params[:project_name]
-        sonar_scanner_args << "-Dsonar.projectVersion=\"#{params[:project_version]}\"" if params[:project_version]
-        sonar_scanner_args << "-Dsonar.sources=\"#{params[:sources_path]}\"" if params[:sources_path]
-        sonar_scanner_args << "-Dsonar.exclusions=\"#{params[:exclusions]}\"" if params[:exclusions]
-        sonar_scanner_args << "-Dsonar.language=\"#{params[:project_language]}\"" if params[:project_language]
-        sonar_scanner_args << "-Dsonar.sourceEncoding=\"#{params[:source_encoding]}\"" if params[:source_encoding]
-        sonar_scanner_args << "-Dsonar.login=\"#{params[:sonar_login]}\"" if params[:sonar_login]
-        sonar_scanner_args << "-Dsonar.token=\"#{params[:sonar_token]}\"" if params[:sonar_token]
-        sonar_scanner_args << "-Dsonar.host.url=\"#{params[:sonar_url]}\"" if params[:sonar_url]
-        sonar_scanner_args << "-Dsonar.organization=\"#{params[:sonar_organization]}\"" if params[:sonar_organization]
-        sonar_scanner_args << "-Dsonar.branch.name=\"#{params[:branch_name]}\"" if params[:branch_name]
-        sonar_scanner_args << "-Dsonar.pullrequest.branch=\"#{params[:pull_request_branch]}\"" if params[:pull_request_branch]
-        sonar_scanner_args << "-Dsonar.pullrequest.base=\"#{params[:pull_request_base]}\"" if params[:pull_request_base]
-        sonar_scanner_args << "-Dsonar.pullrequest.key=\"#{params[:pull_request_key]}\"" if params[:pull_request_key]
+        sonar_scanner_args << "-Dproject.settings=#{params[:project_configuration_path].shellescape}" if params[:project_configuration_path]
+        sonar_scanner_args << "-Dsonar.projectKey=#{params[:project_key].shellescape}" if params[:project_key]
+        sonar_scanner_args << "-Dsonar.projectName=#{params[:project_name].shellescape}" if params[:project_name]
+        sonar_scanner_args << "-Dsonar.projectVersion=#{params[:project_version].shellescape}" if params[:project_version]
+        sonar_scanner_args << "-Dsonar.sources=#{params[:sources_path].shellescape}" if params[:sources_path]
+        sonar_scanner_args << "-Dsonar.exclusions=#{params[:exclusions].shellescape}" if params[:exclusions]
+        sonar_scanner_args << "-Dsonar.language=#{params[:project_language].shellescape}" if params[:project_language]
+        sonar_scanner_args << "-Dsonar.sourceEncoding=#{params[:source_encoding].shellescape}" if params[:source_encoding]
+        sonar_scanner_args << "-Dsonar.login=#{params[:sonar_login].shellescape}" if params[:sonar_login]
+        sonar_scanner_args << "-Dsonar.token=#{params[:sonar_token].shellescape}" if params[:sonar_token]
+        sonar_scanner_args << "-Dsonar.host.url=#{params[:sonar_url].shellescape}" if params[:sonar_url]
+        sonar_scanner_args << "-Dsonar.organization=#{params[:sonar_organization].shellescape}" if params[:sonar_organization]
+        sonar_scanner_args << "-Dsonar.branch.name=#{params[:branch_name].shellescape}" if params[:branch_name]
+        sonar_scanner_args << "-Dsonar.pullrequest.branch=#{params[:pull_request_branch].shellescape}" if params[:pull_request_branch]
+        sonar_scanner_args << "-Dsonar.pullrequest.base=#{params[:pull_request_base].shellescape}" if params[:pull_request_base]
+        sonar_scanner_args << "-Dsonar.pullrequest.key=#{params[:pull_request_key].shellescape}" if params[:pull_request_key]
 
         sonar_scanner_args << params[:sonar_runner_args] if params[:sonar_runner_args]
 

data/fastlane/lib/fastlane/actions/sourcedocs.rb

@@ -6,20 +6,20 @@ module Fastlane
 
         command =  "sourcedocs generate"
         command << " --all-modules" if params[:all_modules]
-        command << " --spm-module #{params[:spm_module]}" unless params[:spm_module].nil?
-        command << " --module-name #{params[:module_name]}" unless params[:module_name].nil?
-        command << " --link-beginning #{params[:link_beginning]}" unless params[:link_beginning].nil?
-        command << " --link-ending #{params[:link_ending]}" unless params[:link_ending].nil?
-        command << " --output-folder #{params[:output_folder]}" unless params[:output_folder].nil?
-        command << " --min-acl #{params[:min_acl]}" unless params[:min_acl].nil?
+        command << " --spm-module #{params[:spm_module].shellescape}" unless params[:spm_module].nil?
+        command << " --module-name #{params[:module_name].shellescape}" unless params[:module_name].nil?
+        command << " --link-beginning #{params[:link_beginning].shellescape}" unless params[:link_beginning].nil?
+        command << " --link-ending #{params[:link_ending].shellescape}" unless params[:link_ending].nil?
+        command << " --output-folder #{params[:output_folder].shellescape}" unless params[:output_folder].nil?
+        command << " --min-acl #{params[:min_acl].shellescape}" unless params[:min_acl].nil?
         command << " --module-name-path" if params[:module_name_path]
         command << " --clean" if params[:clean]
         command << " --collapsible" if params[:collapsible]
         command << " --table-of-contents" if params[:table_of_contents]
         command << " --reproducible-docs" if params[:reproducible]
         unless params[:scheme].nil?
-          command << " -- -scheme #{params[:scheme]}"
-          command << " -sdk #{params[:sdk_platform]}" unless params[:sdk_platform].nil?
+          command << " -- -scheme #{params[:scheme].shellescape}"
+          command << " -sdk #{params[:sdk_platform].shellescape}" unless params[:sdk_platform].nil?
         end
         Actions.sh(command)
       end

data/fastlane/lib/fastlane/actions/spaceship_logs.rb

@@ -1,3 +1,5 @@
+require 'tmpdir'
+
 module Fastlane
   module Actions
     class SpaceshipLogsAction < Action
@@ -8,8 +10,8 @@ module Fastlane
         copy_to_path = params[:copy_to_path]
         copy_to_clipboard = params[:copy_to_clipboard]
 
-        # Get log files
-        files = Dir.glob("/tmp/spaceship*.log").sort_by { |f| File.mtime(f) }.reverse
+        # Get log files, from wherever Spaceship::Client#logger writes them.
+        files = Dir.glob(File.join(Dir.tmpdir, "spaceship*.log")).sort_by { |f| File.mtime(f) }.reverse
 
         if files.size == 0
           UI.message("No Spaceship log files found")

data/fastlane/lib/fastlane/actions/splunkmint.rb

@@ -149,7 +149,14 @@ module Fastlane
       end
 
       def self.category
-        :beta
+        :deprecated
+      end
+
+      def self.deprecated_notes
+        [
+          "Splunk MINT reached End of Life in December 2021 for all MINT products, including the SDK and its Web Service.",
+          "See [Splunk MINT SDK for iOS (EOL)](https://docs.splunk.com/Documentation/MintIOSSDK/latest/DevGuide/APIReference)."
+        ].join("\n")
       end
     end
   end

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

@@ -44,7 +44,10 @@ module Fastlane
         begin
           Actions.sh(command)
         rescue
-          handle_swiftlint_error(params[:ignore_exit_status], $?.exitstatus)
+          # $? is the status of the last subprocess this thread ran, not
+          # necessarily this one: nil when the command never launched, and stale
+          # when something else ran in between. Only report it when it is there.
+          handle_swiftlint_error(params[:ignore_exit_status], $?&.exitstatus)
           raise if params[:raise_if_swiftlint_error]
         end
       end
@@ -248,10 +251,10 @@ module Fastlane
         end
 
         UI.important("")
-        UI.important("SwiftLint finished with exit code #{exit_status}, #{failure_suffix}")
+        UI.important("SwiftLint finished with exit code #{exit_status || 'unknown'}, #{failure_suffix}")
         UI.important(secondary_message)
         UI.important("")
-        UI.user_error!("SwiftLint finished with errors (exit code: #{exit_status})") unless ignore_exit_status
+        UI.user_error!("SwiftLint finished with errors (exit code: #{exit_status || 'unknown'})") unless ignore_exit_status
       end
     end
   end

data/fastlane/lib/fastlane/actions/update_project_provisioning.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'tmpdir'
+
 module Fastlane
   module Actions
     module SharedValues
@@ -23,7 +25,7 @@ module Fastlane
           UI.message("Downloading root certificate from (#{ROOT_CERTIFICATE_URL}) to path '#{params[:certificate]}'")
           require 'open-uri'
           File.open(params[:certificate], "w:ASCII-8BIT") do |file|
-            file.write(URI.open(ROOT_CERTIFICATE_URL, "rb").read)
+            file.write(URI.parse(ROOT_CERTIFICATE_URL).open("rb").read)
           end
         end
 
@@ -146,7 +148,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :certificate,
                                        env_name: "FL_PROJECT_PROVISIONING_CERTIFICATE_PATH",
                                        description: "Path to apple root certificate",
-                                       default_value: "/tmp/AppleIncRootCertificate.cer"),
+                                       default_value: File.join(Dir.tmpdir, "AppleIncRootCertificate.cer")),
           FastlaneCore::ConfigItem.new(key: :code_signing_identity,
                                        env_name: "FL_PROJECT_PROVISIONING_CODE_SIGN_IDENTITY",
                                        description: "Code sign identity for build configuration",

data/fastlane/lib/fastlane/actions/upload_to_app_store.rb

@@ -10,8 +10,11 @@ module Fastlane
         begin
           config.load_configuration_file("Deliverfile")
           config[:screenshots_path] ||= Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH] if Actions.lane_context[SharedValues::SNAPSHOT_SCREENSHOTS_PATH]
-          config[:ipa] ||= Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] if Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
-          config[:pkg] ||= Actions.lane_context[SharedValues::PKG_OUTPUT_PATH] if Actions.lane_context[SharedValues::PKG_OUTPUT_PATH]
+          # The build from gym wins over the newest *.ipa/*.pkg in the current directory, the options' default
+          unless config.specified?(:ipa) || config.specified?(:pkg)
+            config[:ipa] = Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] if Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
+            config[:pkg] = Actions.lane_context[SharedValues::PKG_OUTPUT_PATH] if Actions.lane_context[SharedValues::PKG_OUTPUT_PATH]
+          end
 
           # Only set :api_key from SharedValues if :api_key_path isn't set (conflicting options)
           unless config[:api_key_path]

data/fastlane/lib/fastlane/actions/upload_to_testflight.rb

@@ -11,9 +11,12 @@ module Fastlane
         values[:changelog] ||= changelog if changelog
 
         unless distribute_only
-          values[:ipa] ||= Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
+          # The build from gym wins over the newest *.ipa/*.pkg in the current directory, the options' default
+          unless values.specified?(:ipa) || values.specified?(:pkg)
+            values[:ipa] = Actions.lane_context[SharedValues::IPA_OUTPUT_PATH] if Actions.lane_context[SharedValues::IPA_OUTPUT_PATH]
+            values[:pkg] = Actions.lane_context[SharedValues::PKG_OUTPUT_PATH] if Actions.lane_context[SharedValues::PKG_OUTPUT_PATH]
+          end
           values[:ipa] = File.expand_path(values[:ipa]) if values[:ipa]
-          values[:pkg] ||= Actions.lane_context[SharedValues::PKG_OUTPUT_PATH]
           values[:pkg] = File.expand_path(values[:pkg]) if values[:pkg]
         end
 

data/fastlane/lib/fastlane/actions/verify_build.rb

@@ -69,10 +69,7 @@ module Fastlane
         provision_profile_path = "#{app_path}/embedded.mobileprovision"
         UI.user_error!("Unable to find embedded profile in #{provision_profile_path}") unless File.exist?(provision_profile_path)
 
-        profile = `cat #{provision_profile_path.shellescape} | security cms -D`
-        UI.user_error!("Unable to extract profile") unless $? == 0
-
-        plist = Plist.parse_xml(profile)
+        plist = FastlaneCore::ProvisioningProfile.parse(provision_profile_path)
 
         values['app_name'] = plist['AppIDName']
         values['provisioning_uuid'] = plist['UUID']

data/fastlane/lib/fastlane/actions/verify_pod_keys.rb

@@ -29,7 +29,9 @@ module Fastlane
       end
 
       def self.value(key, target)
-        value = `pod keys get #{key} #{target}`
+        command = ["pod", "keys", "get", key]
+        command << target unless target.to_s.empty?
+        value = `#{command.shelljoin}`
         value.split("]").last.strip
       end
 

data/fastlane/lib/fastlane/actions/xcode_server_get_assets.rb

@@ -20,12 +20,8 @@ module Fastlane
         password = params[:password]
         trust_self_signed_certs = params[:trust_self_signed_certs]
 
-        # setup (not)trusting self signed certificates.
         # it's normal to have a self signed certificate on your Xcode Server
-        Excon.defaults[:ssl_verify_peer] = !trust_self_signed_certs # for self-signed certificates
-
-        # create Xcode Server config
-        xcs = XcodeServer.new(host, username, password)
+        xcs = XcodeServer.new(host, username, password, ssl_verify_peer: !trust_self_signed_certs)
         bots = xcs.fetch_all_bots
 
         UI.important("Fetched #{bots.count} Bots from Xcode Server at #{host}.")
@@ -106,10 +102,11 @@ module Fastlane
       end
 
       class XcodeServer
-        def initialize(host, username, password)
+        def initialize(host, username, password, ssl_verify_peer: true)
           @host = host.start_with?('https://') ? host : "https://#{host}"
           @username = username
           @password = password
+          @ssl_verify_peer = ssl_verify_peer
         end
 
         def fetch_all_bots
@@ -129,18 +126,18 @@ module Fastlane
           # create a temp folder and a file, stream the download into it
           Dir.mktmpdir do |dir|
             temp_file = File.join(dir, "tmp_download.#{rand(1_000_000)}")
-            f = open(temp_file, 'w')
-            streamer = lambda do |chunk, remaining_bytes, total_bytes|
-              if remaining_bytes && total_bytes
-                UI.important("Downloading: #{100 - (100 * remaining_bytes.to_f / total_bytes.to_f).to_i}%")
-              else
-                UI.error(chunk.to_s)
+            response = File.open(temp_file, 'w') do |f|
+              streamer = lambda do |chunk, remaining_bytes, total_bytes|
+                if remaining_bytes && total_bytes
+                  UI.important("Downloading: #{100 - (100 * remaining_bytes.to_f / total_bytes.to_f).to_i}%")
+                else
+                  UI.error(chunk.to_s)
+                end
+                f.write(chunk)
               end
-              f.write(chunk)
-            end
 
-            response = self.get_endpoint("/integrations/#{integration_id}/assets", streamer)
-            f.close
+              self.get_endpoint("/integrations/#{integration_id}/assets", streamer)
+            end
 
             UI.user_error!("Integration doesn't have any assets (it probably never ran).") if response.status == 500
             UI.user_error!("Failed to fetch Assets zip for Integration #{integration_id} from Xcode Server at #{@host}, response: #{response.status}: #{response.body}") if response.status != 200
@@ -199,9 +196,9 @@ module Fastlane
           headers = self.headers || {}
 
           if response_block
-            response = Excon.get(url, response_block: response_block, headers: headers)
+            response = Excon.get(url, response_block: response_block, headers: headers, ssl_verify_peer: @ssl_verify_peer)
           else
-            response = Excon.get(url, headers: headers)
+            response = Excon.get(url, headers: headers, ssl_verify_peer: @ssl_verify_peer)
           end
 
           return response
@@ -305,7 +302,11 @@ module Fastlane
       end
 
       def self.category
-        :testing
+        :deprecated
+      end
+
+      def self.deprecated_notes
+        "Xcode Server is no longer supported since Xcode 14 ([Xcode 14 Release Notes](https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes))."
       end
     end
   end

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

@@ -260,7 +260,7 @@ module Fastlane
           xcpretty_command = "#{xcpretty_command} --utf" if xcpretty_utf
         end
 
-        pipe_command = "| tee '#{buildlog_path}/xcodebuild.log' #{xcpretty_command}"
+        pipe_command = "| tee #{File.join(buildlog_path, 'xcodebuild.log').shellescape} #{xcpretty_command}"
 
         FileUtils.mkdir_p buildlog_path
         UI.message("For a more detailed xcodebuild log open #{buildlog_path}/xcodebuild.log")
@@ -293,7 +293,7 @@ module Fastlane
 
         # If raw_buildlog and some reports had to be created, create xcpretty reports from the build log
         if raw_buildlog && xcpretty_args.include?('--report')
-          output_result = Actions.sh "set -o pipefail && cat '#{buildlog_path}/xcodebuild.log' | xcpretty #{xcpretty_args} > /dev/null"
+          output_result = Actions.sh "set -o pipefail && cat #{File.join(buildlog_path, 'xcodebuild.log').shellescape} | xcpretty #{xcpretty_args} > /dev/null"
         end
 
         output_result
@@ -349,11 +349,10 @@ module Fastlane
         end.compact
       end
 
-      # Cleans values for build settings
-      # Only escaping `$(inherit)` types of values since "sh"
-      # interprets these as sub-commands instead of passing value into xcodebuild
+      # Escapes what sh interprets inside double quotes, so the value reaches xcodebuild unchanged.
+      # xcodebuild expands $(VAR), ${VAR} and $VAR itself, from build settings and the environment.
       def self.clean_build_setting_value(value)
-        value.to_s.gsub('$(', '\\$(')
+        value.to_s.gsub(/[\\"$`]/) { |char| "\\#{char}" }
       end
 
       def self.detect_workspace

data/fastlane/lib/fastlane/actions/zip.rb

@@ -103,7 +103,8 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :password,
                                        env_name: "FL_ZIP_PASSWORD",
                                        description: "Encrypt the contents of the zip archive using a password",
-                                       optional: true),
+                                       optional: true,
+                                       sensitive: true),
           FastlaneCore::ConfigItem.new(key: :symlinks,
                                        env_name: "FL_ZIP_SYMLINKS",
                                        description: "Store symbolic links as such in the zip archive",

data/fastlane/lib/fastlane/auto_complete.rb

@@ -45,7 +45,7 @@ module Fastlane
         custom_commands = options.custom.to_s.split(',')
 
         Fastlane::SHELLS.each do |shell_name|
-          open("#{fastlane_conf_dir}/completions/completion.#{shell_name}", 'a') do |file|
+          File.open("#{fastlane_conf_dir}/completions/completion.#{shell_name}", 'a') do |file|
             default_line_prefix = Helper.bundler? ? "bundle exec " : ""
 
             file.puts(self.get_auto_complete_line(shell_name, "#{default_line_prefix}fastlane"))

data/fastlane/lib/fastlane/cli_tools_distributor.rb

@@ -53,6 +53,7 @@ module Fastlane
         # 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))
+          print_running_version
         end
 
         # Try to check UTF-8 with `locale`, fallback to environment variables
@@ -179,6 +180,19 @@ module Fastlane
         }[tool_name] || tool_name
       end
 
+      # Which fastlane a log comes from: `fastlane env`, run later by hand, can describe another install. See #29938.
+      def print_running_version
+        source = FastlaneCore::Helper.install_method
+        if ARGV.include?("--verbose")
+          require "fastlane/environment_printer"
+          location = FastlaneCore::Helper.bundler? ? ENV["BUNDLE_GEMFILE"] : $PROGRAM_NAME
+          # Dir.home rather than ENV['HOME'], which does not match the paths Ruby gives on Windows
+          source += ": #{EnvironmentPrinter.anonymized_path(location.to_s, Dir.home)}"
+        end
+
+        UI.message("fastlane #{Fastlane::VERSION} (Ruby #{RUBY_VERSION}, #{source})")
+      end
+
       def print_bundle_exec_warning(is_slow: false)
         return if FastlaneCore::Helper.bundler? # user is already using bundler
         return if FastlaneCore::Env.truthy?('SKIP_SLOW_FASTLANE_WARNING') # user disabled the warnings

data/fastlane/lib/fastlane/documentation/markdown_docs_generator.rb

@@ -193,9 +193,32 @@ module Fastlane
         FileUtils.cp(current_asset_path, File.join(docs_dir, "img", "actions", File.basename(current_asset_path)))
       end
 
+      # Generate the team table (docs/generated/team-table.md) from team.json
+      generate_team_table(docs_dir)
+
       UI.success("Generated new docs on path #{target_path}")
     end
 
+    def generate_team_table(docs_dir)
+      team_json_path = File.expand_path(File.join(Fastlane::ROOT, "..", "internal", "team.json"))
+      unless File.exist?(team_json_path)
+        UI.message("Skipping team table generation, could not find #{team_json_path}")
+        return
+      end
+
+      File.write(File.join(docs_dir, "generated", "team-table.md"), self.class.render_team(team_json_path))
+    end
+
+    # Also used by the `generate_team_table` rake task, so it must not depend on fastlane being loaded
+    def self.render_team(team_json_path)
+      require 'erb'
+      require 'json'
+
+      team, alumni = JSON.parse(File.read(team_json_path)).to_a.shuffle.partition { |_, user| !user['alumni'] }
+      template = File.expand_path("../../assets/TeamTable.md.erb", __dir__)
+      ERB.new(File.read(template), trim_mode: '-').result(binding)
+    end
+
     private
 
     def readable_category_name(category_symbol)

data/fastlane/lib/fastlane/environment_printer.rb

@@ -252,34 +252,21 @@ module Fastlane
     def self.print_fastlane_files
       env_output = "### fastlane files:\n\n"
 
-      fastlane_path = FastlaneCore::FastlaneFolder.fastfile_path
-
-      if fastlane_path && File.exist?(fastlane_path)
-        env_output << "<details>"
-        env_output << "<summary>`#{fastlane_path}`</summary>\n"
+      {
+        "Fastfile" => FastlaneCore::FastlaneFolder.fastfile_path,
+        "Appfile" => CredentialsManager::AppfileConfig.default_path
+      }.each do |name, path|
+        if path && File.exist?(path)
+          env_output << "**#{name}** found at `#{path}`\n"
+        else
+          env_output << "**No #{name} found**\n"
+        end
         env_output << "\n"
-        env_output << "```ruby\n"
-        env_output <<  File.read(fastlane_path, encoding: "utf-8")
-        env_output <<  "\n```\n"
-        env_output << "</details>"
-      else
-        env_output << "**No Fastfile found**\n"
       end
-      env_output << "\n\n"
 
-      appfile_path = CredentialsManager::AppfileConfig.default_path
-      if appfile_path && File.exist?(appfile_path)
-        env_output << "<details>"
-        env_output << "<summary>`#{appfile_path}`</summary>\n"
-        env_output << "\n"
-        env_output << "```ruby\n"
-        env_output <<  File.read(appfile_path, encoding: "utf-8")
-        env_output <<  "\n```\n"
-        env_output << "</details>"
-      else
-        env_output << "**No Appfile found**\n"
-      end
-      env_output << "\n\n"
+      env_output << "The contents of these files are not included, as they may contain secrets. "
+      env_output << "If they are relevant to your issue, please add the parts that are, with any sensitive values removed.\n"
+      env_output << "\n"
       env_output
     end
 

data/fastlane/lib/fastlane/fast_file.rb

@@ -314,6 +314,7 @@ module Fastlane
               # it would defeat the caching's purpose.
               command += ['--depth', '1'] unless is_eligible_for_caching
               command += ['--branch', branch] unless branch == 'HEAD'
+              FastlaneCore::Secrets.register(git_extra_headers, name: :git_extra_headers)
               git_extra_headers.each do |header|
                 command += ['--config', "http.extraHeader=#{header}"]
               end
@@ -329,7 +330,7 @@ module Fastlane
                 # Update the repo and try again before failing
                 UI.message("Updating git repo...")
                 Helper.with_env_values('GIT_TERMINAL_PROMPT' => '0') do
-                  Actions.sh("cd #{clone_folder.shellescape} && git checkout #{branch} && git reset --hard && git pull --all")
+                  Actions.sh("cd #{clone_folder.shellescape} && git checkout #{branch.shellescape} && git reset --hard && git pull --all")
                 end
 
                 checkout_param = find_tag(folder: clone_folder, version: version, remote: false)