pact 1.16.1 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 267331deb30dc707b5eca6e97ba5287216788c28
-  data.tar.gz: d5ec90edb6af928a1769e7792912233ce1b23734
+  metadata.gz: 6bcfd873247f92041435d45719162ebb805c9548
+  data.tar.gz: 2d2ed5e94d7d4e147e1930cce0429b9b67bfd7fc
 SHA512:
-  metadata.gz: ba3e1ea5c2063da723cab8b0122ecda20594c6289f27ade1e20eb820e5bc77c7929ad6fcb020fc16d4da7fa8971fe254868ccf9e72d08c117ea8a07f6d33ba6e
-  data.tar.gz: 484c68ed162a8b02453083fecc37931b6d81ea268c3658aa9b3fc3a61d011c90fb42477fb4670e85670dcfff5c03eb83caa3d29b3ca7447e37da7150a227e86e
+  metadata.gz: d650e4a9c69cf3796df7d4f1c42ed0ef81346615d0f3db11a1de7df8332dc63823799fb767dab313e87b0f00fa61d16b8e53b37f135fb32f3ff0502a0d7480d6
+  data.tar.gz: 773488afc5c1473fde3b3f7a5a33d6452258e4822965ce6fe3130b62eecdd36a31643a14bda1026206ce0277cc45e54a6a50a80ad8a0dd4fdea8d26c994097bc

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+<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)
 

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/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/provider/configuration/service_provider_dsl.rb

@@ -40,7 +40,7 @@ module Pact
           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
 

data/lib/pact/provider/pact_spec_runner.rb

@@ -20,7 +20,6 @@ module Pact
 
       attr_reader :pact_urls
       attr_reader :options
-      attr_reader :output
 
       def initialize pact_urls, options = {}
         @pact_urls = pact_urls
@@ -62,10 +61,16 @@ 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
+        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

data/lib/pact/provider/rspec.rb

@@ -21,9 +21,8 @@ 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)

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

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

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

@@ -23,7 +23,7 @@ module Pact
             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."
+              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."
             end
           end
         end
@@ -64,7 +64,7 @@ module Pact
             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: Publishing verification result #{verification_result.to_json} to #{debug_uri}"
           request
         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.16.1"
+  VERSION = "1.17.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.17.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp