match 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca106e53fcfa3a6afb2796907c6375bbeb4712ea
-  data.tar.gz: b2dfe54acc43db599594d53e142a1a53525f33be
+  metadata.gz: 4abe678f917b35157991a1fd570fa49b2c9bb949
+  data.tar.gz: a70c2b38bea8f4031c134fa8c54ed16d89635e56
 SHA512:
-  metadata.gz: 4fe6fc7d7b53ca65690898254cefe1c3119ed3525c8a8ec26c01c39595fe601742312dce8a8938f6f0c23da684a1d15078c05d98da75b4801252d31946c85027
-  data.tar.gz: 14552497d001e8d507c5fede87a21afdee863e7afa930429a2c224b0459c7513338f37536594f9c5fff7b603af30bb448b7d41dd4e304fc99034681af61309e8
+  metadata.gz: a4d3d5dc5457e53ddf636e6b14a728c06ce2e8e353a04b5528de13b1d3f37ab0e0aeb9faaed12a7c8d958bb0c6bb2a91404f606f248758506f3800a8d148e5d5
+  data.tar.gz: 74bfb495c09c40a8ea81fd173493a68dc9664f7fecf700d5bf4cd81511a73626e4329660f96bae2cc23d41d9e120c1b36ec935d39e7febf9cfe949d5d9b6f0f3

data/README.md

@@ -118,7 +118,7 @@ match init
 
 <img src="assets/match_init.gif" width="550" />
 
-You'll be asked to enter the URL to your Git repo. This can be either a `https://` or a `git` URL. `match init` won't read or modify your certificates or profiles.
+You'll be asked to enter the URL to your Git repo. This can be either a `https://` or a `git` URL. (If your machine is currently using SSH to authenticate with Github, you'll want to use a `git` URL, otherwise you may see an authentication error when you attempt to use match.) `match init` won't read or modify your certificates or profiles.
 
 This will create a `Matchfile` in your current directory (or in your `./fastlane/` folder).
 

data/lib/match/nuke.rb

@@ -27,13 +27,15 @@ module Match
       end
 
       if (self.certs + self.profiles + self.files).count > 0
-        UI.error "---"
-        UI.error "Are you sure you want to completely delete and revoke all the"
-        UI.error "certificates and provisioning profiles listed above? (y/n)"
-        UI.error "Warning: By nuking distribution, both App Store and Ad Hoc profiles will be deleted" if type == "distribution"
-        UI.error "Warning: The :app_identifier value will be ignored - this will delete all profiles for all your apps!" if had_app_identifier
-        UI.error "---"
-        if agree("(y/n)", true)
+        unless params[:skip_confirmation]
+          UI.error "---"
+          UI.error "Are you sure you want to completely delete and revoke all the"
+          UI.error "certificates and provisioning profiles listed above? (y/n)"
+          UI.error "Warning: By nuking distribution, both App Store and Ad Hoc profiles will be deleted" if type == "distribution"
+          UI.error "Warning: The :app_identifier value will be ignored - this will delete all profiles for all your apps!" if had_app_identifier
+          UI.error "---"
+        end
+        if params[:skip_confirmation] || agree("(y/n)", true)
           nuke_it_now!
           UI.success "Successfully cleaned your account ♻️"
         else

data/lib/match/options.rb

@@ -44,6 +44,11 @@ module Match
                                      env_name: "MATCH_KEYCHAIN_NAME",
                                      description: "Keychain the items should be imported to",
                                      default_value: "login.keychain"),
+        FastlaneCore::ConfigItem.new(key: :keychain_password,
+                                     short_option: "-p",
+                                     env_name: "MATCH_KEYCHAIN_PASSWORD",
+                                     description: "This might be required the first time you access certificates on a new mac. For the login/default keychain this is your account password",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :readonly,
                                      env_name: "MATCH_READONLY",
                                      description: "Only fetch existing certificates and profiles, don't generate new ones",
@@ -80,6 +85,11 @@ module Match
                                      description: "Renew the provisioning profiles every time you run match",
                                      is_string: false,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :skip_confirmation,
+                                     env_name: "MATCH_SKIP_CONFIRMATION",
+                                     description: "Disables confirmation prompts during nuke, answering them with yes",
+                                     is_string: false,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :shallow_clone,
                                      env_name: "MATCH_SHALLOW_CLONE",
                                      description: "Make a shallow clone of the repository (truncate the history to 1 revision)",

data/lib/match/runner.rb

@@ -79,12 +79,12 @@ module Match
         if FastlaneCore::CertChecker.installed?(cert_path)
           UI.verbose "Certificate '#{File.basename(cert_path)}' is already installed on this machine"
         else
-          Utils.import(cert_path, params[:keychain_name])
+          Utils.import(cert_path, params[:keychain_name], password: params[:keychain_password])
         end
 
         # Import the private key
         # there seems to be no good way to check if it's already installed - so just install it
-        Utils.import(keys.last, params[:keychain_name])
+        Utils.import(keys.last, params[:keychain_name], password: params[:keychain_password])
       end
 
       return File.basename(cert_path).gsub(".cer", "") # Certificate ID

data/lib/match/utils.rb

@@ -1,6 +1,6 @@
 module Match
   class Utils
-    def self.import(item_path, keychain)
+    def self.import(item_path, keychain, password: "")
       # Existing code expects that a keychain name will be expanded into a default path to Libary/Keychains
       # in the user's home directory. However, this will not allow the user to pass an absolute path
       # for the keychain value
@@ -24,12 +24,7 @@ module Match
 
       UI.user_error!("Could not locate the provided keychain. Tried:\n\t#{keychain_paths.join("\n\t")}") unless keychain_path
 
-      command = "security import #{item_path.shellescape} -k #{keychain_path.shellescape}"
-      command << " -T /usr/bin/codesign" # to not be asked for permission when running a tool like `gym`
-      command << " -T /usr/bin/security"
-      command << " &> /dev/null" unless $verbose
-
-      Helper.backticks(command, print: $verbose)
+      FastlaneCore::KeychainImporter.import_file(item_path, keychain_path, keychain_password: password, output: $verbose)
     end
 
     # Fill in an environment variable, ready to be used in _xcodebuild_

data/lib/match/version.rb

@@ -1,4 +1,4 @@
 module Match
-  VERSION = "0.10.0"
+  VERSION = "0.11.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.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.55.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.55.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easily sync your certificates and profiles across your team using git