fastlane 2.109.1 → 2.110.0

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.109.1
+// Generated with fastlane 2.110.0

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.109.1
+// Generated with fastlane 2.110.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -21,6 +21,8 @@ protocol MatchfileProtocol: class {
   var skipDocs: Bool { get }
   var platform: String { get }
   var templateName: String? { get }
+  var googleCloudBucketName: String? { get }
+  var googleCloudKeysFile: String? { get }
 }
 
 extension MatchfileProtocol {
@@ -46,8 +48,10 @@ extension MatchfileProtocol {
   var skipDocs: Bool { return false }
   var platform: String { return "ios" }
   var templateName: String? { return nil }
+  var googleCloudBucketName: String? { return nil }
+  var googleCloudKeysFile: String? { return nil }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.2]
+// FastlaneRunnerAPIVersion [0.9.3]

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.109.1
+// Generated with fastlane 2.110.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.109.1
+// Generated with fastlane 2.110.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -1,16 +1,21 @@
 protocol ScanfileProtocol: class {
   var workspace: String? { get }
   var project: String? { get }
+  var scheme: String? { get }
   var device: String? { get }
-  var toolchain: String? { get }
   var devices: [String]? { get }
   var skipDetectDevices: Bool { get }
-  var scheme: String? { get }
+  var reinstallApp: Bool { get }
+  var appIdentifier: String? { get }
+  var onlyTesting: String? { get }
+  var skipTesting: String? { get }
+  var xctestrun: String? { get }
+  var toolchain: String? { get }
   var clean: Bool { get }
   var codeCoverage: Bool? { get }
   var addressSanitizer: Bool? { get }
   var threadSanitizer: Bool? { get }
-  var skipBuild: Bool { get }
+  var openReport: Bool { get }
   var outputDirectory: String { get }
   var outputStyle: String? { get }
   var outputTypes: String { get }
@@ -20,47 +25,47 @@ protocol ScanfileProtocol: class {
   var suppressXcodeOutput: String? { get }
   var formatter: String? { get }
   var xcprettyArgs: String? { get }
+  var derivedDataPath: String? { get }
+  var shouldZipBuildProducts: Bool { get }
+  var resultBundle: Bool { get }
+  var useClangReportName: Bool { get }
   var maxConcurrentSimulators: Int? { get }
   var disableConcurrentTesting: Bool { get }
+  var skipBuild: Bool { get }
   var testWithoutBuilding: Bool? { get }
   var buildForTesting: Bool? { get }
-  var xctestrun: String? { get }
-  var derivedDataPath: String? { get }
-  var shouldZipBuildProducts: Bool { get }
-  var resultBundle: Bool { get }
   var sdk: String? { get }
-  var openReport: Bool { get }
   var configuration: String? { get }
-  var destination: String? { get }
   var xcargs: String? { get }
   var xcconfig: String? { get }
-  var onlyTesting: String? { get }
-  var skipTesting: String? { get }
   var slackUrl: String? { get }
   var slackChannel: String? { get }
   var slackMessage: String? { get }
   var skipSlack: Bool { get }
   var slackOnlyOnFailure: Bool { get }
-  var useClangReportName: Bool { get }
+  var destination: String? { get }
   var customReportFileName: String? { get }
-  var appIdentifier: String? { get }
-  var reinstallApp: Bool { get }
   var failBuild: Bool { get }
 }
 
 extension ScanfileProtocol {
   var workspace: String? { return nil }
   var project: String? { return nil }
+  var scheme: String? { return nil }
   var device: String? { return nil }
-  var toolchain: String? { return nil }
   var devices: [String]? { return nil }
   var skipDetectDevices: Bool { return false }
-  var scheme: String? { return nil }
+  var reinstallApp: Bool { return false }
+  var appIdentifier: String? { return nil }
+  var onlyTesting: String? { return nil }
+  var skipTesting: String? { return nil }
+  var xctestrun: String? { return nil }
+  var toolchain: String? { return nil }
   var clean: Bool { return false }
   var codeCoverage: Bool? { return nil }
   var addressSanitizer: Bool? { return nil }
   var threadSanitizer: Bool? { return nil }
-  var skipBuild: Bool { return false }
+  var openReport: Bool { return false }
   var outputDirectory: String { return "./test_output" }
   var outputStyle: String? { return nil }
   var outputTypes: String { return "html,junit" }
@@ -70,34 +75,29 @@ extension ScanfileProtocol {
   var suppressXcodeOutput: String? { return nil }
   var formatter: String? { return nil }
   var xcprettyArgs: String? { return nil }
+  var derivedDataPath: String? { return nil }
+  var shouldZipBuildProducts: Bool { return false }
+  var resultBundle: Bool { return false }
+  var useClangReportName: Bool { return false }
   var maxConcurrentSimulators: Int? { return nil }
   var disableConcurrentTesting: Bool { return false }
+  var skipBuild: Bool { return false }
   var testWithoutBuilding: Bool? { return nil }
   var buildForTesting: Bool? { return nil }
-  var xctestrun: String? { return nil }
-  var derivedDataPath: String? { return nil }
-  var shouldZipBuildProducts: Bool { return false }
-  var resultBundle: Bool { return false }
   var sdk: String? { return nil }
-  var openReport: Bool { return false }
   var configuration: String? { return nil }
-  var destination: String? { return nil }
   var xcargs: String? { return nil }
   var xcconfig: String? { return nil }
-  var onlyTesting: String? { return nil }
-  var skipTesting: String? { return nil }
   var slackUrl: String? { return nil }
   var slackChannel: String? { return nil }
   var slackMessage: String? { return nil }
   var skipSlack: Bool { return false }
   var slackOnlyOnFailure: Bool { return false }
-  var useClangReportName: Bool { return false }
+  var destination: String? { return nil }
   var customReportFileName: String? { return nil }
-  var appIdentifier: String? { return nil }
-  var reinstallApp: Bool { return false }
   var failBuild: Bool { return true }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.6]
+// FastlaneRunnerAPIVersion [0.9.7]

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.109.1
+// Generated with fastlane 2.110.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.109.1
+// Generated with fastlane 2.110.0

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -162,7 +162,7 @@ module FastlaneCore
       [
         '"' + Helper.transporter_path + '"',
         "-m upload",
-        "-u \"#{username}\"",
+        "-u #{username.shellescape}",
         "-p #{shell_escaped_password(password)}",
         "-f \"#{source}\"",
         additional_upload_parameters, # that's here, because the user might overwrite the -t option
@@ -177,7 +177,7 @@ module FastlaneCore
       [
         '"' + Helper.transporter_path + '"',
         "-m lookupMetadata",
-        "-u \"#{username}\"",
+        "-u #{username.shellescape}",
         "-p #{shell_escaped_password(password)}",
         "-apple_id #{apple_id}",
         "-destination '#{destination}'",
@@ -203,21 +203,23 @@ module FastlaneCore
     private
 
     def shell_escaped_password(password)
-      # because the shell handles passwords with single-quotes incorrectly, use gsub to replace ShellEscape'd single-quotes of this form:
-      #    \'
-      # with a sequence that wraps the escaped single-quote in double-quotes:
-      #    '"\'"'
-      # this allows us to properly handle passwords with single-quotes in them
-      # we use the 'do' version of gsub, because two-param version interprets the replace text as a pattern and does the wrong thing
-      password = Shellwords.escape(password).gsub("\\'") do
-        "'\"\\'\"'"
-      end
-
-      # wrap the fully-escaped password in single quotes, since the transporter expects a escaped password string
-      # (which must be single-quoted for the shell's benefit [on non-Windows platforms])
-      password = "'" + password + "'" unless Helper.windows?
+      password = password.shellescape
+      unless Helper.windows?
+        # because the shell handles passwords with single-quotes incorrectly, use `gsub` to replace `shellescape`'d single-quotes of this form:
+        #    \'
+        # with a sequence that wraps the escaped single-quote in double-quotes:
+        #    '"\'"'
+        # this allows us to properly handle passwords with single-quotes in them
+        # background: https://stackoverflow.com/questions/1250079/how-to-escape-single-quotes-within-single-quoted-strings/1250098#1250098
+        password = password.gsub("\\'") do
+          # we use the 'do' version of gsub, because two-param version interprets the replace text as a pattern and does the wrong thing
+          "'\"\\'\"'"
+        end
 
-      password
+        # wrap the fully-escaped password in single quotes, since the transporter expects a escaped password string (which must be single-quoted for the shell's benefit)
+        password = "'" + password + "'"
+      end
+      return password
     end
   end
 

data/frameit/lib/frameit/options.rb

@@ -46,7 +46,7 @@ module Frameit
                            default_value: false),
         FastlaneCore::ConfigItem.new(key: :force_orientation_block,
                            type: :string_callback,
-                           description: "[Advanced] A block to customize your screnshots' device orientation",
+                           description: "[Advanced] A block to customize your screenshots' device orientation",
                            display_in_shell: false,
                            optional: true,
                            default_value: proc do |filename|

data/match/lib/match.rb

@@ -7,6 +7,7 @@ require_relative 'match/generator'
 require_relative 'match/setup'
 require_relative 'match/spaceship_ensure'
 require_relative 'match/change_password'
+require_relative 'match/migrate'
 require_relative 'match/storage'
 require_relative 'match/encryption'
 require_relative 'match/module'

data/match/lib/match/change_password.rb

@@ -7,6 +7,13 @@ module Match
   # These functions should only be used while in (UI.) interactive mode
   class ChangePassword
     def self.update(params: nil)
+      if params[:storage_mode] != "git"
+        # Only git supports changing the password
+        # All other storage options will most likely use more advanced
+        # ways to encrypt files
+        UI.user_error!("Only git-based match allows you to change your password, current `storage_mode` is #{params[:storage_mode]}")
+      end
+
       ensure_ui_interactive
 
       to = ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: true)

data/match/lib/match/commands_generator.rb

@@ -1,17 +1,19 @@
 require 'commander'
 
 require 'fastlane_core/configuration/configuration'
-require_relative 'module'
 
 require_relative 'nuke'
 require_relative 'change_password'
 require_relative 'setup'
 require_relative 'runner'
 require_relative 'options'
+require_relative 'migrate'
 
 require_relative 'storage'
 require_relative 'encryption'
 
+require_relative 'module'
+
 HighLine.track_eof = false
 
 module Match
@@ -125,11 +127,22 @@ module Match
             git_url: params[:git_url],
             working_directory: storage.working_directory
           })
-          encryption.decrypt_files
+          encryption.decrypt_files if encryption
           UI.success("Repo is at: '#{storage.working_directory}'")
         end
       end
 
+      command :migrate do |c|
+        c.syntax = "fastlane match migrate"
+        c.description = "Migrate from one storage backend to another one"
+
+        FastlaneCore::CommanderGenerator.new.generate(Match::Options.available_options, command: c)
+
+        c.action do |args, options|
+          Match::Migrate.new.migrate(args, options)
+        end
+      end
+
       command "nuke" do |c|
         # We have this empty command here, since otherwise the normal `match` command will be executed
         c.syntax = "fastlane match nuke"

data/match/lib/match/encryption.rb

@@ -11,6 +11,9 @@ module Match
             # to keychain_name for the name of the keychain entry
             params[:keychain_name] = params[:git_url]
             return Encryption::OpenSSL.configure(params)
+          },
+          "google_cloud" => lambda { |params|
+            return nil
           }
         }
       end

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

