sigh 1.10.4 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa01e7a947422507dd3f858800eba9cd0f50c73
-  data.tar.gz: 38fb2f1dcab67eedc8dabf8d37c838492b72ce93
+  metadata.gz: 1f8bf945e6f124b2057a6bf0a56ee479cd592b3f
+  data.tar.gz: c041215ae373aabb2e70891c13ba04f93bfa8526
 SHA512:
-  metadata.gz: c7a8f04d302c951ab58507743781158003c56e1b42e947eaaa07814898bc1ede7da9b96754c6b8174ac313a89d734777cd57f7c239e91cc5fab81699a2140005
-  data.tar.gz: 9a9e479c13649495a62c42d15e5adbbf100f382dcd553d8cde603d1b3a609c0ac0a9f231a507a4fe6aa17efbeaa0bb88b3f3c8e6c6c399cf861c9a7b65b247ef
+  metadata.gz: fab486554031b17e10e1b3dacf9206a0af0100b244574bb6517eacebebf921cca606a5a2ee7589f78c4a4ab217ca8bb8a4efb9632ed000ac17b2d45449d248cf
+  data.tar.gz: 2459cec1d1778be2a87cdd75129c83576fe631461ccc38672d21b9c0ce866c85c5d85e866d513425f3eb955941980af03c6497216d7067b8cf2a73950f1d431b

data/lib/sigh/commands_generator.rb

@@ -30,7 +30,29 @@ module Sigh
         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__)
+          user_input = options.__hash__
+
+          # The user might run sigh using
+          #
+          #   sigh development
+          #
+          #   sigh adhoc -u user@krausefx.com
+          #
+          # When the user runs this, it will use :development
+          #
+          #   sigh development --adhoc
+          #
+          case args.first
+          when "development"
+            user_input[:development] = true
+            user_input.delete(:adhoc)
+          when "adhoc"
+            user_input[:adhoc] = true
+            user_input.delete(:development)
+          end
+
+          Sigh.config = FastlaneCore::Configuration.create(Sigh::Options.available_options, user_input)
+
           Sigh::Manager.start
         end
       end

data/lib/sigh/options.rb

@@ -12,16 +12,24 @@ module Sigh
                                      env_name: "SIGH_AD_HOC",
                                      description: "Setting this flag will generate AdHoc profiles instead of App Store Profiles",
                                      is_string: false,
-                                     default_value: false),
-        FastlaneCore::ConfigItem.new(key: :skip_install,
-                                     env_name: "SIGH_SKIP_INSTALL",
-                                     description: "By default, the certificate will be added on your local machine. Setting this flag will skip this action",
-                                     is_string: false,
-                                     default_value: false),
+                                     default_value: false,
+                                     conflicting_options: [:development],
+                                     conflict_block: proc do |value|
+                                       UI.user_error!("You can't enable both :development and :adhoc")
+                                     end),
         FastlaneCore::ConfigItem.new(key: :development,
                                      env_name: "SIGH_DEVELOPMENT",
                                      description: "Renew the development certificate instead of the production one",
                                      is_string: false,
+                                     default_value: false,
+                                     conflicting_options: [:adhoc],
+                                     conflict_block: proc do |value|
+                                       UI.user_error!("You can't enable both :development and :adhoc")
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :skip_install,
+                                     env_name: "SIGH_SKIP_INSTALL",
+                                     description: "By default, the certificate will be added on your local machine. Setting this flag will skip this action",
+                                     is_string: false,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :force,
                                      env_name: "SIGH_FORCE",

data/lib/sigh/runner.rb

@@ -85,6 +85,20 @@ module Sigh
         end
       end
 
+      # Since September 20, 2016 spaceship doesn't distinguish between AdHoc and AppStore profiles
+      # any more, since it requires an additional request
+      # Instead we only call is_adhoc? on the matching profiles to speed up spaceship
+
+      results = results.find_all do |current_profile|
+        if profile_type == Spaceship.provisioning_profile.ad_hoc
+          current_profile.is_adhoc?
+        elsif profile_type == Spaceship.provisioning_profile.app_store
+          !current_profile.is_adhoc?
+        else
+          true
+        end
+      end
+
       return results if Sigh.config[:skip_certificate_verification]
 
       return results.find_all do |a|
@@ -97,10 +111,10 @@ module Sigh
           if FastlaneCore::CertChecker.installed?(file.path)
             installed = true
           else
-            UI.important("Certificate for Provisioning Profile '#{a.name}' not available locally: #{cert.id}, skipping this one...")
+            UI.message("Certificate for Provisioning Profile '#{a.name}' not available locally: #{cert.id}, skipping this one...")
           end
         end
-        installed
+        installed && a.certificate_valid?
       end
     end
 
@@ -161,7 +175,7 @@ module Sigh
         UI.important "Found more than one code signing identity. Choosing the first one. Check out `sigh --help` to see all available options."
         UI.important "Available Code Signing Identities for current filters:"
         certificates.each do |c|
-          str = ["\t- Name:", c.owner_name, "- ID:", c.id + "- Expires", c.expires.strftime("%d/%m/%Y")].join(" ")
+          str = ["\t- Name:", c.owner_name, "- ID:", c.id + " - Expires", c.expires.strftime("%d/%m/%Y")].join(" ")
           UI.message str.green
         end
       end

data/lib/sigh/version.rb

@@ -1,3 +1,3 @@
 module Sigh
-  VERSION = "1.10.4"
+  VERSION = "1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sigh
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.11.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-20 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.32.4
+        version: 0.33.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.4
+        version: 0.33.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0