pact_broker-client 1.15.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81c3d29dfec163255db64e918be588a9611b7966
-  data.tar.gz: 8f6b38b9f3090020f9aefdc1b5bc07d98c937986
+  metadata.gz: 86e1090888410192cf087270229f3b0542850d81
+  data.tar.gz: a4f841135438cdb6e5520dccf9fa812d2884f4a0
 SHA512:
-  metadata.gz: 5cec2de1c03cd72dfcca66e1dde056aee37d03181ad5a8a1f94ac29d86b907ab5718f3a565201ef45fa82f82e4966f0651f517cbb0e09c475600edfb867d0ecf
-  data.tar.gz: 7bd74b8249cf16c3255dd20c50c4683d216af7c088597dfc3c7115c3f30536b1811c87f8d714b20996ce33cf9c62d70a4124814eaea3decb18c2bfc9b5b28820
+  metadata.gz: eb5a27dd769ebb1e68ad2b0959a10f6af8ce00f1995f95bbfa5ee14ecf306536c0994d95db2aa7c84c52417b2a318231880b6f60d47357542525528d4e5600c1
+  data.tar.gz: 6e22a6ce47412481e76ea8834caa40c793b70c1d7fbfd2855da16384ae715339c5a52b8100090ba96dae54e375a932666316f951ada164bccf16c2903974d331

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.16.0"></a>
+### v1.16.0 (2018-07-09)
+
+
+#### Features
+
+* add retries to can-i-deploy to allow the command to wait for missing results to arrive	 ([e44f88d](/../../commit/e44f88d))
+
+
 <a name="v1.15.1"></a>
 ### v1.15.1 (2018-06-28)
 

data/README.md

@@ -67,12 +67,17 @@ Options:
   -a, --pacticipant=PACTICIPANT            # The pacticipant name. Use once for each pacticipant being checked.
   -e, [--version=VERSION]                  # The pacticipant version. Must be entered after the --pacticipant that it relates to.
   -l, [--latest=[TAG]]                     # Use the latest pacticipant version. Optionally specify a TAG to use the latest version with the specified tag.
+      [--to=TAG]                           # This is too hard to explain in a short sentence. Look at the examples.
   -b, --broker-base-url=BROKER_BASE_URL    # The base URL of the Pact Broker
   -u, [--broker-username=BROKER_USERNAME]  # Pact Broker basic auth username
   -p, [--broker-password=BROKER_PASSWORD]  # Pact Broker basic auth password
   -o, [--output=OUTPUT]                    # json or table
                                            # Default: table
   -v, [--verbose], [--no-verbose]          # Verbose output. Default: false
+      [--retry-while-unknown=TIMES]        # The number of times to retry while there is an unknown verification result (ie. the provider verification is likely still running)
+                                           # Default: 0
+      [--retry-interval=SECONDS]           # The time between retries in seconds. Use in conjuction with --retry-while-unknown
+                                           # Default: 10
 
 Description:
   Returns exit code 0 or 1, indicating whether or not the specified pacticipant versions are compatible. Prints out the relevant pact/verification details.

data/doc/pacts/markdown/Pact Broker Client - Pact Broker.md