@@ -4,8 +4,8 @@ require 'securerandom'
 require 'security'
 require 'shellwords'
 
-require_relative '../module'
 require_relative '../change_password'
+require_relative '../module'
 
 module Match
   module Encryption
@@ -144,7 +144,7 @@ module Match
       rescue => error
         fallback_hash_algorithm = "SHA256"
         if hash_algorithm != fallback_hash_algorithm
-          decrypt_specific_file(path, password, fallback_hash_algorithm)
+          decrypt_specific_file(path: path, password: password, hash_algorithm: fallback_hash_algorithm)
         else
           UI.error(error.to_s)
           UI.crash!("Error decrypting '#{path}'")

data/match/lib/match/migrate.rb

@@ -0,0 +1,97 @@
+require_relative 'options'
+require_relative 'spaceship_ensure'
+require_relative 'encryption'
+require_relative 'storage'
+require_relative 'module'
+require 'fileutils'
+
+module Match
+  class Migrate
+    def migrate(args, options)
+      params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+      loaded_matchfile = params.load_configuration_file("Matchfile")
+
+      ensure_parameters_are_valid(params)
+
+      # We init the Google storage client before the git client
+      # to ask for all the missing inputs *before* cloning the git repo
+      google_cloud_storage = Storage.for_mode("google_cloud", {
+        google_cloud_bucket_name: params[:google_cloud_bucket_name],
+        google_cloud_keys_file: params[:google_cloud_keys_file]
+      })
+
+      git_storage = Storage.for_mode("git", {
+        git_url: params[:git_url],
+        shallow_clone: params[:shallow_clone],
+        git_branch: params[:git_branch],
+        clone_branch_directly: params[:clone_branch_directly]
+      })
+      git_storage.download
+
+      encryption = Encryption.for_storage_mode(params[:storage_mode], {
+        git_url: params[:git_url],
+        working_directory: git_storage.working_directory
+      })
+      encryption.decrypt_files if encryption
+      UI.success("Decrypted the git repo to '#{git_storage.working_directory}'")
+
+      google_cloud_storage.download
+
+      # Note how we always prefix the path in Google Cloud with the Team ID
+      # while on Git we recommend using the git branch instead. As there is
+      # no concept of branches in Google Cloud Storage (omg thanks), we use
+      # the team id properly
+      spaceship = SpaceshipEnsure.new(params[:username], params[:team_id], params[:team_name])
+      team_id = spaceship.team_id
+      UI.message("Detected team ID '#{team_id}' to use for Google Cloud Storage...")
+
+      files_to_commit = []
+      Dir.chdir(git_storage.working_directory) do
+        Dir[File.join("**", "*")].each do |current_file|
+          next if File.directory?(current_file)
+
+          to_path = File.join(google_cloud_storage.working_directory, team_id, current_file)
+          FileUtils.mkdir_p(File.expand_path("..", to_path))
+
+          if File.exist?(to_path)
+            UI.user_error!("Looks like file already exists on Google Cloud Storage at path '#{to_path}', stopping the migration process. Please make sure the bucket is empty, or at least doesn't contain any files related to the same Team ID")
+          end
+          FileUtils.cp(current_file, to_path)
+
+          files_to_commit << to_path
+        end
+      end
+
+      google_cloud_storage.save_changes!(files_to_commit: files_to_commit)
+
+      UI.success("Successfully migrated your code signing certificates and provisioning profiles to Google Cloud Storage")
+      UI.success("Make sure to update your configuration to specify the `storage_mode`, as well as the bucket to use.")
+      UI.message("")
+      if loaded_matchfile
+        UI.message("Update your Matchfile at path '#{loaded_matchfile.configfile_path}':")
+        UI.message("")
+        UI.command_output("\t\tstorage_mode \"google_cloud\"")
+        UI.command_output("\t\tgoogle_cloud_bucket_name \"#{google_cloud_storage.bucket_name}\"")
+      else
+        UI.message("Update your Fastfile `match` call to include")
+        UI.message("")
+        UI.command_output("\t\tstorage_mode: \"google_cloud\",")
+        UI.command_output("\t\tgoogle_cloud_bucket_name: \"#{google_cloud_storage.bucket_name}\",")
+      end
+      UI.message("")
+      UI.success("You can also remove the `git_url`, as well as any other git related configurations from your Fastfile and Matchfile")
+      UI.message("")
+      UI.input("Please make sure to read the above and confirm with enter")
+    end
+
+    def ensure_parameters_are_valid(params)
+      if params[:readonly]
+        UI.user_error!("`fastlane match migrate` doesn't work in `readonly` mode")
+      end
+
+      if params[:storage_mode] != "git"
+        UI.user_error!("`fastlane match migrate` only allows migration from `git` to `google_cloud` right now, looks like your currently selected `storage_mode` is '#{params[:storage_mode]}'")
+      end
+    end
+  end
+end