fastlane 2.139.0 → 2.144.0

data/match/lib/match/setup.rb

@@ -34,7 +34,7 @@ module Match
     end
 
     def storage_options
-      return ["git", "google_cloud"]
+      return ["git", "google_cloud", "s3"]
     end
   end
 end

data/match/lib/match/spaceship_ensure.rb

@@ -28,8 +28,8 @@ module Match
       return Spaceship.client.team_id
     end
 
-    def bundle_identifier_exists(username: nil, app_identifier: nil)
-      found = Spaceship.app.find(app_identifier)
+    def bundle_identifier_exists(username: nil, app_identifier: nil, platform: nil)
+      found = Spaceship.app.find(app_identifier, mac: platform == "macos")
       return if found
 
       require 'sigh/runner'
@@ -45,24 +45,34 @@ module Match
       UI.user_error!("Couldn't find bundle identifier '#{app_identifier}' for the user '#{username}'")
     end
 
-    def certificate_exists(username: nil, certificate_id: nil)
-      found = Spaceship.certificate.all.find do |cert|
-        cert.id == certificate_id
+    def certificates_exists(username: nil, certificate_ids: [], platform: nil)
+      Spaceship.certificate.all(mac: platform == "macos").each do |cert|
+        certificate_ids.delete(cert.id)
       end
-      return if found
+      return if certificate_ids.empty?
 
-      UI.error("Certificate '#{certificate_id}' (stored in your storage) is not available on the Developer Portal")
+      certificate_ids.each do |certificate_id|
+        UI.error("Certificate '#{certificate_id}' (stored in your storage) is not available on the Developer Portal")
+      end
       UI.error("for the user #{username}")
       UI.error("Make sure to use the same user and team every time you run 'match' for this")
       UI.error("Git repository. This might be caused by revoking the certificate on the Dev Portal")
       UI.user_error!("To reset the certificates of your Apple account, you can use the `fastlane match nuke` feature, more information on https://docs.fastlane.tools/actions/match/")
     end
 
-    def profile_exists(username: nil, uuid: nil)
-      found = Spaceship.provisioning_profile.all.find do |profile|
+    def profile_exists(username: nil, uuid: nil, platform: nil)
+      is_mac = platform == "macos"
+      found = Spaceship.provisioning_profile.all(mac: is_mac).find do |profile|
         profile.uuid == uuid
       end
 
+      # Look for iOS after looking for macOS (needed for Catalyst apps)
+      if !found && is_mac
+        found = Spaceship.provisioning_profile.all(mac: false).find do |profile|
+          profile.uuid == uuid
+        end
+      end
+
       unless found
         UI.error("Provisioning profile '#{uuid}' is not available on the Developer Portal for the user #{username}, fixing this now for you 🔨")
         return false

data/match/lib/match/storage.rb

@@ -1,6 +1,7 @@
 require_relative 'storage/interface'
 require_relative 'storage/git_storage'
 require_relative 'storage/google_cloud_storage'
+require_relative 'storage/s3_storage'
 
 module Match
   module Storage
@@ -12,6 +13,9 @@ module Match
           },
           "google_cloud" => lambda { |params|
             return Storage::GoogleCloudStorage.configure(params)
+          },
+          "s3" => lambda { |params|
+            return Storage::S3Storage.configure(params)
           }
         }
       end

data/match/lib/match/storage/git_storage.rb

@@ -73,8 +73,11 @@ module Match
         self.working_directory = Dir.mktmpdir
 
         command = "git clone #{self.git_url.shellescape} #{self.working_directory.shellescape}"
-        command << " -c http.extraheader='AUTHORIZATION: basic #{self.git_basic_authorization}'" unless self.git_basic_authorization.nil?
-        command << " -c http.extraheader='AUTHORIZATION: bearer #{self.git_bearer_authorization}'" unless self.git_bearer_authorization.nil?
+        # HTTP headers are supposed to be be case insensitive but
+        # Bitbucket requires `Authorization: Basic` and `Authorization Bearer` to work
+        # https://github.com/fastlane/fastlane/pull/15928
+        command << " -c http.extraheader='Authorization: Basic #{self.git_basic_authorization}'" unless self.git_basic_authorization.nil?
+        command << " -c http.extraheader='Authorization: Bearer #{self.git_bearer_authorization}'" unless self.git_bearer_authorization.nil?
 
         if self.shallow_clone
           command << " --depth 1 --no-single-branch"

data/match/lib/match/storage/google_cloud_storage.rb

@@ -181,7 +181,7 @@ module Match
       end
 
       def generate_matchfile_content
-        return "bucket_name(\"#{self.bucket_name}\")"
+        return "google_cloud_bucket_name(\"#{self.bucket_name}\")"
       end
 
       private
