pact 1.6.0 → 1.7.0

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Do this to generate your change history
 
-  git log --pretty=format:'  * %h - %s (%an, %ad)'
+  git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
+
+### 1.7.0 (20 March 2015)
+
+* 61ce2da - Upgraded pact-support and pact-mock_service gems (Beth Skurrie, Fri Mar 20 15:05:14 2015 +1100)
+* 40666b6 - In pact verification DSL pass extra options for pact uri for http basic authentication.  In pact:verify:at[url] task pass http basic authentication info via environment variables (lifei zhou, Thu Feb 26 23:35:32 2015 +1100)
 
 ### 1.6.0 (17 February 2015)
 

data/lib/pact/cli.rb

@@ -7,6 +7,8 @@ module Pact
     desc 'verify', "Verify a pact"
     method_option :pact_helper, aliases: "-h", desc: "Pact helper file", :required => true
     method_option :pact_uri, aliases: "-p", desc: "Pact URI"
+    method_option :pact_broker_username, aliases: "-u", desc: "Pact broker user name"
+    method_option :pact_broker_password, aliases: "-w", desc: "Pact broker password"
     method_option :backtrace, aliases: "-b", desc: "Show full backtrace", :default => false, :type => :boolean
     method_option :description, aliases: "-d", desc: "Interaction description filter"
     method_option :provider_state, aliases: "-s", desc: "Provider state filter"

data/lib/pact/cli/run_pact_verification.rb

@@ -53,7 +53,11 @@ module Pact
       end
 
       def run_with_pact_uri
-        Pact::Provider::PactSpecRunner.new([options[:pact_uri]], pact_spec_options).run
+        pact_repository_uri_options = {}
+        pact_repository_uri_options[:username] = options[:pact_broker_username] if options[:pact_broker_username]
+        pact_repository_uri_options[:password] = options[:pact_broker_password] if options[:pact_broker_password]
+        pact_uri = ::Pact::Provider::PactURI.new(options[:pact_uri], pact_repository_uri_options)
+        Pact::Provider::PactSpecRunner.new([pact_uri], pact_spec_options).run
       end
 
       def run_with_configured_pacts

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

@@ -1,4 +1,5 @@
 require 'pact/provider/pact_verification'
+require 'pact/provider/pact_uri'
 require 'pact/shared/dsl'
 require 'pact/provider/world'
 
@@ -20,8 +21,8 @@ module Pact
         end
 
         dsl do
-          def pact_uri pact_uri
-            self.pact_uri = pact_uri
+          def pact_uri pact_uri, options = {}
+            self.pact_uri = ::Pact::Provider::PactURI.new(pact_uri, options) if pact_uri
           end
         end
 

data/lib/pact/provider/pact_source.rb

@@ -11,7 +11,7 @@ module PactBroker
       end
 
       def pact_json
-        @pact_json ||= Pact::PactFile.read(uri, {})
+        @pact_json ||= Pact::PactFile.read(uri.uri, uri.options)
       end
 
     end

data/lib/pact/provider/pact_uri.rb

@@ -0,0 +1,18 @@
+module Pact
+  module Provider
+    class PactURI
+      attr_reader :uri, :options
+
+      def initialize (uri, options={})
+        @uri = uri
+        @options = options
+      end
+
+      def == other
+        other.is_a?(PactURI) &&
+          uri == other.uri &&
+          options == other.options
+      end
+    end
+  end
+end

data/lib/pact/provider/rspec.rb

@@ -20,7 +20,7 @@ module Pact
 
         def honour_pactfile pact_uri, pact_json, options
           #TODO change puts to use output stream
-          puts "Reading pact at #{pact_uri}"
+          puts "Reading pact at #{pact_uri.uri}"
           puts "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

data/lib/pact/tasks/task_helper.rb

@@ -25,6 +25,9 @@ module Pact
       command_parts << "-S pact verify"
       command_parts << "--pact-helper" << (pact_helper.end_with?(".rb") ? pact_helper : pact_helper + ".rb")
       (command_parts << "--pact-uri" << pact_uri) if pact_uri
+      command_parts << "--pact-broker-username" << ENV['PACT_BROKER_USERNAME'] if ENV['PACT_BROKER_USERNAME']
+      command_parts << "--pact-broker-password" << ENV['PACT_BROKER_PASSWORD'] if ENV['PACT_BROKER_PASSWORD']
+      command_parts << "--backtrace" if ENV['BACKTRACE'] == 'true'
       command_parts << "--backtrace" if ENV['BACKTRACE'] == 'true'
       command_parts << "--description #{Shellwords.escape(ENV['PACT_DESCRIPTION'])}" if ENV['PACT_DESCRIPTION']
       command_parts << "--provider-state #{Shellwords.escape(ENV['PACT_PROVIDER_STATE'])}" if ENV['PACT_PROVIDER_STATE']

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/pact.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'webrick'
   gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
 
-  gem.add_runtime_dependency 'pact-support', '~> 0.3.0'
-  gem.add_runtime_dependency 'pact-mock_service', '~> 0.4.0'
+  gem.add_runtime_dependency 'pact-support', '~> 0.4.0'
+  gem.add_runtime_dependency 'pact-mock_service', '~> 0.5.0'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 1.18.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pact-mock_service
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +383,7 @@ files:
 - lib/pact/provider/pact_helper_locator.rb
 - lib/pact/provider/pact_source.rb
 - lib/pact/provider/pact_spec_runner.rb
+- lib/pact/provider/pact_uri.rb
 - lib/pact/provider/pact_verification.rb
 - lib/pact/provider/print_missing_provider_states.rb
 - lib/pact/provider/request.rb
@@ -422,7 +423,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1564031949540050912
+      hash: 2424764158045904869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -431,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1564031949540050912
+      hash: 2424764158045904869
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23