pact_broker-client 1.8.0 → 1.9.0

data/spec/service_providers/pact_broker_client_matrix_spec.rb

@@ -7,9 +7,9 @@ module PactBroker::Client
     include_context "pact broker"
 
     describe "retriving the compatibility matrix" do
-      let(:matrix_response_body) { { matrix: Pact.like(matrix) } }
+      let(:matrix_response_body) { Pact.like(matrix) }
       let(:matrix) { JSON.parse(File.read('spec/support/matrix.json')) }
-      let(:selectors) { [{ name: "Foo", version: "1.2.3" }, { name: "Bar", version: "4.5.6" }] }
+      let(:selectors) { [{ pacticipant: "Foo", version: "1.2.3" }, { pacticipant: "Bar", version: "4.5.6" }] }
 
       context "when results are found" do
         before do
@@ -19,9 +19,30 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: {
-                'selectors[]' => ['Foo/version/1.2.3', 'Bar/version/4.5.6']
-              }
+              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
+            ).
+            will_respond_with(
+              status: 200,
+              headers: pact_broker_response_headers,
+              body: matrix_response_body
+            )
+        end
+
+        it 'returns the pact matrix' do
+          matrix = pact_broker_client.matrix.get(selectors)
+          expect(matrix[:matrix].size).to eq 1
+        end
+      end
+
+      context "when the pacticipant name has a space in it" do
+        before do
+          pact_broker.
+            given("the pact for Foo Thing version 1.2.3 has been verified by Bar version 4.5.6").
+            upon_receiving("a request for the compatibility matrix for Foo version 1.2.3 and Bar version 4.5.6").
+            with(
+              method: :get,
+              path: "/matrix",
+              query: "q[][pacticipant]=Foo%20Thing&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=4.5.6"
             ).
             will_respond_with(
               status: 200,
@@ -30,9 +51,11 @@ module PactBroker::Client
             )
         end
 
-        it 'a matrix of compatible versions' do
+        let(:selectors) { [{ pacticipant: "Foo Thing", version: "1.2.3" }, { pacticipant: "Bar", version: "4.5.6" }] }
+
+        it 'incorrectly escapes the spaces but it still seems to work' do
           matrix = pact_broker_client.matrix.get(selectors)
-          expect(matrix.size).to eq 1
+          expect(matrix[:matrix].size).to eq 1
         end
       end
 
@@ -64,9 +87,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: {
-                'selectors[]' => ['Foo/version/1.2.3', 'Bar/version/9.9.9']
-              }
+              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&q[][pacticipant]=Bar&q[][version]=9.9.9"
             ).
             will_respond_with(
               status: 400,
@@ -77,9 +98,9 @@ module PactBroker::Client
             )
         end
 
-        let(:selectors) { [{ name: "Foo", version: "1.2.3" }, { name: "Bar", version: "9.9.9" }] }
+        let(:selectors) { [{ pacticipant: "Foo", version: "1.2.3" }, { pacticipant: "Bar", version: "9.9.9" }] }
 
-        it 'returns a list of errors' do
+        it 'raises an error' do
           expect {
             pact_broker_client.matrix.get(selectors)
           }.to raise_error PactBroker::Client::Error, "an error message"
@@ -93,9 +114,7 @@ module PactBroker::Client
             with(
               method: :get,
               path: "/matrix",
-              query: {
-                'selectors[]' => ['Foo/version/1.2.3', 'Bar/version/9.9.9']
-              }
+              query: "q[][pacticipant]=Wiffle&q[][version]=1.2.3&q[][pacticipant]=Meep&q[][version]=9.9.9"
             ).
             will_respond_with(
               status: 400,
@@ -106,14 +125,67 @@ module PactBroker::Client
             )
         end
 
-        let(:selectors) { [{ name: "Foo", version: "1.2.3" }, { name: "Bar", version: "9.9.9" }] }
+        let(:selectors) { [{ pacticipant: "Wiffle", version: "1.2.3" }, { pacticipant: "Meep", version: "9.9.9" }] }
 
-        it 'returns a list of errors' do
+        it 'raises an error' do
           expect {
             pact_broker_client.matrix.get(selectors)
           }.to raise_error PactBroker::Client::Error, "an error message"
         end
       end
+
+      context "when no versions are specified" do
+        before do
+          pact_broker.
+            given("the pact for Foo version 1.2.3 and 1.2.4 has been verified by Bar version 4.5.6").
+            upon_receiving("a request for the compatibility matrix for all versions of Foo and Bar").
+            with(
+              method: :get,
+              path: "/matrix",
+              query: "q[][pacticipant]=Foo&q[][pacticipant]=Bar"
+            ).
+            will_respond_with(
+              status: 200,
+              headers: pact_broker_response_headers,
+              body: {
+                matrix: Pact.each_like(matrix_row, min: 2)
+              }
+            )
+        end
+        let(:matrix_row) { JSON.parse(File.read('spec/support/matrix.json'))['matrix'].first }
+        let(:selectors) { [{ pacticipant: "Foo" }, { pacticipant: "Bar" }] }
+
+        it "returns multiple rows" do
+          matrix = pact_broker_client.matrix.get(selectors)
+          expect(matrix[:matrix].size).to eq 2
+        end
+      end
+
+      context "when the success option is true" do
+        before do
+          pact_broker.
+            given("the pact for Foo version 1.2.3 has been successfully verified by Bar version 4.5.6, and 1.2.4 unsuccessfully by 9.9.9").
+            upon_receiving("a request for the successful rows of the compatibility matrix for all versions of Foo and Bar").
+            with(
+              method: :get,
+              path: "/matrix",
+              query: "q[][pacticipant]=Foo&q[][pacticipant]=Bar&success[]=true"
+            ).
+            will_respond_with(
+              status: 200,
+              headers: pact_broker_response_headers,
+              body: matrix_response_body
+            )
+        end
+        let(:matrix_row) { JSON.parse(File.read('spec/support/matrix.json'))['matrix'].first }
+        let(:selectors) { [{ pacticipant: "Foo" }, { pacticipant: "Bar" }] }
+        let(:options) { {success: true} }
+
+        it "returns only the successful row" do
+          matrix = pact_broker_client.matrix.get(selectors, options)
+          expect(matrix[:matrix].size).to eq 1
+        end
+      end
     end
   end
 end

data/spec/service_providers/pact_helper.rb

@@ -11,6 +11,7 @@ Pact.service_consumer 'Pact Broker Client' do
   has_pact_with "Pact Broker" do
     mock_service :pact_broker do
       port 1234
+      pact_specification_version "2.0"
     end
   end
 

data/spec/support/matrix.json

