sigh 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5999ae3911bed107f327d8beef03e61407c6493
-  data.tar.gz: 04564599bd5c894b8e63fbcda115b7fc3473c068
+  metadata.gz: 1f42e282f190c126b2e2698b8294f64ead5b52ba
+  data.tar.gz: 77fc2e97b0a314183bd0cfdc7ba537f866dfbe01
 SHA512:
-  metadata.gz: 54981675f063943ed973b25392e5a8717094573e19e70753af97b736e36c223134e72fb7b3787cbc65d67fa478eb9a9af75df4840f1727f978091ba9e1faa5f6
-  data.tar.gz: afaffef16c71115c3fd0a3202807c76e7a245522d90505981c3041b077cd157fb2dbe2e77fdcee6ff1cf4813838d249a88c01756019a7fb553e1ea54d72ae064
+  metadata.gz: b2b4dff8c89d996764cb0a28f105c6a4f48c91a2b78b1307463b21842a4b0b7bb895ed1a9a660573733118d3cfe28e767cfb3d21e8d4e54cd744587a0a2c4322
+  data.tar.gz: e6fcf9e4b4a32d8e0905ad46a844c150c3387e8b6449d8491ab8314d4d53bce796adb07a40345468f57fbe62ddab052aaafff889ac9ae64050914d8b24d55c4b

data/README.md

@@ -11,7 +11,8 @@
   <a href="https://github.com/KrauseFx/frameit">frameit</a> &bull; 
   <a href="https://github.com/KrauseFx/PEM">PEM</a> &bull; 
   <b>sigh</b> &bull; 
-  <a href="https://github.com/KrauseFx/produce">produce</a>
+  <a href="https://github.com/KrauseFx/produce">produce</a> &bull;
+  <a href="https://github.com/KrauseFx/cert">cert</a> 
 </p>
 -------
 
@@ -116,9 +117,9 @@ To save the provisioning profile under a specific name, use the -f option:
 
     sigh -a com.krausefx.app -u username -f "myProfile.mobileprovision"
 
-If you need the provisioning profile to be renewed regardless of its state use the `--force` option. This gives you a profile with the maximum lifetime:
+If you need the provisioning profile to be renewed regardless of its state use the `--force` option. This gives you a profile with the maximum lifetime. `--force` will also add all available devices to this profile.
 
-    sigh --force -a com.krausefx.app -u username
+    sigh --force
 
 By default, ```sigh``` will include all certificates on development profiles, and first certificate on other types. If you need to specify which certificate to use you can either use the environment variable `SIGH_CERTIFICATE`, or pass the name or expiry date of the certificate as argument:
 
@@ -144,12 +145,19 @@ You can pass more information using the command line:
 ## Environment Variables
 In case you prefer environment variables:
 
-- ```SIGH_USERNAME```
-- ```SIGH_APP_IDENTIFIER```
-- ```SIGH_CERTIFICATE``` (The name of the certificate to use)
-- ```SIGH_TEAM_ID``` (The Team ID, e.g. `Q2CBPK58CA`)
+- `SIGH_USERNAME`
+- `SIGH_APP_IDENTIFIER`
+- `SIGH_TEAM_ID` (The Team ID, e.g. `Q2CBPK58CA`)
 - `SIGH_DISABLE_OPEN_ERROR` - in case of error, `sigh` won't open Preview with a screenshot of the error when this variable is set.
 
+Choose signing certificate to use:
+
+- `SIGH_CERTIFICATE` (The name of the certificate to use)
+- `SIGH_CERTIFICATE_ID` (The ID of the certificate)
+- `SIGH_CERTIFICATE_EXPIRE_DATE` (The expire date of the certificate)
+
+If you're using [cert](https://github.com/KrauseFx/cert) in combination with [fastlane](https://github.com/KrauseFx/fastlane) the signing certificate will automatically be selected for you.
+
 # How does it work?
 
 ```sigh``` will access the ```iOS Dev Center``` to download, renew or generate the ```.mobileprovision``` file. Check out the full source code: [developer_center.rb](https://github.com/KrauseFx/sigh/blob/master/lib/sigh/developer_center.rb).
@@ -167,6 +175,7 @@ In case you prefer environment variables:
 - [`frameit`](https://github.com/KrauseFx/frameit): Quickly put your screenshots into the right device frames
 - [`PEM`](https://github.com/KrauseFx/pem): Automatically generate and renew your push notification profiles
 - [`produce`](https://github.com/KrauseFx/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
+- [`cert`](https://github.com/KrauseFx/cert): Automatically create and maintain iOS code signing certificates
 
 ## Use the 'Provisioning Quicklook plugin'
 Download and install the [Provisioning Plugin](https://github.com/chockenberry/Provisioning).

data/bin/sigh

@@ -48,8 +48,9 @@ class SighApplication
         type = FastlaneCore::DeveloperCenter::DEVELOPMENT if options.development
 
         ENV['SIGH_CERTIFICATE'] = options.cert_owner if options.cert_owner
+        ENV['SIGH_CERTIFICATE_EXPIRE_DATE'] = options.cert_date if options.cert_date
 
-        path = FastlaneCore::DeveloperCenter.new.run(app, type, options.cert_name, options.force, options.cert_date)
+        path = FastlaneCore::DeveloperCenter.new.run(app, type, options.cert_name, options.force)
 
         if path
           file_name = options.filename || File.basename(path)

data/lib/sigh/developer_center.rb

@@ -1,4 +1,5 @@
 require 'fastlane_core/developer_center/developer_center'
+require 'sigh/developer_center_signing'
 
 module FastlaneCore
   class DeveloperCenter
@@ -10,8 +11,8 @@ module FastlaneCore
     PROFILES_URL_DEV = "https://developer.apple.com/account/ios/profile/profileList.action?type=limited"
 
     
-    def run(app_identifier, type, cert_name = nil, force = false, cert_date = nil)
-      cert = maintain_app_certificate(app_identifier, type, force, cert_date)
+    def run(app_identifier, type, cert_name = nil, force = false)
+      cert = maintain_app_certificate(app_identifier, type, force)
       
       type_name = type
       type_name = "Distribution" if type == APPSTORE # both enterprise and App Store
@@ -24,7 +25,7 @@ module FastlaneCore
       return output_path
     end
 
-    def maintain_app_certificate(app_identifier, type, force, cert_date)
+    def maintain_app_certificate(app_identifier, type, force)
       begin
         if type == DEVELOPMENT 
           visit PROFILES_URL_DEV
@@ -55,13 +56,13 @@ module FastlaneCore
             # We found the correct certificate
             if force && type != DEVELOPMENT
               provisioningProfileId = current_cert['provisioningProfileId']
-              renew_profile(provisioningProfileId, type, cert_date) # This one needs to be forcefully renewed
-              return maintain_app_certificate(app_identifier, type, false, cert_date) # recursive
+              renew_profile(provisioningProfileId, type) # This one needs to be forcefully renewed
+              return maintain_app_certificate(app_identifier, type, false) # recursive
             elsif current_cert['status'] == 'Active'
               return download_profile(details['provisioningProfile']['provisioningProfileId']) # this one is already finished. Just download it.
             elsif ['Expired', 'Invalid'].include? current_cert['status']
-              renew_profile(current_cert['provisioningProfileId'], type, cert_date) # This one needs to be renewed
-              return maintain_app_certificate(app_identifier, type, false, cert_date) # recursive
+              renew_profile(current_cert['provisioningProfileId'], type) # This one needs to be renewed
+              return maintain_app_certificate(app_identifier, type, false) # recursive
             end
 
             break
@@ -70,18 +71,18 @@ module FastlaneCore
 
         Helper.log.info "Could not find existing profile. Trying to create a new one."
         # Certificate does not exist yet, we need to create a new one
-        create_profile(app_identifier, type, cert_date)
+        create_profile(app_identifier, type)
         # After creating the profile, we need to download it
-        return maintain_app_certificate(app_identifier, type, false, cert_date) # recursive
+        return maintain_app_certificate(app_identifier, type, false) # recursive
 
       rescue => ex
         error_occured(ex)
       end
     end
 
-    def create_profile(app_identifier, type, cert_date)
+    def create_profile(app_identifier, type)
       Helper.log.info "Creating new profile for app '#{app_identifier}' for type '#{type}'.".yellow
-      certificates = code_signing_certificates(type, cert_date)
+      certificates = code_signing_certificates(type)
 
       create_url = "https://developer.apple.com/account/ios/profile/profileCreate.action"
       visit create_url
@@ -164,8 +165,8 @@ module FastlaneCore
       wait_for_elements('.row-details')
     end
 
-    def renew_profile(profile_id, type, cert_date)
-      certificate = code_signing_certificates(type, cert_date).first
+    def renew_profile(profile_id, type)
+      certificate = code_signing_certificates(type).first
 
       details_url = "https://developer.apple.com/account/ios/profile/profileEdit.action?type=&provisioningProfileId=#{profile_id}"
       Helper.log.info "Renewing provisioning profile '#{profile_id}' using URL '#{details_url}'"
@@ -177,6 +178,14 @@ module FastlaneCore
       certs = all(:xpath, "//input[@type='radio' and @value='#{certificate["certificateId"]}']")
       if certs.count == 1
         certs.first.click
+
+        if type != APPSTORE
+          # Add all devices
+          wait_for_elements('.selectAll.column')
+          sleep 3
+          first(:xpath, "//div[@class='selectAll column']/input").click # select all the devices
+        end
+
         click_next
 
         wait_for_elements('.row-details')

data/lib/sigh/developer_center_signing.rb

@@ -0,0 +1,88 @@
+module FastlaneCore
+  class DeveloperCenter
+    # Returns a array of hashes, that contains information about the iOS certificate
+    # @example
+      # [{"certRequestId"=>"B23Q2P396B",
+      # "name"=>"SunApps GmbH",
+      # "statusString"=>"Issued",
+      # "expirationDate"=>"2015-11-25T22:45:50Z",
+      # "expirationDateString"=>"Nov 25, 2015",
+      # "ownerType"=>"team",
+      # "ownerName"=>"SunApps GmbH",
+      # "ownerId"=>"....",
+      # "canDownload"=>true,
+      # "canRevoke"=>true,
+      # "certificateId"=>"....",
+      # "certificateStatusCode"=>0,
+      # "certRequestStatusCode"=>4,
+      # "certificateTypeDisplayId"=>"...",
+      # "serialNum"=>"....",
+      # "typeString"=>"iOS Distribution"},
+      # {another sertificate...}]
+    def code_signing_certificates(type)
+      certs_url = "https://developer.apple.com/account/ios/certificate/certificateList.action?type="
+      certs_url << (type == DEVELOPMENT ? 'development' : 'distribution')
+      visit certs_url
+
+      certificateDataURL = wait_for_variable('certificateDataURL')
+      certificateRequestTypes = wait_for_variable('certificateRequestTypes')
+      certificateStatuses = wait_for_variable('certificateStatuses')
+
+      url = [certificateDataURL, certificateRequestTypes, certificateStatuses].join('')
+
+      # https://developer.apple.com/services-account/.../account/ios/certificate/listCertRequests.action?content-type=application/x-www-form-urlencoded&accept=application/json&requestId=...&userLocale=en_US&teamId=...&types=...&status=4&certificateStatus=0&type=distribution
+
+      certs = post_ajax(url)['certRequests']
+
+      ret_certs = []
+
+      # Select certificate
+      certificate_name = ENV['SIGH_CERTIFICATE']
+      cert_date = ENV['SIGH_CERTIFICATE_EXPIRE_DATE']
+      cert_id = ENV['SIGH_CERTIFICATE_ID']
+
+      # The other profiles are push profiles
+      certificate_type = type == DEVELOPMENT ? 'iOS Development' : 'iOS Distribution'
+      
+      # New profiles first
+      certs.sort! do |a, b|
+        Time.parse(b['expirationDate']) <=> Time.parse(a['expirationDate'])
+      end
+
+      certs.each do |current_cert|
+        next unless current_cert['typeString'] == certificate_type
+
+        if cert_date || certificate_name || cert_id
+          if current_cert['expirationDateString'] == cert_date
+            Helper.log.info "Certificate ID '#{current_cert['certificateId']}' with expiry date '#{current_cert['expirationDateString']}' located".green
+            ret_certs << current_cert
+          end
+
+          if current_cert['name'] == certificate_name
+            Helper.log.info "Certificate ID '#{current_cert['certificateId']}' with name '#{certificate_name}' located".green
+            ret_certs << current_cert
+          end
+
+          if current_cert['certificateId'] == cert_id
+            Helper.log.info "Certificate ID '#{current_cert['certificateId']}' with name '#{current_cert['name']}' located".green
+            ret_certs << current_cert
+          end
+        else
+          ret_certs << current_cert
+        end
+      end
+
+      return ret_certs unless ret_certs.empty?
+
+      predicates = []
+      predicates << "name: #{certificate_name}" if certificate_name
+      predicates << "expiry date: #{cert_date}" if cert_date
+      predicates << "certificate ID: #{cert_id}" if cert_id
+      predicates << "type: #{(type == DEVELOPMENT ? 'development' : 'distribution')}"
+
+      predicates_str = " with #{predicates.join(', ')}"
+
+      raise "Could not find a Certificate#{predicates_str}. Please open #{current_url} and make sure you have a signing profile created, which mathces the given filters".red
+    end
+  end
+end

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -138,6 +138,7 @@ files:
 - lib/sigh.rb
 - lib/sigh/dependency_checker.rb
 - lib/sigh/developer_center.rb
+- lib/sigh/developer_center_signing.rb
 - lib/sigh/resign.rb
 - lib/sigh/version.rb
 homepage: http://fastlane.tools