pact 1.23.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f08c3f242d549648001e7294df45094bf80bdfe
-  data.tar.gz: 84c7976f630dcaee652d7c10eb8d6a2bcd9c64a4
+  metadata.gz: 552d608df849af7001c18df8b94463ec9e9da3bf
+  data.tar.gz: 9a3c2bff39b66747e85af6056ce70c14b1d717ae
 SHA512:
-  metadata.gz: d844246c78be90a05be79a69901b9d57c27d5f31b6ea4b2ef79160e2b9524b7e56788ba3b5308815e0108dec02c1f977be528af6f69f1f4c3c5debfda60277fa
-  data.tar.gz: 508f3d6b351a05dc480122ddca8c4ea86fc7c4169d58e309649ae0e39a07bf7e8ac0960d8bbd12c381cba25bf8fdd4ed5ad2642b2286210af97ce8033e4beff2
+  metadata.gz: 74b503a7555d1a08fd19c179379e4eb2c809dcf4acb0b644c978f25468771d55766c1b2ecdcb285c928690644b905017518d6002798eeb73d91ee2ae51104665
+  data.tar.gz: c5b3f0d850f25e6641dcc84a053b79798f56e79f95dc2ec2825f9f4dc5b847f5acd54aaaa5b2c413b216c08e0e8f292466aac57e1f0cea9b8effa9c0fdd32577

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.24.0"></a>
+### v1.24.0 (2018-04-13)
+
+
+#### Features
+
+* Add retries to verification publishing	 ([6620165](/../../commit/6620165))
+
+
 <a name="v1.23.0"></a>
 ### v1.23.0 (2018-04-16)
 

data/lib/pact/provider/verification_results/publish.rb

@@ -1,17 +1,15 @@
 require 'json'
 require 'pact/errors'
+require 'pact/retry'
 
 # TODO move this to the pact broker client
-# TODO retries
 
 module Pact
   module Provider
     module VerificationResults
-
       class PublicationError < Pact::Error; end
 
       class Publish
-
         def self.call pact_source, verification_result
           new(pact_source, verification_result).call
         end
@@ -75,8 +73,10 @@ module Pact
             response = nil
             begin
               options = {:use_ssl => uri.scheme == 'https'}
-              response = Net::HTTP.start(uri.host, uri.port, options) do |http|
-                http.request request
+              Retry.until_true do
+                response = Net::HTTP.start(uri.host, uri.port, options) do |http|
+                  http.request request
+                end
               end
             rescue StandardError => e
               error_message = "Failed to tag provider version due to: #{e.class} #{e.message}"
@@ -95,16 +95,16 @@ module Pact
           response = nil
           begin
             options = {:use_ssl => uri.scheme == 'https'}
-            response = Net::HTTP.start(uri.host, uri.port, options) do |http|
-              http.request request
+            Retry.until_true do
+              response = Net::HTTP.start(uri.host, uri.port, options) do |http|
+                http.request request
+              end
             end
           rescue StandardError => e
             error_message = "Failed to publish verification results due to: #{e.class} #{e.message}"
             raise PublicationError.new(error_message)
           end
 
-
-
           if response.code.start_with?("2")
             new_resource_url = JSON.parse(response.body)['_links']['self']['href']
             Pact.configuration.output_stream.puts "INFO: Verification results published to #{new_resource_url}"

data/lib/pact/retry.rb

@@ -0,0 +1,35 @@
+module Pact
+  class Retry
+    class RescuableError
+      UNRESCUEABLE = [Pact::Error]
+
+      def self.===(e)
+        case e
+          when *UNRESCUEABLE then
+            false
+          else
+            true
+        end
+      end
+    end
+
+    def self.until_true options = {}
+      max_tries = options.fetch(:times, 3)
+      tries = 0
+      while true
+        begin
+          return yield
+        rescue RescuableError => e
+          tries += 1
+          $stderr.puts "Error making request - #{e.class} #{e.message} #{e.backtrace.find {|l| l.include?('pact_provider')}}, attempt #{tries} of #{max_tries}"
+          raise e if max_tries == tries
+          sleep options
+        end
+      end
+    end
+
+    def self.sleep options
+      Kernel.sleep options.fetch(:sleep, 5)
+    end
+  end
+end

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.23.0"
+  VERSION = "1.24.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -374,6 +374,7 @@ files:
 - lib/pact/provider/verification_results/publish_all.rb
 - lib/pact/provider/verification_results/verification_result.rb
 - lib/pact/provider/world.rb
+- lib/pact/retry.rb
 - lib/pact/tasks.rb
 - lib/pact/tasks/task_helper.rb
 - lib/pact/tasks/verification_task.rb