sigh 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d5af70020fddc9626153f04cbee13842dfd87ee
-  data.tar.gz: e06070ef70768fff055194025f35045c3a5f67e3
+  metadata.gz: c8c93a0e5c801a079a07a5a326116afaa05ea2bc
+  data.tar.gz: 4cfe60d72c538349e7de40cd240250256f662ab3
 SHA512:
-  metadata.gz: 7fbe6f5cf2b574e19ced821a6dced4a7d7df48024e3ec244d9c44e57dd1c939b6a29768b46f319fc9b9ef802d0da10e326d9248f3d5855ef270d8f99fda8c422
-  data.tar.gz: 7618fdc40f2b722f4a2ad1364059ab9f9d8456e5c5c3856d9a6b2b9d66b13eedae3d75b9bdc7a253bd3794263c298a9e996fd0a2a3e95bcda239451a115a22a0
+  metadata.gz: 4ba497d825600cb7d09e66035f9174a609982e361eb233eb91b9bc2064b9e72b78510f62bcc90f8c1ce72c4b21518ca00b15d4935d6bd3da31b6aa6830ef0af8
+  data.tar.gz: e5dafb86dadf2f85a1eb5ed47b0b82cc50e4985986b79655392c2a428e3fe79baa99b1db91cb95ae4ad51b3297b862597a370d7d8d7b99a38f7d1f21d2687c12

data/README.md

@@ -184,7 +184,7 @@ If you generated your `ipa` file but want to apply a different code signing onto
 
 You can pass more information using the command line:
 
-    sigh resign ./path/app.ipa --signing_identity "iPhone Distribution: Felix Krause" -n "my.mobileprovision"
+    sigh resign ./path/app.ipa --signing_identity "iPhone Distribution: Felix Krause" -p "my.mobileprovision"
 
 # Manage
 

data/bin/sigh

@@ -1,120 +1,6 @@
 #!/usr/bin/env ruby