@@ -196,7 +196,8 @@ Pact Broker will respond with:
   "body": {
     "summary": {
       "deployable": true,
-      "reason": "some text"
+      "reason": "some text",
+      "unknown": 1
     },
     "matrix": [
       {
@@ -243,7 +244,8 @@ Pact Broker will respond with:
   "body": {
     "summary": {
       "deployable": true,
-      "reason": "some text"
+      "reason": "some text",
+      "unknown": 1
     },
     "matrix": [
       {
@@ -290,7 +292,8 @@ Pact Broker will respond with:
   "body": {
     "summary": {
       "deployable": true,
-      "reason": "some text"
+      "reason": "some text",
+      "unknown": 1
     },
     "matrix": [
       {
@@ -373,7 +376,8 @@ Pact Broker will respond with:
   "body": {
     "summary": {
       "deployable": true,
-      "reason": "some text"
+      "reason": "some text",
+      "unknown": 1
     },
     "matrix": [
       {
@@ -443,7 +447,8 @@ Pact Broker will respond with:
   "body": {
     "summary": {
       "deployable": true,
-      "reason": "some text"
+      "reason": "some text",
+      "unknown": 1
     },
     "matrix": [
       {
@@ -629,7 +634,8 @@ Pact Broker will respond with:
   "body": {
     "summary": {
       "deployable": true,
-      "reason": "some text"
+      "reason": "some text",
+      "unknown": 1
     },
     "matrix": [
       {

data/doc/pacts/markdown/README.md

@@ -1,3 +1,3 @@
 ### Pacts for Pact Broker Client
 
-* [Pact Broker](Pact Broker Client - Pact Broker.md)
+* [Pact Broker](Pact%20Broker%20Client%20-%20Pact%20Broker.md)

data/lib/pact_broker/client/can_i_deploy.rb

@@ -30,11 +30,7 @@ module PactBroker
       end
 
       def call
-        if matrix[:summary][:deployable]
-          Result.new(true, success_message(matrix))
-        else
-          Result.new(false, failure_message(matrix))
-        end
+        create_result(fetch_matrix_with_retries)
       rescue PactBroker::Client::Error => e
         Result.new(false, e.message)
       rescue StandardError => e
@@ -45,10 +41,18 @@ module PactBroker
 
       attr_reader :pact_broker_base_url, :version_selectors, :matrix_options, :options, :pact_broker_client_options
 
+      def create_result(matrix)
+        if matrix.deployable?
+          Result.new(true, success_message(matrix))
+        else
+          Result.new(false, failure_message(matrix))
+        end
+      end
+
       def success_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says yes \o/ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.green(reason(matrix))}"
+          message = 'Computer says yes \o/ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.green(matrix.reason)}"
         end
         message
       end
@@ -56,7 +60,7 @@ module PactBroker
       def failure_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says no ¯\_(ツ)_/¯ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.red(reason(matrix))}"
+          message = 'Computer says no ¯\_(ツ)_/¯ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.red(matrix.reason)}"
         end
         message
       end
@@ -69,17 +73,53 @@ module PactBroker
         options[:output]
       end
 
-      def reason(matrix)
-        matrix[:summary][:reason]
+      def fetch_matrix
+        Retry.while_error { pact_broker_client.matrix.get(version_selectors, matrix_options) }
       end
 
-      def matrix
-        @matrix ||= Retry.until_true { pact_broker_client.matrix.get(version_selectors, matrix_options) }
+      def fetch_matrix_with_retries
+        matrix = fetch_matrix
+        if retry_while_unknown?
+          check_if_retry_while_unknown_supported(matrix)
+          if matrix.any_unknown?
+            matrix = Retry.until_truthy_or_max_times(retry_options) do
+              fetch_matrix
+            end
+          end
+        end
+        matrix
       end
 
       def pact_broker_client
         @pact_broker_client ||= PactBroker::Client::PactBrokerClient.new(base_url: pact_broker_base_url, client_options: pact_broker_client_options)
       end
+
+      def retry_while_unknown?
+        options[:retry_while_unknown] > 0
+      end
+
+      def retry_options
+        {
+          condition: lambda { |matrix| !matrix.any_unknown?  },
+          tries: retry_tries,
+          sleep: retry_interval,
+          sleep_first: true
+        }
+      end
+
+      def retry_interval
+        options[:retry_interval]
+      end
+
+      def retry_tries
+        options[:retry_while_unknown]
+      end
+
+      def check_if_retry_while_unknown_supported(matrix)
+        if !matrix.supports_unknown_count?
+          raise PactBroker::Client::Error.new("This version of the Pact Broker does not provide a count of the unknown verification results. Please upgrade your Broker to >= v2.23.4")
+        end
+      end
     end
   end
 end

data/lib/pact_broker/client/cli/broker.rb

@@ -29,11 +29,14 @@ module PactBroker
         method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password"
         method_option :output, aliases: "-o", desc: "json or table", default: 'table'
         method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
+        method_option :retry_while_unknown, banner: 'TIMES', type: :numeric, default: 0, required: false, desc: "The number of times to retry while there is an unknown verification result (ie. the provider verification is likely still running)"
+        method_option :retry_interval, banner: 'SECONDS', type: :numeric, default: 10, required: false, desc: "The time between retries in seconds. Use in conjuction with --retry-while-unknown"
 
         def can_i_deploy(*ignored_but_necessary)
           selectors = VersionSelectorOptionsParser.call(ARGV)
           validate_can_i_deploy_selectors(selectors)
-          result = CanIDeploy.call(options.broker_base_url, selectors, {to_tag: options.to}, {output: options.output}, pact_broker_client_options)
+          can_i_deploy_options = { output: options.output, retry_while_unknown: options.retry_while_unknown, retry_interval: options.retry_interval }
+          result = CanIDeploy.call(options.broker_base_url, selectors, {to_tag: options.to}, can_i_deploy_options, pact_broker_client_options)
           $stdout.puts result.message
           exit(1) unless result.success
         end

data/lib/pact_broker/client/create_tag.rb

@@ -31,7 +31,7 @@ module PactBroker
         tags.each do | tag |
           # todo check that pacticipant exists first
           $stdout.puts "Tagging #{pacticipant_name} version #{version} as #{tag}"
-          Retry.until_true do
+          Retry.while_error do
             pact_broker_client.pacticipants.versions.tag pacticipant: pacticipant_name, version: version, tag: tag
           end
         end

data/lib/pact_broker/client/hal/http_client.rb

@@ -43,7 +43,7 @@ module PactBroker
         end
 
         def perform_request request, uri
-          response = Retry.until_true do
+          response = Retry.while_error do
             http = Net::HTTP.new(uri.host, uri.port, :ENV)
             http.set_debug_output($stderr) if verbose
             http.use_ssl = (uri.scheme == 'https')

data/lib/pact_broker/client/matrix.rb

@@ -1,4 +1,5 @@
 require_relative 'base_client'
+require 'pact_broker/client/matrix/resource'
 
 module PactBroker
   module Client
@@ -11,7 +12,7 @@ module PactBroker
         }.merge(query_options(options))
         response = self.class.get("/matrix", query: query, headers: default_get_headers)
         response = handle_response(response) do
-          JSON.parse(response.body, symbolize_names: true)
+          Matrix::Resource.new(JSON.parse(response.body, symbolize_names: true))
         end
       end
 
@@ -21,7 +22,7 @@ module PactBroker
         elsif response.code == 401
           raise Error.new("Authentication failed")
         elsif response.code == 404
-          raise Error.new("Matrix resource not found at #{base_url}/matrix. Please upgrade your broker to the latest version.")
+          raise Error.new("Matrix resource not found at #{base_url}/matrix. Please upgrade your Broker to the latest version.")
         else
           error_message = nil
           begin

data/lib/pact_broker/client/matrix/resource.rb

@@ -0,0 +1,34 @@
+require 'pact_broker/client/base_client'
+
+module PactBroker
+  module Client
+    class Matrix < BaseClient
+      class Resource < Hash
+
+        def initialize hash
+          self.merge!(hash)
+        end
+
+        def any_unknown?
+          if supports_unknown_count?
+            self[:summary][:unknown] > 0
+          else
+            false
+          end
+        end
+
+        def supports_unknown_count?
+          !!(self[:summary] && Integer === self[:summary][:unknown] )
+        end
+
+        def reason
+          self[:summary][:reason]
+        end
+
+        def deployable?
+          self[:summary][:deployable]
+        end
+      end
+    end
+  end
+end

data/lib/pact_broker/client/publish_pacts.rb

@@ -71,7 +71,7 @@ module PactBroker
 
       def tag_consumer_version tag
         versions = pact_broker_client.pacticipants.versions
-        Retry.until_true do
+        Retry.while_error do
           $stdout.puts "Tagging version #{consumer_version} of #{consumer_name} as #{tag.inspect}"
           versions.tag(pacticipant: consumer_name, version: consumer_version, tag: tag)
           true
@@ -82,7 +82,7 @@ module PactBroker
       end
 
       def publish_pact_contents(pact)
-        Retry.until_true do
+        Retry.while_error do
           pacts = pact_broker_client.pacticipants.versions.pacts
           if pacts.version_published?(consumer: pact.consumer_name, provider: pact.provider_name, consumer_version: consumer_version)
             $stdout.puts ::Term::ANSIColor.yellow("The given version of pact is already published. Overwriting...")

data/lib/pact_broker/client/retry.rb

@@ -14,7 +14,7 @@ module PactBroker
         end
       end
 
-      def self.until_true options = {}
+      def self.while_error options = {}
         max_tries = options.fetch(:times, 3)
         tries = 0
         while true
@@ -24,13 +24,41 @@ module PactBroker
             tries += 1
             $stderr.puts "Error making request - #{e.class} #{e.message} #{e.backtrace.find{|l| l.include?('pact_broker-client')}}, attempt #{tries} of #{max_tries}"
             raise e if max_tries == tries
-            sleep options
+            sleep options.fetch(:sleep, 5)
           end
         end
       end
 
-      def self.sleep options
-        Kernel.sleep options.fetch(:sleep, 5)
+      def self.until_truthy_or_max_times options = {}
+        max_tries = options.fetch(:times, 3)
+        tries = 0
+        verbose = options[:verbose]
+        sleep_interval = options.fetch(:sleep, 5)
+        sleep(sleep_interval) if options[:sleep_first]
+        while true
+          begin
+            result = yield
+            return result if max_tries < 2
+            if options[:condition]
+              condition_result = options[:condition].call(result)
+              return result if condition_result
+            else
+              return result if result
+            end
+            tries += 1
+            return result if max_tries == tries
+            sleep sleep_interval
+          rescue RescuableError => e
+            tries += 1
+            $stderr.puts "ERROR: Error making request - #{e.class} #{e.message} #{e.backtrace.find{|l| l.include?('pact_broker-client')}}, attempt #{tries} of #{max_tries}"
+            raise e if max_tries == tries
+            sleep sleep_interval
+          end
+        end
+      end
+
+      def self.sleep seconds
+        Kernel.sleep seconds
       end
     end
   end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.15.1'
+    VERSION = '1.16.0'
   end
 end

data/lib/pact_broker/client/webhooks/create.rb

@@ -9,7 +9,7 @@ module PactBroker
     module Webhooks
       class Create
 
-        WEBHOOKS_WITH_OPTIONAL_PACTICICPANTS_NOT_SUPPORTED = "Your version of the Pact Broker requires that both consumer and provider are specified for a webhook. Please upgrade your broker to >= 2.22.0 to create a webhook with optional consumer and provider."
+        WEBHOOKS_WITH_OPTIONAL_PACTICICPANTS_NOT_SUPPORTED = "This version of the Pact Broker requires that both consumer and provider are specified for a webhook. Please upgrade your broker to >= 2.22.0 to create a webhook with optional consumer and provider."
 
         attr_reader  :params, :pact_broker_base_url, :basic_auth_options, :verbose
 

data/spec/lib/pact_broker/client/can_i_deploy_spec.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/client/can_i_deploy'
+require 'pact_broker/client/matrix/resource'
 
 module PactBroker
   module Client
@@ -8,8 +9,12 @@ module PactBroker
       let(:matrix_options) { {} }
       let(:pact_broker_client_options) { { foo: 'bar' } }
       let(:matrix_client) { instance_double('PactBroker::Client::Matrix') }
-      let(:matrix) { { matrix: ['foo'], summary: { deployable: true, reason: 'some reason' } } }
-      let(:options) { { output: 'text' } }
+      let(:matrix) { instance_double('Matrix::Resource', deployable?: true, reason: 'some reason', any_unknown?: any_unknown, supports_unknown_count?: supports_unknown_count) }
+      let(:any_unknown) { false }
+      let(:supports_unknown_count) { true }
+      let(:retry_while_unknown) { 0 }
+      let(:options) { { output: 'text', retry_while_unknown: retry_while_unknown, retry_interval: 5} }
+
 
       before do
         allow_any_instance_of(PactBroker::Client::PactBrokerClient).to receive(:matrix).and_return(matrix_client)
@@ -29,7 +34,7 @@ module PactBroker
         subject
       end
 
-      context "when compatible versions are found" do
+      context "when the versions are deployable" do
         it "returns a success response" do
           expect(subject.success).to be true
         end
@@ -44,8 +49,8 @@ module PactBroker
         end
       end
 
-      context "when compatible versions are not found" do
-        let(:matrix) { {matrix: ['foo'], summary: { deployable: false, reason: 'some reason' }} }
+      context "when the versions are not deployable" do
+        let(:matrix) { instance_double('Matrix::Resource', deployable?: false, reason: 'some reason', any_unknown?: false) }
 
         it "returns a failure response" do
           expect(subject.success).to be false
@@ -60,6 +65,38 @@ module PactBroker
         end
       end
 
+      context "when retry_while_unknown is greater than 0" do
+        let(:retry_while_unknown) { 1 }
+
+        context "when any_unknown? is false" do
+          it "does not retry the request" do
+            expect(Retry).to_not receive(:until_truthy_or_max_times)
+            subject
+          end
+        end
+
+        context "when any_unknown? is true" do
+          let(:any_unknown) { true }
+
+          it "retries the request" do
+            expect(Retry).to receive(:until_truthy_or_max_times).with(hash_including(tries: 1, sleep: 5, sleep_first: true))
+            subject
+          end
+        end
+
+        context "when the matrix does not support the unknown count" do
+          let(:supports_unknown_count) { false }
+
+          it "returns a failure response" do
+            expect(subject.success).to be false
+          end
+
+          it "returns a failure message" do
+            expect(subject.message).to match /does not provide a count/
+          end
+        end
+      end
+
       context "when a PactBroker::Client::Error is raised" do
         before do
           allow(matrix_client).to receive(:get).and_raise(PactBroker::Client::Error.new('error text'))
@@ -76,7 +113,7 @@ module PactBroker
 
       context "when a StandardError is raised" do
         before do
-          allow(Retry).to receive(:until_true) { |&block| block.call }
+          allow(Retry).to receive(:while_error) { |&block| block.call }
           allow($stderr).to receive(:puts)
           allow(matrix_client).to receive(:get).and_raise(StandardError.new('error text'))
         end

data/spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb

@@ -20,7 +20,9 @@ module PactBroker
           {
             broker_base_url: 'http://pact-broker',
             output: 'table',
-            verbose: 'verbose'
+            verbose: 'verbose',
+            retry_while_unknown: 1,
+            retry_interval: 2
           }
         end
 
@@ -32,7 +34,7 @@ module PactBroker
         end
 
         it "invokes the CanIDeploy service" do
-          expect(CanIDeploy).to receive(:call).with('http://pact-broker', version_selectors, {to_tag: nil}, {output: 'table'}, {verbose: 'verbose'})
+          expect(CanIDeploy).to receive(:call).with('http://pact-broker', version_selectors, {to_tag: nil}, {output: 'table', retry_while_unknown: 1, retry_interval: 2}, {verbose: 'verbose'})
           invoke_can_i_deploy
         end
 

data/spec/lib/pact_broker/client/hal/http_client_spec.rb

@@ -4,7 +4,7 @@ module PactBroker::Client
   module Hal
     describe HttpClient do
       before do
-        allow(Retry).to receive(:until_true) { |&block| block.call }
+        allow(Retry).to receive(:while_error) { |&block| block.call }
       end
 
       subject { HttpClient.new(username: 'foo', password: 'bar') }
@@ -43,7 +43,7 @@ module PactBroker::Client
 
 
         it "retries on failure" do
-          expect(Retry).to receive(:until_true)
+          expect(Retry).to receive(:while_error)
           do_get
         end
 
@@ -74,8 +74,8 @@ module PactBroker::Client
           expect(request).to have_been_made
         end
 
-        it "calls Retry.until_true" do
-          expect(Retry).to receive(:until_true)
+        it "calls Retry.while_error" do
+          expect(Retry).to receive(:while_error)
           do_post
         end
 

data/spec/lib/pact_broker/client/matrix/resource_spec.rb

@@ -0,0 +1,70 @@
+require 'pact_broker/client/matrix/resource'
+
+module PactBroker
+  module Client
+    class Matrix
+      describe Resource do
+
+        let(:matrix_hash) { JSON.parse(File.read('spec/support/matrix.json'), symbolize_names: true) }
+
+        subject { Resource.new(matrix_hash) }
+
+        describe "any_unknown?" do
+          context "when $summary.unknown is greater than 0" do
+            it "is true" do
+              expect(subject.any_unknown?).to be true
+            end
+          end
+
+          context "when $summary.unknown is 0" do
+            before do
+              matrix_hash[:summary][:unknown] = 0
+            end
+
+            it "is false" do
+              expect(subject.any_unknown?).to be false
+            end
+          end
+        end
+
+        describe "supports_unknown_count?" do
+          context "when $summary.unknown is present" do
+            it "is true" do
+              expect(subject.supports_unknown_count?).to be true
+            end
+          end
+
+          context "when $summary.unknown is nil" do
+            before do
+              matrix_hash[:summary][:unknown] = nil
+            end
+
+            it "is false" do
+              expect(subject.supports_unknown_count?).to be false
+            end
+          end
+
+          context "when $summary.unknown is not an Integer" do
+            before do
+              matrix_hash[:summary][:unknown] = true
+            end
+
+            it "is false" do
+              expect(subject.supports_unknown_count?).to be false
+            end
+          end
+
+          context "when $summary.unknown is not present" do
+            before do
+              matrix_hash[:summary].delete(:unknown)
+            end
+
+            it "is false" do
+              expect(subject.supports_unknown_count?).to be false
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/client/retry_spec.rb

@@ -0,0 +1,119 @@
+require 'pact_broker/client/retry'
+
+module PactBroker
+  module Client
+    describe Retry do
+      describe ".until_truthy_or_max_times" do
+        before do
+          allow(service).to receive(:get_result).and_return(1, 2, 3)
+          allow(condition).to receive(:call).and_return(false, false, true)
+          allow(Retry).to receive(:sleep)
+        end
+
+        let(:service) { double('service') }
+        let(:condition) { double('condition') }
+        let(:times) { 4 }
+        let(:sleep_first) { nil }
+
+        subject do
+          Retry.until_truthy_or_max_times(condition: condition, times: times, sleep: 3, sleep_first: sleep_first) do
+            service.get_result
+          end
+        end
+
+        context "times is 0 (which it shouldn't be, but just to be sure...)" do
+          let(:times) { 0 }
+
+          it "only executes the block once" do
+            subject
+            expect(service).to have_received(:get_result).exactly(1).times
+          end
+
+          it "does not execute the condition" do
+            expect(condition).to_not receive(:call)
+            subject
+          end
+
+          it "returns the result" do
+            expect(subject).to eq 1
+          end
+        end
+
+        context "times is 1" do
+          let(:times) { 1 }
+
+          it "only executes the block once" do
+            subject
+            expect(service).to have_received(:get_result).exactly(1).times
+          end
+
+          it "does not execute the condition" do
+            expect(condition).to_not receive(:call)
+            subject
+          end
+
+          it "returns the result" do
+            expect(subject).to eq 1
+          end
+        end
+
+        context "when the condition becomes true before the max tries" do
+          it "stops retrying when the condition becomes true" do
+            subject
+            expect(condition).to have_received(:call).exactly(3).times
+            expect(service).to have_received(:get_result).exactly(3).times
+          end
+
+          it "returns the most recent result" do
+            expect(subject).to eq 3
+          end
+        end
+
+        context "when the max tries is reached before the condition becomes true" do
+          let(:times) { 2 }
+
+          it "stops retrying once the max tries is reached" do
+            subject
+            expect(condition).to have_received(:call).exactly(2).times
+            expect(service).to have_received(:get_result).exactly(2).times
+          end
+
+          it "returns the most recent result" do
+            expect(subject).to eq 2
+          end
+        end
+
+        context "when an error is raised each time" do
+          TestError = Class.new(StandardError)
+
+          before do
+            allow(service).to receive(:get_result).and_raise(TestError)
+            allow($stderr).to receive(:puts)
+          end
+
+          it "stops retrying once the max tries is reached" do
+            begin
+              subject
+            rescue TestError
+            end
+            expect(service).to have_received(:get_result).exactly(4).times
+          end
+
+          it "raises the error" do
+            expect { subject }.to raise_error TestError
+          end
+        end
+
+        context "when sleep_first is true" do
+          let(:sleep_first) { true }
+
+          it "sleeps before it executes the block" do
+            expect(Retry).to receive(:sleep).ordered
+            expect(service).to receive(:get_result).ordered
+            subject
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/pact_broker/client/webhooks/create_spec.rb

@@ -39,7 +39,7 @@ module PactBroker
           context "when a 405 is returned from the webhook creation request" do
 
             it "raises an error with a message to upgrade the Pact Broker" do
-              expect { subject }.to raise_error PactBroker::Client::Error, /Your version of the Pact Broker/
+              expect { subject }.to raise_error PactBroker::Client::Error, /This version of the Pact Broker/
             end
           end
 

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -202,7 +202,8 @@
         "body": {
           "summary": {
             "deployable": true,
-            "reason": "some text"
+            "reason": "some text",
+            "unknown": 1
           },
           "matrix": [
             {
@@ -251,7 +252,8 @@
         "body": {
           "summary": {
             "deployable": true,
-            "reason": "some text"
+            "reason": "some text",
+            "unknown": 1
           },
           "matrix": [
             {
@@ -300,7 +302,8 @@
         "body": {
           "summary": {
             "deployable": true,
-            "reason": "some text"
+            "reason": "some text",
+            "unknown": 1
           },
           "matrix": [
             {
@@ -473,7 +476,8 @@
         "body": {
           "summary": {
             "deployable": true,
-            "reason": "some text"
+            "reason": "some text",
+            "unknown": 1
           },
           "matrix": [
             {
@@ -522,7 +526,8 @@
         "body": {
           "summary": {
             "deployable": true,
-            "reason": "some text"
+            "reason": "some text",
+            "unknown": 1
           },
           "matrix": [
             {
@@ -571,7 +576,8 @@
         "body": {
           "summary": {
             "deployable": true,
-            "reason": "some text"
+            "reason": "some text",
+            "unknown": 1
           },
           "matrix": [
             {

data/spec/support/matrix.json

@@ -1,7 +1,8 @@
 {
   "summary": {
     "deployable": true,
-    "reason": "some text"
+    "reason": "some text",
+    "unknown": 1
   },
   "matrix": [
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.16.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -214,6 +214,7 @@ files:
 - lib/pact_broker/client/matrix.rb
 - lib/pact_broker/client/matrix/formatter.rb
 - lib/pact_broker/client/matrix/json_formatter.rb
+- lib/pact_broker/client/matrix/resource.rb
 - lib/pact_broker/client/matrix/text_formatter.rb
 - lib/pact_broker/client/merge_pacts.rb
 - lib/pact_broker/client/pact_broker_client.rb
@@ -249,12 +250,14 @@ files:
 - spec/lib/pact_broker/client/hal/entity_spec.rb
 - spec/lib/pact_broker/client/hal/http_client_spec.rb
 - spec/lib/pact_broker/client/hal/link_spec.rb
+- spec/lib/pact_broker/client/matrix/resource_spec.rb
 - spec/lib/pact_broker/client/matrix/text_formatter_spec.rb
 - spec/lib/pact_broker/client/matrix_spec.rb
 - spec/lib/pact_broker/client/merge_pacts_spec.rb
 - spec/lib/pact_broker/client/pact_broker_client_spec.rb
 - spec/lib/pact_broker/client/pacticipants_spec.rb
 - spec/lib/pact_broker/client/publish_pacts_spec.rb
+- spec/lib/pact_broker/client/retry_spec.rb
 - spec/lib/pact_broker/client/tasks/publication_task_spec.rb
 - spec/lib/pact_broker/client/versions/describe_spec.rb
 - spec/lib/pact_broker/client/versions_spec.rb
@@ -320,12 +323,14 @@ test_files:
 - spec/lib/pact_broker/client/hal/entity_spec.rb
 - spec/lib/pact_broker/client/hal/http_client_spec.rb
 - spec/lib/pact_broker/client/hal/link_spec.rb
+- spec/lib/pact_broker/client/matrix/resource_spec.rb
 - spec/lib/pact_broker/client/matrix/text_formatter_spec.rb
 - spec/lib/pact_broker/client/matrix_spec.rb
 - spec/lib/pact_broker/client/merge_pacts_spec.rb
 - spec/lib/pact_broker/client/pact_broker_client_spec.rb
 - spec/lib/pact_broker/client/pacticipants_spec.rb
 - spec/lib/pact_broker/client/publish_pacts_spec.rb
+- spec/lib/pact_broker/client/retry_spec.rb
 - spec/lib/pact_broker/client/tasks/publication_task_spec.rb
 - spec/lib/pact_broker/client/versions/describe_spec.rb
 - spec/lib/pact_broker/client/versions_spec.rb