sigh 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842fa29839a7bef24356403b43a1e71a4e86dca7
-  data.tar.gz: a8c3136908d566be66ed6475caf9930ca040df7d
+  metadata.gz: 1bc2f125ac62833b6f980877187fea9b642eaca2
+  data.tar.gz: bc2ce6d75032cbe08b966552370e085294f9c05f
 SHA512:
-  metadata.gz: 65bc97c43df673d449516cc962085a189bd62a26fa2aa367bf5e29121554ea0f30d5095215bb984db5a7cf7f31f192c9ff87f372942547087272aca4ccc0a320
-  data.tar.gz: fa01ff066816aa5686621374a5aab8ac4e4fb094fef5cd64f2f867f6969851a01da4e0c268acc06605e31b17ebbbf256fb41d9539daa8e41df85540411f5b3a6
+  metadata.gz: 5a2a88ce769189dbe80a2c72e69b87a24b9a6a37bae640473bc85dc242ba10bc1798335773b3ec453e9f938e8d84bc87396ba3c070563f764a54b136d5465d8b
+  data.tar.gz: 78d6a4bd5c00787c8c382fe8e0b857a27107873400f69ace914b35652cef0d25ef4020ea5722698f1004a0b455683f6294bb86037a10a365d2c5dd47618478ce

data/README.md

@@ -10,7 +10,8 @@
   <a href="https://github.com/KrauseFx/snapshot">snapshot</a> &bull; 
   <a href="https://github.com/KrauseFx/frameit">frameit</a> &bull; 
   <a href="https://github.com/KrauseFx/PEM">PEM</a> &bull; 
-  <b>sigh</b>
+  <b>sigh</b> &bull; 
+  <a href="https://github.com/KrauseFx/produce">produce</a>
 </p>
 -------
 
@@ -81,10 +82,6 @@ Make sure, you have the latest version of the Xcode command line tools installed
 
     xcode-select --install
 
-Install phantomjs (this is needed to control the Apple Developer Portal)
-
-    brew update && brew install phantomjs
-
 If you don't already have homebrew installed, [install it here](http://brew.sh/).
 
 # Usage
@@ -109,10 +106,24 @@ If you want to generate a **Development** profile:
 To generate the profile in a specific directory: 
 
     sigh -o "~/Certificates/"
+    
+### Advanced
 
 By default, ```sigh``` will install the downloaded profile on your machine. If you just want to generate the profile and skip the installation, use the following flag:
 
     sigh --skip_install
+    
+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:
+
+    sigh --force -a com.krausefx.app -u username
+
+To renew a valid profile with a different certificate, look up the expiry date of the certificate you want to sign with in the Apple Developer Portal under Production Certificates. Copy the date string from there and use the following:
+
+    sigh --force -a com.krausefx.app -u username -d "Nov 11, 2017"
 
 
 ## Environment Variables
@@ -139,6 +150,7 @@ In case you prefer environment variables:
 - [`snapshot`](https://github.com/KrauseFx/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`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
 
 ## Use the 'Provisioning Quicklook plugin'
 Download and install the [Provisioning Plugin](https://github.com/chockenberry/Provisioning).

data/bin/sigh

@@ -7,6 +7,8 @@ require 'commander'
 require 'credentials_manager/password_manager'
 require 'credentials_manager/appfile_config'
 
+require 'phantomjs/poltergeist'
+
 HighLine.track_eof = false
 
 class SighApplication
@@ -25,11 +27,14 @@ class SighApplication
     global_option '--adhoc', 'By default, sigh will create and renew App Store profiles. Setting this flag will generate Adhoc profiles instead.'
     global_option '--skip_install', 'By default, the certificate will be added on your local machine. Setting this flag will skip this action.'
     global_option '--development', 'Renew the development certificate instead of the production one.'
+    global_option '--force', 'Renew non-development provisioning profiles regardless of state.'
 
     global_option '-a', '--identifier STRING', String, 'The bundle identifier of your app.'
     global_option '-u', '--username STRING', String, 'Your Apple ID username.'
     global_option '-n', '--cert_name STRING', String, 'The name of the generated certificate file.'
     global_option '-o', '--output STRING', String, 'The folder in which the file should be generated.'
+    global_option '-d', '--cert_date STRING', String, 'The certificate with the given expiry date used to renew. (e.g. "Nov 11, 2017")'
+    global_option '-f', '--filename STRING', String, 'Filename to use for the provisioning profile'
 
     command :renew do |c|
       c.syntax = 'sigh renew'
@@ -43,10 +48,15 @@ class SighApplication
         type = Sigh::DeveloperCenter::ADHOC if options.adhoc 
         type = Sigh::DeveloperCenter::DEVELOPMENT if options.development
         
-        path = Sigh::DeveloperCenter.new.run(app, type, options.cert_name)
+        path = Sigh::DeveloperCenter.new.run(app, type, options.cert_name, options.force, options.cert_date)
 
         if path
-          file_name = File.basename(path)
+          file_name = options.filename || File.basename(path)
+          if options.filename == nil
+            file_name = File.basename(path)
+          else
+            file_name = options.filename
+          end
           output_path = options.output || '.'
           output = File.join(output_path.gsub("~", ENV["HOME"]), file_name)
           FileUtils.mv(path, output)

data/lib/sigh/dependency_checker.rb

@@ -1,22 +1,8 @@
 module Sigh
   class DependencyChecker
     def self.check_dependencies
-      self.check_phantom_js
       self.check_xcode_select unless Helper.is_test?
     end
-    
-    def self.check_phantom_js
-      if `which phantomjs`.length == 0
-        # Missing brew dependency
-        Helper.log.fatal '#############################################################'
-        Helper.log.fatal "# You have to install phantomjs to use sigh"
-        Helper.log.fatal "# phantomjs is used to control the iTunesConnect frontend"
-        Helper.log.fatal "# Install Homebrew using http://brew.sh/" if `which brew`.length == 0
-        Helper.log.fatal "# Run 'brew update && brew install phantomjs' and start sigh again"
-        Helper.log.fatal '#############################################################'
-        raise "Run 'brew update && brew install phantomjs' and start sigh again"
-      end
-    end
 
     def self.check_xcode_select
       unless `xcode-select -v`.include?"xcode-select version "

data/lib/sigh/developer_center.rb

@@ -42,6 +42,7 @@ module Sigh
       Capybara.register_driver :poltergeist do |a|
         conf = ['--debug=no', '--ignore-ssl-errors=yes', '--ssl-protocol=TLSv1']
         Capybara::Poltergeist::Driver.new(a, {
+          phantomjs: Phantomjs.path,
           phantomjs_options: conf,
           phantomjs_logger: File.open("#{TMP_FOLDER}/poltergeist_log.txt", "a"),
           js_errors: false
@@ -167,8 +168,8 @@ module Sigh
       raise "Could not open Developer Center" unless result['status'] == 'success'
     end
 
-    def run(app_identifier, type, cert_name = nil)
-      cert = maintain_app_certificate(app_identifier, type)
+    def run(app_identifier, type, cert_name = nil, force, cert_date)
+      cert = maintain_app_certificate(app_identifier, type, force, cert_date)
 
       type_name = type
       type_name = "Distribution" if type == APPSTORE # both enterprise and App Store
@@ -181,7 +182,7 @@ module Sigh
       return output_path
     end
 
-    def maintain_app_certificate(app_identifier, type)
+    def maintain_app_certificate(app_identifier, type, force, cert_date)
       begin
         if type == DEVELOPMENT 
           visit PROFILES_URL_DEV
@@ -220,11 +221,15 @@ module Sigh
             end
 
             # We found the correct certificate
-            if current_cert['status'] == 'Active'
+            if force and 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
+            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) # This one needs to be renewed
-              return maintain_app_certificate(app_identifier, type) # recursive
+              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
             end
 
             break
@@ -233,18 +238,18 @@ module Sigh
 
         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)
+        create_profile(app_identifier, type, cert_date)
         # After creating the profile, we need to download it
-        return maintain_app_certificate(app_identifier, type) # recursive
+        return maintain_app_certificate(app_identifier, type, false, cert_date) # recursive
 
       rescue => ex
         error_occured(ex)
       end
     end
 
-    def create_profile(app_identifier, type)
+    def create_profile(app_identifier, type, cert_date)
       Helper.log.info "Creating new profile for app '#{app_identifier}' for type '#{type}'.".yellow
-      certificate = code_signing_certificate(type)
+      certificate = code_signing_certificate(type, cert_date)
 
       create_url = "https://developer.apple.com/account/ios/profile/profileCreate.action"
       visit create_url
@@ -314,8 +319,8 @@ module Sigh
       wait_for_elements('.row-details')
     end
 
-    def renew_profile(profile_id, type)
-      certificate = code_signing_certificate type
+    def renew_profile(profile_id, type, cert_date)
+      certificate = code_signing_certificate(type, cert_date)
 
       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}'"
@@ -379,7 +384,7 @@ module Sigh
         # "certificateTypeDisplayId"=>"...",
         # "serialNum"=>"....",
         # "typeString"=>"iOS Distribution"},
-      def code_signing_certificate(type)
+      def code_signing_certificate(type, cert_date)
         certs_url = "https://developer.apple.com/account/ios/certificate/certificateList.action?type="
         certs_url << "distribution" if type != DEVELOPMENT
         certs_url << "development" if type == DEVELOPMENT
@@ -398,13 +403,23 @@ module Sigh
           if type != DEVELOPMENT and current_cert['typeString'] == 'iOS Distribution' 
             # The other profiles are push profiles
             # We only care about the distribution profile
-            return current_cert # mostly we only care about the 'certificateId'
-          elsif type == DEVELOPMENT and current_cert['typeString'] == 'iOS Development' 
+            unless cert_date
+              return current_cert # mostly we only care about the 'certificateId'
+            else
+              if current_cert['expirationDateString'] == cert_date
+                Helper.log.info "Certificate ID '#{current_cert['certificateId']}' with expiry date '#{current_cert['expirationDateString']}' located"
+                return current_cert
+              end
+            end
+          elsif type == DEVELOPMENT and current_cert['typeString'] == 'iOS Development'
             return current_cert # mostly we only care about the 'certificateId'
           end
         end
 
-        raise "Could not find a Certificate. Please open #{current_url} and make sure you have a signing profile created.".red
+        error_message_no_cert_with_date = "Could not find a Certificate with expiry date '#{cert_date}'. Please open #{current_url} and make sure you have a signing profile created.".red
+        error_message_no_cert = "Could not find a Certificate. Please open #{current_url} and make sure you have a signing profile created.".red
+
+        raise cert_date ? error_message_no_cert_with_date : error_message_no_cert
       end
 
       # Download a file from the dev center, by using a HTTP client. This will return the content of the file

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: phantomjs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.8
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -228,8 +242,7 @@ homepage: http://fastlane.tools
 licenses:
 - MIT
 metadata: {}
-post_install_message: sigh requires phantomjs. Install it using 'brew update && brew
-  install phantomjs'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib