fastlane 2.157.4 → 2.162.0

data/fastlane/swift/RubyCommand.swift

@@ -1,9 +1,5 @@
-//
-//  RubyCommand.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 8/4/17.
-//
+// RubyCommand.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/RubyCommandable.swift

@@ -1,9 +1,5 @@
-//
-//  RubyCommandable.swift
-//  FastlaneRunner
-//
-//  Created by Joshua Liebowitz on 1/4/18.
-//
+// RubyCommandable.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/Runner.swift

@@ -1,9 +1,5 @@
-//
-//  Runner.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 8/26/17.
-//
+// Runner.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **
@@ -29,7 +25,7 @@ func desc(_: String) {
 class Runner {
     private var thread: Thread!
     private var socketClient: SocketClient!
-    private let dispatchGroup: DispatchGroup = DispatchGroup()
+    private let dispatchGroup = DispatchGroup()
     private var returnValue: String? // lol, so safe
     private var currentlyExecutingCommand: RubyCommandable?
     private var shouldLeaveDispatchGroupDuringDisconnect = false
@@ -42,7 +38,7 @@ class Runner {
 
         let secondsToWait = DispatchTimeInterval.seconds(SocketClient.defaultCommandTimeoutSeconds)
         // swiftlint:disable next
-        let timeoutResult = waitWithPolling(self.executeNext[command.id], toEventually: { $0 == true }, timeout: SocketClient.defaultCommandTimeoutSeconds)
+        let timeoutResult = Self.waitWithPolling(self.executeNext[command.id], toEventually: { $0 == true }, timeout: SocketClient.defaultCommandTimeoutSeconds)
         executeNext.removeValue(forKey: command.id)
         let failureMessage = "command didn't execute in: \(SocketClient.defaultCommandTimeoutSeconds) seconds"
         let success = testDispatchTimeoutResult(timeoutResult, failureMessage: failureMessage, timeToWait: secondsToWait)
@@ -58,7 +54,7 @@ class Runner {
         }
     }
 
-    private func waitWithPolling<T>(_ expression: @autoclosure @escaping () throws -> T, toEventually predicate: @escaping (T) -> Bool, timeout: Int, pollingInterval: DispatchTimeInterval = .milliseconds(4)) -> DispatchTimeoutResult {
+    static func waitWithPolling<T>(_ expression: @autoclosure @escaping () throws -> T, toEventually predicate: @escaping (T) -> Bool, timeout: Int, pollingInterval: DispatchTimeInterval = .milliseconds(4)) -> DispatchTimeoutResult {
         func memoizedClosure<T>(_ closure: @escaping () throws -> T) -> (Bool) throws -> T {
             var cache: T?
             return { withoutCaching in

data/fastlane/swift/RunnerArgument.swift

@@ -1,9 +1,5 @@
-//
-//  RunnerArgument.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 9/1/17.
-//
+// RunnerArgument.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/Scanfile.swift

@@ -1,3 +1,6 @@
+// Scanfile.swift
+// Copyright (c) 2020 FastlaneTools
+
 // This class is automatically included in FastlaneRunner during build
 
 // This autogenerated file will be overwritten or replaced during build time, or when you initialize `scan`
@@ -8,10 +11,10 @@
 //  new group so that it won't be marked for upgrade
 //
 
-class Scanfile: ScanfileProtocol {
+public class Scanfile: ScanfileProtocol {
     // If you want to enable `scan`, run `fastlane scan init`
     // After, this file will be replaced with a custom implementation that contains values you supplied
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.4
+// Generated with fastlane 2.162.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -1,4 +1,7 @@
-protocol ScanfileProtocol: class {
+// ScanfileProtocol.swift
+// Copyright (c) 2020 FastlaneTools
+
+public protocol ScanfileProtocol: class {
     /// Path to the workspace file
     var workspace: String? { get }
 
@@ -189,7 +192,7 @@ protocol ScanfileProtocol: class {
     var failBuild: Bool { get }
 }
 
-extension ScanfileProtocol {
+public extension ScanfileProtocol {
     var workspace: String? { return nil }
     var project: String? { return nil }
     var scheme: String? { return nil }
@@ -257,4 +260,4 @@ extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.47]
+// FastlaneRunnerAPIVersion [0.9.53]

data/fastlane/swift/Screengrabfile.swift

@@ -1,3 +1,6 @@
+// Screengrabfile.swift
+// Copyright (c) 2020 FastlaneTools
+
 // This class is automatically included in FastlaneRunner during build
 
 // This autogenerated file will be overwritten or replaced during build time, or when you initialize `screengrab`
@@ -8,10 +11,10 @@
 //  new group so that it won't be marked for upgrade
 //
 
-class Screengrabfile: ScreengrabfileProtocol {
+public class Screengrabfile: ScreengrabfileProtocol {
     // If you want to enable `screengrab`, run `fastlane screengrab init`
     // After, this file will be replaced with a custom implementation that contains values you supplied
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.4
+// Generated with fastlane 2.162.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -1,4 +1,7 @@
-protocol ScreengrabfileProtocol: class {
+// ScreengrabfileProtocol.swift
+// Copyright (c) 2020 FastlaneTools
+
+public protocol ScreengrabfileProtocol: class {
     /// Path to the root of your Android SDK installation, e.g. ~/tools/android-sdk-macosx
     var androidHome: String? { get }
 
@@ -66,7 +69,7 @@ protocol ScreengrabfileProtocol: class {
     var adbHost: String? { get }
 }
 
-extension ScreengrabfileProtocol {
+public extension ScreengrabfileProtocol {
     var androidHome: String? { return nil }
     var buildToolsVersion: String? { return nil }
     var locales: [String] { return ["en-US"] }
@@ -93,4 +96,4 @@ extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.37]
+// FastlaneRunnerAPIVersion [0.9.43]

data/fastlane/swift/Snapshotfile.swift

@@ -1,3 +1,6 @@
+// Snapshotfile.swift
+// Copyright (c) 2020 FastlaneTools
+
 // This class is automatically included in FastlaneRunner during build
 
 // This autogenerated file will be overwritten or replaced during build time, or when you initialize `snapshot`
@@ -8,10 +11,10 @@
 //  new group so that it won't be marked for upgrade
 //
 
-class Snapshotfile: SnapshotfileProtocol {
+public class Snapshotfile: SnapshotfileProtocol {
     // If you want to enable `snapshot`, run `fastlane snapshot init`
     // After, this file will be replaced with a custom implementation that contains values you supplied
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.157.4
+// Generated with fastlane 2.162.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -1,4 +1,7 @@
-protocol SnapshotfileProtocol: class {
+// SnapshotfileProtocol.swift
+// Copyright (c) 2020 FastlaneTools
+
+public protocol SnapshotfileProtocol: class {
     /// Path the workspace file
     var workspace: String? { get }
 
@@ -132,7 +135,7 @@ protocol SnapshotfileProtocol: class {
     var suppressXcodeOutput: Bool? { get }
 }
 
-extension SnapshotfileProtocol {
+public extension SnapshotfileProtocol {
     var workspace: String? { return nil }
     var project: String? { return nil }
     var xcargs: String? { return nil }
@@ -181,4 +184,4 @@ extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.31]
+// FastlaneRunnerAPIVersion [0.9.37]

data/fastlane/swift/SocketClient.swift

@@ -1,9 +1,5 @@
-//
-//  SocketClient.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 7/30/17.
-//
+// SocketClient.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **
@@ -40,7 +36,7 @@ class SocketClient: NSObject {
     fileprivate var inputStream: InputStream!
     fileprivate var outputStream: OutputStream!
     fileprivate var cleaningUpAfterDone = false
-    fileprivate let dispatchGroup: DispatchGroup = DispatchGroup()
+    fileprivate let dispatchGroup = DispatchGroup()
     fileprivate let readSemaphore = DispatchSemaphore(value: 1)
     fileprivate let writeSemaphore = DispatchSemaphore(value: 1)
     fileprivate let commandTimeoutSeconds: Int

data/fastlane/swift/SocketClientDelegateProtocol.swift

@@ -1,9 +1,5 @@
-//
-//  SocketClientDelegateProtocol.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 8/12/17.
-//
+// SocketClientDelegateProtocol.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/SocketResponse.swift

@@ -1,9 +1,5 @@
-//
-//  SocketResponse.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 7/30/17.
-//
+// SocketResponse.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/formatting/Brewfile.lock.json

@@ -2,22 +2,22 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.44.8",
+        "version": "0.45.6",
         "bottle": {
           "cellar": ":any_skip_relocation",
           "prefix": "/usr/local",
           "files": {
             "catalina": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.44.8.catalina.bottle.tar.gz",
-              "sha256": "9cbd2c21d4579c8c4ffc9df7b44593f7622d13f8517a3fed047c5e5f3f2560c6"
+              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.45.6.catalina.bottle.tar.gz",
+              "sha256": "7f23ff740679b30e313c91533c2f3e6fa4210bb68f8e383c29e7f922f87d8f66"
             },
             "mojave": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.44.8.mojave.bottle.tar.gz",
-              "sha256": "a8f8b6fa977804c2d13f0cbc9ed223ddaa88e3c0684e91519e005784c8418b36"
+              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.45.6.mojave.bottle.tar.gz",
+              "sha256": "b5349b775ff60c73c284d5de8ad2c0fdfb35428cff92bb7a8e5fcc6536750b89"
             },
             "high_sierra": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.44.8.high_sierra.bottle.tar.gz",
-              "sha256": "fd43d192d194a8bb02308714b691e6a7101f839889f749dff4a1facf8172b951"
+              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.45.6.high_sierra.bottle.tar.gz",
+              "sha256": "34d900217ca12736a112c31e54a5f4f7e64c1fe224f6e4ea76ad1d25b149f647"
             }
           }
         }
@@ -27,12 +27,20 @@
   "system": {
     "macos": {
       "catalina": {
-        "HOMEBREW_VERSION": "2.2.14-62-g9befd55",
+        "HOMEBREW_VERSION": "2.4.9-133-g0fdf8f2",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "0b738b77a5a13a66a52d76d34c4f608b719e0485",
+        "Homebrew/homebrew-core": "7141f37f3af0e6702f6dab2263852ddefbbbf8ed",
         "CLT": "11.0.28.3",
-        "Xcode": "11.4.1",
+        "Xcode": "11.6",
         "macOS": "10.15.4"
+      },
+      "big_sur": {
+        "HOMEBREW_VERSION": "2.4.13-249-g6454504",
+        "HOMEBREW_PREFIX": "/usr/local",
+        "Homebrew/homebrew-core": "020491c34515c229d904e6e69e14157cb728d2fa",
+        "CLT": "11.0.28.3",
+        "Xcode": "12.0",
+        "macOS": "11.0"
       }
     }
   }

data/fastlane/swift/main.swift

@@ -1,9 +1,5 @@
-//
-//  main.swift
-//  FastlaneSwiftRunner
-//
-//  Created by Joshua Liebowitz on 8/26/17.
-//
+// main.swift
+// Copyright (c) 2020 FastlaneTools
 
 //
 //  ** NOTE **
@@ -24,7 +20,7 @@ class MainProcess {
     @objc func connectToFastlaneAndRunLane() {
         runner.startSocketThread(port: argumentProcessor.port)
 
-        let completedRun = Fastfile.runLane(named: argumentProcessor.currentLane, parameters: argumentProcessor.laneParameters())
+        let completedRun = Fastfile.runLane(from: nil, named: argumentProcessor.currentLane, parameters: argumentProcessor.laneParameters())
         if completedRun {
             runner.disconnectFromFastlaneProcess()
         }
@@ -39,7 +35,7 @@ class MainProcess {
     }
 }
 
-let process: MainProcess = MainProcess()
+let process = MainProcess()
 process.startFastlaneThread()
 
 while !process.doneRunningLane, RunLoop.current.run(mode: RunLoopMode.defaultRunLoopMode, before: Date(timeIntervalSinceNow: 2)) {

data/fastlane/swift/upgrade_manifest.json

@@ -1 +1 @@
-{"Actions.swift":"Autogenerated API","Fastlane.swift":"Autogenerated API","DeliverfileProtocol.swift":"Autogenerated API","GymfileProtocol.swift":"Autogenerated API","MatchfileProtocol.swift":"Autogenerated API","Plugins.swift":"Autogenerated API","PrecheckfileProtocol.swift":"Autogenerated API","ScanfileProtocol.swift":"Autogenerated API","ScreengrabfileProtocol.swift":"Autogenerated API","SnapshotfileProtocol.swift":"Autogenerated API","LaneFileProtocol.swift":"Fastfile Components","ControlCommand.swift":"Networking","RubyCommand.swift":"Networking","RubyCommandable.swift":"Networking","Runner.swift":"Networking","SocketClient.swift":"Networking","SocketClientDelegateProtocol.swift":"Networking","SocketResponse.swift":"Networking","ArgumentProcessor.swift":"Runner Code","main.swift":"Runner Code","RunnerArgument.swift":"Runner Code"}
+{"Actions.swift":"Autogenerated API","Fastlane.swift":"Autogenerated API","DeliverfileProtocol.swift":"Autogenerated API","GymfileProtocol.swift":"Autogenerated API","MatchfileProtocol.swift":"Autogenerated API","Plugins.swift":"Autogenerated API","PrecheckfileProtocol.swift":"Autogenerated API","ScanfileProtocol.swift":"Autogenerated API","ScreengrabfileProtocol.swift":"Autogenerated API","SnapshotfileProtocol.swift":"Autogenerated API","LaneFileProtocol.swift":"Fastfile Components","ControlCommand.swift":"Networking","RubyCommand.swift":"Networking","RubyCommandable.swift":"Networking","Runner.swift":"Networking","SocketClient.swift":"Networking","SocketClientDelegateProtocol.swift":"Networking","SocketResponse.swift":"Networking","main.swift":"Runner Code","ArgumentProcessor.swift":"Runner Code","RunnerArgument.swift":"Runner Code"}

data/fastlane_core/lib/fastlane_core/analytics/analytics_session.rb

@@ -19,7 +19,7 @@ module FastlaneCore
     end
 
     def action_launched(launch_context: nil)
-      unless did_show_message?
+      if should_show_message?
         show_message
       end
 
@@ -52,16 +52,15 @@ module FastlaneCore
       UI.message("You can disable this by adding `opt_out_usage` at the top of your Fastfile")
     end
 
-    def did_show_message?
-      file_name = ".did_show_opt_info"
+    def should_show_message?
+      return false if FastlaneCore::Env.truthy?("FASTLANE_OPT_OUT_USAGE")
 
+      file_name = ".did_show_opt_info"
       new_path = File.join(FastlaneCore.fastlane_user_dir, file_name)
-      did_show = File.exist?(new_path)
-
-      return did_show if did_show
+      return false if File.exist?(new_path)
 
       File.write(new_path, '1')
-      false
+      true
     end
 
     def finalize_session

data/fastlane_core/lib/fastlane_core/keychain_importer.rb

@@ -4,7 +4,7 @@ require 'security'
 
 module FastlaneCore
   class KeychainImporter
-    def self.import_file(path, keychain_path, keychain_password: nil, certificate_password: "", output: FastlaneCore::Globals.verbose?)
+    def self.import_file(path, keychain_path, keychain_password: nil, certificate_password: "", skip_set_partition_list: false, output: FastlaneCore::Globals.verbose?)
       UI.user_error!("Could not find file '#{path}'") unless File.exist?(path)
 
       command = "security import #{path.shellescape} -k '#{keychain_path.shellescape}'"
@@ -19,7 +19,7 @@ module FastlaneCore
         UI.command_output(stdout.read.to_s) if output
 
         # Set partition list only if success since it can be a time consuming process if a lot of keys are installed
-        if thrd.value.success?
+        if thrd.value.success? && !skip_set_partition_list
           keychain_password ||= resolve_keychain_password(keychain_path)
           set_partition_list(path, keychain_path, keychain_password: keychain_password, output: output)
         else

data/frameit/lib/frameit/editor.rb

@@ -429,6 +429,7 @@ module Frameit
         # Add the actual title
         text_image.combine_options do |i|
           i.font(current_font) if current_font
+          i.weight(@config[key.to_s]['font_weight']) if @config[key.to_s]['font_weight']
           i.gravity("Center")
           i.pointsize(actual_font_size(key))
           i.draw("text 0,0 '#{text}'")

data/match/lib/match/generator.rb

@@ -26,11 +26,14 @@ module Match
         generate_apple_certs: params[:generate_apple_certs],
         output_path: output_path,
         force: true, # we don't need a certificate without its private key, we only care about a new certificate
+        api_key_path: params[:api_key_path],
+        api_key: params[:api_key],
         username: params[:username],
         team_id: params[:team_id],
         team_name: params[:team_name],
         keychain_path: FastlaneCore::Helper.keychain_path(params[:keychain_name]),
-        keychain_password: params[:keychain_password]
+        keychain_password: params[:keychain_password],
+        skip_set_partition_list: params[:skip_set_partition_list]
       })
 
       Cert.config = arguments
@@ -80,6 +83,8 @@ module Match
         cert_id: certificate_id,
         provisioning_name: profile_name,
         ignore_profiles_with_different_name: true,
+        api_key_path: params[:api_key_path],
+        api_key: params[:api_key],
         team_id: params[:team_id],
         team_name: params[:team_name],
         template_name: params[:template_name],

data/match/lib/match/importer.rb

@@ -2,6 +2,7 @@ require_relative 'spaceship_ensure'
 require_relative 'encryption'
 require_relative 'storage'
 require_relative 'module'
+require_relative 'generator'
 require 'fastlane_core/provisioning_profile'
 require 'fileutils'
 
@@ -27,10 +28,17 @@ 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_bucket: params[:s3_bucket],
+        s3_region: params[:s3_region],
+        s3_access_key: params[:s3_access_key],
+        s3_secret_access_key: params[:s3_secret_access_key],
+        s3_object_prefix: params[:s3_object_prefix],
         readonly: params[:readonly],
         username: params[:username],
         team_id: params[:team_id],
-        team_name: params[:team_name]
+        team_name: params[:team_name],
+        api_key_path: params[:api_key_path],
+        api_key: params[:api_key]
       })
       storage.download
 
@@ -47,21 +55,42 @@ module Match
 
       case cert_type
       when :development
-        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT + "," + Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT
+        certificate_type = [
+          Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT,
+          Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DEVELOPMENT,
+          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPMENT
+        ].join(',')
       when :distribution, :enterprise
-        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION + "," + Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION
+        certificate_type = [
+          Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION,
+          Spaceship::ConnectAPI::Certificate::CertificateType::MAC_APP_DISTRIBUTION,
+          Spaceship::ConnectAPI::Certificate::CertificateType::DISTRIBUTION
+        ].join(',')
       when :developer_id_application
-        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+        certificate_type = [
+          Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+        ].join(',')
+      when :mac_installer_distribution
+        certificate_type = [
+          Spaceship::ConnectAPI::Certificate::CertificateType::MAC_INSTALLER_DISTRIBUTION
+        ].join(',')
       else
         UI.user_error!("Cert type '#{cert_type}' is not supported")
       end
 
+      prov_type = Match.profile_type_sym(params[:type])
       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)
+      output_dir_profiles = File.join(storage.prefixed_working_directory, "profiles", prov_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])
+      token = api_token(params)
+      if token
+        UI.message("Creating authorization token for App Store Connect API")
+        Spaceship::ConnectAPI.token = token
+      else
+        UI.message("Login to App Store Connect (#{params[:username]})")
+        Spaceship::ConnectAPI.login(params[:username], use_portal: true, use_tunes: false, portal_team_id: params[:team_id], team_name: params[:team_name])
+      end
       certs = Spaceship::ConnectAPI::Certificate.all(filter: { certificateType: certificate_type })
 
       # Base64 encode contents to find match from API to find a cert ID
@@ -86,7 +115,8 @@ module Match
         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}")
+        profile_type_name = Match::Generator.profile_type_name(prov_type)
+        dest_profile_path = File.join(output_dir_profiles, "#{profile_type_name}_#{bundle_id}#{profile_extension}")
         files_to_commit.push(dest_profile_path)
         IO.copy_stream(profile_path, dest_profile_path)
       end
@@ -105,5 +135,11 @@ module Match
       UI.user_error!("#{file_description} does not exist at path: #{file_path}") unless !file_path.nil? || optional
       file_path
     end
+
+    def api_token(params)
+      @api_token ||= Spaceship::ConnectAPI::Token.create(params[:api_key]) if params[:api_key]
+      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
+      return @api_token
+    end
   end
 end