pem 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d12ab8bf44ad8467e32200e2b77d60e0406d6254
-  data.tar.gz: 5379f10009de542b8ad113da8d0906d1c9ab86ee
+  metadata.gz: d017f22c946bf5b7edc3f19207fc18f4a7f44d74
+  data.tar.gz: a768d2968115885940b6eae235e986918b4415e1
 SHA512:
-  metadata.gz: 49ae6ed9e1b5439c20360591550734ee320b4ddc3842f4d9f0e36da12dd172ea899b5262c9c33f288179a9aee296c7c6420db5698575b1af67a99589d5b1389a
-  data.tar.gz: 94d1036a54d9e728a8ec498fd48cb6f934bb2754c85e9a76e4820b563789e9ba7145148e1ebf98d3757d95ba246c3c04a135212c7a71340d735f6db81f7a36ef
+  metadata.gz: de12a00972b77b529f0636029c919f491607d38b7d65e3781297ae17880390da23e951c3a4b7e12ebfadca519a515474773037d4e56ea917f0696d4582a39ac8
+  data.tar.gz: 8e08fb66e95a7641021a929934c8898a4b45133d485c9f6588b2b5030ad592869dbd68fa0a4fc27f3faa6c92c29f2d4e0682e57ef7f6b71e4a1492152391b871

data/README.md

@@ -91,6 +91,11 @@ If you want to generate a development certificate instead:
 
     pem --development
 
+To get a list of available options run:
+
+    pem --help
+    
+
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
 ## Environment Variables

data/bin/pem

@@ -6,6 +6,8 @@ require 'pem'
 require 'commander'
 require 'credentials_manager/password_manager'
 require 'credentials_manager/appfile_config'
+require 'pem/options'
+require 'pem/manager'
 
 HighLine.track_eof = false
 
@@ -22,36 +24,15 @@ class PemApplication
 
     always_trace!
 
-    global_option '--development', 'Renew the development push certificate instead of the production one'
-    global_option '-u', '--username STRING', 'Your Apple ID username'
-    global_option '-a', '--identifier STRING', String, 'The bundle identifier of your app'
+    FastlaneCore::CommanderGenerator.new.generate(PEM::Options.available_options)
 
     command :renew do |c|
       c.syntax = 'pem renew'
       c.description = 'Renews the certificate (in case it expired) and shows the path to the generated pem file'
 
       c.action do |args, options|
-        app = app_identifier(options)
-        username(options)
-
-        path, rsa_file = PEM::CertManager.new.run(app, !options.development)
-
-        if path
-          file_name = File.basename(path)
-          output = "./#{file_name}"
-          FileUtils.mv(path, output)
-          puts output.green
-        end
-        
-        if ENV["PEM_SAVE_PRIVATEKEY"]
-          file_name = File.basename(rsa_file)
-          output = "./#{file_name}"
-          FileUtils.mv(rsa_file, output)
-          puts output.green          
-        else
-          File.delete(rsa_file)
-        end
-        
+        PEM.config = FastlaneCore::Configuration.create(PEM::Options.available_options, options.__hash__)
+        PEM::Manager.start
       end
     end
 
@@ -59,23 +40,6 @@ class PemApplication
 
     run!
   end
-
-  def username(options)
-    user = options.username
-    user ||= ENV["PEM_USERNAME"]
-    user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
-    
-    CredentialsManager::PasswordManager.shared_manager(user) if user
-  end
-
-  def app_identifier(options)
-    value = options.identifier
-    value ||= ENV["PEM_APP_IDENTIFIER"]
-    value ||= CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)
-    value ||= ask("App Identifier (Bundle ID, e.g. com.krausefx.app): ")
-    return value
-  end
-
 end
 
 PemApplication.new.run

data/lib/pem.rb

@@ -7,10 +7,16 @@ require 'pem/signing_request'
 require 'fastlane_core'
 
 module PEM
+  # Use this to just setup the configuration attribute and set it later somewhere else
+  class << self
+    attr_accessor :config
+  end
+  
   TMP_FOLDER = "/tmp/PEM/"
   FileUtils.mkdir_p TMP_FOLDER
 
   ENV['FASTLANE_TEAM_ID'] ||= ENV["PEM_TEAM_ID"]
