pact 1.14.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb2ea12b63cd90b9451173dd6deb6a10146d426
-  data.tar.gz: 2ba870980eb5403ab32c405138315b6f471b189e
+  metadata.gz: 4ff1d60084d4c20892a663b68af77d3c05e419a6
+  data.tar.gz: 78f85722706fc0c6328a16172b4e9a31adb2c4b7
 SHA512:
-  metadata.gz: 517699fa66be479723e0f703dc00e5453482d18d5463b59176b8fd09138211c648dfa8f654223690f77c1cbe4cafad7ae98165c97b3561e69248a7bb4ad204f4
-  data.tar.gz: 44ef94d0fa65a5ee0b003ec3e7f8c6915da6c8ecadce6c690fa9c5a50e507f313f39b802839e3671cbfb5aea54ea9c4735d86a5ee1f854f37533333d37851985
+  metadata.gz: 5873fe24cd3eb193068ae0a155a4ee0dfbc15ee4f2b53e4b7f1f39549b58d2a3e5563a11f7915caaa82a33562de88a35519b52223dfef6e3b103caa4c85213ea
+  data.tar.gz: d12f70c741c1367936ebd3a6d004b005390a2892e2171368aa0242186fd73b3fd46c515d488739e18d566c3c741f3ed561ed294c25df1db625a2c247e26edee4

data/CHANGELOG.md

@@ -1,6 +1,73 @@
-Do this to generate your change history
+<a name="v1.20.0"></a>
+### v1.20.0 (2017-12-10)
 
-  git log --pretty=format:'  * %h - %s (%an, %ad)'
+
+#### Bug Fixes
+
+* send verification publishing message to stderr when json output	 ([568f511](/../../commit/568f511))
+
+
+<a name="v1.19.2"></a>
+### v1.19.2 (2017-11-16)
+
+
+#### Features
+
+* **publish test results**
+  * rename example to test in JSON	 ([cd2b79e](/../../commit/cd2b79e))
+  * remove ansi colours from error messages	 ([4416d04](/../../commit/4416d04))
+  * only publish for rspec 3	 ([31192d0](/../../commit/31192d0))
+  * only publish verification results when all interactions have been run	 ([0c56752](/../../commit/0c56752))
+  * enable test results to be published to the pact broker in the verification results	 ([e0dad27](/../../commit/e0dad27))
+
+
+#### Bug Fixes
+
+* **verifications**
+  * tag provider version, not consumer version	 ([b347588](/../../commit/b347588))
+
+
+<a name="v1.19.1"></a>
+### v1.19.1 (2017-10-31)
+
+
+#### Bug Fixes
+
+* **verifications**
+  * do not print warning about missing pb:tag-version link when there are no tags configured	 ([ed9468a](/../../commit/ed9468a))
+
+
+<a name="v1.19.0"></a>
+### v1.19.0 (2017-10-30)
+
+
+#### Features
+
+* **verifications**
+  * allow provider version tags to be specified	 ([bff4611](/../../commit/bff4611))
+
+
+<a name="v1.18.0"></a>
+## 1.18.0 (2017-10-30)
+* 7cde586 - feat: correct rack-test dependency for rails 5 support (Beth Skurrie, Mon Oct 30 10:09:07 2017 +1100)
+
+<a name="v1.17.0"></a>
+## 1.17.0 (2017-10-27)
+
+* 4ae8417 - feat: allow json formatter to be configured for pact verify (Beth Skurrie, Fri Oct 27 16:08:41 2017 +1100)
+
+<a name="v1.16.1"></a>
+## 1.16.1 (2017-10-18)
+
+* 7b1747b - fix: reify terms in headers when replaying request (Beth Skurrie, Wed Oct 18 09:01:26 2017 +1100)
+
+## 1.16.0 (25 September 2017)
+* 70e67cf - feat: improve description of rspec header matching 'it' blocks and failure text (Beth Skurrie, Mon Sep 25 08:46:06 2017 +1000)
+* 85d8e09 - fix: correctly display pact term when parent key is missing (Beth Skurrie, Mon Sep 25 08:43:02 2017 +1000)
+
+## 1.15.0 (11 August 2017)
+* a950a16 - fix: Fix module declaration (Beth Skurrie, Fri Aug 11 11:47:46 2017 +1000)
+* 14cd969 - feat(output): Remove ruby specific text from pact verification output. (Beth Skurrie, Tue Aug 8 17:12:50 2017 +1000)
 
 ## 1.14.0 (19 June 2017)
 * eb44499 - Updated pact-support version (Beth Skurrie, Mon Jun 19 09:51:13 2017 +1000)

data/lib/pact/cli/run_pact_verification.rb

