fastlane-plugin-notarize 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c6b2af870f602051718f4e12a3ff8f50e143de5
-  data.tar.gz: 354fb94000dd61c23ae7d69efe5c7c8770e65daa
+  metadata.gz: 01bec99979e8263df14a46d03e6f6b0b482d37df
+  data.tar.gz: 5f3a978cf1c0522bd70c05b1bb20792e59822c44
 SHA512:
-  metadata.gz: e617932066cfc9fedbef60f70a85da79892fe8df874d2400ab022e7012351754f4fd54869cd756e6accc0f5f8388b3231e97ff0e270b79f9c5036cb6dce4d655
-  data.tar.gz: 76cf8459503aa0b52a3ca81d361b7745e22a2109fb46c72828c08de96609480ae0fc61997cc17607985dbad4abe913501735ff1fc0889464ecf98e291cbe341d
+  metadata.gz: 6d5667a5e9e6f01f0aaa6da50b44468ebf2b2650fc9b24707cf8ff28513a764a283c17d2c195cfc4b796fb1fe8544dff451150d1ccb64e956a44b30880ea6131
+  data.tar.gz: ee51080404be195383c213e3ebc748a44215ab147bd9e9c677395aa25853e705cc0ea25203c2099cef70c2ae0a2aacd463219b2a27fa067d9505bb8a089976d8

data/lib/fastlane/plugin/notarize/actions/notarize_action.rb

@@ -6,6 +6,7 @@ module Fastlane
       def self.run(params)
         package_path = params[:package]
         bundle_id = params[:bundle_id]
+        try_early_stapling = params[:try_early_stapling]
 
         # Compress and read bundle identifier only for .app bundle.
         compressed_package_path = nil
@@ -25,7 +26,7 @@ module Fastlane
           end
         end
 
-        UI.user_error!('Could not read bundle identifier, provide as a parameter.') unless bundle_id
+        UI.user_error!('Could not read bundle identifier, provide as a parameter') unless bundle_id
 
         apple_id_account = CredentialsManager::AccountManager.new(user: params[:username])
 
@@ -53,8 +54,17 @@ module Fastlane
         while notarization_info.empty? || (notarization_info['Status'] == 'in progress')
           if notarization_info.empty?
             UI.message('Waiting to query request status')
-          else
-            UI.message('Request in progress, waiting to query again')
+          elsif try_early_stapling
+            UI.message('Request in progress, trying early staple')
+
+            begin
+              self.staple(package_path)
+              UI.message('Successfully notarized and early stapled package.')
+
+              return
+            rescue
+              UI.message('Early staple failed, waiting to query again')
+            end
           end
 
           sleep(30)
@@ -82,10 +92,7 @@ module Fastlane
         when 'success'
           UI.message('Stapling package')
 
-          Actions.sh(
-            "xcrun stapler staple \"#{package_path}\"",
-            log: false
-          )
+          self.staple(package_path)
 
           UI.success("Successfully notarized and stapled package#{log_suffix}")
         when 'invalid'
@@ -97,6 +104,13 @@ module Fastlane
         ENV.delete('FL_NOTARIZE_PASSWORD')
       end
 
+      def self.staple(package_path)
+        Actions.sh(
+          "xcrun stapler staple \"#{package_path}\"",
+          log: false
+        )
+      end
+
       def self.description
         'Notarizes a macOS app'
       end
@@ -119,6 +133,12 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("Could not find package at '#{value}'") unless File.exist?(value)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :try_early_stapling,
+                                       env_name: 'FL_NOTARIZE_TRY_EARLY_STAPLING',
+                                       description: 'Whether to try early stapling while the notarization request is in progress',
+                                       optional: true,
+                                       default_value: false,
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :bundle_id,
                                        env_name: 'FL_NOTARIZE_BUNDLE_ID',
                                        description: 'Bundle identifier to uniquely identify the package',

data/lib/fastlane/plugin/notarize/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Notarize
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-notarize
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Zeplin, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry