cert 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e27598992c352ec26e99815898586e1ba85c6d1e
-  data.tar.gz: a4415ab01ec9879ee2be155717c1f75f1d02d5bc
+  metadata.gz: 6259690b66a7e4c593ec0791ea5bb3c0942454e2
+  data.tar.gz: 30cd02aade4ab49c87a0bc9d8ac2f14eb7996adc
 SHA512:
-  metadata.gz: 87ad0f5a9e10c8e150b974ec3c5442ec480a4ea26790dc6f510e193b3bdfe6f5caef09fcd648afe995f7e498870857822120ecfe03fa3e385cd1894f7ddfc5b6
-  data.tar.gz: e469f9b484544a7b49a96223cb82fb94bce02c0b17f145a5d3fdf31e6d3ac53f20ee81d8ca55a8c170b4831ba19a2ecbd7d81aa8a70990220d6ea35d4be301af
+  metadata.gz: 20cb4cdb1b72596db16faca9bce5d3fa6fe0e24ade05d5a59e6efb707bdc98ac2b1ced4fd171e79f1c58b646c2082a69f275f8669ca29815a113cedd8a05b0f5
+  data.tar.gz: 94ab37d8f4216f5591b37675eae649239b035f2f15f83a0a6f701cdf55db24631cc96c2cc0ab3dfcfda2c00bab56b9c2d45f5d9fa8f97676c8380a99a905ddc4

data/README.md

@@ -90,6 +90,9 @@ You can pass your Apple ID:
 
     cert -u cert@krausefx.com
 
+For a list of available commands run
+
+    cert --help
 
 ## Environment Variables
 In case you prefer environment variables:
@@ -97,6 +100,7 @@ In case you prefer environment variables:
 - ```CERT_USERNAME```
 - ```CERT_TEAM_ID```
 - ```CERT_KEYCHAIN_PATH``` The path to a specific Keychain if you don't want to use the default one
+- ```FASTLANE_TEAM_NAME``` (the Team Name, e.g. `Felix Krause`)
 
 ## Use with [`sigh`](https://github.com/KrauseFx/sigh)
 

data/bin/cert

@@ -6,6 +6,7 @@ require 'cert'
 require 'commander'
 require 'credentials_manager/password_manager'
 require 'credentials_manager/appfile_config'
+require 'cert/options'
 
 HighLine.track_eof = false
 
@@ -22,34 +23,18 @@ class CertApplication
 
     always_trace!
 
-    global_option '-u', '--username STRING', 'Your Apple ID username'
-    global_option '--development', 'Create a development certificate instead of a distribution one.'
+    FastlaneCore::CommanderGenerator.new.generate(Cert::Options.available_options)
 
     command :create do |c|
       c.syntax = 'cert create'
       c.description = 'Create new iOS code signing certificates'
 
       c.action do |args, options|
-        username(options)
-
-        type = Cert::DeveloperCenter::DISTRIBUTION
-        type = Cert::DeveloperCenter::DEVELOPMENT if options.development
-
-        Cert::CertRunner.run(type)
-
-        installed = Cert::CertChecker.is_installed?ENV["CER_FILE_PATH"]
-        raise "Could not find the newly generated certificate installed" unless installed
+        Cert.config = FastlaneCore::Configuration.create(Cert::Options.available_options, options.__hash__)
+        Cert::CertRunner.run
       end
     end
 
-    def username(options)
-      user = options.username
-      user ||= ENV["CERT_USERNAME"]
-      user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
-      
-      CredentialsManager::PasswordManager.shared_manager(user) if user
-    end
-
     default_command :create
 
     run!

data/lib/cert.rb

@@ -9,6 +9,11 @@ require 'cert/keychain_importer'
 require 'fastlane_core'
 
 module Cert
+  # Use this to just setup the configuration attribute and set it later somewhere else
+  class << self
+    attr_accessor :config
+  end
+  
   TMP_FOLDER = "/tmp/cert/"
   FileUtils.mkdir_p TMP_FOLDER
 

data/lib/cert/cert_runner.rb

@@ -1,7 +1,10 @@
 module Cert
   class CertRunner
-    def self.run(type)
-      Cert::DeveloperCenter.new.run(type)
+    def self.run
+      Cert::DeveloperCenter.new.run
+
+      installed = Cert::CertChecker.is_installed?ENV["CER_FILE_PATH"]
+      raise "Could not find the newly generated certificate installed" unless installed
     end
   end
 end