@@ -27,8 +27,9 @@ module Pact
       def initialize_rspec
         # With RSpec3, if the pact_helper loads a library that adds its own formatter before we set one,
         # we will get a ProgressFormatter too, and get little dots sprinkled throughout our output.
+        # Load a NilFormatter here to prevent that.
         require 'pact/rspec'
-        ::RSpec.configuration.add_formatter Pact::RSpec.formatter_class
+        ::RSpec.configuration.add_formatter Pact::RSpec.formatter_class.const_get('NilFormatter')
       end
 
       def setup_load_path
@@ -69,7 +70,8 @@ module Pact
       def pact_spec_options
         {
           full_backtrace: options[:backtrace],
-          criteria: SpecCriteria.call(options)
+          criteria: SpecCriteria.call(options),
+          format: options[:format]
         }
       end
 

data/lib/pact/cli.rb

@@ -16,6 +16,7 @@ module Pact
                   default: Pact.configuration.interactions_replay_order
     method_option :description, aliases: "-d", desc: "Interaction description filter"
     method_option :provider_state, aliases: "-s", desc: "Provider state filter"
+    method_option :format, aliases: "-f", banner: "FORMATTER", desc: "RSpec formatter. Defaults to custom Pact formatter. [j]son may also be used."
 
     def verify
       require 'pact/cli/run_pact_verification'

data/lib/pact/provider/configuration/service_provider_config.rb

@@ -5,8 +5,9 @@ module Pact
 
         attr_accessor :application_version
 
-        def initialize application_version, publish_verification_results, &app_block
+        def initialize application_version, tags, publish_verification_results, &app_block
           @application_version = application_version
+          @tags = [*tags]
           @publish_verification_results = publish_verification_results
           @app_block = app_block
         end
@@ -18,6 +19,10 @@ module Pact
         def publish_verification_results?
           @publish_verification_results
         end
+
+        def tags
+          @tags
+        end
       end
     end
   end

data/lib/pact/provider/configuration/service_provider_dsl.rb

@@ -13,7 +13,7 @@ module Pact
 
         extend Pact::DSL
 
-        attr_accessor :name, :app_block, :application_version, :publish_verification_results
+        attr_accessor :name, :app_block, :application_version, :tags, :publish_verification_results
 
         CONFIG_RU_APP = lambda {
           unless File.exist? Pact.configuration.config_ru_path
@@ -25,6 +25,7 @@ module Pact
         def initialize name
           @name = name
           @publish_verification_results = false
+          @tags = []
           @app_block = CONFIG_RU_APP
         end
 
@@ -37,10 +38,14 @@ module Pact
             self.application_version = application_version
           end
 
+          def app_version_tags tags
+            self.tags = tags
+          end
+
           def publish_verification_results publish_verification_results
             self.publish_verification_results = publish_verification_results
             Pact::RSpec.with_rspec_2 do
-              puts "WARNING: Publishing of verification results is currently not supported with rspec 2. If you would like this functionality, please feel free to submit a PR!"
+              Pact.configuration.error_stream.puts "WARN: Publishing of verification results is currently not supported with rspec 2. If you would like this functionality, please feel free to submit a PR!"
             end
           end
 
@@ -70,7 +75,7 @@ module Pact
         end
 
         def create_service_provider
-          Pact.configuration.provider = ServiceProviderConfig.new(application_version, publish_verification_results, &@app_block)
+          Pact.configuration.provider = ServiceProviderConfig.new(application_version, tags, publish_verification_results, &@app_block)
         end
       end
     end

data/lib/pact/provider/matchers/messages.rb

@@ -19,6 +19,20 @@ module Pact
         "Expected header \"#{header_name}\" to #{expected_desc(expected)}, but was #{actual_desc(actual)}"
       end
 
+      def expected_desc_for_it expected
+        case expected
+        when NilClass then "is nil"
+        when Regexp
+          "matches #{expected.inspect}"
+        when Pact::Term
+          "matches #{expected.matcher.inspect}"
+        when Pact::SomethingLike
+          "is an instance of #{Pact::Reification.from_term(expected).class}"
+        else
+          "equals #{expected.inspect}"
+        end
+      end
+
       private
 
       def colorize_if_enabled formatted_diff, color_enabled
@@ -35,15 +49,20 @@ module Pact
       def expected_desc expected
         case expected
         when NilClass then "be nil"
-        else
+        when Regexp
           "match #{expected.inspect}"
+        when Pact::Term
+          "match #{expected.matcher.inspect}"
+        when Pact::SomethingLike
+          "be an instance of #{Pact::Reification.from_term(expected).class}"
+        else
+          "equal #{expected.inspect}"
         end
       end
 
       def actual_desc actual
         actual.nil? ? 'nil' : '"' + actual + '"'
       end
-
     end
   end
 end

data/lib/pact/provider/pact_spec_runner.rb

@@ -8,6 +8,7 @@ require 'pact/rspec'
 require 'pact/provider/pact_source'
 require 'pact/provider/help/write'
 require 'pact/provider/verification_results/publish_all'
+require 'pact/provider/rspec/pact_broker_formatter'
 
 require_relative 'rspec'
 
@@ -20,7 +21,6 @@ module Pact
 
       attr_reader :pact_urls
       attr_reader :options
-      attr_reader :output
 
       def initialize pact_urls, options = {}
         @pact_urls = pact_urls
@@ -62,10 +62,20 @@ module Pact
           config.output_stream = Pact.configuration.output_stream
         end
 
-        # Sometimes the formatter set in the cli.rb get set with an output of StringIO.. don't know why
-        formatter_class = Pact::RSpec.formatter_class
-        pact_formatter = ::RSpec.configuration.formatters.find {|f| f.class == formatter_class && f.output == ::RSpec.configuration.output_stream}
-        ::RSpec.configuration.add_formatter formatter_class unless pact_formatter
+        Pact::RSpec.with_rspec_3 do
+          ::RSpec.configuration.add_formatter Pact::Provider::RSpec::PactBrokerFormatter, StringIO.new
+        end
+
+        if options[:format]
+          ::RSpec.configuration.add_formatter options[:format]
+          # Don't want to mess up the JSON parsing with messages to stdout, so send it to stderr
+          Pact.configuration.output_stream = Pact.configuration.error_stream
+        else
+          # Sometimes the formatter set in the cli.rb get set with an output of StringIO.. don't know why
+          formatter_class = Pact::RSpec.formatter_class
+          pact_formatter = ::RSpec.configuration.formatters.find {|f| f.class == formatter_class && f.output == ::RSpec.configuration.output_stream}
+          ::RSpec.configuration.add_formatter formatter_class unless pact_formatter
+        end
         ::RSpec.configuration.full_backtrace = @options[:full_backtrace]
 
         config.before(:suite) do
@@ -77,14 +87,12 @@ module Pact
           Pact.configuration.provider.app
         end
 
+        # For the Pact::Provider::RSpec::PactBrokerFormatter
+        Pact.provider_world.pact_sources = pact_sources
         jsons = pact_jsons
-        sources = pact_sources
 
         config.after(:suite) do | suite |
           Pact::Provider::Help::Write.call(jsons)
-          Pact::RSpec.with_rspec_3 do
-            Pact::Provider::VerificationResults::PublishAll.call(sources, ::RSpec.configuration.reporter.failed_examples)
-          end
         end
 
       end

data/lib/pact/provider/request.rb

@@ -35,12 +35,13 @@ module Pact
           request_headers = {}
           return request_headers if expected_request.headers.is_a?(Pact::NullExpectation)
           expected_request.headers.each do |key, value|
-            request_headers[rack_request_header_for(key)] = value
+            request_headers[rack_request_header_for(key)] = Pact::Reification.from_term(value)
           end
           request_headers
         end
 
         private
+
         attr_reader :expected_request
 
         def reified_body
@@ -63,8 +64,7 @@ module Pact
         def with_http_prefix header
           NO_HTTP_PREFIX.include?(header) ? header : "HTTP_#{header}"
         end
-
       end
     end
   end
-end
+end

data/lib/pact/provider/rspec/formatter_rspec_2.rb

@@ -8,6 +8,11 @@ module Pact
     module RSpec
       class Formatter2 < ::RSpec::Core::Formatters::DocumentationFormatter
 
+        class NilFormatter < ::RSpec::Core::Formatters::DocumentationFormatter
+          def dump_commands_to_rerun_failed_examples
+          end
+        end
+
         C = ::Term::ANSIColor
 
         def dump_commands_to_rerun_failed_examples
@@ -29,7 +34,9 @@ module Pact
         end
 
         def print_missing_provider_states
-          PrintMissingProviderStates.call Pact.provider_world.provider_states.missing_provider_states, output
+          if executing_with_ruby?
+            PrintMissingProviderStates.call Pact.provider_world.provider_states.missing_provider_states, output
+          end
         end
 
         def interaction_rerun_commands
@@ -39,26 +46,33 @@ module Pact
         end
 
         def interaction_rerun_command_for example
-          provider_state = example.metadata[:pact_interaction].provider_state
-          description = example.metadata[:pact_interaction].description
-          pactfile_uri = example.metadata[:pactfile_uri]
           example_description = example.metadata[:pact_interaction_example_description]
-          failure_color("bundle exec rake pact:verify:at[#{pactfile_uri}] PACT_DESCRIPTION=\"#{description}\" PACT_PROVIDER_STATE=\"#{provider_state}\"") + " " + detail_color("# #{example_description}")
+          if ENV['PACT_INTERACTION_RERUN_COMMAND']
+            cmd = String.new(ENV['PACT_INTERACTION_RERUN_COMMAND'])
+            provider_state = example.metadata[:pact_interaction].provider_state
+            description = example.metadata[:pact_interaction].description
+            pactfile_uri = example.metadata[:pactfile_uri]
+            cmd.gsub!("<PACT_URI>", pactfile_uri.to_s)
+            cmd.gsub!("<PACT_DESCRIPTION>", description)
+            cmd.gsub!("<PACT_PROVIDER_STATE>", "#{provider_state}")
+            failure_color(cmd) + " " + detail_color("# #{example_description}")
+          else
+            failure_color("* #{example_description}")
+          end
         end
 
         def print_failure_message
-          output.puts failure_message
+          output.puts(failure_message) if executing_with_ruby?
         end
 
         def failure_message
           "\n" + Pact::Provider::Help::PromptText.() + "\n"
         end
 
+        def executing_with_ruby?
+          ENV['PACT_EXECUTING_LANGUAGE'] == 'ruby'
+        end
       end
-
     end
-
   end
 end
-
-

data/lib/pact/provider/rspec/formatter_rspec_3.rb

@@ -6,8 +6,17 @@ require 'pact/provider/help/prompt_text'
 module Pact
   module Provider
     module RSpec
+
       class Formatter < ::RSpec::Core::Formatters::DocumentationFormatter
 
+        class NilFormatter < ::RSpec::Core::Formatters::BaseFormatter
+          Pact::RSpec.with_rspec_3 do
+            ::RSpec::Core::Formatters.register self, :start, :example_group_started, :close
+          end
+          def dump_summary(summary)
+          end
+        end
+
         Pact::RSpec.with_rspec_3 do
           ::RSpec::Core::Formatters.register self, :example_group_started, :example_group_finished,
                                     :example_passed, :example_pending, :example_failed
@@ -55,26 +64,35 @@ module Pact
         end
 
         def print_missing_provider_states
-          PrintMissingProviderStates.call Pact.provider_world.provider_states.missing_provider_states, output
+          if executing_with_ruby?
+            PrintMissingProviderStates.call Pact.provider_world.provider_states.missing_provider_states, output
+          end
         end
 
         def interaction_rerun_commands summary
           summary.failed_examples.collect do |example|
             interaction_rerun_command_for example
-          end.uniq
+          end.uniq.compact
         end
 
         def interaction_rerun_command_for example
-          provider_state = example.metadata[:pact_interaction].provider_state
-          description = example.metadata[:pact_interaction].description
-          pactfile_uri = example.metadata[:pactfile_uri]
           example_description = example.metadata[:pact_interaction_example_description]
-          colorizer.wrap("bundle exec rake pact:verify:at[#{pactfile_uri}] PACT_DESCRIPTION=\"#{description}\" PACT_PROVIDER_STATE=\"#{provider_state}\" ", ::RSpec.configuration.failure_color) +
-            colorizer.wrap("# #{example_description}", ::RSpec.configuration.detail_color)
+          if ENV['PACT_INTERACTION_RERUN_COMMAND']
+            cmd = String.new(ENV['PACT_INTERACTION_RERUN_COMMAND'])
+            provider_state = example.metadata[:pact_interaction].provider_state
+            description = example.metadata[:pact_interaction].description
+            pactfile_uri = example.metadata[:pactfile_uri]
+            cmd.gsub!("<PACT_URI>", pactfile_uri.to_s)
+            cmd.gsub!("<PACT_DESCRIPTION>", description)
+            cmd.gsub!("<PACT_PROVIDER_STATE>", "#{provider_state}")
+            colorizer.wrap("#{cmd} ", ::RSpec.configuration.failure_color) + colorizer.wrap("# #{example_description}", ::RSpec.configuration.detail_color)
+          else
+            colorizer.wrap("* #{example_description}", ::RSpec.configuration.failure_color)
+          end
         end
 
         def print_failure_message
-          output.puts failure_message
+          output.puts(failure_message) if executing_with_ruby?
         end
 
         def failure_message
@@ -85,11 +103,11 @@ module Pact
           @colorizer ||= ::RSpec::Core::Formatters::ConsoleCodes
         end
 
+        def executing_with_ruby?
+          ENV['PACT_EXECUTING_LANGUAGE'] == 'ruby'
+        end
       end
-
     end
-
   end
 end
 
-

data/lib/pact/provider/rspec/pact_broker_formatter.rb

@@ -0,0 +1,67 @@
+require 'rspec/core/formatters'
+require 'pact/provider/verification_results/publish_all'
+require 'term/ansicolor'
+
+module Pact
+  module Provider
+    module RSpec
+      class PactBrokerFormatter < ::RSpec::Core::Formatters::BaseFormatter
+        Pact::RSpec.with_rspec_3 do
+          ::RSpec::Core::Formatters.register self, :message, :dump_summary, :stop, :seed, :close
+        end
+
+        attr_reader :output_hash
+
+        def initialize(output)
+          super
+          @output_hash = {
+            :version => ::RSpec::Core::Version::STRING
+          }
+        end
+
+        def message(notification)
+          (@output_hash[:messages] ||= []) << notification.message
+        end
+
+        def dump_summary(summary)
+        end
+
+        def stop(notification)
+          @output_hash[:tests] = notification
+                                  .examples
+                                  .map { |example| format_example(example) }
+        end
+
+        def seed(notification)
+          return unless notification.seed_used?
+          @output_hash[:seed] = notification.seed
+        end
+
+        def close(_notification)
+          Pact::Provider::VerificationResults::PublishAll.call(Pact.provider_world.pact_sources, output_hash)
+        end
+
+      private
+
+        def format_example(example)
+          {
+            testDescription: example.description,
+            testFullDescription: example.full_description,
+            status: example.execution_result.status.to_s,
+            interactionProviderState: example.metadata[:pact_interaction].provider_state,
+            interactionDescription: example.metadata[:pact_interaction].description,
+            pact_uri: example.metadata[:pact_uri],
+            pact_interaction: example.metadata[:pact_interaction]
+          }.tap do |hash|
+            if example.exception
+              hash[:exception] =  {
+                class: example.exception.class.name,
+                message: ::Term::ANSIColor.uncolor(example.exception.message)
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact/provider/rspec.rb

@@ -3,6 +3,8 @@ require 'pact/consumer_contract'
 require 'pact/provider/rspec/matchers'
 require 'pact/provider/test_methods'
 require 'pact/provider/configuration'
+require 'pact/provider/matchers/messages'
+
 
 module Pact
   module Provider
@@ -19,12 +21,11 @@ module Pact
         include ::RSpec::Core::DSL
 
         def honour_pactfile pact_uri, pact_json, options
-          #TODO change puts to use output stream
-          puts "Reading pact at #{pact_uri}"
-          puts "Filtering interactions by: #{options[:criteria]}" if options[:criteria] && options[:criteria].any?
+          Pact.configuration.output_stream.puts "INFO: Reading pact at #{pact_uri}"
+          Pact.configuration.output_stream.puts "INFO: Filtering interactions by: #{options[:criteria]}" if options[:criteria] && options[:criteria].any?
           consumer_contract = Pact::ConsumerContract.from_json(pact_json)
           ::RSpec.describe "Verifying a pact between #{consumer_contract.consumer.name} and #{consumer_contract.provider.name}", pactfile_uri: pact_uri do
-            honour_consumer_contract consumer_contract, options.merge(pact_json: pact_json)
+            honour_consumer_contract consumer_contract, options.merge(pact_json: pact_json, pact_uri: pact_uri)
           end
         end
 
@@ -60,19 +61,24 @@ module Pact
 
         def describe_interaction interaction, options
 
+          # pact_uri and pact_interaction are used by
+          # Pact::Provider::RSpec::PactBrokerFormatter
+
+          # pact_interaction_example_description is used by
+          # Pact::Provider::RSpec::Formatter and Pact::Provider::RSpec::Formatter2
+
+          # pact: verify is used to allow RSpec before and after hooks.
           metadata = {
             pact: :verify,
             pact_interaction: interaction,
             pact_interaction_example_description: interaction_description_for_rerun_command(interaction),
-            pact_json: options[:pact_json]
+            pact_uri: options[:pact_uri]
           }
 
           describe description_for(interaction), metadata do
 
-
             describe "with #{interaction.request.method_and_path}" do
 
-
               interaction_context = InteractionContext.new
 
               before do | example |
@@ -90,7 +96,7 @@ module Pact
                 end
               end
 
-              describe_response Pact::Response.new(Pact::Term.unpack_regexps(interaction.response)), interaction_context
+              describe_response Pact::Response.new(interaction.response), interaction_context
 
             end
 
@@ -103,6 +109,7 @@ module Pact
           describe "returns a response which" do
 
             include Pact::RSpec::Matchers
+            extend Pact::Matchers::Messages
 
             let(:expected_response_status) { expected_response.status }
             let(:expected_response_body) { expected_response.body }
@@ -125,7 +132,7 @@ module Pact
             if expected_response.headers
               describe "includes headers" do
                 expected_response.headers.each do |name, expected_header_value|
-                  it "\"#{name}\" with value #{expected_header_value.inspect}" do
+                  it "\"#{name}\" which #{expected_desc_for_it(expected_header_value)}" do
                     header_value = response.headers[name]
                     expect(header_value).to match_header(name, expected_header_value)
                   end

data/lib/pact/provider/state/provider_state_configured_modules.rb

@@ -1,13 +1,15 @@
 require 'rspec/mocks'
 
 module Pact
-  module Provider::State
-    module ProviderStateConfiguredModules
+  module Provider
+    module State
+      module ProviderStateConfiguredModules
 
-      include ::RSpec::Mocks::ExampleMethods
+        include ::RSpec::Mocks::ExampleMethods
 
-      # Placeholder for modules configured using config.include
+        # Placeholder for modules configured using config.include
 
+      end
     end
   end
 end

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

@@ -4,38 +4,67 @@ module Pact
     module VerificationResults
       class Create
 
-        def self.call pact_json, failed_examples
-          new(pact_json, failed_examples).call
+        def self.call pact_source, test_results_hash
+          new(pact_source, test_results_hash).call
         end
 
-        def initialize pact_json, failed_examples
-          @pact_json = pact_json
-          @failed_examples = failed_examples
+        def initialize pact_source, test_results_hash
+          @pact_source = pact_source
+          @test_results_hash = test_results_hash
         end
 
         def call
-          VerificationResult.new(!any_failures?, Pact.configuration.provider.application_version)
+          VerificationResult.new(publishable?, !any_failures?, Pact.configuration.provider.application_version, test_results_hash_for_pact_uri)
         end
 
         private
 
-        def pact_hash
-          @pact_hash ||= json_load(pact_json)
+        def pact_uri
+          @pact_uri ||= pact_source.uri
         end
 
-        def json_load json
-          JSON.load(json, nil, { max_nesting: 50 })
+        def any_failures?
+          count_failures_for_pact_uri > 0
         end
 
-        def count_failures_for_pact_json
-          failed_examples.collect{ |e| e.metadata[:pact_json] == pact_json }.uniq.size
+        def publishable?
+          executed_interactions_count == all_interactions_count && all_interactions_count > 0
         end
 
-        def any_failures?
-          count_failures_for_pact_json > 0
+        def examples_for_pact_uri
+          @examples_for_pact_uri ||= test_results_hash[:tests].select{ |e| e[:pact_uri] == pact_uri }
+        end
+
+        def count_failures_for_pact_uri
+          examples_for_pact_uri.count{ |e| e[:status] != 'passed' }
+        end
+
+        def executed_interactions_count
+          examples_for_pact_uri
+            .collect { |e| e[:pact_interaction].object_id }
+            .uniq
+            .count
+        end
+
+        def all_interactions_count
+          pact_source.pact_hash['interactions'].count
+        end
+
+        def test_results_hash_for_pact_uri
+          {
+            tests: examples_for_pact_uri.collect{ |e| clean_example(e) },
+            summary: {
+              testCount: examples_for_pact_uri.size,
+              failureCount: count_failures_for_pact_uri
+            }
+          }
+        end
+
+        def clean_example(example)
+          example.reject{ |k, v| k == :pact_uri || k == :pact_interaction }
         end
 
-        attr_reader :pact_json, :failed_examples
+        attr_reader :pact_source, :test_results_hash
       end
     end
   end

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

@@ -1,6 +1,9 @@
 require 'json'
 require 'pact/errors'
 
+# TODO move this to the pact broker client
+# TODO retries
+
 module Pact
   module Provider
     module VerificationResults
@@ -19,26 +22,76 @@ module Pact
         end
 
         def call
-          if Pact.configuration.provider.publish_verification_results?
-            if publication_url
-              publish
-            else
-              puts "WARNING: Cannot publish verification for #{consumer_name} as there is no link named pb:publish-verification-results in the pact JSON. If you are using a pact broker, please upgrade to version 2.0.0 or later."
-            end
+          if can_publish_verification_results?
+            tag_versions_if_configured
+            publish_verification_results
           end
         end
 
         private
 
+        def can_publish_verification_results?
+          return false unless Pact.configuration.provider.publish_verification_results?
+
+          if publication_url.nil?
+            Pact.configuration.error_stream.puts "WARN: Cannot publish verification for #{consumer_name} as there is no link named pb:publish-verification-results in the pact JSON. If you are using a pact broker, please upgrade to version 2.0.0 or later."
+            return false
+          end
+
+          if !verification_result.publishable?
+            Pact.configuration.error_stream.puts "WARN: Cannot publish verification for #{consumer_name} as not all interactions have been verified. Re-run the verification without the filter parameters or environment variables to publish the verification."
+            return false
+          end
+          true
+        end
+
         def publication_url
           @publication_url ||= pact_source.pact_hash.fetch('_links', {}).fetch('pb:publish-verification-results', {})['href']
         end
 
-        def publish
-          #TODO https
-          #TODO username/password
+        def tag_url tag
+          # This is so dodgey, need to use proper HAL
+          if publication_url
+            u = URI(publication_url)
+            if match = publication_url.match(%r{/provider/([^/]+)})
+              provider_name = match[1]
+              base_url = "#{u.scheme}://#{u.host}:#{u.host == u.default_port ? '' : u.port}"
+              provider_application_version = Pact.configuration.provider.application_version
+              "#{base_url}/pacticipants/#{provider_name}/versions/#{provider_application_version}/tags/#{tag}"
+            end
+          end
+        end
+
+        def tag_versions_if_configured
+          if Pact.configuration.provider.tags.any?
+            tag_versions if tag_url('')
+          end
+        end
+
+        def tag_versions
+          Pact.configuration.provider.tags.each do | tag |
+            uri = URI(tag_url(tag))
+            request = build_request('Put', uri, nil, "Tagging provider version at")
+            response = nil
+            begin
+              options = {:use_ssl => uri.scheme == 'https'}
+              response = Net::HTTP.start(uri.host, uri.port, options) do |http|
+                http.request request
+              end
+            rescue StandardError => e
+              error_message = "Failed to tag provider version due to: #{e.class} #{e.message}"
+              raise PublicationError.new(error_message)
+            end
+
+            unless response.code.start_with?("2")
+              raise PublicationError.new("Error returned from tagging request #{response.code} #{response.body}")
+            end
+          end
+        end
+
+        def publish_verification_results
           uri = URI(publication_url)
-          request = build_request(uri)
+          request = build_request('Post', uri, verification_result.to_json, "Publishing verification result #{verification_result} to")
           response = nil
           begin
             options = {:use_ssl => uri.scheme == 'https'}
@@ -46,25 +99,30 @@ module Pact
               http.request request
             end
           rescue StandardError => e
-            error_message = "Failed to publish verification result due to: #{e.class} #{e.message}"
+            error_message = "Failed to publish verification results due to: #{e.class} #{e.message}"
             raise PublicationError.new(error_message)
           end
 
-          unless response.code.start_with?("2")
-            raise PublicationError.new("Error returned from verification result publication #{response.code} #{response.body}")
+
+
+          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}"
+          else
+            raise PublicationError.new("Error returned from verification results publication #{response.code} #{response.body}")
           end
         end
 
-        def build_request uri
-          request = Net::HTTP::Post.new(uri.path)
+        def build_request meth, uri, body, action
+          request = Net::HTTP.const_get(meth).new(uri.path)
           request['Content-Type'] = "application/json"
-          request.body = verification_result.to_json
+          request.body = body if body
           debug_uri = uri
           if pact_source.uri.basic_auth?
             request.basic_auth pact_source.uri.username, pact_source.uri.password
             debug_uri = URI(uri.to_s).tap { |x| x.userinfo="#{pact_source.uri.username}:*****"}
           end
-          puts "Publishing verification result #{verification_result.to_json} to #{debug_uri}"
+          Pact.configuration.output_stream.puts "INFO: #{action} #{debug_uri}"
           request
         end
 

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

@@ -6,18 +6,18 @@ module Pact
     module VerificationResults
       class PublishAll
 
-        def self.call pact_sources, rspec_summary
-          new(pact_sources, rspec_summary).call
+        def self.call pact_sources, test_results_hash
+          new(pact_sources, test_results_hash).call
         end
 
-        def initialize pact_sources, rspec_summary
+        def initialize pact_sources, test_results_hash
           @pact_sources = pact_sources
-          @rspec_summary = rspec_summary
+          @test_results_hash = test_results_hash
         end
 
         def call
-          verification_results.collect do | pair |
-            Publish.call(pair.first, pair.last)
+          verification_results.collect do | (pact_source, verification_result) |
+            Publish.call(pact_source, verification_result)
           end
         end
 
@@ -25,11 +25,11 @@ module Pact
 
         def verification_results
           pact_sources.collect do | pact_source |
-            [pact_source, Create.call(pact_source.pact_json, rspec_summary)]
+            [pact_source, Create.call(pact_source, test_results_hash)]
           end
         end
 
-        attr_reader :pact_sources, :rspec_summary
+        attr_reader :pact_sources, :test_results_hash
       end
     end
   end

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

@@ -1,11 +1,19 @@
+require 'json'
+
 module Pact
   module Provider
     module VerificationResults
       class VerificationResult
 
-        def initialize success, provider_application_version
+        def initialize publishable, success, provider_application_version, test_results_hash
+          @publishable = publishable
           @success = success
           @provider_application_version = provider_application_version
+          @test_results_hash = test_results_hash
+        end
+
+        def publishable?
+          @publishable
         end
 
         def provider_application_version_set?
@@ -15,13 +23,18 @@ module Pact
         def to_json
           {
             success: success,
-            providerApplicationVersion: provider_application_version
+            providerApplicationVersion: provider_application_version,
+            #testResults: test_results_hash # not yet
           }.to_json
         end
 
+        def to_s
+          "[success: #{success}, providerApplicationVersion: #{provider_application_version}]"
+        end
+
         private
 
-        attr_reader :success, :provider_application_version
+        attr_reader :success, :provider_application_version, :test_results_hash
       end
     end
   end

data/lib/pact/provider/world.rb

@@ -14,6 +14,8 @@ module Pact
   module Provider
     class World
 
+      attr_accessor :pact_sources
+
       def provider_states
         @provider_states_proxy ||= Pact::Provider::State::ProviderStateProxy.new
       end
@@ -29,7 +31,6 @@ module Pact
       def pact_urls
         pact_verifications.collect(&:uri)
       end
-
     end
   end
 end

data/lib/pact/tasks/task_helper.rb

@@ -1,3 +1,4 @@
+require 'pact/configuration'
 require 'pact/provider/pact_helper_locator'
 require 'rake/file_utils'
 require 'shellwords'
@@ -5,6 +6,8 @@ require 'shellwords'
 module Pact
   module TaskHelper
 
+    PACT_INTERACTION_RERUN_COMMAND = "bundle exec rake pact:verify:at[<PACT_URI>] PACT_DESCRIPTION=\"<PACT_DESCRIPTION>\" PACT_PROVIDER_STATE=\"<PACT_PROVIDER_STATE>\""
+
     extend self
 
     def execute_pact_verify pact_uri = nil, pact_helper = nil, rspec_opts = nil
@@ -34,9 +37,20 @@ module Pact
     end
 
     def execute_cmd command
-      $stdout.puts command
-      system(command) ? 0 : 1
+      Pact.configuration.output_stream.puts command
+      temporarily_set_env_var 'PACT_EXECUTING_LANGUAGE', 'ruby' do
+        temporarily_set_env_var 'PACT_INTERACTION_RERUN_COMMAND', PACT_INTERACTION_RERUN_COMMAND do
+          exit_status = system(command) ? 0 : 1
+        end
+      end
     end
 
+    def temporarily_set_env_var name, value
+      original_value = ENV[name]
+      ENV[name] ||= value
+      yield
+    ensure
+      ENV[name] = original_value
+    end
   end
 end

data/lib/pact/templates/help.erb

@@ -19,4 +19,4 @@
 
 * Check out https://github.com/realestate-com-au/pact/wiki/Troubleshooting
 
-* Ask a question in the google users' group https://groups.google.com/forum/#!forum/pact-support
+* Ask a question on stackoverflow and tag it `pact-ruby`

data/lib/pact/version.rb

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

data/lib/tasks/pact.rake

@@ -31,5 +31,4 @@ namespace :pact do
     require 'pact/provider/help/console_text'
     puts Pact::Provider::Help::ConsoleText.(args[:reports_dir])
   end
-
 end

data/pact.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'randexp', '~> 0.1.7'
   gem.add_runtime_dependency 'rspec', '>=2.14'
-  gem.add_runtime_dependency 'rack-test', '~> 0.6.2'
+  gem.add_runtime_dependency 'rack-test', '~> 0.6', '>= 0.6.3'
   gem.add_runtime_dependency 'thor'
   gem.add_runtime_dependency 'json','> 1.8.5'
   gem.add_runtime_dependency 'webrick'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 1.1'
+  gem.add_runtime_dependency 'pact-support', '~> 1.2', '>= 1.2.4'
   gem.add_runtime_dependency 'pact-mock_service', '~> 2.0'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
@@ -37,6 +37,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'fakefs', '0.5' # 0.6.0 blows up
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'activesupport'
-  gem.add_development_dependency 'faraday'
-  gem.add_development_dependency 'appraisal'
+  gem.add_development_dependency 'faraday', '~> 0.13'
+  gem.add_development_dependency 'appraisal', '~> 2.2'
+  gem.add_development_dependency 'conventional-changelog', '~> 1.3'
+  gem.add_development_dependency 'bump', '~> 0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.20.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2017-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -48,14 +48,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -118,14 +124,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -228,30 +240,58 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: conventional-changelog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Enables consumer driven contract testing, providing a mock service and
   DSL for the consumer project, and interaction playback and verification for the
   service provider project.
@@ -326,6 +366,7 @@ files:
 - lib/pact/provider/rspec/formatter_rspec_2.rb
 - lib/pact/provider/rspec/formatter_rspec_3.rb
 - lib/pact/provider/rspec/matchers.rb
+- lib/pact/provider/rspec/pact_broker_formatter.rb
 - lib/pact/provider/state/provider_state.rb
 - lib/pact/provider/state/provider_state_configured_modules.rb
 - lib/pact/provider/state/provider_state_manager.rb
@@ -367,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL