pact_broker-client 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce7491eef82209698edba4cb2634ceb83ef69f4
-  data.tar.gz: 14a3c6d6f84aa3826b68bce12b74528f69e5978d
+  metadata.gz: 9a8dab4f53fb2a35fd1d121dfc10c7d6ba07c1ac
+  data.tar.gz: 7a32febac80a24893016af889af96c9a33fcad22
 SHA512:
-  metadata.gz: d0213fe9b132dcecacff316757703115d2c849ba40dadb9d20ba035df8e269e348fba8dd390d8d8809f23b3aa35e86a6c8e8c33af961813b36e6353311e69fb2
-  data.tar.gz: 22f7ecc131a2e0ab53bc21700cae9c406d7b52b1c4e5a51eb45657a3f4d8db190fbd674168a70e892a602f94cc3eaf2a9ef4a206717b87884a6bec20b23e578e
+  metadata.gz: 20b659f85416883f3649448803ffe5b4f9a93073462df04c635780e376f8e16d2bcce4658bd127a98bbbee07ad057c2009d1b76b0625cac6d03ce92befa12417
+  data.tar.gz: 8e0ab94d47be12c18fa995717911a9e03b7c9d562ff5a73c4f076d543f6993516db29dd209103c98e5a4bd4c6222b77727f9a9ffb3f3bbbe3d1b01bec73f33ad

data/CHANGELOG.md

@@ -2,6 +2,9 @@ Do this to generate your change history
 
     $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+#### 1.3.0 (2017-07-03)
+* 138a042 - feat(tag): Added tag to PublicationTask (Beth Skurrie, Mon Jul 3 11:45:24 2017 +1000)
+
 #### 1.2.0 (2016-11-23)
 * 08e6025 - Fixed broken spec - expected hal+json (Bethany Skurrie, Wed Nov 23 09:20:39 2016 +1100)
 * ec4b7d7 - Added Travis badge. (Beth Skurrie, Wed Nov 23 09:16:10 2016 +1100)

data/README.md

@@ -2,7 +2,7 @@
 
 A client for the Pact Broker. Publishes pacts to, and retrieves pacts from, the pact broker.
 
-[![Build Status](https://travis-ci.org/bethesque/pact_broker-client.svg?branch=master)](https://travis-ci.org/bethesque/pact_broker-client)
+[![Build Status](https://travis-ci.org/pact-foundation/pact_broker-client.svg?branch=master)](https://travis-ci.org/pact-foundation/pact_broker-client)
 
 ## Usage
 
@@ -25,15 +25,26 @@ PactBroker::Client::PublicationTask.new do | task |
   require 'my_consumer/version'
   task.consumer_version = MyConsumer::VERSION
   task.pact_broker_base_url = "http://pact-broker.my.org"
+  task.tag = "dev" # optional
   task.pact_broker_basic_auth =  { username: 'basic_auth_user', password: 'basic_auth_pass'} #optional
-  task.write_method = :merge # optional, this will merge the published pact into an existing pact rather than overwriting it if one exists
+  task.write_method = :merge # optional, this will merge the published pact into an existing pact rather than overwriting it if one exists. Not recommended, as it makes a mulch of the workflow on the broker.
 end
 ```
 
+## Using tags
+
+Tags enable you to test different versions of your consumer and provider against each other (eg. `head` and `prod`) and to use pacts on feature branches without breaking your main line of development. You can read more about using tags on the Pact broker [wiki][wiki-tags].
+
+If you want to use the git branch name as the tag name, use:
+
+```ruby
+  task.tag = `git rev-parse --abbrev-ref HEAD`.strip
+```
+
 ```bash
 # In CI script
 
-rake pact:publish
+bundle exec rake pact:publish
 ```
 
 ### Provider
@@ -51,3 +62,5 @@ Pact.service_provider "My Provider" do
 
 end
 ```
+
+[wiki-tags]: https://github.com/pact-foundation/pact_broker/wiki/Using-tags

data/RELEASING.md

@@ -1,15 +1,16 @@
 # Releasing
 
 1. Increment the version in `lib/pact_broker/client/version.rb`
-2. Update the `CHANGELOG.md` using:
+2. `bundle exec appraisal update`
+3. Update the `CHANGELOG.md` using:
 
-      $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
+      $ git log --pretty=format:'  * %h - %s (%an, %ad)'
 
-3. Add files to git
+4. Add files to git
 
       $ git add CHANGELOG.md lib/pact_broker/client/version.rb
       $ git commit -m "Releasing version X.Y.Z"
 
-3. Release:
+5. Release:
 
       $ bundle exec rake release

data/gemfiles/default.gemfile

@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/default.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    pact_broker-client (1.1.1)
+    pact_broker-client (1.2.0)
       httparty
       json
       pact
@@ -10,44 +10,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (1.0.2)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     awesome_print (1.7.0)
     coderay (1.1.1)
-    diff-lcs (1.2.5)
-    fakefs (0.6.1)
+    diff-lcs (1.3)
+    fakefs (0.11.0)
     find_a_port (1.0.1)
-    httparty (0.13.5)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    json (1.8.3)
+    json (2.1.0)
     method_source (0.8.2)
-    multi_xml (0.5.5)
-    pact (1.9.0)
-      awesome_print (~> 1.1)
-      find_a_port (~> 1.0.1)
-      json
-      pact-mock_service (~> 0.7)
-      pact-support (~> 0.5)
+    multi_xml (0.6.0)
+    pact (1.11.1)
+      json (> 1.8.5)
+      pact-mock_service (~> 1.2)
+      pact-support (~> 0.6)
       rack-test (~> 0.6.2)
       randexp (~> 0.1.7)
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
       webrick
-    pact-mock_service (0.7.0)
+    pact-mock_service (1.2.0)
       find_a_port (~> 1.0.1)
       json
-      pact-support (~> 0.5)
+      pact-support (~> 0.6)
       rack
       rack-test (~> 0.6.2)
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
       webrick
-    pact-support (0.5.1)
+    pact-support (0.6.1)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
@@ -56,35 +53,35 @@ GEM
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    rack (2.0.2)
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.0.4)
     randexp (0.1.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.6.0)
     rspec-fire (1.3.0)
       rspec (>= 2.11, < 4)
-    rspec-mocks (3.3.2)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     slop (3.6.0)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.12.0)
+    thor (0.19.4)
+    tins (1.13.2)
     webrick (1.3.1)
 
 PLATFORMS
@@ -97,3 +94,6 @@ DEPENDENCIES
   pry
   rake (~> 10.0.3)
   rspec-fire
+
+BUNDLED WITH
+   1.14.6

data/gemfiles/ruby_under_22.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rack", "< 2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/ruby_under_22.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
-    pact_broker-client (1.1.1)
+    pact_broker-client (1.2.0)
       httparty
       json
       pact
@@ -10,44 +10,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    appraisal (1.0.2)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     awesome_print (1.7.0)
     coderay (1.1.1)
-    diff-lcs (1.2.5)
-    fakefs (0.6.1)
+    diff-lcs (1.3)
+    fakefs (0.11.0)
     find_a_port (1.0.1)
-    httparty (0.13.5)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    json (1.8.3)
+    json (2.1.0)
     method_source (0.8.2)
-    multi_xml (0.5.5)
-    pact (1.9.0)
-      awesome_print (~> 1.1)
-      find_a_port (~> 1.0.1)
-      json
-      pact-mock_service (~> 0.7)
-      pact-support (~> 0.5)
+    multi_xml (0.6.0)
+    pact (1.11.1)
+      json (> 1.8.5)
+      pact-mock_service (~> 1.2)
+      pact-support (~> 0.6)
       rack-test (~> 0.6.2)
       randexp (~> 0.1.7)
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
       webrick
-    pact-mock_service (0.7.0)
+    pact-mock_service (1.2.0)
       find_a_port (~> 1.0.1)
       json
-      pact-support (~> 0.5)
+      pact-support (~> 0.6)
       rack
       rack-test (~> 0.6.2)
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
       webrick
-    pact-support (0.5.1)
+    pact-support (0.6.1)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json
@@ -56,35 +53,35 @@ GEM
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
-    pry (0.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    rack (1.6.6)
     rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.0.4)
     randexp (0.1.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
+      rspec-support (~> 3.6.0)
     rspec-fire (1.3.0)
       rspec (>= 2.11, < 4)
-    rspec-mocks (3.3.2)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     slop (3.6.0)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.12.0)
+    thor (0.19.4)
+    tins (1.13.2)
     webrick (1.3.1)
 
 PLATFORMS
@@ -98,3 +95,6 @@ DEPENDENCIES
   rack (< 2.0)
   rake (~> 10.0.3)
   rspec-fire
+
+BUNDLED WITH
+   1.14.6

data/lib/pact_broker/client/publish_pacts.rb

@@ -6,22 +6,26 @@ module PactBroker
   module Client
     class PublishPacts
 
-      def initialize pact_broker_base_url, pact_files, consumer_version, pact_broker_client_options={}
+      def initialize pact_broker_base_url, pact_files, consumer_version, tag, pact_broker_client_options={}
         @pact_broker_base_url = pact_broker_base_url
         @pact_files = pact_files
         @consumer_version = consumer_version
+        @tag = tag
         @pact_broker_client_options = pact_broker_client_options
       end
 
       def call
         validate
         $stdout.puts("")
-        pact_files.collect{ | pact_file | publish_pact pact_file }.all?
+        result = pact_files.collect{ | pact_file | publish_pact pact_file }.all?
+        result = result && tag_consumer_version
+        $stdout.puts("")
+        result
       end
 
       private
 
-      attr_reader :pact_broker_base_url, :pact_files, :consumer_version, :pact_broker_client_options
+      attr_reader :pact_broker_base_url, :pact_files, :consumer_version, :tag, :pact_broker_client_options
 
       def pact_broker_client
         @pact_broker_client ||= PactBroker::Client::PactBrokerClient.new(base_url: pact_broker_base_url, client_options: pact_broker_client_options)
@@ -37,20 +41,40 @@ module PactBroker
         end
       end
 
+      def tag_consumer_version
+        return true unless tag
+        versions = pact_broker_client.pacticipants.versions
+        Retry.until_true do
+          $stdout.puts "Tagging version #{consumer_version} of #{consumer_name} as #{tag.inspect}"
+          versions.tag(pacticipant: consumer_name, version: consumer_version, tag: tag)
+        end
+      rescue => e
+        $stderr.puts "Failed to tag version #{consumer_version} of #{consumer_name} due to error: #{e.to_s}\n#{e.backtrace.join("\n")}"
+        false
+      end
+
       def publish_pact_contents(pact_file_contents)
         Retry.until_true do
-          contract = ::Pact::ConsumerContract.from_json(pact_file_contents)
+          contract = contract_from_file(pact_file_contents)
           pacts = pact_broker_client.pacticipants.versions.pacts
           if pacts.version_published?(consumer: contract.consumer.name, provider: contract.provider.name, consumer_version: consumer_version)
             $stdout.puts ::Term::ANSIColor.yellow("The given version of pact is already published. Will Overwrite...")
           end
 
           latest_pact_url = pacts.publish(pact_json: pact_file_contents, consumer_version: consumer_version)
-          $stdout.puts "The latest version of this pact can be accessed at the following URL (use this to configure the provider verification):\n#{latest_pact_url}\n\n"
+          $stdout.puts "The latest version of this pact can be accessed at the following URL (use this to configure the provider verification):\n#{latest_pact_url}"
           true
         end
       end
 
+      def consumer_name
+        contract_from_file(File.read(pact_files.first)).consumer.name
+      end
+
+      def contract_from_file pact_file_contents
+        ::Pact::ConsumerContract.from_json(pact_file_contents)
+      end
+
       def validate
         raise "Please specify the consumer_version" unless (consumer_version && consumer_version.to_s.strip.size > 0)
         raise "Please specify the pact_broker_base_url" unless (pact_broker_base_url && pact_broker_base_url.to_s.strip.size > 0)

data/lib/pact_broker/client/tasks/publication_task.rb

@@ -7,6 +7,7 @@ PactBroker::Client::PublicationTask.new do | task |
   require 'consumer/version'
   task.pact_broker_base_url = 'http://pact-broker'
   task.consumer_version = Consumer::VERSION
+  task.tag = "dev"
 end
 
 =end
@@ -15,7 +16,7 @@ module PactBroker
   module Client
     class PublicationTask < ::Rake::TaskLib
 
-      attr_accessor :pattern, :pact_broker_base_url, :consumer_version, :write_method, :pact_broker_basic_auth
+      attr_accessor :pattern, :pact_broker_base_url, :consumer_version, :tag, :write_method, :pact_broker_basic_auth
 
       def initialize name = nil, &block
         @name = name
@@ -34,7 +35,7 @@ module PactBroker
             require 'pact_broker/client/publish_pacts'
             basic_auth_client_options = pact_broker_basic_auth ? {basic_auth: pact_broker_basic_auth} : {}
             pact_broker_client_options = basic_auth_client_options.merge(write_method ? {write: write_method} : {})
-            success = PactBroker::Client::PublishPacts.new(pact_broker_base_url, FileList[pattern], consumer_version, pact_broker_client_options).call
+            success = PactBroker::Client::PublishPacts.new(pact_broker_base_url, FileList[pattern], consumer_version, tag, pact_broker_client_options).call
             raise "One or more pacts failed to be published" unless success
           end
         end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/spec/lib/pact_broker/client/publish_pacts_spec.rb

@@ -22,8 +22,10 @@ module PactBroker
       let(:pact_broker_client) { double("PactBroker::Client")}
       let(:pact_files) { ['spec/pacts/consumer-provider.json']}
       let(:consumer_version) { "1.2.3" }
+      let(:tag) { nil }
       let(:pact_hash) { {consumer: {name: 'Consumer'}, provider: {name: 'Provider'}, interactions: [] } }
       let(:pacts_client) { instance_double("PactBroker::ClientSupport::Pacts")}
+      let(:pact_versions_client) { instance_double("PactBroker::Client::Versions", tag: false) }
       let(:pact_broker_base_url) { 'http://some-host'}
       let(:pact_broker_client_options) do
         {
@@ -34,11 +36,12 @@ module PactBroker
         }
       end
 
-      subject { PublishPacts.new(pact_broker_base_url, pact_files, consumer_version, pact_broker_client_options) }
+      subject { PublishPacts.new(pact_broker_base_url, pact_files, consumer_version, tag, pact_broker_client_options) }
 
       before do
         FileUtils.mkdir_p "spec/pacts"
         File.open("spec/pacts/consumer-provider.json", "w") { |file| file << pact_hash.to_json }
+        allow(pact_broker_client).to receive_message_chain(:pacticipants, :versions).and_return(pact_versions_client)
         allow(pact_broker_client).to receive_message_chain(:pacticipants, :versions, :pacts).and_return(pacts_client)
         allow(pacts_client).to receive(:version_published?).and_return(false)
       end
@@ -105,6 +108,33 @@ module PactBroker
           end
         end
 
+        context "when a tag is provided" do
+          let(:tag) { "dev" }
+
+          it "tags the consumer version" do
+            expect(pact_versions_client).to receive(:tag).with({pacticipant: "Consumer", version: consumer_version, tag: tag})
+            subject.call
+          end
+
+          context "when an error occurs tagging the pact" do
+
+            before do
+              allow(pact_versions_client).to receive(:tag).and_raise("an error")
+              allow(Retry).to receive(:sleep)
+              allow($stderr).to receive(:puts)
+            end
+
+            it "retries multiple times" do
+              expect(pact_versions_client).to receive(:tag).exactly(3).times
+              subject.call
+            end
+
+            it "returns false" do
+              expect(subject.call).to eq false
+            end
+          end
+        end
+
         context "when an error occurs every time while publishing a pact" do
 
           before do

data/spec/lib/pact_broker/client/tasks/publication_task_spec.rb

@@ -30,7 +30,7 @@ module PactBroker::Client
 
       context "when pacts are succesfully published" do
         it "invokes PublishPacts with the default values" do
-          PactBroker::Client::PublishPacts.should_receive(:new).with('http://pact-broker', pact_file_list, '1.2.3', {}).and_return(publish_pacts)
+          PactBroker::Client::PublishPacts.should_receive(:new).with('http://pact-broker', pact_file_list, '1.2.3', nil, {}).and_return(publish_pacts)
           publish_pacts.should_receive(:call).and_return(true)
           Rake::Task['pact:publish'].execute
         end
@@ -53,7 +53,7 @@ module PactBroker::Client
       end
 
       it "invokes PublishPacts with the write method set" do
-        PactBroker::Client::PublishPacts.should_receive(:new).with('http://pact-broker', pact_file_list, '1.2.3', {write: :merge}).and_return(publish_pacts)
+        PactBroker::Client::PublishPacts.should_receive(:new).with('http://pact-broker', pact_file_list, '1.2.3', nil, {write: :merge}).and_return(publish_pacts)
         publish_pacts.should_receive(:call).and_return(true)
         Rake::Task['pact:publish:merge'].execute
       end
@@ -65,8 +65,10 @@ module PactBroker::Client
         @pact_broker_base_url = "http://some-host"
         @pattern = "pact/*.json"
         @pact_broker_basic_auth = { username: 'user', password: 'pass'}
+        @tag = "dev"
         PactBroker::Client::PublicationTask.new(:custom) do | task |
           task.consumer_version = '1.2.3'
+          task.tag = @tag
           task.pact_broker_base_url = @pact_broker_base_url
           task.pattern = @pattern
           task.pact_broker_basic_auth = @pact_broker_basic_auth
@@ -76,7 +78,7 @@ module PactBroker::Client
       let(:pattern) { @pattern }
 
       it "invokes PublishPacts with the customised values" do
-        PactBroker::Client::PublishPacts.should_receive(:new).with(@pact_broker_base_url, pact_file_list, '1.2.3', {basic_auth: @pact_broker_basic_auth})
+        PactBroker::Client::PublishPacts.should_receive(:new).with(@pact_broker_base_url, pact_file_list, '1.2.3', @tag, {basic_auth: @pact_broker_basic_auth})
         publish_pacts.should_receive(:call).and_return(true)
         Rake::Task['pact:publish:custom'].execute
       end

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -8,7 +8,7 @@
   "interactions": [
     {
       "description": "a request to list the latest pacts",
-      "provider_state": "a pact between Condor and the Pricing Service exists",
+      "providerState": "a pact between Condor and the Pricing Service exists",
       "request": {
         "method": "get",
         "path": "/pacts/latest",
@@ -78,7 +78,7 @@
     },
     {
       "description": "a request to list pacticipants",
-      "provider_state": "'Condor' exists in the pact-broker",
+      "providerState": "'Condor' exists in the pact-broker",
       "request": {
         "method": "get",
         "path": "/pacticipants",
@@ -137,7 +137,7 @@
     },
     {
       "description": "a request to get the Pricing Service",
-      "provider_state": "the 'Pricing Service' already exists in the pact-broker",
+      "providerState": "the 'Pricing Service' already exists in the pact-broker",
       "request": {
         "method": "get",
         "path": "/pacticipants/Pricing%20Service",
@@ -188,7 +188,7 @@
     },
     {
       "description": "a request to get the Pricing Service",
-      "provider_state": "the 'Pricing Service' does not exist in the pact-broker",
+      "providerState": "the 'Pricing Service' does not exist in the pact-broker",
       "request": {
         "method": "get",
         "path": "/pacticipants/Pricing%20Service",
@@ -203,7 +203,7 @@
     },
     {
       "description": "a request to publish a pact",
-      "provider_state": "the 'Pricing Service' already exists in the pact-broker",
+      "providerState": "the 'Pricing Service' already exists in the pact-broker",
       "request": {
         "method": "put",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
@@ -237,7 +237,7 @@
     },
     {
       "description": "a request to publish a pact with method patch",
-      "provider_state": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
+      "providerState": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
       "request": {
         "method": "patch",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
@@ -271,7 +271,7 @@
     },
     {
       "description": "a request to publish a pact with method put",
-      "provider_state": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
+      "providerState": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
       "request": {
         "method": "put",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
@@ -305,7 +305,7 @@
     },
     {
       "description": "a request to publish a pact",
-      "provider_state": "'Condor' already exist in the pact-broker, but the 'Pricing Service' does not",
+      "providerState": "'Condor' already exist in the pact-broker, but the 'Pricing Service' does not",
       "request": {
         "method": "put",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
@@ -339,7 +339,7 @@
     },
     {
       "description": "a request to publish a pact",
-      "provider_state": "an error occurs while publishing a pact",
+      "providerState": "an error occurs while publishing a pact",
       "request": {
         "method": "put",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
@@ -364,11 +364,11 @@
           "Content-Type": {
             "json_class": "Pact::Term",
             "data": {
-              "generate": "application/json",
+              "generate": "application/hal+json",
               "matcher": {
                 "json_class": "Regexp",
                 "o": 0,
-                "s": "application/json"
+                "s": "application/.*json"
               }
             }
           }
@@ -390,7 +390,7 @@
     },
     {
       "description": "a request to register the repository URL of a pacticipant",
-      "provider_state": "the 'Pricing Service' does not exist in the pact-broker",
+      "providerState": "the 'Pricing Service' does not exist in the pact-broker",
       "request": {
         "method": "patch",
         "path": "/pacticipants/Pricing%20Service",
@@ -409,7 +409,7 @@
     },
     {
       "description": "a request to register the repository URL of a pacticipant",
-      "provider_state": "the 'Pricing Service' already exists in the pact-broker",
+      "providerState": "the 'Pricing Service' already exists in the pact-broker",
       "request": {
         "method": "patch",
         "path": "/pacticipants/Pricing%20Service",
@@ -428,7 +428,7 @@
     },
     {
       "description": "a request for the list of the latest prod pacts from all consumers for the Pricing Service'",
-      "provider_state": "tagged as prod pact between Condor and the Pricing Service exists",
+      "providerState": "tagged as prod pact between Condor and the Pricing Service exists",
       "request": {
         "method": "get",
         "path": "/pacts/provider/Pricing%20Service/latest/prod",
@@ -443,12 +443,12 @@
           "_links": {
             "provider": {
               "href": "http://example.org/pacticipants/Pricing%20Service",
-              "title": "Pricing%20Service"
+              "title": "Pricing Service"
             },
             "pacts": [
               {
                 "href": "http://example.org/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
-                "title": "Pact between Condor (v1.3.0) and Pricing%20Service",
+                "title": "Pact between Condor (v1.3.0) and Pricing Service",
                 "name": "Condor"
               }
             ]
@@ -458,7 +458,7 @@
     },
     {
       "description": "a request for the list of the latest pacts from all consumers for the Pricing Service'",
-      "provider_state": "a latest pact between Condor and the Pricing Service exists",
+      "providerState": "a latest pact between Condor and the Pricing Service exists",
       "request": {
         "method": "get",
         "path": "/pacts/provider/Pricing%20Service/latest",
@@ -473,12 +473,12 @@
           "_links": {
             "provider": {
               "href": "http://example.org/pacticipants/Pricing%20Service",
-              "title": "Pricing%20Service"
+              "title": "Pricing Service"
             },
             "pacts": [
               {
                 "href": "http://example.org/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
-                "title": "Pact between Condor (v1.3.0) and Pricing%20Service",
+                "title": "Pact between Condor (v1.3.0) and Pricing Service",
                 "name": "Condor"
               }
             ]
@@ -488,7 +488,7 @@
     },
     {
       "description": "a request retrieve a pact for a specific version",
-      "provider_state": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
+      "providerState": "the 'Pricing Service' and 'Condor' already exist in the pact-broker, and Condor already has a pact published for version 1.3.0",
       "request": {
         "method": "get",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
@@ -514,7 +514,7 @@
     },
     {
       "description": "a request to retrieve the latest pact between Condor and the Pricing Service",
-      "provider_state": "a pact between Condor and the Pricing Service exists",
+      "providerState": "a pact between Condor and the Pricing Service exists",
       "request": {
         "method": "get",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/latest",
@@ -527,11 +527,11 @@
           "Content-Type": {
             "json_class": "Pact::Term",
             "data": {
-              "generate": "application/json",
+              "generate": "application/hal+json",
               "matcher": {
                 "json_class": "Regexp",
                 "o": 0,
-                "s": "application/json"
+                "s": "application/.*json"
               }
             }
           },
@@ -552,7 +552,7 @@
     },
     {
       "description": "a request to retrieve the latest pact between Condor and the Pricing Service",
-      "provider_state": "no pact between Condor and the Pricing Service exists",
+      "providerState": "no pact between Condor and the Pricing Service exists",
       "request": {
         "method": "get",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/latest",
@@ -567,7 +567,7 @@
     },
     {
       "description": "a request to retrieve the pact between the production verison of Condor and the Pricing Service",
-      "provider_state": "a pact between Condor and the Pricing Service exists for the production version of Condor",
+      "providerState": "a pact between Condor and the Pricing Service exists for the production version of Condor",
       "request": {
         "method": "get",
         "path": "/pacts/provider/Pricing%20Service/consumer/Condor/latest/prod",
@@ -594,7 +594,7 @@
     },
     {
       "description": "a request to tag the production version of Condor",
-      "provider_state": "'Condor' exists in the pact-broker",
+      "providerState": "'Condor' exists in the pact-broker",
       "request": {
         "method": "put",
         "path": "/pacticipants/Condor/versions/1.3.0/tags/prod",
@@ -627,7 +627,7 @@
     },
     {
       "description": "a request to tag the production version of Condor",
-      "provider_state": "'Condor' does not exist in the pact-broker",
+      "providerState": "'Condor' does not exist in the pact-broker",
       "request": {
         "method": "put",
         "path": "/pacticipants/Condor/versions/1.3.0/tags/prod",
@@ -660,7 +660,7 @@
     },
     {
       "description": "a request to tag the production version of Condor",
-      "provider_state": "'Condor' exists in the pact-broker with version 1.3.0, tagged with 'prod'",
+      "providerState": "'Condor' exists in the pact-broker with version 1.3.0, tagged with 'prod'",
       "request": {
         "method": "put",
         "path": "/pacticipants/Condor/versions/1.3.0/tags/prod",
@@ -693,6 +693,8 @@
     }
   ],
   "metadata": {
-    "pactSpecificationVersion": "1.0.0"
+    "pactSpecification": {
+      "version": "1.0.0"
+    }
   }
 }

data/spec/service_providers/pact_broker_client_publish_spec.rb

@@ -114,7 +114,7 @@ module PactBroker::Client
               body: pact_hash ).
             will_respond_with(
               status: 500,
-              headers: {'Content-Type' => Pact.term(generate: 'application/json', matcher: %r{application/json})},
+              headers: {'Content-Type' => Pact.term(generate: 'application/hal+json', matcher: %r{application/.*json})},
               body: {
                 message: Pact::Term.new(matcher: /.*/, generate: 'An error occurred')
               }

data/spec/service_providers/pact_broker_client_retrive_pact_spec.rb

@@ -33,7 +33,7 @@ module PactBroker::Client
 
           let(:response_headers) do
             pact_broker_response_headers.merge(
-              'Content-Type' => Pact.term(generate: 'application/json', matcher: %r{application/json}),
+              'Content-Type' => Pact.term(generate: 'application/hal+json', matcher: %r{application/.*json}),
               'X-Pact-Consumer-Version' => consumer_version
             )
           end

data/spec/support/latest_pacts_for_provider.json

@@ -2,12 +2,12 @@
   "_links": {
     "provider": {
       "href": "http://example.org/pacticipants/Pricing%20Service",
-      "title": "Pricing%20Service"
+      "title": "Pricing Service"
     },
     "pacts": [
       {
         "href": "http://example.org/pacts/provider/Pricing%20Service/consumer/Condor/version/1.3.0",
-        "title": "Pact between Condor (v1.3.0) and Pricing%20Service",
+        "title": "Pact between Condor (v1.3.0) and Pricing Service",
         "name": "Condor"
       }
     ]

data/tasks/pact.rake

@@ -1,7 +1,16 @@
 require 'pact_broker/client/tasks'
 
-PactBroker::Client::PublicationTask.new do | task |
+PactBroker::Client::PublicationTask.new(:localhost) do | task |
   require 'pact_broker/client/version'
+  task.tag = `git rev-parse --abbrev-ref HEAD`.strip
   task.consumer_version = PactBroker::Client::VERSION
   task.pact_broker_base_url = "http://localhost:9292"
-end
+end
+
+PactBroker::Client::PublicationTask.new(:remote) do | task |
+  require 'pact_broker/client/version'
+  task.tag = `git rev-parse --abbrev-ref HEAD`.strip
+  task.consumer_version = PactBroker::Client::VERSION
+  task.pact_broker_base_url = "https://test.pact.dius.com.au"
+  task.pact_broker_basic_auth = {username: ENV.fetch('PACT_BROKER_USERNAME'), password: ENV.fetch('PACT_BROKER_PASSWORD')}
+end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Bethany Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pact
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Publishes pacts to, and retrieves pacts from, the pact broker server.
@@ -143,9 +143,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -204,17 +204,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: See description