@@ -349,7 +349,7 @@ module Match
           UI.message("\t\t 1. Click on your bucket to open it".cyan)
           UI.message("\t\t 2. Click 'Permissions'".cyan)
           UI.message("\t\t 3. Click 'Add members'".cyan)
-          UI.message("\t\t 4. Enter the email of your service account".cyan)
+          UI.message("\t\t 4. Enter the service account email address".cyan)
           UI.message("\t\t 5. Set the role to 'Storage Admin'".cyan)
           UI.message("\t\t 6. Click 'Save'".cyan)
           UI.message("")

data/match/lib/match/storage/s3_storage.rb

@@ -0,0 +1,162 @@
+require 'fastlane_core/command_executor'
+require 'fastlane_core/configuration/configuration'
+require 'fastlane/helper/s3_client_helper'
+
+require_relative '../options'
+require_relative '../module'
+require_relative '../spaceship_ensure'
+require_relative './interface'
+
+module Match
+  module Storage
+    # Store the code signing identities on AWS S3
+    class S3Storage < Interface
+      attr_reader :s3_bucket
+      attr_reader :s3_region
+      attr_reader :s3_client
+      attr_reader :readonly
+      attr_reader :username
+      attr_reader :team_id
+      attr_reader :team_name
+
+      def self.configure(params)
+        s3_region = params[:s3_region]
+        s3_access_key = params[:s3_access_key]
+        s3_secret_access_key = params[:s3_secret_access_key]
+        s3_bucket = params[:s3_bucket]
+
+        if params[:git_url].to_s.length > 0
+          UI.important("Looks like you still define a `git_url` somewhere, even though")
+          UI.important("you use S3 Storage. You can remove the `git_url`")
+          UI.important("from your Matchfile and Fastfile")
+          UI.message("The above is just a warning, fastlane will continue as usual now...")
+        end
+
+        return self.new(
+          s3_region: s3_region,
+          s3_access_key: s3_access_key,
+          s3_secret_access_key: s3_secret_access_key,
+          s3_bucket: s3_bucket,
+          readonly: params[:readonly],
+          username: params[:username],
+          team_id: params[:team_id],
+          team_name: params[:team_name]
+        )
+      end
+
+      def initialize(s3_region: nil,
+                     s3_access_key: nil,
+                     s3_secret_access_key: nil,
+                     s3_bucket: nil,
+                     readonly: nil,
+                     username: nil,
+                     team_id: nil,
+                     team_name: nil)
+        @s3_bucket = s3_bucket
+        @s3_region = s3_region
+        @s3_client = Fastlane::Helper::S3ClientHelper.new(access_key: s3_access_key, secret_access_key: s3_secret_access_key, region: s3_region)
+        @readonly = readonly
+        @username = username
+        @team_id = team_id
+        @team_name = team_name
+      end
+
+      # To make debugging easier, we have a custom exception here
+      def prefixed_working_directory
+        # We fall back to "*", which means certificates and profiles
+        # from all teams that use this bucket would be installed. This is not ideal, but
+        # unless the user provides a `team_id`, we can't know which one to use
+        # This only happens if `readonly` is activated, and no `team_id` was provided
+        @_folder_prefix ||= currently_used_team_id
+        if @_folder_prefix.nil?
+          # We use a `@_folder_prefix` variable, to keep state between multiple calls of this
+          # method, as the value won't change. This way the warning is only printed once
+          UI.important("Looks like you run `match` in `readonly` mode, and didn't provide a `team_id`. This will still work, however it is recommended to provide a `team_id` in your Appfile or Matchfile")
+          @_folder_prefix = "*"
+        end
+        return File.join(working_directory, @_folder_prefix)
+      end
+
+      # Call this method for the initial clone/download of the
+      # user's certificates & profiles
+      # As part of this method, the `self.working_directory` attribute
+      # will be set
+      def download
+        # Check if we already have a functional working_directory
+        return if @working_directory && Dir.exist?(@working_directory)
+
+        # No existing working directory, creating a new one now
+        self.working_directory = Dir.mktmpdir
+
+        s3_client.find_bucket!(s3_bucket).objects.each do |object|
+          file_path = object.public_url.to_s.split("s3.amazonaws.com/").last
+          download_path = File.join(self.working_directory, file_path)
+
+          FileUtils.mkdir_p(File.expand_path("..", download_path))
+          UI.verbose("Downloading file from S3 '#{file_path}' on bucket #{self.s3_bucket}")
+
+          object.download_file(download_path)
+        end
+        UI.verbose("Successfully downloaded files from S3 to #{self.working_directory}")
+      end
+
+      # Returns a short string describing + identifing the current
+      # storage backend. This will be printed when nuking a storage
+      def human_readable_description
+        return "S3 Bucket [#{s3_bucket}] on region #{s3_region}"
+      end
+
+      def upload_files(files_to_upload: [], custom_message: nil)
+        # `files_to_upload` is an array of files that need to be uploaded to S3
+        # Those doesn't mean they're new, it might just be they're changed
+        # Either way, we'll upload them using the same technique
+
+        files_to_upload.each do |current_file|
+          # Go from
+          #   "/var/folders/px/bz2kts9n69g8crgv4jpjh6b40000gn/T/d20181026-96528-1av4gge/profiles/development/Development_me.mobileprovision"
+          # to
+          #   "profiles/development/Development_me.mobileprovision"
+          #
+
+          target_path = current_file.gsub(self.working_directory + "/", "")
+          UI.verbose("Uploading '#{target_path}' to S3 Storage...")
+
+          body = File.read(current_file)
+          acl = 'private'
+          s3_url = s3_client.upload_file(s3_bucket, target_path, body, acl)
+          UI.verbose("Uploaded '#{s3_url}' to S3 Storage.")
+        end
+      end
+
+      def delete_files(files_to_delete: [], custom_message: nil)
+        files_to_delete.each do |file_name|
+          s3_client.delete_file(s3_bucket, file_name)
+        end
+      end
+
+      def skip_docs
+        false
+      end
+
+      # Implement this for the `fastlane match init` command
+      # This method must return the content of the Matchfile
+      # that should be generated
+      def generate_matchfile_content(template: nil)
+        return "s3_bucket(\"#{self.s3_bucket}\")"
+      end
+
+      private
+
+      def currently_used_team_id
+        if self.readonly
+          # In readonly mode, we still want to see if the user provided a team_id
+          # see `prefixed_working_directory` comments for more details
+          return self.team_id
+        else
+          spaceship = SpaceshipEnsure.new(self.username, self.team_id, self.team_name)
+          return spaceship.team_id
+        end
+      end
+    end
+  end
+end

data/pilot/lib/pilot/build_manager.rb

@@ -245,12 +245,21 @@ module Pilot
     end
 
     def self.truncate_changelog(changelog)
-      max_changelog_length = 4000
-      if changelog && changelog.length > max_changelog_length
-        original_length = changelog.length
-        bottom_message = "..."
-        changelog = "#{changelog[0...max_changelog_length - bottom_message.length]}#{bottom_message}"
-        UI.important("Changelog has been truncated since it exceeds Apple's #{max_changelog_length} character limit. It currently contains #{original_length} characters.")
+      max_changelog_bytes = 4000
+      if changelog
+        changelog_bytes = changelog.unpack('C*').length
+        if changelog_bytes > max_changelog_bytes
+          UI.important("Changelog will be truncated since it exceeds Apple's #{max_changelog_bytes}-byte limit. It currently contains #{changelog_bytes} bytes.")
+          new_changelog = ''
+          new_changelog_bytes = 0
+          max_changelog_bytes -= 3 # Will append '...' later.
+          changelog.chars.each do |char|
+            new_changelog_bytes += char.unpack('C*').length
+            break if new_changelog_bytes >= max_changelog_bytes
+            new_changelog += char
+          end
+          changelog = new_changelog + '...'
+        end
       end
       changelog
     end
@@ -472,12 +481,18 @@ module Pilot
     end
 
     def update_build_beta_details(build, info)
-      build_beta_detail = build.build_beta_detail
-
       attributes = {}
       attributes[:autoNotifyEnabled] = info[:auto_notify_enabled] if info.key?(:auto_notify_enabled)
+      build_beta_detail = build.build_beta_detail
 
-      Spaceship::ConnectAPI.patch_build_beta_details(build_beta_details_id: build_beta_detail.id, attributes: attributes)
+      # https://github.com/fastlane/fastlane/pull/16006
+      if build_beta_detail
+        Spaceship::ConnectAPI.patch_build_beta_details(build_beta_details_id: build_beta_detail.id, attributes: attributes)
+      else
+        if attributes[:autoNotifyEnabled]
+          UI.important("Unable to auto notify testers as the build did not include beta detail information - this is likely a temporary issue on TestFlight.")
+        end
+      end
     end
   end
   # rubocop:enable Metrics/ClassLength

data/scan/lib/scan/detect_values.rb

@@ -108,7 +108,7 @@ module Scan
     def self.detect_simulator(devices, requested_os_type, deployment_target_key, default_device_name, simulator_type_descriptor)
       require 'set'
 
-      deployment_target_version = Scan.project.build_settings(key: deployment_target_key) || '0'
+      deployment_target_version = get_deployment_target_version(deployment_target_key)
 
       simulators = filter_simulators(
         FastlaneCore::DeviceManager.simulators(requested_os_type).tap do |array|
@@ -215,5 +215,10 @@ module Scan
         Scan.config[:destination] = min_xcode8? ? ["platform=macOS"] : ["platform=OS X"]
       end
     end
+
+    # get deployment target version
+    def self.get_deployment_target_version(deployment_target_key)
+      Scan.config[:deployment_target_version] || Scan.project.build_settings(key: deployment_target_key) || '0'
+    end
   end
 end

data/scan/lib/scan/manager.rb

@@ -4,8 +4,13 @@ require_relative 'runner'
 
 module Scan
   class Manager
+    attr_accessor :plist_files_before
+
     def work(options)
-      Scan.config = options
+      Scan.config = options # we set this here to auto-detect missing values, which we need later on
+      unless options[:derived_data_path].to_s.empty?
+        self.plist_files_before = test_summary_filenames(Scan.config[:derived_data_path])
+      end
 
       # Also print out the path to the used Xcode installation
       # We go 2 folders up, to not show "Contents/Developer/"
@@ -17,5 +22,17 @@ module Scan
 
       return Runner.new.run
     end
+
+    def test_summary_filenames(derived_data_path)
+      files = []
+
+      # Xcode < 10
+      files += Dir["#{derived_data_path}/**/Logs/Test/*TestSummaries.plist"]
+
+      # Xcode 10
+      files += Dir["#{derived_data_path}/**/Logs/Test/*.xcresult/TestSummaries.plist"]
+
+      return files
+    end
   end
 end

data/scan/lib/scan/options.rb

@@ -124,6 +124,11 @@ module Scan
                                      end),
 
         # other test options
+        FastlaneCore::ConfigItem.new(key: :testplan,
+                                     env_name: "SCAN_TESTPLAN",
+                                     description: "The testplan associated with the scheme that should be used for testing",
+                                     is_string: true,
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :xctestrun,
                                      short_option: "-X",
                                      env_name: "SCAN_XCTESTRUN",
@@ -254,6 +259,11 @@ module Scan
                                      default_value: false),
 
         # concurrency
+        FastlaneCore::ConfigItem.new(key: :concurrent_workers,
+                                     type: Integer,
+                                     env_name: "SCAN_CONCURRENT_WORKERS",
+                                     description: "Specify the exact number of test runners that will be spawned during parallel testing. Equivalent to -parallel-testing-worker-count",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :max_concurrent_simulators,
                                      type: Integer,
                                      env_name: "SCAN_MAX_CONCURRENT_SIMULATORS",
@@ -316,6 +326,18 @@ module Scan
                                        UI.user_error!("File not found at path '#{File.expand_path(value)}'") unless File.exist?(value)
                                      end),
 
+        # build settings
+        FastlaneCore::ConfigItem.new(key: :app_name,
+                                    env_name: "SCAN_APP_NAME",
+                                    optional: true,
+                                    description: "App name to use in slack message and logfile name",
+                                    is_string: true),
+        FastlaneCore::ConfigItem.new(key: :deployment_target_version,
+                                    env_name: "SCAN_DEPLOYMENT_TARGET_VERSION",
+                                    optional: true,
+                                    description: "Target version of the app being build or tested. Used to filter out simulator version",
+                                    is_string: true),
+
         # slack
         FastlaneCore::ConfigItem.new(key: :slack_url,
                                      short_option: "-i",
@@ -386,7 +408,12 @@ module Scan
                                     description: "Allows for override of the default `xcodebuild` command",
                                     type: String,
                                     optional: true,
-                                    default_value: "env NSUnbufferedIO=YES xcodebuild")
+                                    default_value: "env NSUnbufferedIO=YES xcodebuild"),
+        FastlaneCore::ConfigItem.new(key: :cloned_source_packages_path,
+                                    env_name: "SCAN_CLONED_SOURCE_PACKAGES_PATH",
+                                    description: "Sets a custom path for Swift Package Manager dependencies",
+                                    type: String,
+                                    optional: true)
 
       ]
     end

data/scan/lib/scan/runner.rb

@@ -25,15 +25,17 @@ module Scan
     def test_app
       force_quit_simulator_processes if Scan.config[:force_quit_simulator]
 
-      if Scan.config[:reset_simulator]
-        Scan.devices.each do |device|
-          FastlaneCore::Simulator.reset(udid: device.udid)
+      if Scan.devices
+        if Scan.config[:reset_simulator]
+          Scan.devices.each do |device|
+            FastlaneCore::Simulator.reset(udid: device.udid)
+          end
         end
-      end
 
-      if Scan.config[:disable_slide_to_type]
-        Scan.devices.each do |device|
-          FastlaneCore::Simulator.disable_slide_to_type(udid: device.udid)
+        if Scan.config[:disable_slide_to_type]
+          Scan.devices.each do |device|
+            FastlaneCore::Simulator.disable_slide_to_type(udid: device.udid)
+          end
         end
       end