fastlane 2.141.0 → 2.146.0

data/frameit/lib/frameit/template_finder.rb

@@ -1,5 +1,4 @@
 require 'deliver/app_screenshot'
-
 require_relative 'module'
 require_relative 'device_types'
 require_relative 'frame_downloader'
@@ -11,32 +10,36 @@ module Frameit
     def self.get_template(screenshot)
       return nil if screenshot.mac?
 
-      filename = "Apple #{screenshot.device_name} #{screenshot.color}"
-
+      filename = create_file_name(screenshot.device_name, screenshot.color.nil? ? screenshot.default_color : screenshot.color)
       templates = Dir["#{FrameDownloader.templates_path}/#{filename}.{png,jpg}"] # ~/.frameit folder
 
       UI.verbose("Looking for #{filename} and found #{templates.count} template(s)")
 
+      return filename if Helper.test?
+      if templates.count == 0 && !screenshot.color.nil? && screenshot.color != screenshot.default_color
+        filename = create_file_name(screenshot.device_name, screenshot.default_color)
+        UI.important("Unfortunately device type '#{screenshot.device_name}' is not available in #{screenshot.color}, falling back to " + (screenshot.default_color.nil? ? "default" : screenshot.default_color) + "...")
+        templates = Dir["#{FrameDownloader.templates_path}/#{filename}.{png,jpg}"] # ~/.frameit folder
+        UI.verbose("Looking for #{filename} and found #{templates.count} template(s)")
+      end
+
       if templates.count == 0
-        if screenshot.screen_size == Deliver::AppScreenshot::ScreenSize::IOS_35
+        if screenshot.deliver_screen_id == Deliver::AppScreenshot::ScreenSize::IOS_35
           UI.important("Unfortunately 3.5\" device frames were discontinued. Skipping screen '#{screenshot.path}'")
           UI.error("Looked for: '#{filename}.png'")
-        elsif screenshot.color == Frameit::Color::ROSE_GOLD || screenshot.color == Frameit::Color::GOLD
-          # Unfortunately not every device type is available in rose gold or gold
-          # This is why we can't have nice things #yatusabes
-          # fallback to a white iPhone, which looks similar
-          UI.important("Unfortunately device type '#{screenshot.device_name}' is not available in #{screenshot.color}, falling back to silver...")
-          screenshot.color = Frameit::Color::SILVER
-          return self.get_template(screenshot)
         else
           UI.error("Couldn't find template for screenshot type '#{filename}'")
           UI.error("Please run `fastlane frameit download_frames` to download the latest frames")
         end
-        return filename if Helper.test?
         return nil
       else
         return templates.first.tr(" ", "\ ")
       end
     end
+
+    def self.create_file_name(device_name, color)
+      return "#{device_name} #{color}" unless color.nil?
+      return device_name
+    end
   end
 end

data/gym/lib/gym/generators/package_command_generator.rb

@@ -49,6 +49,10 @@ module Gym
         generator.apps_path
       end
 
+      def asset_packs_path
+        generator.asset_packs_path
+      end
+
       # The generator we need to use for the currently used Xcode version
       # Since we dropped Xcode 6 support, it's just this class, but maybe we'll have
       # new classes in the future

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

@@ -25,11 +25,11 @@ module Gym
 
       # Determine platform to archive
       is_mac = Gym.project.mac? || Gym.building_mac_catalyst_for_mac?
-      is_ios = !is_mac && (Gym.project.ios? || Gym.project.tvos?)
+      is_ios = !is_mac && (Gym.project.ios? || Gym.project.tvos? || Gym.project.watchos?)
 
       # Archive
       if is_ios
-        fix_generic_archive # See https://github.com/fastlane/fastlane/pull/4325
+        fix_generic_archive unless Gym.project.watchos? # See https://github.com/fastlane/fastlane/pull/4325
         return BuildCommandGenerator.archive_path if Gym.config[:skip_package_ipa]
 
         package_app
@@ -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

@@ -45,7 +45,7 @@ module Match
     end
 
     # This method is called from both here, and from `openssl.rb`
-    def self.ask_password(message: "Passphrase for Git Repo: ", confirm: nil)
+    def self.ask_password(message: "Passphrase for Match storage: ", confirm: nil)
       ensure_ui_interactive
       loop do
         password = UI.password(message)

data/match/lib/match/encryption.rb

@@ -14,6 +14,10 @@ module Match
           },
           "google_cloud" => lambda { |params|
             return nil
+          },
+          "s3" => lambda { |params|
+            params[:keychain_name] = params[:s3_bucket]
+            return Encryption::OpenSSL.configure(params)
           }
         }
       end

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], {
@@ -54,20 +47,25 @@ module Match
 
       case cert_type
       when :development
-        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT
+        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT + "," + Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT
       when :distribution, :enterprise
-        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
+        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/module.rb

@@ -13,7 +13,7 @@ module Match
   end
 
   def self.storage_modes
-    return %w(git google_cloud)
+    return %w(git google_cloud s3)
   end
 
   def self.profile_type_sym(type)

data/match/lib/match/nuke.rb

@@ -37,7 +37,11 @@ module Match
         clone_branch_directly: params[:clone_branch_directly],
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
         google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
-        google_cloud_project_id: params[:google_cloud_project_id].to_s
+        google_cloud_project_id: params[:google_cloud_project_id].to_s,
+        s3_region: params[:s3_region].to_s,
+        s3_access_key: params[:s3_access_key].to_s,
+        s3_secret_access_key: params[:s3_secret_access_key].to_s,
+        s3_bucket: params[:s3_bucket].to_s
       })
       self.storage.download
 

data/match/lib/match/options.rb

@@ -159,6 +159,24 @@ module Match
                                      description: "ID of the Google Cloud project to use for authentication",
                                      optional: true),
 
+        # Storage: S3
+        FastlaneCore::ConfigItem.new(key: :s3_region,
+                                     env_name: "MATCH_S3_REGION",
+                                     description: "Name of the S3 region",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :s3_access_key,
+                                     env_name: "MATCH_S3_ACCESS_KEY",
+                                     description: "S3 access key",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :s3_secret_access_key,
+                                     env_name: "MATCH_S3_SECRET_ACCESS_KEY",
+                                     description: "S3 secret access key",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :s3_bucket,
+                                     env_name: "MATCH_S3_BUCKET",
+                                     description: "Name of the S3 bucket",
+                                     optional: true),
+
         # Keychain
         FastlaneCore::ConfigItem.new(key: :keychain_name,
                                      short_option: "-s",

data/match/lib/match/runner.rb

@@ -46,6 +46,10 @@ module Match
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
         google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
         google_cloud_project_id: params[:google_cloud_project_id].to_s,
+        s3_region: params[:s3_region].to_s,
+        s3_access_key: params[:s3_access_key].to_s,
+        s3_secret_access_key: params[:s3_secret_access_key].to_s,
+        s3_bucket: params[:s3_bucket].to_s,
         readonly: params[:readonly],
         username: params[:readonly] ? nil : params[:username], # only pass username if not readonly
         team_id: params[:team_id],

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/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/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,167 @@
+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.key # :team_id/path/to/file
+          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 |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 = sanitize_file_name(file_name)
+          UI.verbose("Uploading '#{target_path}' to S3 Storage...")
+
+          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.")
+        end
+      end
+
+      def delete_files(files_to_delete: [], custom_message: nil)
+        files_to_delete.each do |file_name|
+          target_path = sanitize_file_name(file_name)
+          s3_client.delete_file(s3_bucket, target_path)
+        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 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
+          # 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