pact 1.22.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98e5eb1496b65c594ed13101b2fc458979b0dcc3
-  data.tar.gz: '091e47ad1474581a0d6d5fa47c6feded20b10d9a'
+  metadata.gz: 2f08c3f242d549648001e7294df45094bf80bdfe
+  data.tar.gz: 84c7976f630dcaee652d7c10eb8d6a2bcd9c64a4
 SHA512:
-  metadata.gz: 4b222248d8f3d7fc8b5dc5631945b1e44ae1ecb8175d5caea1efda1d57a2073d7e87cc874a52128ce750246170bf141fcb40dcfffb95d00e0f49fc65c1fb9e89
-  data.tar.gz: e65bd27bd345906792632cfa52a19d4c300e9bdfc3249229849d8ce04a36ff921d69feea8ba86272bbeac1f24bcce861ef213780b5c081d1f83c9e6627ba0e88
+  metadata.gz: d844246c78be90a05be79a69901b9d57c27d5f31b6ea4b2ef79160e2b9524b7e56788ba3b5308815e0108dec02c1f977be528af6f69f1f4c3c5debfda60277fa
+  data.tar.gz: 508f3d6b351a05dc480122ddca8c4ea86fc7c4169d58e309649ae0e39a07bf7e8ac0960d8bbd12c381cba25bf8fdd4ed5ad2642b2286210af97ce8033e4beff2

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+<a name="v1.23.0"></a>
+### v1.23.0 (2018-04-16)
+
+
+#### Features
+
+* allow --out FILE to be specified for the output from pact verify	 ([ca19aa8](/../../commit/ca19aa8))
+
+
+#### Bug Fixes
+
+* URL escape file paths in index of generated markdown	 ([6af19d5](/../../commit/6af19d5))
+
+
+<a name="v1.22.2"></a>
+### v1.22.2 (2018-03-24)
+
+
+#### Bug Fixes
+
+* message pact verification code	 ([1bfa8f3](/../../commit/1bfa8f3))
+
+
 <a name="v1.22.0"></a>
 ### v1.22.0 (2018-03-16)
 

data/lib/pact/cli/run_pact_verification.rb

@@ -14,7 +14,6 @@ module Pact
         new(options).call
       end
 
-
       def call
         initialize_rspec
         setup_load_path
@@ -71,10 +70,10 @@ module Pact
         {
           full_backtrace: options[:backtrace],
           criteria: SpecCriteria.call(options),
-          format: options[:format]
+          format: options[:format],
+          out: options[:out]
         }
       end
-
     end
   end
 end

data/lib/pact/cli.rb

@@ -17,6 +17,7 @@ module Pact
     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."
+    method_option :out, aliases: "-o", banner: "FILE", desc: "Write output to a file instead of $stdout."
 
     def verify
       require 'pact/cli/run_pact_verification'

data/lib/pact/doc/markdown/index_renderer.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module Pact
   module Doc
     module Markdown
@@ -32,7 +34,7 @@ module Pact
         end
 
         def item title, file_name
-          "* [#{title}](#{file_name})"
+          "* [#{title}](#{ERB::Util.url_encode(file_name)})"
         end
 
       end

data/lib/pact/provider/pact_spec_runner.rb

@@ -62,21 +62,7 @@ module Pact
           config.output_stream = Pact.configuration.output_stream
         end
 
-        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]
+        configure_output
 
         config.before(:suite) do
           # Preload app before suite so the classes loaded in memory are consistent for
@@ -138,6 +124,28 @@ module Pact
         end
       end
 
+      def configure_output
+        Pact::RSpec.with_rspec_3 do
+          ::RSpec.configuration.add_formatter Pact::Provider::RSpec::PactBrokerFormatter, StringIO.new
+        end
+
+        output = options[:out] || Pact.configuration.output_stream
+        if options[:format]
+          ::RSpec.configuration.add_formatter options[:format], output
+          if !options[:out]
+            # 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
+          end
+        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, output) unless pact_formatter
+        end
+
+        ::RSpec.configuration.full_backtrace = @options[:full_backtrace]
+      end
+
       def ordered_pact_json(pact_json)
         return pact_json if Pact.configuration.interactions_replay_order == :recorded
 

data/lib/pact/provider/rspec.rb

@@ -108,7 +108,7 @@ module Pact
           include Pact::RSpec::Matchers
           extend Pact::Matchers::Messages
 
-          let(:expected_content) { expected_response.body[:content] }
+          let(:expected_content) { expected_response.body[:content].as_json }
           let(:response) { interaction_context.last_response }
           let(:differ) { Pact.configuration.body_differ_for_content_type diff_content_type }
           let(:diff_formatter) { Pact.configuration.diff_formatter_for_content_type diff_content_type }
@@ -117,11 +117,11 @@ module Pact
           let(:response_body) { parse_body_from_response(response) }
           let(:actual_content) { response_body['content'] }
 
-          it "has matching content" do
+          it "has matching content" do | example |
             if response.status != 200
               raise "An error was raised while verifying the message. The response body is: #{response.body}"
             end
-            expect(actual_content).to match_term expected_content, diff_options
+            expect(actual_content).to match_term expected_content, diff_options, example
           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.22.0"
+  VERSION = "1.23.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp