pact 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb2ea12b63cd90b9451173dd6deb6a10146d426
-  data.tar.gz: 2ba870980eb5403ab32c405138315b6f471b189e
+  metadata.gz: 4f12dd3c9ccdf082d1816783d7defa13ee9df47b
+  data.tar.gz: 0221ad15770f29536daea315b64f965579e9a4fb
 SHA512:
-  metadata.gz: 517699fa66be479723e0f703dc00e5453482d18d5463b59176b8fd09138211c648dfa8f654223690f77c1cbe4cafad7ae98165c97b3561e69248a7bb4ad204f4
-  data.tar.gz: 44ef94d0fa65a5ee0b003ec3e7f8c6915da6c8ecadce6c690fa9c5a50e507f313f39b802839e3671cbfb5aea54ea9c4735d86a5ee1f854f37533333d37851985
+  metadata.gz: 68ca83ab0bfab86a947a582adee3b3583ef1fe429d372660f738e9c977be6987e80de122f5d8e93ef1b1159d40d186df8c26b9d67c7839f76d7d46e3d8633a8e
+  data.tar.gz: cc1ca09bcac2acee98480ef4b92237328686eb8a6e73f8d868f168ea29842155979871f244287c5a0d56785c936dacb2051418b95736d592a5e7ca5beaf6a28a

data/CHANGELOG.md

@@ -2,6 +2,14 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+## 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)
 * 8835496 - Changed colour of acutal response body output (Beth Skurrie, Tue Jun 6 10:44:45 2017 +1000)

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/rspec/formatter_rspec_2.rb

@@ -29,7 +29,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 +41,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

@@ -55,26 +55,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 +94,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.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
@@ -90,7 +92,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 +105,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 +128,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/tasks/task_helper.rb

@@ -5,6 +5,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
@@ -35,8 +37,19 @@ module Pact
 
     def execute_cmd command
       $stdout.puts command
-      system(command) ? 0 : 1
+      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.16.0"
 end

data/pact.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   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.1', '>=1.1.8'
   gem.add_runtime_dependency 'pact-mock_service', '~> 2.0'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.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-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -119,6 +119,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -126,6 +129,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.8
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -367,7 +373,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