fastlane 2.128.0.beta.20190722200021 → 2.128.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de826ad1328636023b2f7cbc0c6c1fe2739ca805
-  data.tar.gz: d8b553ff8d9b03f6e24a41f4d0ed50d0580ab62f
+SHA256:
+  metadata.gz: cfbcd2e9eb321099998ee88a73eb4d57b48835bbfda6f1e463f5116099ca43e6
+  data.tar.gz: f0013718dfe75e9282d2917642754498ad73486244ba32d804500f88889dcf25
 SHA512:
-  metadata.gz: 0cb46da4e3d7b7979dc6ab3001976f521823b1da6048dbffdec2d6fd7c3113fb8c107d3cf405d50aea84f9c0aa4f1c4051c4e910f930411ffd2ce9d057e4aaa5
-  data.tar.gz: 84b9b8c2c0440624c3d3a9633d433c8f16cfea5548d23a2a9a455738dadd44bb9214ccf275adf65975b992b5d933d63e459a5c0aec317d8c999e63e94422c48b
+  metadata.gz: b2cbd0d9169e59413d82340364983e036d1a90ffc73cf8062f67b1278265f4464554d9a35ee9285c3df1bfa20f21b3dec1d9617f1c04744d41c48ef8e39f5fcd
+  data.tar.gz: 0362bbb52b555bc5036c4be2261f1e3549d8eba8b827f3956e6c7af1a01d522dcee20fbb5a27c7cf3970b4a2f381ef4caba136e59cfba4bfde1d9a697beaf318

data/README.md

@@ -34,17 +34,11 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 <!-- This table is regenerated and resorted on each release -->
 <table id='team'>
 <tr>
-<td id='helmut-januschka'>
-<a href='https://github.com/hjanuschka'>
-<img src='https://github.com/hjanuschka.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
-</td>
-<td id='danielle-tomlinson'>
-<a href='https://github.com/endocrimes'>
-<img src='https://github.com/endocrimes.png?size=140'>
+<td id='iulian-onofrei'>
+<a href='https://github.com/revolter'>
+<img src='https://github.com/revolter.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
+<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
 </td>
 <td id='andrew-mcburney'>
 <a href='https://github.com/armcburney'>
@@ -52,11 +46,17 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
 </td>
-<td id='jérôme-lacoste'>
-<a href='https://github.com/lacostej'>
-<img src='https://github.com/lacostej.png?size=140'>
+<td id='fumiya-nakamura'>
+<a href='https://github.com/nafu'>
+<img src='https://github.com/nafu.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
+<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
+</td>
+<td id='helmut-januschka'>
+<a href='https://github.com/hjanuschka'>
+<img src='https://github.com/hjanuschka.png?size=140'>
+</a>
+<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
 </td>
 <td id='felix-krause'>
 <a href='https://github.com/KrauseFx'>
@@ -66,11 +66,11 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </td>
 </tr>
 <tr>
-<td id='manu-wallner'>
-<a href='https://github.com/milch'>
-<img src='https://github.com/milch.png?size=140'>
+<td id='aaron-brager'>
+<a href='https://github.com/getaaron'>
+<img src='https://github.com/getaaron.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
+<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
 </td>
 <td id='stefan-natchev'>
 <a href='https://github.com/snatchev'>
@@ -78,43 +78,49 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
 </td>
-<td id='jan-piotrowski'>
-<a href='https://github.com/janpio'>
-<img src='https://github.com/janpio.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
-</td>
-<td id='aaron-brager'>
-<a href='https://github.com/getaaron'>
-<img src='https://github.com/getaaron.png?size=140'>
+<td id='maksym-grebenets'>
+<a href='https://github.com/mgrebenets'>
+<img src='https://github.com/mgrebenets.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
+<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
 </td>
-<td id='fumiya-nakamura'>
-<a href='https://github.com/nafu'>
-<img src='https://github.com/nafu.png?size=140'>
+<td id='olivier-halligon'>
+<a href='https://github.com/AliSoftware'>
+<img src='https://github.com/AliSoftware.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
+<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
 </td>
