deliver 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 058f7223cc29b7f7889099cfd5e4891bc0a02c4a
-  data.tar.gz: fd18658e964d32779730619e7613609c23e1558f
+  metadata.gz: 2e53e55611e6ae56d0fa0371a3b4bd08716d43c8
+  data.tar.gz: c1d9817f3fd4e7f58c372d41ec69b85b2457e2ad
 SHA512:
-  metadata.gz: 2b323f9a8cd5fc3cf618e39c9eec181da3a3b512389955f01f8553010675209daf3a9314129d61b0a97dbe64184f4d082d0fa41e90e288a8a18937b2c01049af
-  data.tar.gz: 3328ca8e5996bf73fd4d37c9a2ed36b7c63a130be13951f50b331279485150d925e419f94c67fbb201d468075f3c743a9c93d9a2adc91b1e7584289e47729458
+  metadata.gz: a599b7c21a251ada077bdd22e5540fa31e372d4d5d5d6ccc285532e47cd74b8ad04b6a52d261258d7eb21472aa60984940beb11223505e07235130a3fe3670b3
+  data.tar.gz: 52abde10badcc9ee4e87e6b19d4b8d763752b50813b623c73ba02374592bfb79b3e8621979f9ed6783be3ef264d25c77aa63fb0b45496b5a7fe7b2a54bfe3800

data/lib/deliver/deliver_process.rb

@@ -261,13 +261,15 @@ module Deliver
     end
 
     def call_success_block
-      @deploy_information[:blocks][:success].call if @deploy_information[:blocks][:success]
+      if @deploy_information[:blocks][:success]
+        @deploy_information[:blocks][:success].call(hash_for_callback)
+      end
     end
 
     def call_error_block(ex)
       if @deploy_information[:blocks][:error]
         # Custom error handling, we just call this one
-        @deploy_information[:blocks][:error].call(ex)
+        @deploy_information[:blocks][:error].call(hash_for_callback(ex))
       end
       
       # Re-Raise the exception
@@ -278,6 +280,19 @@ module Deliver
       #####################################################
       # @!group All the helper methods
       #####################################################
+
+      def hash_for_callback(error = nil)
+        {
+          error: error,
+          app_version: @app_version,
+          app_identifier: @app_identifier,
+          skipped_deploy: skip_deployment?,
+          is_release_build: is_release_build?,
+          is_beta_build: is_beta_build?,
+          ipa_path: ENV["DELIVER_IPA_PATH"]
+        }
+      end
+
       def verify_app_identifier(app_identifier)
         if app_identifier
           if @ipa.fetch_app_identifier and app_identifier != @ipa.fetch_app_identifier
@@ -309,7 +324,7 @@ module Deliver
       end
 
       def is_beta_build?
-          @deploy_information[Deliverer::ValKey::IS_BETA_IPA]
+        @deploy_information[Deliverer::ValKey::IS_BETA_IPA]
       end
   end
 end

data/lib/deliver/itunes_connect/itunes_connect_new_version.rb

@@ -33,15 +33,15 @@ module Deliver
           end
         else
           Helper.log.warn "Can not create version #{version_number} on iTunesConnect. Maybe it was already created."
-          Helper.log.info "Check out '#{current_url}' what's the latest version."
 
           begin
-            created_version = first(".status.waiting").text.split(" ").first
+            created_version = wait_for_elements("input[ng-model='versionInfo.version.value']").first.value
             if created_version != version_number
-              raise "Some other version ('#{created_version}') was created instead of the one you defined ('#{version_number}')"
+              update_existing_version_number!(app, version_number)
             end
           rescue => ex
             # Can not fetch the version number of the new version (this happens, when it's e.g. 'Developer Rejected')
+            Helper.log.error ex
             unless page.has_content?version_number
               raise "Some other version was created instead of the one you defined ('#{version_number}')."
             end
@@ -53,5 +53,15 @@ module Deliver
         error_occured(ex)
       end
     end
+
+    def update_existing_version_number!(app, version_number)
+      Helper.log.warn "There is already a new version created, which does not match the current version: '#{version_number}'"
+
+      version_input = wait_for_elements("input[ng-model='versionInfo.version.value']").first
+      version_input.set version_number
+      click_on "Save"
+
+      Helper.log.warn "Changed the version number of the latest version to '#{version_number}'".green
+    end
   end
 end

data/lib/deliver/itunes_connect/itunes_connect_reader.rb

@@ -47,7 +47,9 @@ module Deliver
         open_app_page(app)
 
         begin
-          return first(".status.ready").text.split(" ").first
+          version_number = wait_for_elements("input[ng-model='versionInfo.version.value']").first.value
+          version_number ||= first(".status.ready").text.split(" ").first
+          return version_number
         rescue
           Helper.log.debug "Could not fetch version number of the live version for app #{app}."
           return nil

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Felix Krause