-
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'sigh'
-require 'commander'
-require 'credentials_manager/appfile_config'
-require 'sigh/options'
-require 'sigh/manager'
-require 'sigh/local_manage'
-
-HighLine.track_eof = false
-
-class SighApplication
-  include Commander::Methods
-
-  def run
-    program :version, Sigh::VERSION
-    program :description, 'CLI for \'sigh\' - Because you would rather spend your time building stuff than fighting provisioning'
-    program :help, 'Author', 'Felix Krause <sigh@krausefx.com>'
-    program :help, 'Website', 'https://fastlane.tools'
-    program :help, 'GitHub', 'https://github.com/fastlane/sigh'
-    program :help_formatter, :compact
-
-    global_option('--verbose') { $verbose = true }
-
-    FastlaneCore::CommanderGenerator.new.generate(Sigh::Options.available_options)
-
-    command :renew do |c|
-      c.syntax = 'sigh renew'
-      c.description = 'Renews the certificate (in case it expired) and outputs the path to the generated file'
-
-      c.action do |args, options|
-        Sigh.config = FastlaneCore::Configuration.create(Sigh::Options.available_options, options.__hash__)
-        Sigh::Manager.start
-      end
-    end
-
-    command :download_all do |c|
-      c.syntax = 'sigh download_all'
-      c.description = 'Downloads all valid provisioning profiles'
-
-      c.action do |args, options|
-        Sigh.config = FastlaneCore::Configuration.create(Sigh::Options.available_options, options.__hash__)
-        Sigh::Manager.download_all
-      end
-    end
-
-    command :repair do |c|
-      c.syntax = 'sigh repair'
-      c.description = 'Repairs all expired or invalid provisioning profiles'
-
-      c.action do |args, options|
-        Sigh.config = FastlaneCore::Configuration.create(Sigh::Options.available_options, options.__hash__)
-        require 'sigh/repair'
-        Sigh::Repair.new.repair_all
-      end
-    end
-
-    command :resign do |c|
-      c.syntax = 'sigh resign'
-      c.description = 'Resigns an existing ipa file with the given provisioning profile'
-      c.option '-i', '--signing_identity STRING', String, 'The signing identity to use. Must match the one defined in the provisioning profile.'
-      c.option '-x', '--version_number STRING', String, 'Version number to force binary and all nested binaries to use. Changes both CFBundleShortVersionString and CFBundleIdentifier.'
-      c.option '-p', '--provisioning_profile PATH', String, '(or BUNDLE_ID=PATH) The path to the provisioning profile which should be used. '\
-               'Can be provided multiple times if the application contains nested applications and app extensions, which need their own provisioning profile. '\
-               'The path may be prefixed with a identifier in order to determine which provisioning profile should be used on which app.',
-               &multiple_values_option_proc(c, "provisioning_profile", &proc { |value| value.split('=', 2) })
-      c.option '-d', '--display_name STRING', String, 'Display name to use'
-      c.option '-e', '--entitlements PATH', String, 'The path to the entitlements file to use.'
-      c.option '--short-version STRING', String, 'Short version string to force binary to use (CFBundleShortVersionString). '\
-               '\nCannot be used together with -x|--version_number option.'
-      c.option '--bundle-version STRING', String, 'Bundle version to force binary and all nested binaries to use (CFBundleIdentifier). '\
-               'Cannot be used together with -x|--version_number option.'
-      c.option '-g', '--new_bundle_id STRING', String, 'New application bundle ID'
-
-      c.action do |args, options|
-        Sigh::Resign.new.run(options, args)
-      end
-    end
-
-    command :manage do |c|
-      c.syntax = 'sigh manage'
-      c.description = 'Manage installed provisioning profiles on your system.'
-
-      c.option '-f', '--force', 'Force remove all expired provisioning profiles. Required on CI.'
-      c.option '-e', '--clean_expired', 'Remove all expired provisioning profiles.'
-
-      c.option '-p', '--clean_pattern STRING', String, 'Remove any provisioning profiles that matches the regular expression.'
-      c.example 'Remove all "iOS Team Provisioning" provisioning profiles', 'sigh manage -p "iOS\ ?Team Provisioning Profile"'
-
-      c.action do |args, options|
-        Sigh::LocalManage.start(options, args)
-      end
-    end
-
-    default_command :renew
-
-    run!
-  end
-
-  def multiple_values_option_proc(command, name)
-    proc do |value|
-      value = yield(value) if block_given?
-      option = command.proxy_options.find { |opt| opt[0] == name } || []
-      values = option[1] || []
-      values << value
-
-      command.proxy_options.delete option
-      command.proxy_options << [name, values]
-    end
-  end
-end
-
-begin
-  FastlaneCore::UpdateChecker.start_looking_for_update('sigh')
-  SighApplication.new.run
-ensure
-  FastlaneCore::UpdateChecker.show_update_status('sigh', Sigh::VERSION)
-end
+require 'sigh/commands_generator'
+Sigh::CommandsGenerator.start

data/lib/sigh.rb

@@ -1,9 +1,9 @@
+require 'fastlane_core'
 require 'sigh/version'
 require 'sigh/resign'
 require 'sigh/manager'
 require 'sigh/options'
-
-require 'fastlane_core'
+require 'sigh/local_manage'
 
 module Sigh
   # Use this to just setup the configuration attribute and set it later somewhere else

data/lib/sigh/commands_generator.rb

@@ -0,0 +1,113 @@
+require 'commander'
+
+HighLine.track_eof = false
+
+module Sigh
+  class CommandsGenerator
+    include Commander::Methods
+
+    def self.start
+      FastlaneCore::UpdateChecker.start_looking_for_update('sigh')
+      self.new.run
+    ensure
+      FastlaneCore::UpdateChecker.show_update_status('sigh', Sigh::VERSION)
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    def run
+      program :version, Sigh::VERSION
+      program :description, 'CLI for \'sigh\' - Because you would rather spend your time building stuff than fighting provisioning'
+      program :help, 'Author', 'Felix Krause <sigh@krausefx.com>'
+      program :help, 'Website', 'https://fastlane.tools'
+      program :help, 'GitHub', 'https://github.com/fastlane/sigh'
+      program :help_formatter, :compact
+
+      global_option('--verbose') { $verbose = true }
+
+      FastlaneCore::CommanderGenerator.new.generate(Sigh::Options.available_options)
+
+      command :renew do |c|
+        c.syntax = 'sigh renew'
+        c.description = 'Renews the certificate (in case it expired) and outputs the path to the generated file'
+
+        c.action do |args, options|
+          Sigh.config = FastlaneCore::Configuration.create(Sigh::Options.available_options, options.__hash__)
+          Sigh::Manager.start
+        end
+      end
+
+      command :download_all do |c|
+        c.syntax = 'sigh download_all'
+        c.description = 'Downloads all valid provisioning profiles'
+
+        c.action do |args, options|
+          Sigh.config = FastlaneCore::Configuration.create(Sigh::Options.available_options, options.__hash__)
+          Sigh::Manager.download_all
+        end
+      end
+
+      command :repair do |c|
+        c.syntax = 'sigh repair'
+        c.description = 'Repairs all expired or invalid provisioning profiles'
+
+        c.action do |args, options|
+          Sigh.config = FastlaneCore::Configuration.create(Sigh::Options.available_options, options.__hash__)
+          require 'sigh/repair'
+          Sigh::Repair.new.repair_all
+        end
+      end
+
+      command :resign do |c|
+        c.syntax = 'sigh resign'
+        c.description = 'Resigns an existing ipa file with the given provisioning profile'
+        c.option '-i', '--signing_identity STRING', String, 'The signing identity to use. Must match the one defined in the provisioning profile.'
+        c.option '-x', '--version_number STRING', String, 'Version number to force binary and all nested binaries to use. Changes both CFBundleShortVersionString and CFBundleIdentifier.'
+        c.option '-p', '--provisioning_profile PATH', String, '(or BUNDLE_ID=PATH) The path to the provisioning profile which should be used. '\
+                 'Can be provided multiple times if the application contains nested applications and app extensions, which need their own provisioning profile. '\
+                 'The path may be prefixed with a identifier in order to determine which provisioning profile should be used on which app.',
+                 &multiple_values_option_proc(c, "provisioning_profile", &proc { |value| value.split('=', 2) })
+        c.option '-d', '--display_name STRING', String, 'Display name to use'
+        c.option '-e', '--entitlements PATH', String, 'The path to the entitlements file to use.'
+        c.option '--short_version STRING', String, 'Short version string to force binary and all nested binaries to use (CFBundleShortVersionString).'
+        c.option '--bundle_version STRING', String, 'Bundle version to force binary and all nested binaries to use (CFBundleIdentifier).'
+        c.option '-g', '--new_bundle_id STRING', String, 'New application bundle ID'
+
+        c.action do |args, options|
+          Sigh::Resign.new.run(options, args)
+        end
+      end
+
+      command :manage do |c|
+        c.syntax = 'sigh manage'
+        c.description = 'Manage installed provisioning profiles on your system.'
+
+        c.option '-f', '--force', 'Force remove all expired provisioning profiles. Required on CI.'
+        c.option '-e', '--clean_expired', 'Remove all expired provisioning profiles.'
+
+        c.option '-p', '--clean_pattern STRING', String, 'Remove any provisioning profiles that matches the regular expression.'
+        c.example 'Remove all "iOS Team Provisioning" provisioning profiles', 'sigh manage -p "iOS\ ?Team Provisioning Profile"'
+
+        c.action do |args, options|
+          Sigh::LocalManage.start(options, args)
+        end
+      end
+
+      default_command :renew
+
+      run!
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def multiple_values_option_proc(command, name)
+      proc do |value|
+        value = yield(value) if block_given?
+        option = command.proxy_options.find { |opt| opt[0] == name } || []
+        values = option[1] || []
+        values << value
+
+        command.proxy_options.delete option
+        command.proxy_options << [name, values]
+      end
+    end
+  end
+end

data/lib/sigh/local_manage.rb

@@ -41,6 +41,7 @@ module Sigh
       return command, clean_expired, clean_pattern, force
     end
 
+    # rubocop:disable Metrics/AbcSize
     def self.list_profiles
       profiles = load_profiles
 
@@ -83,6 +84,7 @@ module Sigh
 
       UI.message "You can remove all expired profiles using `sigh manage -e`" if profiles_expired.count > 0
     end
+    # rubocop:enable Metrics/AbcSize
 
     def self.profile_info(profile)
       if $verbose

data/lib/sigh/resign.rb

@@ -8,7 +8,9 @@ module Sigh
 
       ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id = get_inputs(options, args)
       # ... then invoke our programmatic interface with these vars
-      resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id)
+      unless resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id)
+        UI.user_error!("Failed to re-sign .ipa")
+      end
     end
 
     def self.resign(ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id)
@@ -92,7 +94,7 @@ module Sigh
     end
 
     def find_signing_identity(signing_identity)
-      until installed_identies.include?(signing_identity)
+      until (signing_identity = sha1_for_signing_identity(signing_identity))
         UI.error "Couldn't find signing identity '#{signing_identity}'."
         signing_identity = ask_for_signing_identity
       end
@@ -100,6 +102,12 @@ module Sigh
       signing_identity
     end
 
+    def sha1_for_signing_identity(signing_identity)
+      identities = installed_identities
+      return signing_identity if identities.keys.include?(signing_identity)
+      identities.key(signing_identity)
+    end
+
     def validate_params(resign_path, ipa, provisioning_profiles)
       validate_resign_path(resign_path)
       validate_ipa_file(ipa)
@@ -121,7 +129,7 @@ module Sigh
     end
 
     def print_available_identities
-      UI.message "Available identities: \n\t#{installed_identies.join("\n\t")}\n"
+      UI.message "Available identities: \n\t#{installed_identity_descriptions.join("\n\t")}\n"
     end
 
     def ask_for_signing_identity
@@ -129,13 +137,15 @@ module Sigh
       ask('Signing Identity: ')
     end
 
-    # Array of available signing identities
-    def installed_identies
-      available = `security find-identity -v -p codesigning`
-      ids = []
+    # Hash of available signing identities
+    def installed_identities
+      available = request_valid_identities
+      ids = {}
       available.split("\n").each do |current|
         begin
-          (ids << current.match(/.*\"(.*)\"/)[1])
+          sha1 = current.match(/[a-zA-Z0-9]{40}/).to_s
+          name = current.match(/.*\"(.*)\"/)[1]
+          ids[sha1] = name
         rescue
           nil
         end # the last line does not match
@@ -143,5 +153,21 @@ module Sigh
 
       ids
     end
+
+    def request_valid_identities
+      `security find-identity -v -p codesigning`
+    end
+
+    def installed_identity_descriptions
+      descriptions = []
+      installed_identities.group_by { |sha1, name| name }.each do |name, identities|
+        descriptions << name
+        # Show SHA-1 for homonymous identities
+        descriptions += identities.map do |sha1, _|
+          "\t#{sha1}"
+        end
+      end
+      descriptions
+    end
   end
 end

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.29.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.29.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -218,6 +218,7 @@ files:
 - bin/sigh
 - lib/assets/resign.sh
 - lib/sigh.rb
+- lib/sigh/commands_generator.rb
 - lib/sigh/download_all.rb
 - lib/sigh/local_manage.rb
 - lib/sigh/manager.rb