@@ -1,23 +1,28 @@
-[
-  {
-    "consumer": {
-      "name": "Foo",
-      "version": {
-        "number": "4"
+{
+  "summary": {
+    "compatible": true
+  },
+  "matrix": [
+    {
+      "consumer": {
+        "name": "Foo",
+        "version": {
+          "number": "4"
+        }
+      },
+      "provider": {
+        "name": "Bar",
+        "version": {
+          "number": "5"
+        }
+      },
+      "verificationResult": {
+        "verifiedAt": "2017-10-10T12:49:04+11:00",
+        "success": true
+      },
+      "pact": {
+        "createdAt": "2017-10-10T12:49:04+11:00"
       }
-    },
-    "provider": {
-      "name": "Bar",
-      "version": {
-        "number": "5"
-      }
-    },
-    "verificationResult": {
-      "verifiedAt": "2017-10-10T12:49:04+11:00",
-      "success": true
-    },
-    "pact": {
-      "createdAt": "2017-10-10T12:49:04+11:00"
     }
-  }
-]
+  ]
+}

data/spec/support/matrix.txt

@@ -1,3 +1,3 @@
 CONSUMER | CONSUMER_VERSION | PROVIDER | PROVIDER_VERSION | SUCCESS
 ---------|------------------|----------|------------------|--------
-Foo      | 4                | Foo      | 5                | true
+Foo      | 4                | Bar      | 5                | true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
-- Bethany Skurrie
+- Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !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'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +122,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
-description: Publishes pacts to, and retrieves pacts from, the pact broker server.
+description: Client for the Pact Broker. Publish, retrieve and query pacts and verification
+  results.
 email:
 - bskurrie@dius.com.au
 executables:
@@ -147,7 +134,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -157,10 +143,6 @@ files:
 - ci.sh
 - doc/markdown/Pact Broker Client - Pact Broker.md
 - doc/markdown/README.md
-- gemfiles/default.gemfile
-- gemfiles/default.gemfile.lock
-- gemfiles/ruby_under_22.gemfile
-- gemfiles/ruby_under_22.gemfile.lock
 - lib/pact_broker/client.rb
 - lib/pact_broker/client/base_client.rb
 - lib/pact_broker/client/can_i_deploy.rb
@@ -168,6 +150,7 @@ files:
 - lib/pact_broker/client/cli/custom_thor.rb
 - lib/pact_broker/client/cli/version_selector_options_parser.rb
 - lib/pact_broker/client/error.rb
+- lib/pact_broker/client/git.rb
 - lib/pact_broker/client/matrix.rb
 - lib/pact_broker/client/matrix/formatter.rb
 - lib/pact_broker/client/matrix/json_formatter.rb
@@ -186,6 +169,9 @@ files:
 - lib/pact_broker/client/versions.rb
 - lib/pact_broker_client.rb
 - pact-broker-client.gemspec
+- script/publish-pact.sh
+- script/release.sh
+- spec/integration/can_i_deploy_spec.rb
 - spec/lib/pact_broker/client/base_client_spec.rb
 - spec/lib/pact_broker/client/can_i_deploy_spec.rb
 - spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb
@@ -242,11 +228,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: See description
 test_files:
+- spec/integration/can_i_deploy_spec.rb
 - spec/lib/pact_broker/client/base_client_spec.rb
 - spec/lib/pact_broker/client/can_i_deploy_spec.rb
 - spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb

data/Appraisals

@@ -1,6 +0,0 @@
-appraise "default" do
-end
-
-appraise "ruby-under-22" do
-  gem "rack", "< 2.0"
-end

data/gemfiles/default.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake", "~> 10.0.3"
-
-gemspec path: "../"

data/gemfiles/default.gemfile.lock

@@ -1,106 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    pact_broker-client (1.8.0)
-      httparty
-      json
-      table_print (~> 1.5)
-      term-ansicolor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    awesome_print (1.8.0)
-    conventional-changelog (1.3.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    fakefs (0.11.3)
-    filelock (1.1.1)
-    find_a_port (1.0.1)
-    hashdiff (0.3.7)
-    httparty (0.15.6)
-      multi_xml (>= 0.5.2)
-    json (2.1.0)
-    multi_xml (0.6.0)
-    pact (1.16.1)
-      json (> 1.8.5)
-      pact-mock_service (~> 2.0)
-      pact-support (~> 1.1, >= 1.1.8)
-      rack-test (~> 0.6.2)
-      randexp (~> 0.1.7)
-      rspec (>= 2.14)
-      term-ansicolor (~> 1.0)
-      thor
-      webrick
-    pact-mock_service (2.4.0)
-      filelock (~> 1.1)
-      find_a_port (~> 1.0.1)
-      json
-      pact-support (~> 1.2, >= 1.2.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.2)
-      rspec (>= 2.14)
-      term-ansicolor (~> 1.0)
-      thor (~> 0.19)
-      webrick (~> 1.3)
-    pact-support (1.2.1)
-      awesome_print (~> 1.1)
-      find_a_port (~> 1.0.1)
-      json
-      rack-test (~> 0.6.2)
-      randexp (~> 0.1.7)
-      rspec (>= 2.14)
-      term-ansicolor (~> 1.0)
-      thor
-    public_suffix (3.0.0)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.0.4)
-    randexp (0.1.7)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    safe_yaml (1.0.4)
-    table_print (1.5.6)
-    term-ansicolor (1.6.0)
-      tins (~> 1.0)
-    thor (0.20.0)
-    tins (1.15.0)
-    webmock (3.1.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    webrick (1.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  conventional-changelog
-  fakefs (~> 0.4)
-  pact (~> 1.16)
-  pact_broker-client!
-  rake (~> 10.0.3)
-  webmock (~> 3.0)
-
-BUNDLED WITH
-   1.15.4