pem 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58b76a291f4f4d5357010fe9583c88e17110a41d
-  data.tar.gz: 31b25b5ebd72a80b7b94cc30f63062413c9230d3
+  metadata.gz: c63744fac27ee4becfc297253279c9f0d0d17b4d
+  data.tar.gz: 10fc43cd0ed9fcf094b806f605b97e2bf2e90a35
 SHA512:
-  metadata.gz: ad830aa3841d3f51a800ad8504df8b75a2a64a875d644986755658c56043eea2505c56fc2381cf35d40672c236335d1496a4f3a5025281ad4435e2a6382c0bfa
-  data.tar.gz: 66dbc21cedb673c77ac87592f35abaa8ec489e629c528e32d588849e2d9877537b4e54819ab2d53380778202db395ce31e78693cef604d22a1da4550d4a0786f
+  metadata.gz: 269cdf9f61a91730afdbf632bdd53115e3b68421a3b7c3127c258bea2f452676266e90f15b0386f2d53283316b31d7e02f2c24c0389b90b92e32b6288da9f88f
+  data.tar.gz: f06f13638f120165c80bc69fdeda14c299fb56300bd67231ac27b386cb77b78132eb320091e33749b6ae6b9e6cdf1d6be22baaddf8933fa8cba88bfd6dbc3225

data/lib/pem/manager.rb

@@ -5,11 +5,12 @@ module PEM
   # Creates the push profile and stores it in the correct location
   class Manager
     def self.start
-      password_manager = CredentialsManager::PasswordManager.shared_manager
-      Spaceship.login(password_manager.username, password_manager.password)
+      Helper.log.info "Starting login with user '#{PEM.config[:username]}'"
+      Spaceship.login(PEM.config[:username], nil)
       Spaceship.client.select_team
+      Helper.log.info "Successfully logged in"
 
-      existing_certificate = certificate.all.detect do |c| 
+      existing_certificate = certificate.all.detect do |c|
         c.name == PEM.config[:app_identifier]
       end
 
@@ -50,25 +51,22 @@ module PEM
       filename_base = File.basename(filename_base, ".pem") # strip off the .pem if it was provided.
 
       if PEM.config[:save_private_key]
-        file = File.new("#{filename_base}.pkey",'w')
-        file.write(pkey.to_pem)
-        file.close
-        Helper.log.info "Private key: ".green + Pathname.new(file).realpath.to_s
+        private_key_path = File.join(PEM.config[:output_path], "#{filename_base}.pkey")
+        File.write(private_key_path, pkey.to_pem)
+        Helper.log.info "Private key: ".green + Pathname.new(private_key_path).realpath.to_s
       end
 
       if PEM.config[:generate_p12]
+        p12_cert_path = File.join(PEM.config[:output_path], "#{filename_base}.p12")
         p12 = OpenSSL::PKCS12.create(PEM.config[:p12_password], certificate_type, pkey, x509_certificate)
-        file = File.new("#{filename_base}.p12", 'wb')
-        file.write(p12.to_der)
-        file.close
-        Helper.log.info "p12 certificate: ".green + Pathname.new(file).realpath.to_s
+        File.write(p12_cert_path, p12.to_der)
+        Helper.log.info "p12 certificate: ".green + Pathname.new(p12_cert_path).realpath.to_s
       end
 
-      file = File.new("#{filename_base}.pem", 'w')
-      file.write(x509_certificate.to_pem + pkey.to_pem)
-      file.close
-      Helper.log.info "PEM: ".green + Pathname.new(file).realpath.to_s
-      return file
+      x509_cert_path = File.join(PEM.config[:output_path], "#{filename_base}.pem")
+      File.write(x509_cert_path, x509_certificate.to_pem + pkey.to_pem)
+      Helper.log.info "PEM: ".green + Pathname.new(x509_cert_path).realpath.to_s
+      return x509_cert_path
     end
 
     def self.certificate

data/lib/pem/options.rb

@@ -1,4 +1,5 @@
 require 'fastlane_core'
+require 'credentials_manager'
 
 module PEM
   class Options
@@ -12,12 +13,12 @@ module PEM
         FastlaneCore::ConfigItem.new(key: :generate_p12,
                                      env_name: "PEM_GENERATE_P12_FILE",
                                      description: "Generate a p12 file additionally to a PEM file",
-                                     is_string: false, 
+                                     is_string: false,
                                      default_value: true),
         FastlaneCore::ConfigItem.new(key: :save_private_key,
                                      short_option: "-s",
                                      env_name: "PEM_SAVE_PRIVATEKEY",
-                                     description: "Set to save the private RSA key in the current directory",
+                                     description: "Set to save the private RSA key",
                                      is_string: false,
                                      default_value: true),
         FastlaneCore::ConfigItem.new(key: :force,
@@ -34,10 +35,7 @@ module PEM
                                      short_option: "-u",
                                      env_name: "PEM_USERNAME",
                                      description: "Your Apple ID Username",
-                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:apple_id),
-                                     verify_block: Proc.new do |value|
-                                       CredentialsManager::PasswordManager.shared_manager(value)
-                                     end),
+                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)),
         FastlaneCore::ConfigItem.new(key: :team_id,
                                      short_option: "-b",
                                      env_name: "PEM_TEAM_ID",
@@ -55,7 +53,12 @@ module PEM
                                      short_option: "-o",
                                      env_name: "PEM_FILE_NAME",
                                      description: "The file name of the generated .pem file",
-                                     optional: true)
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :output_path,
+                                     short_option: "-l",
+                                     env_name: "PEM_OUTPUT_PATH",
+                                     description: "The path to a directory in which all certificates and private keys should be stored",
+                                     default_value: ".")
       ]
     end
   end

data/lib/pem/version.rb

@@ -1,3 +1,3 @@
 module PEM
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pem
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,28 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: spaceship
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement