pact_broker-client 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdab3c67440cdd2d780675b8a599d6f1dd09e3d1
-  data.tar.gz: 8f114056c4f6447b1cd6efac1434d9a0eb878d67
+  metadata.gz: '038d9dad336dd4380cecfed72c8149a0db8b6083'
+  data.tar.gz: 534b53f01fe7d391edadc74e01513a2cb0914c9d
 SHA512:
-  metadata.gz: 39b123daae457e35c9a64492ef8516979259cef4e71462c990c46d22c02cfaa0156262f42710f2e00ae97aebe6facb261c3ed1e117315ba44fdca94f938c042b
-  data.tar.gz: 994166b7e4151a37b36f783385634363cc3aa14056e89faaf5740f2882cebb53054bd1fe2b23973d0a70f6d699f2f106370e1fdb1f9d73306410fc4829fa417d
+  metadata.gz: 7c6a3cd12937059590d1d8e775ff33bbde1d232b9870394e1bd123472c9e27d5ec840463abe9c047deff7d72b152cba9be489ca2fe8eebcc643a137f7e27a96b
+  data.tar.gz: fdc7eaf43f5d2008e8bfa0a04301fef007bf07fa11fde3a9076ab65ab46b6a392a9948055ff1368de20a5384e2642fbac20f2037019fa67088e3ab957aca8812

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="v1.18.0"></a>
+### v1.18.0 (2019-03-05)
+
+
+#### Features
+
+* remove 'no data' message when there are no rows.	 ([b0246a2](/../../commit/b0246a2))
+* allow for broker token to be used	 ([3266bc1](/../../commit/3266bc1))
+* add broker token to cli	 ([e342c29](/../../commit/e342c29))
+
+
 <a name="v1.17.0"></a>
 ### v1.17.0 (2018-11-15)
 

data/README.md

@@ -29,6 +29,7 @@ Options:
   -b, --broker-base-url=BROKER_BASE_URL                    # The base URL of the Pact Broker
   -u, [--broker-username=BROKER_USERNAME]                  # Pact Broker basic auth username
   -p, [--broker-password=BROKER_PASSWORD]                  # Pact Broker basic auth password
+  -k, [--broker-token=BROKER_TOKEN]                        # Pact Broker bearer token
   -t, [--tag=TAG]                                          # Tag name for consumer version. Can be specified multiple times.
   -g, [--tag-with-git-branch], [--no-tag-with-git-branch]  # Tag consumer version with the name of the current git branch. Default: false
   -v, [--verbose], [--no-verbose]                          # Verbose output. Default: false
@@ -50,6 +51,7 @@ Options:
   -b, --broker-base-url=BROKER_BASE_URL                    # The base URL of the Pact Broker
   -u, [--broker-username=BROKER_USERNAME]                  # Pact Broker basic auth username
   -p, [--broker-password=BROKER_PASSWORD]                  # Pact Broker basic auth password
+  -k, [--broker-token=BROKER_TOKEN]                        # Pact Broker bearer token
   -v, [--verbose], [--no-verbose]                          # Verbose output. Default: false
 
 Add a tag to a pacticipant version
@@ -71,6 +73,7 @@ Options:
   -b, --broker-base-url=BROKER_BASE_URL    # The base URL of the Pact Broker
   -u, [--broker-username=BROKER_USERNAME]  # Pact Broker basic auth username
   -p, [--broker-password=BROKER_PASSWORD]  # Pact Broker basic auth password
+  -k, [--broker-token=BROKER_TOKEN]        # Pact Broker bearer token
   -o, [--output=OUTPUT]                    # json or table
                                            # Default: table
   -v, [--verbose], [--no-verbose]          # Verbose output. Default: false
@@ -80,51 +83,68 @@ Options:
                                            # Default: 10
 
 Description:
-  Returns exit code 0 or 1, indicating whether or not the specified pacticipant versions are compatible. Prints out the relevant pact/verification details.
+  Returns exit code 0 or 1, indicating whether or not the specified pacticipant versions are compatible. Prints out the relevant
+  pact/verification details.
 