-</tr>
-<tr>
 <td id='jimmy-dee'>
 <a href='https://github.com/jdee'>
 <img src='https://github.com/jdee.png?size=140'>
 </a>
 <h4 align='center'>Jimmy Dee</h4>
 </td>
-<td id='iulian-onofrei'>
-<a href='https://github.com/revolter'>
-<img src='https://github.com/revolter.png?size=140'>
+</tr>
+<tr>
+<td id='kohki-miki'>
+<a href='https://github.com/giginet'>
+<img src='https://github.com/giginet.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
+<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
 </td>
-<td id='jorge-revuelta-h'>
-<a href='https://github.com/minuscorp'>
-<img src='https://github.com/minuscorp.png?size=140'>
+<td id='josh-holtz'>
+<a href='https://github.com/joshdholtz'>
+<img src='https://github.com/joshdholtz.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</a></h4>
+<h4 align='center'><a href='https://twitter.com/joshdholtz'>Josh Holtz</a></h4>
+</td>
+<td id='matthew-ellis'>
+<a href='https://github.com/matthewellis'>
+<img src='https://github.com/matthewellis.png?size=140'>
+</a>
+<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
+</td>
+<td id='manu-wallner'>
+<a href='https://github.com/milch'>
+<img src='https://github.com/milch.png?size=140'>
+</a>
+<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
 </td>
 <td id='joshua-liebowitz'>
 <a href='https://github.com/taquitos'>
@@ -122,12 +128,6 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
 </td>
-<td id='kohki-miki'>
-<a href='https://github.com/giginet'>
-<img src='https://github.com/giginet.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
-</td>
 </tr>
 <tr>
 <td id='luka-mirosevic'>
@@ -136,29 +136,29 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
 </td>
-<td id='maksym-grebenets'>
-<a href='https://github.com/mgrebenets'>
-<img src='https://github.com/mgrebenets.png?size=140'>
+<td id='jan-piotrowski'>
+<a href='https://github.com/janpio'>
+<img src='https://github.com/janpio.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
+<h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
 </td>
-<td id='matthew-ellis'>
-<a href='https://github.com/matthewellis'>
-<img src='https://github.com/matthewellis.png?size=140'>
+<td id='danielle-tomlinson'>
+<a href='https://github.com/endocrimes'>
+<img src='https://github.com/endocrimes.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
+<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
 </td>
-<td id='josh-holtz'>
-<a href='https://github.com/joshdholtz'>
-<img src='https://github.com/joshdholtz.png?size=140'>
+<td id='jorge-revuelta-h'>
+<a href='https://github.com/minuscorp'>
+<img src='https://github.com/minuscorp.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/joshdholtz'>Josh Holtz</a></h4>
+<h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</a></h4>
 </td>
-<td id='olivier-halligon'>
-<a href='https://github.com/AliSoftware'>
-<img src='https://github.com/AliSoftware.png?size=140'>
+<td id='jérôme-lacoste'>
+<a href='https://github.com/lacostej'>
+<img src='https://github.com/lacostej.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
+<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
 </td>
 </tr>
 </table>

data/fastlane/lib/fastlane/actions/docs/sync_code_signing.md

@@ -407,6 +407,16 @@ fastlane match change_password
 
 You'll be asked for the new password on all your machines on the next run.
 
+### Import
+
+To import and encrypt a certificate (`.cer`) and the private key (`.p12`) into the _match_ repo run:
+
+```no-highlight
+fastlane match import
+```
+
+You'll be prompted for the certificate (`.cer`) and the private key (`.p12`) paths. _match_ will first validate the certificate (`.cer`) against the Developer Portal before importing the certificate (`.cer`) and the private key (`.p12`).
+
 ### Manual Decrypt
 
 If you want to manually decrypt a file you can.

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.128.0.beta.20190722200021'.freeze
+  VERSION = '2.128.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -18,4 +18,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.127.2
+// Generated with fastlane 2.128.0

data/fastlane/swift/Fastlane.swift

