match 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7d0367ebbd35eee9ee47b25a0734135b7c581d4
-  data.tar.gz: af1eed433bd624b38b68a04f0b2810beba05da74
+  metadata.gz: f3cf7e4c9af9050a9b6e8f6a7c5c760bc281c92b
+  data.tar.gz: c76983326e8d722aeff558973124604555adf5e0
 SHA512:
-  metadata.gz: e27b794c23fac1878dbd1a814ab910244d965247fd387d2d84d06ad2dd96e0fee9d96750792420e3767b18631cedd6c639ffd5f29ef2a8716447627da104a558
-  data.tar.gz: 41a7f0fd1c24d790147a3e03c94c7ac8cb31402a4d79f89bcfdbeddafb55d511eb30af092c70ba651c15101a815aa141e274570614430c8e2dcb95e44dc1ad13
+  metadata.gz: e4aca4ba5efcd4ab989d0d04969b418632ae2840de179a9ad3469d2f43655809495753a34d8d1aa8202231951790fafbf1da7291093065d03cd1330024ca1292
+  data.tar.gz: 89e4be72b960293545dc25678dc71db2402f4da7c8fb4ec280be44d2bc2574376b861ab43e685e822d30d58bcef8b0afa2921943687c810695a909d55081151d

data/README.md

@@ -32,7 +32,6 @@ match
 [![Twitter: @FastlaneTools](https://img.shields.io/badge/contact-@FastlaneTools-blue.svg?style=flat)](https://twitter.com/FastlaneTools)
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/match/LICENSE)
 [![Gem](https://img.shields.io/gem/v/match.svg?style=flat)](http://rubygems.org/gems/match)
-[![Build Status](https://img.shields.io/circleci/project/fastlane/fastlane/master.svg?style=flat)](https://circleci.com/gh/fastlane/fastlane)
 
 ###### Easily sync your certificates and profiles across your team using git
 
@@ -53,7 +52,7 @@ A new approach to iOS code signing: Share one code signing identity across your
 
 -------
 
-<h5 align="center"><code>match</code> is part of <a href="https://fastlane.tools">fastlane</a>: The easiest way to automate building and releasing your iOS and Android apps.</h5>
+<h5 align="center"><code>match</code> is part of <a href="https://fastlane.tools">fastlane</a>: The easiest way to automate beta deployments and releases for your iOS and Android apps.</h5>
 
 ## Why match?
 
@@ -174,20 +173,17 @@ match --help
 
 #### Handle multiple targets
 
-If you have several targets with different bundle identifiers, call `match` for each of them:
+If you have several targets with different bundle identifiers, supply them as a comma-separated list to match:
 
 ```
-match appstore -a tools.fastlane.app
-match appstore -a tools.fastlane.app.watchkitapp
+match appstore -a tools.fastlane.app,tools.fastlane.app.watchkitapp
 ```
 
 You can make this even easier using [fastlane](https://github.com/fastlane/fastlane/tree/master/fastlane) by creating a `certificates` lane like this:
 
 ```
 lane :certificates do
-  match(app_identifier: "com.krausefx.app1", readonly: true)
-  match(app_identifier: "com.krausefx.app2", readonly: true)
-  match(app_identifier: "com.krausefx.app3", readonly: true)
+  match(app_identifier: ["com.krausefx.app1", "com.krausefx.app2", "com.krausefx.app3"], readonly: true)
 end
 ```
 
@@ -282,8 +278,7 @@ match adhoc --force_for_new_devices
 If your app has multiple targets (e.g. Today Widget or WatchOS Extension)
 
 ```ruby
-match(app_identifier: "tools.fastlane.app", type: "appstore")
-match(app_identifier: "tools.fastlane.app.today_widget", type: "appstore")
+match(app_identifier: ["tools.fastlane.app", "tools.fastlane.app.today_widget"], type: "appstore")
 ```
 
 `match` can even use the same one Git repository for all bundle identifiers.
@@ -393,7 +388,7 @@ Because of the potentially dangerous nature of In-House profiles we decided to n
 
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
-- [`fastlane`](https://fastlane.tools): The easiest way to automate building and releasing your iOS and Android apps
+- [`fastlane`](https://fastlane.tools): The easiest way to automate beta deployments and releases for your iOS and Android apps
 - [`deliver`](https://github.com/fastlane/fastlane/tree/master/deliver): Upload screenshots, metadata and your app to the App Store
 - [`snapshot`](https://github.com/fastlane/fastlane/tree/master/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`frameit`](https://github.com/fastlane/fastlane/tree/master/frameit): Quickly put your screenshots into the right device frames

data/lib/assets/MatchfileTemplate

@@ -2,7 +2,7 @@ git_url "[[GIT_URL]]"
 
 type "development" # The default type, can be: appstore, adhoc or development
 
-# app_identifier "tools.fastlane.app" 
+# app_identifier ["tools.fastlane.app", "tools.fastlane.app2"]
 # username "user@fastlane.tools" # Your Apple Developer Portal username
 
 # For all available options run `match --help`

data/lib/match/generator.rb

@@ -33,15 +33,15 @@ 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)
+    def self.generate_provisioning_profile(params: nil, prov_type: nil, certificate_id: nil, app_identifier: nil)
       require 'sigh'
 
       prov_type = :enterprise if Match.enterprise? && ENV["SIGH_PROFILE_ENTERPRISE"] && !params[:type] == "development"
 
-      profile_name = ["match", profile_type_name(prov_type), params[:app_identifier]].join(" ")
+      profile_name = ["match", profile_type_name(prov_type), app_identifier].join(" ")
 
       values = {
-        app_identifier: params[:app_identifier],
+        app_identifier: app_identifier,
         output_path: File.join(params[:workspace], "profiles", prov_type.to_s),
         username: params[:username],
         force: true,

data/lib/match/git_helper.rb

@@ -5,14 +5,21 @@ module Match
 
       @dir = Dir.mktmpdir
 
-      # GIT_TERMINAL_PROMPT will fail the `git clone` command if user credentials are missing
-      command = "GIT_TERMINAL_PROMPT=0 git clone '#{git_url}' '#{@dir}'"
+      command = "git clone '#{git_url}' '#{@dir}'"
       command << " --depth 1" if shallow_clone
 
       UI.message "Cloning remote git repo..."
-      FastlaneCore::CommandExecutor.execute(command: command,
-                                          print_all: $verbose,
-                                      print_command: $verbose)
+      begin
+        # GIT_TERMINAL_PROMPT will fail the `git clone` command if user credentials are missing
+        FastlaneCore::CommandExecutor.execute(command: "GIT_TERMINAL_PROMPT=0 #{command}",
+                                            print_all: $verbose,
+                                        print_command: $verbose)
+      rescue
+        UI.error("Error cloning certificates repo, please make sure you have read access to the repository you want to use")
+        UI.error("Run the following command manually to make sure you're properly authenticated:")
+        UI.command(command)
+        UI.user_error!("Error cloning certificates git repo, please make sure you have access to the repository - see instructions above")
+      end
 
       UI.user_error!("Error cloning repo, make sure you have access to it '#{git_url}'") unless File.directory?(@dir)
 
@@ -39,8 +46,6 @@ module Match
       [
         "[fastlane]",
         "Updated",
-        params[:app_identifier],
-        "for",
         params[:type].to_s
       ].join(" ")
     end

data/lib/match/options.rb

@@ -31,7 +31,8 @@ module Match
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      short_option: "-a",
                                      env_name: "MATCH_APP_IDENTIFIER",
-                                     description: "The bundle identifier of your app",
+                                     description: "The bundle identifier(s) of your app (comma-separated)",
+                                     is_string: false,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)),
         FastlaneCore::ConfigItem.new(key: :username,
                                      short_option: "-u",
@@ -51,20 +52,20 @@ module Match
         FastlaneCore::ConfigItem.new(key: :team_id,
                                      short_option: "-b",
                                      env_name: "FASTLANE_TEAM_ID",
-                                     description: "The ID of your team if you're in multiple teams",
+                                     description: "The ID of your Developer Portal team if you're in multiple teams",
                                      optional: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_id),
                                      verify_block: proc do |value|
-                                       ENV["FASTLANE_TEAM_ID"] = value
+                                       ENV["FASTLANE_TEAM_ID"] = value.to_s
                                      end),
         FastlaneCore::ConfigItem.new(key: :team_name,
                                      short_option: "-l",
                                      env_name: "FASTLANE_TEAM_NAME",
-                                     description: "The name of your team if you're in multiple teams",
+                                     description: "The name of your Developer Portal team if you're in multiple teams",
                                      optional: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_name),
                                      verify_block: proc do |value|
-                                       ENV["FASTLANE_TEAM_NAME"] = value
+                                       ENV["FASTLANE_TEAM_NAME"] = value.to_s
                                      end),
         FastlaneCore::ConfigItem.new(key: :verbose,
                                      env_name: "MATCH_VERBOSE",

data/lib/match/runner.rb

@@ -12,17 +12,30 @@ module Match
       params[:workspace] = GitHelper.clone(params[:git_url], params[:shallow_clone], skip_docs: params[:skip_docs], branch: params[:git_branch])
       spaceship = SpaceshipEnsure.new(params[:username]) unless params[:readonly]
 
+      if params[:app_identifier].kind_of?(Array)
+        app_identifiers = params[:app_identifier]
+      else
+        app_identifiers = params[:app_identifier].to_s.split(/\s*,\s*/).uniq
+      end
+
       # Verify the App ID (as we don't want 'match' to fail at a later point)
-      spaceship.bundle_identifier_exists(params) if spaceship
+      if spaceship
+        app_identifiers.each do |app_identifier|
+          spaceship.bundle_identifier_exists(username: params[:username], app_identifier: app_identifier)
+        end
+      end
 
       # Certificate
       cert_id = fetch_certificate(params: params)
-      spaceship.certificate_exists(params, cert_id) if spaceship
-
-      # Provisioning Profile
-      uuid = fetch_provisioning_profile(params: params,
-                                certificate_id: cert_id)
-      spaceship.profile_exists(params, uuid) if spaceship
+      spaceship.certificate_exists(username: params[:username], certificate_id: cert_id) if spaceship
+
+      # Provisioning Profiles
+      app_identifiers.each do |app_identifier|
+        uuid = fetch_provisioning_profile(params: params,
+                                  certificate_id: cert_id,
+                                  app_identifier: app_identifier)
+        spaceship.profile_exists(username: params[:username], uuid: uuid) if spaceship
+      end
 
       # Done
       if self.changes_to_commit and !params[:readonly]
@@ -30,7 +43,10 @@ module Match
         GitHelper.commit_changes(params[:workspace], message, params[:git_url], params[:git_branch])
       end
 
-      TablePrinter.print_summary(params)
+      # Print a summary table for each app_identifier
+      app_identifiers.each do |app_identifier|
+        TablePrinter.print_summary(app_identifier: app_identifier, type: params[:type])
+      end
 
       UI.success "All required keys, certificates and provisioning profiles are installed 🙌".green
     rescue Spaceship::Client::UnexpectedResponse, Spaceship::Client::InvalidUserCredentialsError, Spaceship::Client::NoUserCredentialsError => ex
@@ -75,8 +91,7 @@ module Match
     end
 
     # @return [String] The UUID of the provisioning profile so we can verify it with the Apple Developer Portal
-    def fetch_provisioning_profile(params: nil, certificate_id: nil)
-      app_identifier = params[:app_identifier]
+    def fetch_provisioning_profile(params: nil, certificate_id: nil, app_identifier: nil)
       prov_type = params[:type].to_sym
 
       profile_name = [Match::Generator.profile_type_name(prov_type), app_identifier].join("_").gsub("*", '\*') # this is important, as it shouldn't be a wildcard
@@ -93,7 +108,8 @@ module Match
         UI.user_error!("No matching provisioning profiles found and can not create a new one because you enabled `readonly`") if params[:readonly]
         profile = Generator.generate_provisioning_profile(params: params,
                                                        prov_type: prov_type,
-                                                  certificate_id: certificate_id)
+                                                  certificate_id: certificate_id,
+                                                  app_identifier: app_identifier)
         self.changes_to_commit = true
       end
 

data/lib/match/spaceship_ensure.rb

@@ -20,42 +20,44 @@ module Match
       Spaceship.select_team
     end
 
-    def bundle_identifier_exists(params)
-      found = Spaceship.app.find(params[:app_identifier])
+    def bundle_identifier_exists(username: nil, app_identifier: nil)
+      found = Spaceship.app.find(app_identifier)
       return if found
 
       require 'sigh'
       Sigh::Runner.new.print_produce_command({
-        username: params[:username],
-        app_identifier: params[:app_identifier]
+        username: username,
+        app_identifier: app_identifier
       })
       UI.error("An app with that bundle ID needs to exist in order to create a provisioning profile for it")
       UI.error("================================================================")
+      available_apps = Spaceship.app.all.collect { |a| "#{a.bundle_id} (#{a.name})" }
+      UI.message("Available apps:\n- #{available_apps.join("\n- ")}")
       UI.error("Make sure to run `match` with the same user and team every time.")
-      UI.user_error!("Couldn't find bundle identifier '#{params[:app_identifier]}' for the user '#{params[:username]}'")
+      UI.user_error!("Couldn't find bundle identifier '#{app_identifier}' for the user '#{username}'")
     end
 
-    def certificate_exists(params, certificate_id)
+    def certificate_exists(username: nil, certificate_id: nil)
       found = Spaceship.certificate.all.find do |cert|
         cert.id == certificate_id
       end
       return if found
 
       UI.error("Certificate '#{certificate_id}' (stored in your git repo) is not available on the Developer Portal")
-      UI.error("for the user #{params[:username]}")
+      UI.error("for the user #{username}")
       UI.error("Make sure to use the same user and team every time you run 'match' for this")
       UI.error("Git repository. This might be caused by revoking the certificate on the Dev Portal")
       UI.user_error!("To reset the certificates of your Apple account, you can use the `match nuke` feature, more information on https://github.com/fastlane/fastlane/tree/master/match")
     end
 
-    def profile_exists(params, uuid)
+    def profile_exists(username: nil, uuid: nil)
       found = Spaceship.provisioning_profile.all.find do |profile|
         profile.uuid == uuid
       end
       return if found
 
       UI.error("Provisioning profile '#{uuid}' is not available on the Developer Portal")
-      UI.error("for the user #{params[:username]}")
+      UI.error("for the user #{username}")
       UI.error("Make sure to use the same user and team every time you run 'match' for this")
       UI.error("Git repository. This might be caused by deleting the provisioning profile on the Dev Portal")
       UI.user_error!("To reset the provisioning profiles of your Apple account, you can use the `match nuke` feature, more information on https://github.com/fastlane/fastlane/tree/master/match")

data/lib/match/table_printer.rb

@@ -1,10 +1,9 @@
 module Match
   class TablePrinter
-    def self.print_summary(params)
+    def self.print_summary(app_identifier: nil, type: nil)
       rows = []
 
-      app_identifier = params[:app_identifier]
-      type = params[:type].to_sym
+      type = type.to_sym
 
       rows << ["App Identifier", "", app_identifier]
       rows << ["Type", "", type]

data/lib/match/version.rb

@@ -1,4 +1,4 @@
 module Match
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
   DESCRIPTION = "Easily sync your certificates and profiles across your team using git"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: match
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.53.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.53.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.16.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.16.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.36.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.36.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -256,14 +256,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.44.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.44.0
 description: Easily sync your certificates and profiles across your team using git
 email:
 - match@krausefx.com