pact_broker-client 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e0409305fdcec099daca823e1cb127ef56081d
-  data.tar.gz: 810b2cd5e4f581e229104fb30cf9fddaf1387aa6
+  metadata.gz: 7a240cb5444a544a20e73c613823dbb906a91f72
+  data.tar.gz: 017c87cc9083555bbeedd798ff3da5a006af2136
 SHA512:
-  metadata.gz: c5d6208dedba22ebcbd587bf593d3ca626c54d60d3f3e0a5b3fc23c2d02b6d282e416ae024fdbad77ab1a0915602f3d715fb6ad04b59bcd17c579a249be47de2
-  data.tar.gz: 4b37910c9a784962d4f9e054d0308e13227f7a267e60c8e64f8803faf6a71cb7a1d215a4eb7b35300fef35f6437dcd229bc991af636e6e7cb1de2a89051b5639
+  metadata.gz: de778e9c51875c42ef42c82847cbd2dd1684d275229de7feaec5c478e21ae3c6f4caa10f690e9ce054b3c067c33d48d544a30346bb0d581b89087e0509415427
+  data.tar.gz: 978a327dc7114bf433b81b0e95ce9a3ac0ef6c08399f133a52af36c52eee90dd211438c0a916957344b62f85b7caca5c461f8df7b28de6ece4e8b49c3535738c

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="v1.13.0"></a>
+### v1.13.0 (2017-11-09)
+
+
+#### Features
+
+* **can-i-deploy**
+  * allow pacticipant version to be checked against latest tagged versions of all the other pacticipants	 ([7f10e13](/../../commit/7f10e13))
+
+
+#### Bug Fixes
+
+* **publish**
+  * accept pact file paths using windows separator	 ([5ee9dd7](/../../commit/5ee9dd7))
+
+
 <a name="v1.12.0"></a>
 ### v1.12.0 (2017-11-06)
 

data/appveyor.yml

@@ -0,0 +1,17 @@
+# fix lineendings in Windows
+init:
+  - git config --global core.autocrlf input
+
+build: off
+
+install:
+  - set PATH=C:\Ruby22\bin;%PATH%
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake

data/lib/pact_broker/client/can_i_deploy.rb

@@ -17,13 +17,14 @@ module PactBroker
         end
       end
 
-      def self.call(pact_broker_base_url, version_selectors, options, pact_broker_client_options={})
-        new(pact_broker_base_url, version_selectors, options, pact_broker_client_options).call
+      def self.call(pact_broker_base_url, version_selectors, matrix_options, options, pact_broker_client_options={})
+        new(pact_broker_base_url, version_selectors, matrix_options, options, pact_broker_client_options).call
       end
 
-      def initialize(pact_broker_base_url, version_selectors, options, pact_broker_client_options)
+      def initialize(pact_broker_base_url, version_selectors, matrix_options, options, pact_broker_client_options)
         @pact_broker_base_url = pact_broker_base_url
         @version_selectors = version_selectors
+        @matrix_options = matrix_options
         @options = options
         @pact_broker_client_options = pact_broker_client_options
       end
@@ -42,7 +43,7 @@ module PactBroker
 
       private
 
-      attr_reader :pact_broker_base_url, :version_selectors, :options, :pact_broker_client_options
+      attr_reader :pact_broker_base_url, :version_selectors, :matrix_options, :options, :pact_broker_client_options
 
       def success_message(matrix)
         message = format_matrix(matrix)
@@ -73,7 +74,7 @@ module PactBroker
       end
 
       def matrix
-        @matrix ||= Retry.until_true { pact_broker_client.matrix.get(version_selectors) }
+        @matrix ||= Retry.until_true { pact_broker_client.matrix.get(version_selectors, matrix_options) }
       end
 
       def pact_broker_client

data/lib/pact_broker/client/cli/broker.rb

@@ -21,6 +21,7 @@ module PactBroker
         method_option :pacticipant, required: true, aliases: "-a", desc: "The pacticipant name. Use once for each pacticipant being checked."
         method_option :version, required: false, aliases: "-e", desc: "The pacticipant version. Must be entered after the --pacticipant that it relates to."
         method_option :latest, required: false, aliases: "-l", banner: '[TAG]', desc: "Use the latest pacticipant version. Optionally specify a TAG to use the latest version with the specified tag."
+        method_option :to, required: false, banner: 'TAG', desc: "This is too hard to explain in a short sentence. Look at the examples.", default: nil
         method_option :broker_base_url, required: true, aliases: "-b", desc: "The base URL of the Pact Broker"
         method_option :broker_username, aliases: "-u", desc: "Pact Broker basic auth username"
         method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password"
@@ -30,7 +31,7 @@ module PactBroker
         def can_i_deploy(*ignored_but_necessary)
           selectors = VersionSelectorOptionsParser.call(ARGV)
           validate_can_i_deploy_selectors(selectors)
-          result = CanIDeploy.call(options.broker_base_url, selectors, {output: options.output}, pact_broker_client_options)
+          result = CanIDeploy.call(options.broker_base_url, selectors, {to_tag: options.to}, {output: options.output}, pact_broker_client_options)
           $stdout.puts result.message
           exit(1) unless result.success
         end
@@ -104,7 +105,8 @@ module PactBroker
           end
 
           def file_list pact_files
-            Rake::FileList[pact_files].collect do | path |
+            correctly_separated_pact_files = pact_files.collect{ |path| path.gsub(/\\+/, '/') }
+            Rake::FileList[correctly_separated_pact_files].collect do | path |
               if File.directory?(path)
                 Rake::FileList[File.join(path, "*.json")]
               else

data/lib/pact_broker/client/cli/can_i_deploy_long_desc.txt

@@ -6,10 +6,14 @@ The environment variables PACT_BROKER_BASE_URL_BASE_URL, PACT_BROKER_BASE_URL_US
 
 SCENARIOS
 
-Check the status of the pacts for a pacticipant version:
+Check the status of the pacts for a pacticipant version. Note that this only checks that the most recent verification for each pact is successful. It doesn't provide any assurance that the pact has been verified by the *production* version of the provider, however, it is sufficient if you are doing true continuous deployment.
 
   $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION --broker-base-url BROKER_BASE_URL
 
+If all applications within the pact network are not being deployed continuously (ie. if there is a gap between pact verification and actual deployment) then the following strategy is recommended. Each application version should be tagged in the broker with the name of the stage (eg. test, staging, production) as it is deployed (see the pact-broker create-version-tag CLI). This enables you to use the following very simple command to check if the application version you are about to deploy is compatible with every other application version already deployed in that environment.
+
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION --to TAG --broker-base-url BROKER_BASE_URL
+
 Check the status of the pacts for the latest pacticipant version:
 
   $ pact-broker can-i-deploy --pacticipant PACTICIPANT --latest --broker-base-url BROKER_BASE_URL

data/lib/pact_broker/client/matrix.rb

@@ -47,6 +47,10 @@ module PactBroker
         if options.key?(:success)
           opts[:success] = [*options[:success]]
         end
+        if options[:to_tag]
+          opts[:latest] = 'true'
+          opts[:tag] = options[:to_tag]
+        end
         opts
       end
 

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.12.0'
+    VERSION = '1.13.0'
   end
 end

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

@@ -5,6 +5,7 @@ module PactBroker
     describe CanIDeploy do
       let(:pact_broker_base_url) { 'http://example.org' }
       let(:version_selectors) { [{ pacticipant: "Foo", version: "1" }] }
+      let(:matrix_options) { {} }
       let(:pact_broker_client_options) { { foo: 'bar' } }
       let(:matrix_client) { instance_double('PactBroker::Client::Matrix') }
       let(:matrix) { { matrix: ['foo'], summary: { deployable: true, reason: 'some reason' } } }
@@ -16,10 +17,10 @@ module PactBroker
         allow(Matrix::Formatter).to receive(:call).and_return('text matrix')
       end
 
-      subject { CanIDeploy.call(pact_broker_base_url, version_selectors, options, pact_broker_client_options) }
+      subject { CanIDeploy.call(pact_broker_base_url, version_selectors, matrix_options, options, pact_broker_client_options) }
 
       it "retrieves the matrix from the pact broker" do
-        expect(matrix_client).to receive(:get).with(version_selectors)
+        expect(matrix_client).to receive(:get).with(version_selectors, matrix_options)
         subject
       end
 

data/spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb

@@ -32,7 +32,7 @@ module PactBroker
         end
 
         it "invokes the CanIDeploy service" do
-          expect(CanIDeploy).to receive(:call).with('http://pact-broker', version_selectors, {output: 'table'}, {verbose: 'verbose'})
+          expect(CanIDeploy).to receive(:call).with('http://pact-broker', version_selectors, {to_tag: nil}, {output: 'table'}, {verbose: 'verbose'})
           invoke_can_i_deploy
         end
 
