cert 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d225815e01d053bbbb316a9f253e973367ac1f2
-  data.tar.gz: d7a8c902990c66aaf75c74d7878bcf9947752455
+  metadata.gz: 2c0a9402d68423c24198bf2ecdb6782df3c99d18
+  data.tar.gz: 5f9aea5d0c78b13154eabe65b40b14ed152f0908
 SHA512:
-  metadata.gz: 4c6a9213bf8e0e192626c00060ec0d657876643629be63c9a7defb60588b1173e92c17ed779ebcc6767d2ccffdb4cb34db90e34f6ccb674e39743a3f347bab8d
-  data.tar.gz: d308a9475b84babecae0fe313289ec6834eca8ff2209a3efde2a6c55dc43c0af9b4043da1cab650da89ec1b64703f4303f0aeb86a0d6bba589cec0d2039ca7c9
+  metadata.gz: f7b446fde1bdee8113d876d154902c3e096dd2dc1d53c7a266d898f8582aa7a1fa511e889d624e65f4f0e88ebbb7d93ffc7bb14f84209dfd09895cd67aa06c55
+  data.tar.gz: f29c7b9358b554050d5f0f13674294f66ba684590de89bf1e46e078eb6daac1bee2edf6e52dabb071e19e1f3294f2325919ca909ff617ba2ad34b7f62bc42f0e

data/README.md

@@ -51,7 +51,7 @@ Get in contact with the developers on Twitter: [@FastlaneTools](https://twitter.
 
 -------
 
-<h5 align="center"><code>cert</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>cert</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>
 
 
 
@@ -132,7 +132,7 @@ This will result in `sigh` always using the correct signing certificate, which i
 
 ## [`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/cert.rb

@@ -1,6 +1,5 @@
 require 'cert/version'
 require 'cert/runner'
-require 'cert/keychain_importer'
 require 'cert/options'
 
 require 'fastlane_core'

data/lib/cert/options.rb

@@ -27,19 +27,19 @@ module Cert
                                      short_option: "-b",
                                      env_name: "CERT_TEAM_ID",
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(: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,
                                      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: "CERT_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: :output_path,
                                      short_option: "-o",
@@ -50,11 +50,16 @@ module Cert
                                      short_option: "-k",
                                      env_name: "CERT_KEYCHAIN_PATH",
                                      description: "Path to a custom keychain",
-                                     default_value: Dir["#{Dir.home}/Library/Keychains/login.keychain"].last,
+                                     default_value: Dir["#{Dir.home}/Library/Keychains/login.keychain", "#{Dir.home}/Library/Keychains/login.keychain-db"].last,
                                      verify_block: proc do |value|
                                        value = File.expand_path(value)
                                        UI.user_error!("Keychain not found at path '#{value}'") unless File.exist?(value)
-                                     end)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :keychain_password,
+                                     short_option: "-p",
+                                     env_name: "CERT_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)
       ]
     end
   end

data/lib/cert/runner.rb

@@ -94,8 +94,10 @@ module Cert
 
           return path
         elsif File.exist?(private_key_path)
-          KeychainImporter.import_file(private_key_path)
-          KeychainImporter.import_file(path)
+          keychain = File.expand_path(Cert.config[:keychain_path])
+          password = Cert.config[:keychain_password]
+          FastlaneCore::KeychainImporter.import_file(private_key_path, keychain, keychain_password: password)
+          FastlaneCore::KeychainImporter.import_file(path, keychain, keychain_password: password)
 
           ENV["CER_CERTIFICATE_ID"] = certificate.id
           ENV["CER_FILE_PATH"] = path
@@ -155,8 +157,10 @@ module Cert
       cert_path = store_certificate(certificate)
 
       # Import all the things into the Keychain
-      KeychainImporter.import_file(private_key_path)
-      KeychainImporter.import_file(cert_path)
+      keychain = File.expand_path(Cert.config[:keychain_path])
+      password = Cert.config[:keychain_password]
+      FastlaneCore::KeychainImporter.import_file(private_key_path, keychain, keychain_password: password)
+      FastlaneCore::KeychainImporter.import_file(cert_path, keychain, keychain_password: password)
 
       # Environment variables for the fastlane action
       ENV["CER_CERTIFICATE_ID"] = certificate.id

data/lib/cert/version.rb

@@ -1,3 +1,3 @@
 module Cert
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cert
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.55.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.55.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -182,14 +182,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: Create new iOS code signing certificates
 email:
 - cert@krausefx.com
@@ -203,7 +203,6 @@ files:
 - bin/cert
 - lib/cert.rb
 - lib/cert/commands_generator.rb
-- lib/cert/keychain_importer.rb
 - lib/cert/options.rb
 - lib/cert/runner.rb
 - lib/cert/version.rb
@@ -227,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create new iOS code signing certificates

data/lib/cert/keychain_importer.rb

@@ -1,14 +0,0 @@
-module Cert
-  class KeychainImporter
-    def self.import_file(path)
-      UI.user_error!("Could not find file '#{path}'") unless File.exist?(path)
-      keychain = File.expand_path(Cert.config[:keychain_path])
-
-      command = "security import #{path.shellescape} -k '#{keychain}'"
-      command << " -T /usr/bin/codesign" # to not be asked for permission when running a tool like `gym`
-      command << " -T /usr/bin/security"
-
-      Helper.backticks(command)
-    end
-  end
-end