-  The environment variables PACT_BROKER_BASE_URL, PACT_BROKER_USERNAME and PACT_BROKER_PASSWORD may be used instead of their respective command line options.
+  The environment variables PACT_BROKER_BASE_URL, PACT_BROKER_BASE_URL_USERNAME and PACT_BROKER_BASE_URL_PASSWORD may be used
+  instead of their respective command line options.
 
   SCENARIOS
 
   # If every build goes straight to production
 
-  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.
+  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
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION --broker-base-url BROKER_BASE_URL
 
   # If every build does NOT go straight to production
 
   ## Recommended approach
 
-  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.
+  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
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT --version VERSION --to TAG --broker-base-url BROKER_BASE_URL
 
   ## Other approaches
 
-  If you do not/cannot tag every application at deployment, you have two options. You can either use the very first form of this command which just checks that the *latest* verification is successful (not recommended as it's the production version that you really care about) or you will need to determine the production versions of each collaborating application from some other source (eg. git) and explictly reference each one using one using the format `--pacticipant PACTICIPANT1 --version VERSION1 --pacticipant PACTICIPANT2 --version VERSION2 ...`
+  If you do not/cannot tag every application at deployment, you have two options. You can either use the very first form of this
+  command which just checks that the *latest* verification is successful (not recommended as it's the production version that you
+  really care about) or you will need to determine the production versions of each collaborating application from some other
+  source (eg. git) and explictly reference each one using one using the format `--pacticipant PACTICIPANT1 --version VERSION1
+  --pacticipant PACTICIPANT2 --version VERSION2 ...`
 
   # Other commands
 
-  Check the status of the pacts for the latest pacticipant version. This form is not recommended for use in your CI as it is possible that the version you are about to deploy is not the the version that the Broker considers the latest. It's best to specify the version explictly.
+  Check the status of the pacts for the latest pacticipant version. This form is not recommended for use in your CI as it is
+  possible that the version you are about to deploy is not the the version that the Broker considers the latest. It's best to
+  specify the version explictly.
 
-    $ pact-broker can-i-deploy --pacticipant PACTICIPANT --latest --broker-base-url BROKER_BASE_URL
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT --latest --broker-base-url BROKER_BASE_URL
 
   Check the status of the pacts for the latest pacticipant version for a given tag:
 
-    $ pact-broker can-i-deploy --pacticipant PACTICIPANT --latest TAG --broker-base-url BROKER_BASE_URL
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT --latest TAG --broker-base-url BROKER_BASE_URL
 
   Check the status of the pacts between two (or more) specific pacticipant versions:
 
-    $ pact-broker can-i-deploy --pacticipant PACTICIPANT1 --version VERSION1 --pacticipant PACTICIPANT2 --version VERSION2 --broker-base-url BROKER_BASE_URL
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT1 --version VERSION1 --pacticipant PACTICIPANT2 --version VERSION2
+  --broker-base-url BROKER_BASE_URL
 
   Check the status of the pacts between the latest versions of two (or more) pacticipants:
 
-    $ pact-broker can-i-deploy --pacticipant PACTICIPANT1 --latest --pacticipant PACTICIPANT2 --latest --broker-base-url BROKER_BASE_URL
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT1 --latest --pacticipant PACTICIPANT2 --latest --broker-base-url
+  BROKER_BASE_URL
 
   Check the status of the pacts between the latest versions of two (or more) pacticipants with a given tag:
 
-  $ pact-broker can-i-deploy --pacticipant PACTICIPANT1 --latest TAG1 --pacticipant PACTICIPANT2 --latest TAG2 --broker-base-url BROKER_BASE_URL
+  $ pact-broker can-i-deploy --pacticipant PACTICIPANT1 --latest TAG1 --pacticipant PACTICIPANT2 --latest TAG2 --broker-base-url
+  BROKER_BASE_URL
 
 ```
 
@@ -167,12 +187,12 @@ Options:
   -b, --broker-base-url=BROKER_BASE_URL    # The base URL of the Pact Broker
   -u, [--broker-username=BROKER_USERNAME]  # Pact Broker basic auth username
   -p, [--broker-password=BROKER_PASSWORD]  # Pact Broker basic auth password
+  -k, [--broker-token=BROKER_TOKEN]        # Pact Broker bearer token
   -o, [--output=OUTPUT]                    # json or table or id
                                            # Default: table
   -v, [--verbose], [--no-verbose]          # Verbose output. Default: false
 
-Description:
-  Describes a pacticipant version. If no version or tag is specified, the latest version is described.
+Describes a pacticipant version. If no version or tag is specified, the latest version is described.
 ```
 
 ## Usage - Ruby
@@ -198,6 +218,7 @@ PactBroker::Client::PublicationTask.new do | task |
   task.tag_with_git_branch = true|false # Optional but STRONGLY RECOMMENDED as it will greatly assist with your pact workflow. Result will be merged with other specified task.tags
   task.tags = ["dev"] # optional
   task.pact_broker_basic_auth =  { username: 'basic_auth_user', password: 'basic_auth_pass'} # optional
+  task.pact_broker_token = "1234abcd" # Bearer token
   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
 ```

data/lib/pact_broker/client/base_client.rb

@@ -43,6 +43,7 @@ module PactBroker
         self.class.base_uri base_url
         self.class.debug_output($stderr) if verbose?
         self.class.basic_auth(client_options[:basic_auth][:username], client_options[:basic_auth][:password]) if client_options[:basic_auth]
+        self.class.headers('Authorization' => "Bearer #{client_options[:token]}") if client_options[:token]
         self.class.ssl_ca_file(ENV['SSL_CERT_FILE']) if ENV['SSL_CERT_FILE'] && ENV['SSL_CERT_FILE'] != ''
         self.class.ssl_ca_path(ENV['SSL_CERT_DIR']) if ENV['SSL_CERT_DIR'] && ENV['SSL_CERT_DIR'] != ''
       end

data/lib/pact_broker/client/can_i_deploy.rb

@@ -52,7 +52,7 @@ module PactBroker
       def success_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says yes \o/ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.green(matrix.reason)}"
+          message = 'Computer says yes \o/ ' + message + "\n\n" + Term::ANSIColor.green(matrix.reason)
         end
         message
       end
@@ -60,13 +60,18 @@ module PactBroker
       def failure_message(matrix)
         message = format_matrix(matrix)
         if format != 'json'
-          message = 'Computer says no ¯\_(ツ)_/¯ ' + "\n\n" + message + "\n\n#{Term::ANSIColor.red(matrix.reason)}"
+          message = 'Computer says no ¯\_(ツ)_/¯ ' + message + "\n\n" + Term::ANSIColor.red(matrix.reason)
         end
         message
       end
 
       def format_matrix(matrix)
-        Matrix::Formatter.call(matrix, format)
+        formatted_matrix = Matrix::Formatter.call(matrix, format)
+        if format != 'json' && formatted_matrix.size > 0
+          "\n\n" + formatted_matrix
+        else
+          formatted_matrix
+        end
       end
 
       def format

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

@@ -27,6 +27,7 @@ module PactBroker
         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"
+        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
         method_option :output, aliases: "-o", desc: "json or table", default: 'table'
         method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
         method_option :retry_while_unknown, banner: 'TIMES', type: :numeric, default: 0, required: false, desc: "The number of times to retry while there is an unknown verification result (ie. the provider verification is likely still running)"
@@ -46,6 +47,7 @@ module PactBroker
         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"
+        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
         method_option :tag, aliases: "-t", type: :array, banner: "TAG", desc: "Tag name for consumer version. Can be specified multiple times."
         method_option :tag_with_git_branch, aliases: "-g", type: :boolean, default: false, required: false, desc: "Tag consumer version with the name of the current git branch. Default: false"
         method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
@@ -66,6 +68,7 @@ module PactBroker
         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"
+        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
         method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
 
         def create_version_tag
@@ -83,6 +86,7 @@ module PactBroker
         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"
+        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
         method_option :output, aliases: "-o", desc: "json or table or id", default: 'table'
         method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
 
@@ -112,6 +116,7 @@ module PactBroker
         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"
+        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
         method_option :contract_content_changed, type: :boolean, desc: "Trigger this webhook when the pact content changes"
         method_option :provider_verification_published, type: :boolean, desc: "Trigger this webhook when a provider verification result is published"
         method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
@@ -215,19 +220,15 @@ module PactBroker
           end
 
           def pact_broker_client_options
+            client_options = { verbose: options.verbose, token: options.broker_token }
             if options.broker_username
-              {
-                basic_auth: {
+              client_options[:basic_auth] = {
                   username: options.broker_username,
                   password: options.broker_password
-                },
-                verbose: options.verbose
-              }
-            else
-              {
-                verbose: options.verbose
-              }
+                }
             end
+
+            client_options
           end
         end
       end

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

@@ -24,6 +24,7 @@ module PactBroker
 
             new_argv = add_option_from_environment_variable(argv, 'broker-base-url', 'b', 'PACT_BROKER_BASE_URL')
             new_argv = add_option_from_environment_variable(new_argv, 'broker-username', 'u', 'PACT_BROKER_USERNAME')
+            new_argv = add_option_from_environment_variable(new_argv, 'broker-token', 'k', 'PACT_BROKER_TOKEN')
             add_option_from_environment_variable(new_argv, 'broker-password', 'p', 'PACT_BROKER_PASSWORD')
           end
 

data/lib/pact_broker/client/matrix/text_formatter.rb

@@ -16,7 +16,9 @@ module PactBroker
         ]
 
         def self.call(matrix)
-          data = matrix[:matrix].collect do | line |
+          matrix_rows = matrix[:matrix]
+          return "" if matrix_rows.size == 0
+          data = matrix_rows.collect do | line |
             Line.new(
               lookup(line, :consumer, :name),
               lookup(line, :consumer, :version, :number),

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

@@ -18,7 +18,7 @@ module PactBroker
   module Client
     class PublicationTask < ::Rake::TaskLib
 
-      attr_accessor :pattern, :pact_broker_base_url, :consumer_version, :tag, :write_method, :tag_with_git_branch, :pact_broker_basic_auth
+      attr_accessor :pattern, :pact_broker_base_url, :consumer_version, :tag, :write_method, :tag_with_git_branch, :pact_broker_basic_auth, :pact_broker_token
       alias_method :tags=, :tag=
       alias_method :tags, :tag
 
@@ -37,8 +37,10 @@ module PactBroker
           task task_name do
             block.call(self)
             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} : {})
+            pact_broker_client_options =  {}
+              .merge( pact_broker_basic_auth ? { basic_auth: pact_broker_basic_auth } : {} )
+              .merge( write_method ? { write: write_method } : {} )
+              .merge( pact_broker_token ? { token: pact_broker_token } : {} )
             success = PactBroker::Client::PublishPacts.new(pact_broker_base_url, FileList[pattern], consumer_version, all_tags, pact_broker_client_options).call
             raise "One or more pacts failed to be published" unless success
           end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.17.0'
+    VERSION = '1.18.0'
   end
 end

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

@@ -8,14 +8,17 @@ module PactBroker
         let(:base_url) { 'http://pact_broker_base_url'}
         let(:username) { 'pact_repo_username'}
         let(:password) { 'pact_repo_password'}
+        let(:token) { '123456789' }
         let(:client_options) do
-          {
+          { 
             basic_auth: {
               username: username,
               password: password
-            }
+            },
+            token: token
           }
         end
+        
         context 'with basic url' do
           it 'sets the base url' do
             base_client = BaseClient.new(base_url: base_url)
@@ -26,13 +29,22 @@ module PactBroker
 
         context 'with client options' do
           subject { BaseClient.new(base_url: base_url, client_options: client_options) }
-          it 'sets the client options ' do
+          it 'sets the client options' do
             expect(subject.client_options).to eq(client_options)
           end
 
-          it 'sets the httpparty basic auth when client options contains basic auth' do
-            expect(BaseClient).to receive(:basic_auth).with(username, password)
-            subject
+          context 'when client options contains basic auth' do
+            it 'sets the httpparty basic auth' do
+              expect(BaseClient).to receive(:basic_auth).with(username, password)
+              subject
+            end
+          end
+
+          context  'when client options contains broker token' do
+            it 'sets the httparty broker token' do
+              expect(BaseClient).to receive(:headers).with('Authorization' => "Bearer #{token}")
+              subject
+            end
           end
         end
 
@@ -46,6 +58,11 @@ module PactBroker
             expect(BaseClient).to_not receive(:basic_auth).with(username, password)
             subject
           end
+
+          it 'does not set the httparty broker token' do
+            expect(BaseClient).to_not receive(:headers).with('Authorization' => "Bearer #{token}")
+            subject
+          end
         end
 
         context 'when the SSL_CERT_FILE environment variable is set' do

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

@@ -20,6 +20,7 @@ module PactBroker
           {
             broker_base_url: 'http://pact-broker',
             output: 'table',
+            broker_token: 'token',
             verbose: 'verbose',
             retry_while_unknown: 1,
             retry_interval: 2
@@ -34,7 +35,7 @@ module PactBroker
         end
 
         it "invokes the CanIDeploy service" do
-          expect(CanIDeploy).to receive(:call).with('http://pact-broker', version_selectors, {to_tag: nil}, {output: 'table', retry_while_unknown: 1, retry_interval: 2}, {verbose: 'verbose'})
+          expect(CanIDeploy).to receive(:call).with('http://pact-broker', version_selectors, {to_tag: nil}, {output: 'table', retry_while_unknown: 1, retry_interval: 2}, {token: 'token', verbose: 'verbose'})
           invoke_can_i_deploy
         end
 
@@ -64,7 +65,7 @@ module PactBroker
           end
 
           it "invokes the CanIDeploy service with the basic auth credentials" do
-            expect(CanIDeploy).to receive(:call).with(anything, 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"}, token: 'token', verbose: 'verbose'})
             invoke_can_i_deploy
           end
         end

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

@@ -30,6 +30,7 @@ module PactBroker
               broker_base_url: "http://broker",
               broker_username: "username",
               broker_password: "password",
+              broker_token: "token",
               contract_content_changed: true,
               verbose: true
             }
@@ -62,7 +63,7 @@ module PactBroker
           it "calls PactBroker::Client::Webhooks::Create with pact broker details" do
             expect(PactBroker::Client::Webhooks::Create).to receive(:call) do | _, broker_base_url, pact_broker_client_options |
               expect(broker_base_url).to eq "http://broker"
-              expect(pact_broker_client_options).to eq(basic_auth: { username: "username", password: "password"}, verbose: true)
+              expect(pact_broker_client_options).to eq(basic_auth: { username: "username", password: "password"}, token: "token", verbose: true)
               command_result
             end
             subject
@@ -88,7 +89,7 @@ module PactBroker
 
             it "calls Webhooks::Create without basic auth" do
               expect(PactBroker::Client::Webhooks::Create).to receive(:call) do | _, _, pact_broker_client_options |
-                expect(pact_broker_client_options).to eq(verbose: true)
+                expect(pact_broker_client_options).to eq(token: "token", verbose: true)
                 command_result
               end
               subject

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

@@ -27,7 +27,7 @@ module PactBroker::Client::CLI
             ["spec/support/cli_test_pacts/foo.json"],
             "1.2.3",
             [],
-            {verbose: nil}
+            {token: nil, verbose: nil}
           )
           invoke_broker
         end

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

@@ -22,6 +22,7 @@ module PactBroker::Client::CLI
     method_option :broker_base_url, required: true, aliases: "-b"
     method_option :broker_username, aliases: "-u"
     method_option :broker_password, aliases: "-p"
+    method_option :broker_token, aliases: "-k"
     def test_using_env_vars
       Delegate.call(options)
     end
@@ -42,6 +43,7 @@ module PactBroker::Client::CLI
         ENV['PACT_BROKER_BASE_URL'] = 'http://foo'
         ENV['PACT_BROKER_USERNAME'] = 'username'
         ENV['PACT_BROKER_PASSWORD'] = 'password'
+        ENV['PACT_BROKER_TOKEN'] = 'token'
       end
 
       it "populates the options from the environment variables" do
@@ -49,6 +51,7 @@ module PactBroker::Client::CLI
           expect(options.broker_base_url).to eq 'http://foo'
           expect(options.broker_username).to eq 'username'
           expect(options.broker_password).to eq 'password'
+          expect(options.broker_token).to eq 'token'
         end
         TestThor.start(%w{test_using_env_vars})
       end
@@ -58,6 +61,7 @@ module PactBroker::Client::CLI
           expect(options.broker_base_url).to eq 'http://bar'
           expect(options.broker_username).to eq 'username'
           expect(options.broker_password).to eq 'password'
+          expect(options.broker_token).to eq 'token'
         end
         TestThor.start(%w{test_using_env_vars --broker-base-url http://bar})
       end

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

@@ -12,9 +12,7 @@ module PactBroker
       before do
         FakeFS.activate!
         allow(pacts_client).to receive(:publish).and_return(latest_pact_url)
-        allow(PactBroker::Client::PactBrokerClient).to receive(:new)
-          .with(base_url: pact_broker_base_url, client_options: pact_broker_client_options)
-          .and_return(pact_broker_client)
+        allow(PactBroker::Client::PactBrokerClient).to receive(:new).and_return(pact_broker_client)
         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)
@@ -53,6 +51,10 @@ module PactBroker
       subject { PublishPacts.new(pact_broker_base_url, pact_file_paths, consumer_version, tags, pact_broker_client_options) }
 
       describe "call" do
+        it "creates a PactBroker Client" do
+          expect(PactBroker::Client::PactBrokerClient).to receive(:new).with(base_url: pact_broker_base_url, client_options: pact_broker_client_options)
+          subject.call
+        end
 
         it "uses the pact_broker client to publish the given pact" do
           expect(pacts_client).to receive(:publish).with(pact_hash: pact_hash, consumer_version: consumer_version)

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

@@ -81,7 +81,8 @@ module PactBroker::Client
       before :all do
         @pact_broker_base_url = "http://some-host"
         @pattern = "pact/*.json"
-        @pact_broker_basic_auth = { username: 'user', password: 'pass'}
+        @pact_broker_basic_auth = { username: 'user', password: 'pass' }
+        @pact_broker_token = 'token'
         @tag = "dev"
         PactBroker::Client::PublicationTask.new(:custom) do | task |
           task.consumer_version = '1.2.3'
@@ -89,13 +90,20 @@ module PactBroker::Client
           task.pact_broker_base_url = @pact_broker_base_url
           task.pattern = @pattern
           task.pact_broker_basic_auth = @pact_broker_basic_auth
+          task.pact_broker_token = @pact_broker_token
         end
       end
 
       let(:pattern) { @pattern }
 
       it "invokes PublishPacts with the customised values" do
-        expect(PactBroker::Client::PublishPacts).to receive(:new).with(@pact_broker_base_url, pact_file_list, '1.2.3', [@tag], {basic_auth: @pact_broker_basic_auth})
+        expect(PactBroker::Client::PublishPacts).to receive(:new).with(
+          @pact_broker_base_url, 
+          pact_file_list, 
+          '1.2.3', 
+          [@tag], 
+          { basic_auth: @pact_broker_basic_auth, token: @pact_broker_token }
+        )
         expect(publish_pacts).to receive(:call).and_return(true)
         Rake::Task['pact:publish:custom'].execute
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty