fastlane 2.143.0 → 2.147.0

data/gym/lib/gym/generators/package_command_generator_xcode7.rb

@@ -136,6 +136,11 @@ module Gym
         Gym.cache[:apps_path] ||= File.join(temporary_output_path, "Apps")
       end
 
+      # The path to the Apps folder
+      def asset_packs_path
+        Gym.cache[:asset_packs_path] ||= File.join(temporary_output_path, "OnDemandResources")
+      end
+
       private
 
       def normalize_export_options(hash)

data/gym/lib/gym/runner.rb

@@ -39,6 +39,7 @@ module Gym
         move_app_thinning
         move_app_thinning_size_report
         move_apps_folder
+        move_asset_packs
       elsif is_mac
         path = File.expand_path(Gym.config[:output_directory])
         compress_and_move_dsym
@@ -325,6 +326,19 @@ module Gym
       end
     end
 
+    # Move Asset Packs folder to the output directory
+    # @return (String) The path to the resulting Asset Packs (aka OnDemandResources) folder
+    def move_asset_packs
+      if Dir.exist?(PackageCommandGenerator.asset_packs_path)
+        FileUtils.mv(PackageCommandGenerator.asset_packs_path, File.expand_path(Gym.config[:output_directory]), force: true)
+        asset_packs_path = File.join(File.expand_path(Gym.config[:output_directory]), File.basename(PackageCommandGenerator.asset_packs_path))
+
+        UI.success("Successfully exported Asset Pack folder:")
+        UI.message(asset_packs_path)
+        asset_packs_path
+      end
+    end
+
     def find_archive_path
       Dir.glob(File.join(BuildCommandGenerator.build_path, "*.ipa")).last
     end

data/match/lib/match/change_password.rb

@@ -16,7 +16,7 @@ module Match
 
       ensure_ui_interactive
 
-      to = ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: true)
+      to = FastlaneCore::Helper.ask_password(message: "New passphrase for Git Repo: ", confirm: true)
 
       # Choose the right storage and encryption implementations
       storage = Storage.for_mode(params[:storage_mode], {
@@ -44,23 +44,6 @@ module Match
       storage.save_changes!(files_to_commit: files_to_commit, custom_message: message)
     end
 
-    # This method is called from both here, and from `openssl.rb`
-    def self.ask_password(message: "Passphrase for Match storage: ", confirm: nil)
-      ensure_ui_interactive
-      loop do
-        password = UI.password(message)
-        if confirm
-          password2 = UI.password("Type passphrase again: ")
-          if password == password2
-            return password
-          end
-        else
-          return password
-        end
-        UI.error("Passphrases differ. Try again")
-      end
-    end
-
     def self.ensure_ui_interactive
       raise "This code should only run in interactive mode" unless UI.interactive?
     end

data/match/lib/match/encryption/openssl.rb

@@ -99,7 +99,7 @@ module Match
             UI.important("Enter the passphrase that should be used to encrypt/decrypt your certificates")
             UI.important("This passphrase is specific per repository and will be stored in your local keychain")
             UI.important("Make sure to remember the password, as you'll need it when you run match on a different machine")
-            password = ChangePassword.ask_password(confirm: true)
+            password = FastlaneCore::Helper.ask_password(message: "Passphrase for Match storage: ", confirm: true)
             store_password(password)
           end
         end

data/match/lib/match/generator.rb

@@ -60,7 +60,11 @@ module Match
         names << params[:platform]
       end
 
-      profile_name = names.join(" ")
+      if params[:profile_name].to_s.empty?
+        profile_name = names.join(" ")
+      else
+        profile_name = params[:profile_name]
+      end
 
       values = {
         app_identifier: app_identifier,

data/match/lib/match/importer.rb

@@ -2,23 +2,16 @@ require_relative 'spaceship_ensure'
 require_relative 'encryption'
 require_relative 'storage'
 require_relative 'module'
+require 'fastlane_core/provisioning_profile'
 require 'fileutils'
 
 module Match
   class Importer
-    def import_cert(params, cert_path: nil, p12_path: nil)
-      # Get and verify cert and p12 path
-      cert_path ||= UI.input("Certificate (.cer) path:")
-      p12_path ||= UI.input("Private key (.p12) path:")
-
-      cert_path = File.absolute_path(cert_path)
-      p12_path = File.absolute_path(p12_path)
-
-      UI.user_error!("Certificate does not exist at path: #{cert_path}") unless File.exist?(cert_path)
-      UI.user_error!("Private key does not exist at path: #{p12_path}") unless File.exist?(p12_path)
-
-      # Base64 encode contents to find match from API to find a cert ID
-      cert_contents_base_64 = Base64.strict_encode64(File.open(cert_path).read)
+    def import_cert(params, cert_path: nil, p12_path: nil, profile_path: nil)
+      # Get and verify cert, p12 and profiles path
+      cert_path = ensure_valid_file_path(cert_path, "Certificate", ".cer")
+      p12_path = ensure_valid_file_path(p12_path, "Private key", ".p12")
+      profile_path = ensure_valid_file_path(profile_path, "Provisioning profile", ".mobileprovision or .provisionprofile", optional: true)
 
       # Storage
       storage = Storage.for_mode(params[:storage_mode], {
@@ -57,17 +50,22 @@ module Match
         certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT + "," + Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT
       when :distribution, :enterprise
         certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION + "," + Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION
+      when :developer_id_application
+        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
       else
         UI.user_error!("Cert type '#{cert_type}' is not supported")
       end
 
-      output_dir = File.join(storage.prefixed_working_directory, "certs", cert_type.to_s)
+      output_dir_certs = File.join(storage.prefixed_working_directory, "certs", cert_type.to_s)
+      output_dir_profiles = File.join(storage.prefixed_working_directory, "profiles", cert_type.to_s)
 
       # Need to get the cert id by comparing base64 encoded cert content with certificate content from the API responses
       Spaceship::Portal.login(params[:username])
       Spaceship::Portal.select_team(team_id: params[:team_id], team_name: params[:team_name])
       certs = Spaceship::ConnectAPI::Certificate.all(filter: { certificateType: certificate_type })
 
+      # Base64 encode contents to find match from API to find a cert ID
+      cert_contents_base_64 = Base64.strict_encode64(File.binread(cert_path))
       matching_cert = certs.find do |cert|
         cert.certificate_content == cert_contents_base_64
       end
@@ -75,18 +73,37 @@ module Match
       UI.user_error!("This certificate cannot be imported - the certificate contents did not match with any available on the Developer Portal") if matching_cert.nil?
 
       # Make dir if doesn't exist
-      FileUtils.mkdir_p(output_dir)
-      dest_cert_path = File.join(output_dir, "#{matching_cert.id}.cer")
-      dest_p12_path = File.join(output_dir, "#{matching_cert.id}.p12")
+      FileUtils.mkdir_p(output_dir_certs)
+      dest_cert_path = File.join(output_dir_certs, "#{matching_cert.id}.cer")
+      dest_p12_path = File.join(output_dir_certs, "#{matching_cert.id}.p12")
+
+      files_to_commit = [dest_cert_path, dest_p12_path]
 
       # Copy files
       IO.copy_stream(cert_path, dest_cert_path)
       IO.copy_stream(p12_path, dest_p12_path)
-      files_to_commit = [dest_cert_path, dest_p12_path]
+      unless profile_path.nil?
+        FileUtils.mkdir_p(output_dir_profiles)
+        bundle_id = FastlaneCore::ProvisioningProfile.bundle_id(profile_path)
+        profile_extension = FastlaneCore::ProvisioningProfile.profile_extension(profile_path)
+        dest_profile_path = File.join(output_dir_profiles, "#{cert_type.to_s.capitalize}_#{bundle_id}#{profile_extension}")
+        files_to_commit.push(dest_profile_path)
+        IO.copy_stream(profile_path, dest_profile_path)
+      end
 
       # Encrypt and commit
       encryption.encrypt_files if encryption
       storage.save_changes!(files_to_commit: files_to_commit)
     end
+
+    def ensure_valid_file_path(file_path, file_description, file_extension, optional: false)
+      optional_file_message = optional ? " or leave empty to skip this file" : ""
+      file_path ||= UI.input("#{file_description} (#{file_extension}) path#{optional_file_message}:")
+
+      file_path = File.absolute_path(file_path) unless file_path == ""
+      file_path = File.exist?(file_path) ? file_path : nil
+      UI.user_error!("#{file_description} does not exist at path: #{file_path}") unless !file_path.nil? || optional
+      file_path
+    end
   end
 end

data/match/lib/match/options.rb

@@ -170,7 +170,7 @@ module Match
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :s3_secret_access_key,
                                      env_name: "MATCH_S3_SECRET_ACCESS_KEY",
-                                     description: "S3 secret secret access key",
+                                     description: "S3 secret access key",
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :s3_bucket,
                                      env_name: "MATCH_S3_BUCKET",
@@ -226,6 +226,11 @@ module Match
                                      description: "The name of provisioning profile template. If the developer account has provisioning profile templates (aka: custom entitlements), the template name can be found by inspecting the Entitlements drop-down while creating/editing a provisioning profile (e.g. \"Apple Pay Pass Suppression Development\")",
                                      optional: true,
                                      default_value: nil),
+        FastlaneCore::ConfigItem.new(key: :profile_name,
+                                    env_name: "MATCH_PROVISIONING_PROFILE_NAME",
+                                    description: "A custom name for the provisioning profile. This will replace the default provisioning profile name if specified",
+                                    optional: true,
+                                    default_value: nil),
         FastlaneCore::ConfigItem.new(key: :output_path,
                                      env_name: "MATCH_OUTPUT_PATH",
                                      description: "Path in which to export certificates, key and profile",

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

@@ -89,7 +89,7 @@ module Match
         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
+          file_path = object.key # :team_id/path/to/file
           download_path = File.join(self.working_directory, file_path)
 
           FileUtils.mkdir_p(File.expand_path("..", download_path))
@@ -111,17 +111,17 @@ module Match
         # 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|
+        files_to_upload.each do |file_name|
           # 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 + "/", "")
+          target_path = sanitize_file_name(file_name)
           UI.verbose("Uploading '#{target_path}' to S3 Storage...")
 
-          body = File.read(current_file)
+          body = File.read(file_name)
           acl = 'private'
           s3_url = s3_client.upload_file(s3_bucket, target_path, body, acl)
           UI.verbose("Uploaded '#{s3_url}' to S3 Storage.")
@@ -130,7 +130,8 @@ module Match
 
       def delete_files(files_to_delete: [], custom_message: nil)
         files_to_delete.each do |file_name|
-          s3_client.delete_file(s3_bucket, file_name)
+          target_path = sanitize_file_name(file_name)
+          s3_client.delete_file(s3_bucket, target_path)
         end
       end
 
@@ -147,6 +148,10 @@ module Match
 
       private
 
+      def sanitize_file_name(file_name)
+        file_name.gsub(self.working_directory + "/", "")
+      end
+
       def currently_used_team_id
         if self.readonly
           # In readonly mode, we still want to see if the user provided a team_id

data/match/lib/match/utils.rb

@@ -4,7 +4,7 @@ require_relative 'module'
 
 module Match
   class Utils
-    def self.import(item_path, keychain, password: "")
+    def self.import(item_path, keychain, password: nil)
       keychain_path = FastlaneCore::Helper.keychain_path(keychain)
       FastlaneCore::KeychainImporter.import_file(item_path, keychain_path, keychain_password: password, output: FastlaneCore::Globals.verbose?)
     end

data/pilot/lib/pilot/build_manager.rb

@@ -118,9 +118,17 @@ module Pilot
 
       # Get latest uploaded build if no build specified
       if build.nil?
-        UI.important("No build specified - fetching latest build")
+        app_version = config[:app_version]
+        build_number = config[:build_number]
+        if build_number.nil?
+          if app_version.nil?
+            UI.important("No build specified - fetching latest build")
+          else
+            UI.important("No build specified - fetching latest build for version #{app_version}")
+          end
+        end
         platform = Spaceship::ConnectAPI::Platform.map(fetch_app_platform)
-        build ||= Spaceship::ConnectAPI::Build.all(app_id: app.id, sort: "-uploadedDate", platform: platform, limit: 1).first
+        build ||= Spaceship::ConnectAPI::Build.all(app_id: app.id, version: app_version, build_number: build_number, sort: "-uploadedDate", platform: platform, limit: 1).first
       end
 
       # Verify the build has all the includes that we need
@@ -207,8 +215,11 @@ module Pilot
     end
 
     def update_beta_app_meta(options, build)
-      # Setting account required wth AppStore Connect API
-      update_review_detail(build, { demo_account_required: options[:demo_account_required] })
+      # If demo_account_required is a parameter, it should added into beta_app_review_info
+      unless options[:demo_account_required].nil?
+        options[:beta_app_review_info] = {} if options[:beta_app_review_info].nil?
+        options[:beta_app_review_info][:demo_account_required] = options[:demo_account_required]
+      end
 
       if should_update_beta_app_review_info(options)
         update_review_detail(build, options[:beta_app_review_info])

data/pilot/lib/pilot/options.rb

@@ -162,6 +162,14 @@ module Pilot
                                     env_name: "PILOT_NOTIFY_EXTERNAL_TESTERS",
                                     description: "Should notify external testers?",
                                     default_value: true),
+        FastlaneCore::ConfigItem.new(key: :app_version,
+                                     env_name: "PILOT_APP_VERSION",
+                                     description: "The version number of the application build to distribute. If the version number is not specified, then the most recent build uploaded to TestFlight will be distributed. If specified, the most recent build for the version number will be distributed",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :build_number,
+                                     env_name: "PILOT_BUILD_NUMBER",
+                                     description: "The build number of the application build to distribute. If the build number is not specified, the most recent build is distributed",
+                                     optional: true),
 
         # testers
         FastlaneCore::ConfigItem.new(key: :first_name,

data/produce/lib/produce/developer_center.rb

@@ -59,7 +59,7 @@ module Produce
         app = Spaceship.app.create!(bundle_id: app_identifier,
                                          name: app_name,
                                          enable_services: enable_services,
-                                         mac: Produce.config[:platform] == "osx")
+                                         mac: platform == "osx")
 
         if app.name != Produce.config[:app_name]
           UI.important("Your app name includes non-ASCII characters, which are not supported by the Apple Developer Portal.")
@@ -122,8 +122,17 @@ module Produce
 
     private
 
+    def platform
+      # This was added to support creation of multiple platforms
+      # Produce::ItunesConnect can take an array of platforms to create for App Store Connect
+      # but the Developer Center is now platform agnostic so we choose any platform here
+      #
+      # Platform won't be needed at all in the future when this is change over to use Spaceship::ConnectAPI
+      (Produce.config[:platforms] || []).first || Produce.config[:platform]
+    end
+
     def app_exists?
-      Spaceship.app.find(app_identifier, mac: Produce.config[:platform] == "osx") != nil
+      Spaceship.app.find(app_identifier, mac: platform == "osx") != nil
     end
 
     def login

data/produce/lib/produce/itunes_connect.rb

@@ -23,6 +23,8 @@ module Produce
       else
         UI.success("Creating new app '#{Produce.config[:app_name]}' on App Store Connect")
 
+        platforms = Produce.config[:platforms] || [Produce.config[:platform]]
+
         Produce.config[:bundle_identifier_suffix] = '' unless wildcard_bundle?
         generated_app = Spaceship::Tunes::Application.create!(name: Produce.config[:app_name],
                                                               primary_language: language,
@@ -30,7 +32,7 @@ module Produce
                                                               bundle_id: app_identifier,
                                                               bundle_id_suffix: Produce.config[:bundle_identifier_suffix],
                                                               company_name: Produce.config[:company_name],
-                                                              platform: Produce.config[:platform],
+                                                              platforms: platforms,
                                                               itunes_connect_users: Produce.config[:itc_users])
 
         UI.crash!("Something went wrong when creating the new app on iTC") if generated_app["adamId"].to_s.empty?
@@ -51,16 +53,22 @@ module Produce
         UI.crash!("Something went wrong when creating the new app - it's not listed in the App's list") unless application
 
         UI.message("Ensuring version number")
-        application.ensure_version!(Produce.config[:app_version], platform: Produce.config[:platform]) if Produce.config[:app_version]
+        platforms.each do |platform|
+          application.ensure_version!(Produce.config[:app_version], platform: platform) if Produce.config[:app_version]
+        end
 
         UI.success("Successfully created new app '#{Produce.config[:app_name]}' on App Store Connect with ID #{application.apple_id}")
       end
 
-      return Spaceship::Tunes::Application.find(@full_bundle_identifier, mac: Produce.config[:platform] == "osx").apple_id
+      return Spaceship::Tunes::Application.find(@full_bundle_identifier, mac: platform == "osx").apple_id
     end
 
     private
 
+    def platform
+      (Produce.config[:platforms] || []).first || Produce.config[:platform]
+    end
+
     def fetch_application
       Spaceship::Tunes::Application.find(@full_bundle_identifier)
     end

data/produce/lib/produce/options.rb

@@ -50,11 +50,23 @@ module Produce
                                      short_option: "-j",
                                      env_name: "PRODUCE_PLATFORM",
                                      description: "The platform to use (optional)",
+                                     conflicting_options: [:platforms],
                                      optional: true,
                                      default_value: "ios",
                                      verify_block: proc do |value|
                                                      UI.user_error!("The platform can only be ios or osx") unless %('ios', 'osx').include?(value)
                                                    end),
+        FastlaneCore::ConfigItem.new(key: :platforms,
+                                     short_option: "-J",
+                                     env_name: "PRODUCE_PLATFORMS",
+                                     description: "The platforms to use (optional)",
+                                     conflicting_options: [:platform],
+                                     optional: true,
+                                     type: Array,
+                                     verify_block: proc do |values|
+                                                     types = %w(ios osx)
+                                                     UI.user_error!("The platform can only be #{types}") unless (values - types).empty?
+                                                   end),
         FastlaneCore::ConfigItem.new(key: :language,
                                      short_option: "-m",
                                      env_name: "PRODUCE_LANGUAGE",

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",
@@ -175,6 +180,11 @@ module Scan
                                      description: "Should the HTML report be opened when tests are completed?",
                                      is_string: false,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
+                                     env_name: "SCAN_DISABLE_XCPRETTY",
+                                     description: "Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table",
+                                     type: Boolean,
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :output_directory,
                                      short_option: "-o",
                                      env_name: "SCAN_OUTPUT_DIRECTORY",
@@ -186,7 +196,7 @@ module Scan
         FastlaneCore::ConfigItem.new(key: :output_style,
                                      short_option: "-b",
                                      env_name: "SCAN_OUTPUT_STYLE",
-                                     description: "Define how the output should look like. Valid values are: standard, basic, rspec, or raw (disables xcpretty)",
+                                     description: "Define how the output should look like. Valid values are: standard, basic, rspec, or raw (disables xcpretty during xcodebuild)",
                                      optional: true,
                                      verify_block: proc do |value|
                                        UI.user_error!("Invalid output_style #{value}") unless ['standard', 'basic', 'rspec', 'raw'].include?(value)