@@ -44,13 +44,25 @@ module PactBroker
           end
         end
 
+        context "with --to" do
+          before do
+            subject.options.to = 'prod'
+          end
+
+          it "passes the value as the matrix options" do
+            expect(CanIDeploy).to receive(:call).with(anything, anything, {to_tag: 'prod'}, anything, anything)
+            invoke_can_i_deploy
+          end
+        end
+
         context "with basic auth" do
           before do
-            subject.options = OpenStruct.new(minimum_valid_options.merge(broker_username: 'foo', broker_password: 'bar'))
+            subject.options.broker_username = 'foo'
+            subject.options.broker_password = 'bar'
           end
 
           it "invokes the CanIDeploy service with the basic auth credentials" do
-            expect(CanIDeploy).to receive(:call).with(anything, anything, anything, {basic_auth: {username: "foo", password: "bar"}, verbose: 'verbose'})
+            expect(CanIDeploy).to receive(:call).with(anything, anything, anything, anything, {basic_auth: {username: "foo", password: "bar"}, verbose: 'verbose'})
             invoke_can_i_deploy
           end
         end

data/spec/lib/pact_broker/client/cli/broker_publish_spec.rb

@@ -63,6 +63,21 @@ module PactBroker::Client::CLI
         end
       end
 
+      context "with a windows directory specified" do
+        let(:file_list) { ['spec\\support\cli_test_pacts'] }
+
+        it "invokes the PublishPacts command with the list of files in the directory" do
+          expect(PactBroker::Client::PublishPacts).to receive(:call).with(
+            anything,
+            ["spec/support/cli_test_pacts/bar.json", "spec/support/cli_test_pacts/foo.json"],
+            anything,
+            anything,
+            anything
+          )
+          invoke_broker
+        end
+      end
+
       context "with a tag" do
         before do
           subject.options = OpenStruct.new(minimum_valid_options.merge(tag: ['foo']))

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -595,6 +595,38 @@
         }
       }
     },
+    {
+      "description": "a request for the compatibility matrix for Foo version 1.2.3 and the latest prod versions of all other pacticipants",
+      "providerState": "the pact for Foo version 1.2.3 has been successfully verified by Bar version 4.5.6 (tagged prod) and version 5.6.7",
+      "request": {
+        "method": "get",
+        "path": "/matrix",
+        "query": "q[][pacticipant]=Foo&q[][version]=1.2.3&latestby=cvp&latest=true&tag=prod"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+        },
+        "body": {
+          "matrix": [
+            {
+              "consumer": {
+                "name": "Foo",
+                "version": {
+                  "number": "1.2.3"
+                }
+              },
+              "provider": {
+                "name": "Bar",
+                "version": {
+                  "number": "4.5.6"
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
     {
       "description": "a request to publish a pact",
       "providerState": "the 'Pricing Service' already exists in the pact-broker",

data/spec/service_providers/pact_broker_client_matrix_spec.rb

@@ -243,6 +243,42 @@ module PactBroker::Client
           expect(matrix[:matrix].size).to eq 1
         end
       end
+
+      context "when checking if we can deploy with the latest tagged versions of the other services" do
+        before do
+          pact_broker.
+            given("the pact for Foo version 1.2.3 has been successfully verified by Bar version 4.5.6 (tagged prod) and version 5.6.7").
+            upon_receiving("a request for the compatibility matrix for Foo version 1.2.3 and the latest prod versions of all other pacticipants").
+            with(
+              method: :get,
+              path: "/matrix",
+              query: "q[][pacticipant]=Foo&q[][version]=1.2.3&latestby=cvp&latest=true&tag=prod"
+            ).
+            will_respond_with(
+              status: 200,
+              headers: pact_broker_response_headers,
+              body: matrix_response_body
+            )
+        end
+
+        let(:selectors) { [{ pacticipant: "Foo", version: "1.2.3" }] }
+
+        let(:matrix_response_body) {
+          {
+            matrix: [{
+              consumer: { name: 'Foo', version: { number: '1.2.3' } },
+              provider: { name: 'Bar', version: { number: '4.5.6'} },
+            }]
+          }
+        }
+
+        let(:options) { { to_tag: 'prod' } }
+
+        it "returns the matrix with the latest prod version of Bar" do
+          matrix = pact_broker_client.matrix.get(selectors, options)
+          expect(matrix[:matrix].size).to eq 1
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -153,6 +153,7 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- appveyor.yml
 - bin/pact-broker
 - ci.sh
 - doc/markdown/Pact Broker Client - Pact Broker.md