@@ -1406,7 +1406,7 @@ func downloadDsyms(username: String,
   _ = runner.executeCommand(command)
 }
 func downloadFromPlayStore(packageName: String,
-                           metadataPath: String = "./metadata",
+                           metadataPath: String? = nil,
                            key: String? = nil,
                            issuer: String? = nil,
                            jsonKey: String? = nil,
@@ -3498,7 +3498,7 @@ func ssh(username: String,
 func supply(packageName: String,
             track: String = "production",
             rollout: String? = nil,
-            metadataPath: String = "./metadata",
+            metadataPath: String? = nil,
             key: String? = nil,
             issuer: String? = nil,
             jsonKey: String? = nil,
@@ -4034,7 +4034,7 @@ func uploadToAppStore(username: String,
 func uploadToPlayStore(packageName: String,
                        track: String = "production",
                        rollout: String? = nil,
-                       metadataPath: String = "./metadata",
+                       metadataPath: String? = nil,
                        key: String? = nil,
                        issuer: String? = nil,
                        jsonKey: String? = nil,
@@ -4285,7 +4285,7 @@ func xcov(workspace: String? = nil,
           coverallsServiceJobId: String? = nil,
           coverallsRepoToken: String? = nil,
           xcconfig: String? = nil,
-          ideFoundationPath: String = "/Applications/Xcode-10.2.1.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
+          ideFoundationPath: String = "/Applications/Xcode10.1.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
           legacySupport: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "xcov", className: nil, args: [RubyCommand.Argument(name: "workspace", value: workspace),
                                                                                       RubyCommand.Argument(name: "project", value: project),
@@ -4395,4 +4395,4 @@ let screengrabfile: Screengrabfile = Screengrabfile()
 let snapshotfile: Snapshotfile = Snapshotfile()
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.52]
+// FastlaneRunnerAPIVersion [0.9.53]

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.127.2
+// Generated with fastlane 2.128.0

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.127.2
+// Generated with fastlane 2.128.0

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.127.2
+// Generated with fastlane 2.128.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.127.2
+// Generated with fastlane 2.128.0

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.127.2
+// Generated with fastlane 2.128.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.127.2
+// Generated with fastlane 2.128.0

data/match/lib/match.rb

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

data/match/lib/match/commands_generator.rb

@@ -8,6 +8,7 @@ require_relative 'setup'
 require_relative 'runner'
 require_relative 'options'
 require_relative 'migrate'
+require_relative 'importer'
 
 require_relative 'storage'
 require_relative 'encryption'
@@ -132,6 +133,19 @@ module Match
         end
       end
 
+      command :import do |c|
+        c.syntax = "fastlane match import"
+        c.description = "Imports certificates and profiles into the encrypted repository"
+
+        FastlaneCore::CommanderGenerator.new.generate(Match::Options.available_options, command: c)
+
+        c.action do |args, options|
+          params = FastlaneCore::Configuration.create(Match::Options.available_options, options.__hash__)
+          params.load_configuration_file("Matchfile") # this has to be done *before* overwriting the value
+          Match::Importer.new.import_cert(params)
+        end
+      end
+
       command :migrate do |c|
         c.syntax = "fastlane match migrate"
         c.description = "Migrate from one storage backend to another one"

data/match/lib/match/generator.rb

@@ -41,7 +41,7 @@ module Match
     end
 
     # @return (String) The UUID of the newly generated profile
-    def self.generate_provisioning_profile(params: nil, prov_type: nil, certificate_id: nil, app_identifier: nil, working_directory: nil)
+    def self.generate_provisioning_profile(params: nil, prov_type: nil, certificate_id: nil, app_identifier: nil, force: true, working_directory: nil)
       require 'sigh/manager'
       require 'sigh/options'
 
@@ -59,7 +59,7 @@ module Match
         app_identifier: app_identifier,
         output_path: File.join(working_directory, "profiles", prov_type.to_s),
         username: params[:username],
-        force: true,
+        force: force,
         cert_id: certificate_id,
         provisioning_name: profile_name,
         ignore_profiles_with_different_name: true,

data/match/lib/match/importer.rb

@@ -0,0 +1,92 @@
+require_relative 'spaceship_ensure'
+require_relative 'encryption'
+require_relative 'storage'
+require_relative 'module'
+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 encrypt contents to find match from API to find a cert ID
+      cert_contents_base_64 = Base64.strict_encode64(File.open(cert_path).read)
+
+      # Storage
+      storage = Storage.for_mode(params[:storage_mode], {
+        git_url: params[:git_url],
+        shallow_clone: params[:shallow_clone],
+        skip_docs: params[:skip_docs],
+        git_branch: params[:git_branch],
+        git_full_name: params[:git_full_name],
+        git_user_email: params[:git_user_email],
+        clone_branch_directly: params[:clone_branch_directly],
+        type: params[:type].to_s,
+        platform: params[:platform].to_s,
+        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,
+        readonly: params[:readonly],
+        username: params[:username],
+        team_id: params[:team_id],
+        team_name: params[:team_name]
+      })
+      storage.download
+
+      # Encryption
+      encryption = Encryption.for_storage_mode(params[:storage_mode], {
+        git_url: params[:git_url],
+        working_directory: storage.working_directory
+      })
+      encryption.decrypt_files if encryption
+      UI.success("Repo is at: '#{storage.working_directory}'")
+
+      # Map match type into Spaceship::ConnectAPI::Certificate::CertificateType
+      cert_type = Match.cert_type_sym(params[:type])
+
+      case cert_type
+      when :development
+        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DEVELOPMENT
+      when :distribution, :enterprise
+        certificate_type = Spaceship::ConnectAPI::Certificate::CertificateType::IOS_DISTRIBUTION
+      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)
+
+      # 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 })
+
+      matching_cert = certs.find do |cert|
+        cert.certificate_content == cert_contents_base_64
+      end
+
+      UI.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")
+
+      # 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]
+
+      # Encrypt and commit
+      encryption.encrypt_files if encryption
+      storage.save_changes!(files_to_commit: files_to_commit)
+    end
+  end
+end

data/match/lib/match/runner.rb

@@ -16,11 +16,7 @@ module Match
     attr_accessor :files_to_commit
     attr_accessor :spaceship
 
-    attr_accessor :storage_mode
-
-    # The Team ID that was fetched
-    # This will always be `nil` in readonly mode
-    attr_accessor :currently_used_team_id
+    attr_accessor :storage
 
     def run(params)
       self.files_to_commit = []
@@ -32,10 +28,8 @@ module Match
 
       update_optional_values_depending_on_storage_type(params)
 
-      self.storage_mode = params[:storage_mode]
-
       # Choose the right storage and encryption implementations
-      storage = Storage.for_mode(params[:storage_mode], {
+      self.storage = Storage.for_mode(params[:storage_mode], {
         git_url: params[:git_url],
         shallow_clone: params[:shallow_clone],
         skip_docs: params[:skip_docs],
@@ -47,7 +41,11 @@ module Match
         platform: params[:platform].to_s,
         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,
+        readonly: params[:readonly],
+        username: params[:username],
+        team_id: params[:team_id],
+        team_name: params[:team_name]
       })
       storage.download
 
@@ -58,14 +56,8 @@ module Match
       })
       encryption.decrypt_files if encryption
 
-      if params[:readonly]
-        # In readonly mode, we still want to see if the user provided a team_id
-        # see `prefixed_working_directory` comments for more details
-        self.currently_used_team_id = params[:team_id]
-      else
+      unless params[:readonly]
         self.spaceship = SpaceshipEnsure.new(params[:username], params[:team_id], params[:team_name])
-        self.currently_used_team_id = self.spaceship.team_id
-
         if params[:type] == "enterprise" && !Spaceship.client.in_house?
           UI.user_error!("You defined the profile type 'enterprise', but your Apple account doesn't support In-House profiles")
         end
@@ -124,25 +116,8 @@ module Match
     end
 
     # Used when creating a new certificate or profile
-    def prefixed_working_directory(working_directory)
-      if self.storage_mode == "git"
-        return working_directory
-      elsif self.storage_mode == "google_cloud"
-        # 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 ||= self.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)
-      else
-        UI.crash!("No implementation for `prefixed_working_directory`")
-      end
+    def prefixed_working_directory
+      return self.storage.prefixed_working_directory
     end
 
     # Be smart about optional values here
@@ -156,13 +131,13 @@ module Match
     def fetch_certificate(params: nil, working_directory: nil)
       cert_type = Match.cert_type_sym(params[:type])
 
-      certs = Dir[File.join(prefixed_working_directory(working_directory), "certs", cert_type.to_s, "*.cer")]
-      keys = Dir[File.join(prefixed_working_directory(working_directory), "certs", cert_type.to_s, "*.p12")]
+      certs = Dir[File.join(prefixed_working_directory, "certs", cert_type.to_s, "*.cer")]
+      keys = Dir[File.join(prefixed_working_directory, "certs", cert_type.to_s, "*.p12")]
 
       if certs.count == 0 || keys.count == 0
         UI.important("Couldn't find a valid code signing identity for #{cert_type}... creating one for you now")
         UI.crash!("No code signing identity found and can not create a new one because you enabled `readonly`") if params[:readonly]
-        cert_path = Generator.generate_certificate(params, cert_type, prefixed_working_directory(working_directory))
+        cert_path = Generator.generate_certificate(params, cert_type, prefixed_working_directory)
         private_key_path = cert_path.gsub(".cer", ".p12")
 
         self.files_to_commit << cert_path
@@ -221,7 +196,7 @@ module Match
       end
 
       profile_name = names.join("_").gsub("*", '\*') # this is important, as it shouldn't be a wildcard
-      base_dir = File.join(prefixed_working_directory(working_directory), "profiles", prov_type.to_s)
+      base_dir = File.join(prefixed_working_directory, "profiles", prov_type.to_s)
       profiles = Dir[File.join(base_dir, "#{profile_name}.mobileprovision")]
       if Helper.mac?
         keychain_path = FastlaneCore::Helper.keychain_path(params[:keychain_name]) unless params[:keychain_name].nil?
@@ -229,10 +204,11 @@ module Match
 
       # Install the provisioning profiles
       profile = profiles.last
+      force = params[:force]
 
       if params[:force_for_new_devices] && !params[:readonly]
-        if prov_type != :appstore
-          params[:force] = device_count_different?(profile: profile, keychain_path: keychain_path, platform: params[:platform].to_sym) unless params[:force]
+        if prov_type != :appstore && !params[:force]
+          force = device_count_different?(profile: profile, keychain_path: keychain_path, platform: params[:platform].to_sym)
         else
           # App Store provisioning profiles don't contain device identifiers and
           # thus shouldn't be renewed if the device count has changed.
@@ -253,11 +229,13 @@ module Match
           UI.error("If you are certain that a profile should exist, double-check the recent changes to your match repository")
           UI.user_error!("No matching provisioning profiles found and can not create a new one because you enabled `readonly`. Check the output above for more information.")
         end
+
         profile = Generator.generate_provisioning_profile(params: params,
                                                        prov_type: prov_type,
                                                   certificate_id: certificate_id,
                                                   app_identifier: app_identifier,
-                                               working_directory: prefixed_working_directory(working_directory))
+                                                           force: force,
+                                               working_directory: prefixed_working_directory)
         self.files_to_commit << profile
       end
 

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

@@ -53,6 +53,10 @@ module Match
         self.platform = platform if platform
       end
 
+      def prefixed_working_directory
+        return working_directory
+      end
+
       def download
         # Check if we already have a functional working_directory
         return if @working_directory

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

@@ -4,6 +4,7 @@ require 'google/cloud/storage'
 
 require_relative '../options'
 require_relative '../module'
+require_relative '../spaceship_ensure'
 require_relative './interface'
 
 module Match
@@ -18,6 +19,10 @@ module Match
       attr_reader :bucket_name
       attr_reader :google_cloud_keys_file
       attr_reader :google_cloud_project_id
+      attr_reader :readonly
+      attr_reader :username
+      attr_reader :team_id
+      attr_reader :team_name
 
       # Managed values
       attr_accessor :gc_storage
@@ -35,7 +40,11 @@ module Match
           platform: params[:platform].to_s,
           google_cloud_bucket_name: params[:google_cloud_bucket_name],
           google_cloud_keys_file: params[:google_cloud_keys_file],
-          google_cloud_project_id: params[:google_cloud_project_id]
+          google_cloud_project_id: params[:google_cloud_project_id],
+          readonly: params[:readonly],
+          username: params[:username],
+          team_id: params[:team_id],
+          team_name: params[:team_name]
         )
       end
 
@@ -43,12 +52,21 @@ module Match
                      platform: nil,
                      google_cloud_bucket_name: nil,
                      google_cloud_keys_file: nil,
-                     google_cloud_project_id: nil)
+                     google_cloud_project_id: nil,
+                     readonly: nil,
+                     username: nil,
+                     team_id: nil,
+                     team_name: nil)
         @type = type if type
         @platform = platform if platform
         @google_cloud_project_id = google_cloud_project_id if google_cloud_project_id
         @bucket_name = google_cloud_bucket_name
 
+        @readonly = readonly
+        @username = username
+        @team_id = team_id
+        @team_name = team_name
+
         @google_cloud_keys_file = ensure_keys_file_exists(google_cloud_keys_file, google_cloud_project_id)
 
         if self.google_cloud_keys_file.to_s.length > 0
@@ -81,6 +99,32 @@ module Match
         ensure_bucket_is_selected
       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
+
+      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
+
       def download
         # Check if we already have a functional working_directory
         return if @working_directory

data/match/lib/match/storage/interface.rb

@@ -8,6 +8,11 @@ module Match
       # and decrypt/encrypt them
       attr_accessor :working_directory
 
+      # To make debugging easier, we have a custom exception here
+      def prefixed_working_directory
+        not_implemented(__method__)
+      end
+
       # To make debugging easier, we have a custom exception here
       def working_directory
         if @working_directory.nil?

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.128.0.beta.20190722200021
+  version: 2.128.0
 platform: ruby
 authors:
-- Danielle Tomlinson
-- Joshua Liebowitz
-- Andrew McBurney
-- Jimmy Dee
-- Jorge Revuelta H
-- Josh Holtz
 - Helmut Januschka
-- Jan Piotrowski
-- Aaron Brager
 - Kohki Miki
-- Matthew Ellis
+- Jimmy Dee
+- Josh Holtz
 - Fumiya Nakamura
 - Jérôme Lacoste
-- Manu Wallner
+- Danielle Tomlinson
+- Matthew Ellis
 - Felix Krause
+- Maksym Grebenets
+- Joshua Liebowitz
+- Stefan Natchev
 - Luka Mirosevic
+- Jorge Revuelta H
+- Andrew McBurney
 - Olivier Halligon
-- Stefan Natchev
-- Maksym Grebenets
 - Iulian Onofrei
+- Aaron Brager
+- Jan Piotrowski
+- Manu Wallner
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -1441,6 +1441,7 @@ files:
 - match/lib/match/encryption/interface.rb
 - match/lib/match/encryption/openssl.rb
 - match/lib/match/generator.rb
+- match/lib/match/importer.rb
 - match/lib/match/migrate.rb
 - match/lib/match/module.rb
 - match/lib/match/nuke.rb
@@ -1741,24 +1742,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- fastlane/lib
-- spaceship/lib
-- sigh/lib
-- fastlane_core/lib
-- supply/lib
-- gym/lib
-- screengrab/lib
-- match/lib
-- frameit/lib
+- credentials_manager/lib
+- pem/lib
 - snapshot/lib
+- frameit/lib
+- match/lib
+- fastlane_core/lib
 - deliver/lib
 - scan/lib
+- supply/lib
 - cert/lib
-- precheck/lib
-- pem/lib
+- fastlane/lib
+- spaceship/lib
 - pilot/lib
+- gym/lib
+- precheck/lib
+- screengrab/lib
+- sigh/lib
 - produce/lib
-- credentials_manager/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1766,12 +1767,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and