+  ENV['DELIVER_USER'] ||= ENV["PEM_USERNAME"]
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
 

data/lib/pem/cert_manager.rb

@@ -1,26 +1,33 @@
 module PEM
   class CertManager
     # Download the cert, do all kinds of Keychain related things
-    def run(app_identifier, production)
+    def run
       # Keychain (security) documentation: https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/security.1.html
       # Old project, which might be helpful: https://github.com/jprichardson/keychain_manager
 
-      Helper.log.info "Refreshing push notification profiles for app '#{app_identifier}'"
+      Helper.log.info "Refreshing push notification profiles for app '#{PEM.config[:app_identifier]}'"
 
       dev = PEM::DeveloperCenter.new
 
-      cert_file = dev.fetch_cer_file(app_identifier, production)
+      cert_file = dev.fetch_cer_file
       rsa_file = File.join(TMP_FOLDER, 'private_key.key')
 
       pem_temp = File.join(TMP_FOLDER, 'pem_temp.pem')
 
-      certificate_type = (production ? 'production' : 'development')
+      certificate_type = (PEM.config[:development] ? 'development' : 'production')
 
 
-      pem_file = File.join(TMP_FOLDER, "#{certificate_type}_#{app_identifier}.pem")
+      pem_file = File.join(TMP_FOLDER, "#{certificate_type}_#{PEM.config[:app_identifier]}.pem")
       command("openssl x509 -inform der -in '#{cert_file}' -out #{pem_temp}")
       content = File.read(pem_temp) + File.read(rsa_file)
       File.write(pem_file, content)
+
+      # Generate p12 file as well
+      if PEM.config[:generate_p12]
+        output = "#{certificate_type}.p12"
+        command("openssl pkcs12 -export -password pass:"" -in '#{pem_file}' -inkey '#{pem_file}' -out '#{output}'")
+        puts output.green
+      end
       
       return pem_file, rsa_file
     end

data/lib/pem/developer_center.rb

@@ -8,24 +8,25 @@ module PEM
     # This method will enable push for the given app
     # and download the cer file in any case, no matter if it existed before or not
     # @return the path to the push file
-    def fetch_cer_file(app_identifier, production)
+    def fetch_cer_file
+      @app_identifier = PEM.config[:app_identifier]
       begin
-        open_app_page(app_identifier)
+        open_app_page
 
         click_on "Edit"
         wait_for_elements(".item-details") # just to finish loading
 
         push_value = first(:css, '#pushEnabled').value
         if push_value == "on"
-          Helper.log.info "Push for app '#{app_identifier}' is enabled"
+          Helper.log.info "Push for app '#{@app_identifier}' is enabled"
         else
-          Helper.log.warn "Push for app '#{app_identifier}' is disabled. This has to change."
+          Helper.log.warn "Push for app '#{@app_identifier}' is disabled. This has to change."
           first(:css, '#pushEnabled').click
           sleep 3 # this takes some time
         end
 
-        Helper.log.warn "Creating push certificate for app '#{app_identifier}'."
-        create_push_for_app(app_identifier, production)
+        Helper.log.warn "Creating push certificate for app '#{@app_identifier}'."
+        create_push_for_app
       rescue => ex
         error_occured(ex)
       end
@@ -33,36 +34,36 @@ module PEM
 
 
     private
-      def open_app_page(app_identifier)
+      def open_app_page
         begin
           visit APP_IDS_URL
           sleep 5
 
           wait_for_elements(".toolbar-button.search").first.click
-          fill_in "bundle-list-search", with: app_identifier
+          fill_in "bundle-list-search", with: @app_identifier
           sleep 5
 
-          apps = all(:xpath, "//td[@title='#{app_identifier}']")
+          apps = all(:xpath, "//td[@title='#{@app_identifier}']")
           if apps.count == 1
             apps.first.click
             sleep 2
 
             return true
           else
-            raise DeveloperCenterGeneralError.new("Could not find app with identifier '#{app_identifier}' on apps page. The identifier is case sensitive.")
+            raise DeveloperCenterGeneralError.new("Could not find app with identifier '#{@app_identifier}' on apps page. The identifier is case sensitive.")
           end
         rescue => ex
           error_occured(ex)
         end
       end
 
-      def create_push_for_app(app_identifier, production)
+      def create_push_for_app
 
-        element_name = (production ? '.button.small.navLink.distribution.enabled' : '.button.small.navLink.development.enabled')
+        element_name = (PEM.config[:development] ? '.button.small.navLink.development.enabled' : '.button.small.navLink.distribution.enabled')
         begin
           wait_for_elements(element_name).first.click # Create Certificate button
         rescue
-          raise "Could not create a new push profile for app '#{app_identifier}'. There are already 2 certificates active. Please revoke one to let PEM create a new one\n\n#{current_url}".red
+          raise "Could not create a new push profile for app '#{@app_identifier}'. There are already 2 certificates active. Please revoke one to let PEM create a new one\n\n#{current_url}".red
         end
 
         sleep 2
@@ -84,7 +85,7 @@ module PEM
           sleep 2
         end
 
-        certificate_type = (production ? 'production' : 'development')
+        certificate_type = (PEM.config[:development] ? 'development' : 'production')
 
         # Download the newly created certificate
         Helper.log.info "Going to download the latest profile"
@@ -108,7 +109,7 @@ module PEM
 
         raise "Something went wrong when downloading the certificate" unless data
 
-        path = "#{TMP_FOLDER}aps_#{certificate_type}_#{app_identifier}.cer"
+        path = "#{TMP_FOLDER}aps_#{certificate_type}_#{@app_identifier}.cer"
         dataWritten = File.write(path, data)
         
         if dataWritten == 0

data/lib/pem/manager.rb

@@ -0,0 +1,24 @@
+module PEM
+  # Creates the push profile and stores it in the correct location
+  class Manager
+    def self.start
+      path, rsa_file = PEM::CertManager.new.run
+
+      if path
+        file_name = File.basename(path)
+        output = "./#{file_name}"
+        FileUtils.mv(path, output)
+        puts output.green
+      end
+      
+      if PEM.config[:save_private_key]
+        file_name = File.basename(rsa_file)
+        output = "./#{file_name}"
+        FileUtils.mv(rsa_file, output)
+        puts output.green          
+      else
+        File.delete(rsa_file)
+      end
+    end
+  end
+end

data/lib/pem/options.rb

@@ -0,0 +1,44 @@
+require 'fastlane_core'
+
+module PEM
+  class Options
+    def self.available_options
+      @@options ||= [
+        FastlaneCore::ConfigItem.new(key: :development,
+                                     env_name: "PEM_DEVELOPMENT",
+                                     description: "Renew the development push certificate instead of the production one",
+                                     is_string: false),
+        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),
+        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",
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :app_identifier,
+                                     short_option: "-a",
+                                     env_name: "PEM_APP_IDENTIFIER",
+                                     description: "The bundle identifier of your app",
+                                     default_value: CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier)),
+        FastlaneCore::ConfigItem.new(key: :username,
+                                     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),
+        FastlaneCore::ConfigItem.new(key: :team_id,
+                                     short_option: "-t",
+                                     env_name: "PEM_TEAM_ID",
+                                     description: "The ID of your team if you're in multiple teams",
+                                     optional: true,
+                                     verify_block: Proc.new do |value|
+                                        ENV["FASTLANE_TEAM_ID"] = value
+                                     end),
+      ]
+    end
+  end
+end

data/lib/pem/version.rb

@@ -1,3 +1,3 @@
 module PEM
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pem
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,8 @@ files:
 - lib/pem/cert_manager.rb
 - lib/pem/dependency_checker.rb
 - lib/pem/developer_center.rb
+- lib/pem/manager.rb
+- lib/pem/options.rb
 - lib/pem/signing_request.rb
 - lib/pem/version.rb
 homepage: https://fastlane.tools