data/lib/cert/developer_center.rb

@@ -11,27 +11,28 @@ module Cert
 
     # This will check if there is at least one of the certificates already installed on the local machine
     # This will store the resulting file name in ENV 'CER_FILE_PATH' and the Cert ID in 'CER_CERTIFICATE_ID'
-    def run(type)
-      file = find_existing_cert(type)
+    def run
+      @type = (Cert.config[:development] ? DEVELOPMENT : DISTRIBUTION)
+      file = find_existing_cert
       if file
         # We don't need to do anything :)
         ENV["CER_FILE_PATH"] = file
       else
-        create_certificate(type)
+        create_certificate
       end
     rescue => ex
       error_occured(ex)
     end
 
-    def find_existing_cert(type)
-      if type == DEVELOPMENT
+    def find_existing_cert
+      if @type == DEVELOPMENT
         visit CERTS_URL_DEV
       else
         visit CERTS_URL
       end
 
       # Download all available certs to check if they are installed using the SHA1 hash
-      certs = code_signing_certificate(type)
+      certs = code_signing_certificate
       certs.each do |current|
         display_id = current['certificateId']
         type_id = current['certificateTypeDisplayId']
@@ -54,7 +55,7 @@ module Cert
     end
 
     # This will actually create a new certificate
-    def create_certificate(type)
+    def create_certificate
       visit CREATE_CERT_URL
       wait_for_elements("form[name='certificateSave']")
 
@@ -62,7 +63,7 @@ module Cert
 
       # select certificate type
       toggle_value = 'type-iosNoOCSP'
-      toggle_value = 'type-development' if type == DEVELOPMENT
+      toggle_value = 'type-development' if @type == DEVELOPMENT
       app_store_toggle = first("input##{toggle_value}")
       if !!app_store_toggle['disabled']
         # Limit of certificates already reached
@@ -150,8 +151,8 @@ module Cert
         # "certificateTypeDisplayId"=>"...",
         # "serialNum"=>"....",
         # "typeString"=>"iOS Distribution"},
-      def code_signing_certificate(type)
-        if type == DEVELOPMENT
+      def code_signing_certificate
+        if @type == DEVELOPMENT
           visit CERTS_URL_DEV
         else
           visit CERTS_URL
@@ -168,7 +169,7 @@ module Cert
         available = []
 
         certTypeName = 'iOS Distribution'
-        certTypeName = 'iOS Development' if type == DEVELOPMENT
+        certTypeName = 'iOS Development' if @type == DEVELOPMENT
         certs = post_ajax(url)['certRequests']
         certs.each do |current_cert|
           if current_cert['typeString'] == certTypeName

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.exists?(path)
-      keychain = ENV["CERT_KEYCHAIN_PATH"] || "#{Dir.home}/Library/Keychains/login.keychain"
+      keychain = Cert.config[:keychain_path] || "#{Dir.home}/Library/Keychains/login.keychain"
       
       puts `security import '#{path}' -k '#{keychain}'`
     end

data/lib/cert/options.rb

@@ -0,0 +1,38 @@
+require 'fastlane_core'
+
+module Cert
+  class Options
+    def self.available_options
+      @@options ||= [
+        FastlaneCore::ConfigItem.new(key: :development,
+                                     env_name: "CERT_DEVELOPMENT",
+                                     description: "Create a development certificate instead of a distribution one",
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :username,
+                                     short_option: "-u",
+                                     env_name: "CERT_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: "CERT_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),
+        FastlaneCore::ConfigItem.new(key: :keychain_path,
+                                     short_option: "-k",
+                                     env_name: "CERT_KEYCHAIN_PATH",
+                                     description: "Path to a custom keychain",
+                                     optional: true,
+                                     verify_block: Proc.new do |value|
+                                        raise "Keychain not found at path '#{value}'".red unless File.exists?value
+                                     end)
+      ]
+    end
+  end
+end

data/lib/cert/version.rb

@@ -1,3 +1,3 @@
 module Cert
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cert
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 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
@@ -139,6 +139,7 @@ files:
 - lib/cert/dependency_checker.rb
 - lib/cert/developer_center.rb
 - lib/cert/keychain_importer.rb
+- lib/cert/options.rb
 - lib/cert/signing_request.rb
 - lib/cert/version.rb
 homepage: https://fastlane.tools