cert 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cf06826d22f982778a2740de18028d20f1ed45a
-  data.tar.gz: c817719c45e235a5d363c864c1a5902a74ca0cec
+  metadata.gz: 5dc672f91a984de666467e09292a3b33f43932cb
+  data.tar.gz: 7897eb987cb577b8d7714dd32dca080290183b10
 SHA512:
-  metadata.gz: 9ae9c75fbef4ed61babe5a89f8e99162f0a06584fd6c9cdd26e3c8f5f47bac1abe43ab314fa53fda23e1385a24b9d7f44a2c427c46f9c45cc7f32ea5099c75e4
-  data.tar.gz: cf7b0442742228c23d9f4d1e2ea9aad7fa89661020ab6113f18c006f56c842159eaec41129b32a1af2bdb95c9c7f1ef07d7b3eebe0d5c9f8260832e1af13c2a8
+  metadata.gz: 86b735f69ae660166565c260f69bafcabb130c3b2463b35e24b5db9e9623b208bea9d44294a451f97e24096570cdf7cea235ea73fa33c11d73cb033fd13971b9
+  data.tar.gz: 175cf3b8f3bd4bacc3427c898cdbfd5a3c6c33758aa7caf32183d87dd297077bfc77c4f7cb2cc21377358fbed8c97021c2fed789b320dadabccdaac6bc5bb90d

data/lib/cert/keychain_importer.rb

@@ -2,7 +2,7 @@ module Cert
   class KeychainImporter
     def self.import_file(path)
       raise "Could not find file '#{path}'".red unless File.exist?(path)
-      keychain = Cert.config[:keychain_path] || "#{Dir.home}/Library/Keychains/login.keychain"
+      keychain = File.expand_path(Cert.config[:keychain_path]) || "#{Dir.home}/Library/Keychains/login.keychain"
 
       command = "security import #{path.shellescape} -k '#{keychain}'"
       command << " -T /usr/bin/codesign" # to not be asked for permission when running a tool like `gym`

data/lib/cert/options.rb

@@ -49,6 +49,7 @@ module Cert
                                      description: "Path to a custom keychain",
                                      optional: true,
                                      verify_block: proc do |value|
+                                       value = File.expand_path(value)
                                        raise "Keychain not found at path '#{value}'".red unless File.exist? value
                                      end)
       ]

data/lib/cert/runner.rb

@@ -32,6 +32,7 @@ module Cert
     def find_existing_cert
       certificates.each do |certificate|
         path = store_certificate(certificate)
+        private_key_path = File.expand_path(File.join(Cert.config[:output_path], "#{certificate.id}.p12"))
 
         if FastlaneCore::CertChecker.installed?(path)
           # This certificate is installed on the local machine
@@ -41,6 +42,18 @@ module Cert
           Helper.log.info "Found the certificate #{certificate.id} (#{certificate.name}) which is installed on the local machine. Using this one.".green
 
           return path
+
+        elsif File.exist?(private_key_path)
+          KeychainImporter.import_file(private_key_path)
+          KeychainImporter.import_file(path)
+
+          ENV["CER_CERTIFICATE_ID"] = certificate.id
+          ENV["CER_FILE_PATH"] = path
+
+          Helper.log.info "Found the cached certificate #{certificate.id} (#{certificate.name}). Using this one.".green
+
+          return path
+
         else
           Helper.log.info "Certificate #{certificate.id} (#{certificate.name}) can't be found on your local computer"
         end
@@ -77,10 +90,13 @@ module Cert
       end
 
       # Store all that onto the filesystem
-      request_path = File.expand_path(File.join(Cert.config[:output_path], 'CertCertificateSigningRequest.certSigningRequest'))
+
+      request_path = File.expand_path(File.join(Cert.config[:output_path], "#{certificate.id}.certSigningRequest"))
       File.write(request_path, csr.to_pem)
-      private_key_path = File.expand_path(File.join(Cert.config[:output_path], 'private_key.p12'))
+
+      private_key_path = File.expand_path(File.join(Cert.config[:output_path], "#{certificate.id}.p12"))
       File.write(private_key_path, pkey)
+
       cert_path = store_certificate(certificate)
 
       # Import all the things into the Keychain

data/lib/cert/version.rb

@@ -1,3 +1,3 @@
 module Cert
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cert
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core