pact_broker-client 1.72.0 → 1.74.0

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

@@ -1,6 +1,8 @@
 require 'rake/tasklib'
 require 'pact_broker/client/git'
 require 'pact_broker/client/hash_refinements'
+require 'pact_broker/client/string_refinements'
+require "pact_broker/client/error"
 
 =begin
 require pact_broker/client/tasks
@@ -19,57 +21,52 @@ module PactBroker
   module Client
     class PublicationTask < ::Rake::TaskLib
       using PactBroker::Client::HashRefinements
+      using PactBroker::Client::StringRefinements
 
-      attr_accessor :pattern, :pact_broker_base_url, :consumer_version, :tag, :write_method, :tag_with_git_branch, :pact_broker_basic_auth, :pact_broker_token
-      attr_reader :auto_detect_version_properties, :branch, :build_url
+      attr_accessor :pattern, :pact_broker_base_url, :tag, :build_url, :write_method, :tag_with_git_branch, :pact_broker_basic_auth, :pact_broker_token
+      attr_reader :auto_detect_version_properties, :build_url
+      attr_writer :consumer_version, :branch
       alias_method :tags=, :tag=
       alias_method :tags, :tag
 
       def initialize name = nil, &block
         @name = name
         @auto_detect_version_properties = nil
-        @version_required = false
         @pattern = 'spec/pacts/*.json'
         @pact_broker_base_url = 'http://pact-broker'
         rake_task &block
       end
 
       def auto_detect_version_properties= auto_detect_version_properties
-        @version_required = version_required || auto_detect_version_properties
         @auto_detect_version_properties = auto_detect_version_properties
       end
-
-      def branch= branch
-        @version_required = version_required || !!branch
-        @branch = branch
-      end
-
-      def build_url= build_url
-        @version_required = version_required || !!build_url
-        @build_url = build_url
-      end
-
+      
       private
 
-      attr_reader :version_required
-
       def rake_task &block
         namespace :pact do
           desc "Publish pacts to pact broker"
           task task_name do
             block.call(self)
+            validate!
             require 'pact_broker/client/publish_pacts'
             pact_broker_client_options = { write: write_method, token: pact_broker_token }
             pact_broker_client_options[:basic_auth] = pact_broker_basic_auth if pact_broker_basic_auth && pact_broker_basic_auth.any?
             pact_broker_client_options.compact!
-            consumer_version_params = { number: consumer_version, branch: the_branch, build_url: build_url, tags: all_tags, version_required: version_required }.compact
+            consumer_version_params = { number: consumer_version, branch: branch, build_url: build_url, tags: all_tags }.compact
             result = PactBroker::Client::PublishPacts.new(pact_broker_base_url, FileList[pattern], consumer_version_params, {}, pact_broker_client_options).call
             $stdout.puts result.message
-            raise "One or more pacts failed to be published" unless result.success
+            raise PactBroker::Client::Error.new("One or more pacts failed to be published") unless result.success
           end
         end
       end
 
+      def validate!
+        if consumer_version.blank?
+          raise PactBroker::Client::Error.new("A consumer version must be provided")
+        end
+      end
+
       def task_name
         @name ? "publish:#{@name}" : "publish"
       end
@@ -80,11 +77,31 @@ module PactBroker
         t.compact.uniq
       end
 
-      def the_branch
-        if branch.nil? && auto_detect_version_properties != false
-          PactBroker::Client::Git.branch(raise_error: auto_detect_version_properties == true)
+      # Attempt to detect the branch automatically, but don't raise an error if the branch can't be found
+      # unless the user has explicitly enabled auto_detect_version_properties.
+      # This approach is an attempt to include the branch without the user having to explicitly
+      # set it, because people tend to not update things.
+      def branch
+        if @branch.nil? && auto_detect_version_properties != false
+          @branch = PactBroker::Client::Git.branch(raise_error: auto_detect_version_properties == true)
+        else
+          @branch
+        end
+      end
+
+      def consumer_version
+        if @consumer_version.nil? && @auto_detect_version_properties
+          @consumer_version = PactBroker::Client::Git.commit(raise_error: true)
+        else
+          @consumer_version
+        end
+      end
+
+      def build_url
+        if @build_url.nil? && @auto_detect_version_properties
+          @build_url = PactBroker::Client::Git.build_url
         else
-          branch
+          @build_url
         end
       end
     end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.72.0'
+    VERSION = '1.74.0'
   end
 end

data/script/ci/record-release.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-set -Eeuxo pipefail
+set -eu
 
-bundle exec bin/pact-broker record-deployment \
+bundle exec bin/pact-broker record-release \
    --pacticipant "Pact Broker Client" --version $GITHUB_SHA \
    --environment production

data/script/publish-pact.sh

@@ -29,7 +29,7 @@ export PACT_BROKER_TOKEN=${PACT_BROKER_TOKEN:-"localhost"}
 #   --contract-published
 
 
-bundle exec bin/pact-broker publish scripts/foo-bar.json \
+bundle exec bin/pact-broker publish script/foo-bar.json \
   --consumer-app-version 1.2.26 \
     --auto-detect-version-properties \
     --build-url http://mybuild \

data/script/update-cli-usage-in-readme.rb

@@ -1,4 +1,11 @@
 #!/usr/bin/env ruby
+require "bundler/inline"
+
+gemfile do
+  source "https://rubygems.org"
+  gem "pact_broker-client", path: "."
+end
+
 require "stringio"
 require "pact_broker/client/cli/broker"
 require "pactflow/client/cli/pactflow"

data/spec/fixtures/MyConsumer-MyProvider (1).json

@@ -0,0 +1,37 @@
+{
+  "consumer": {
+    "name": "MyConsumer"
+  },
+  "interactions": [
+    {
+      "description": "request",
+      "providerStates": [
+        {
+          "name": "state 2"
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "path": "/2"
+      },
+      "response": {
+        "status": 200
+      }
+    }
+  ],
+  "metadata": {
+    "pact-js": {
+      "version": "11.0.2"
+    },
+    "pactRust": {
+      "ffi": "0.4.0",
+      "models": "1.0.4"
+    },
+    "pactSpecification": {
+      "version": "3.0.0"
+    }
+  },
+  "provider": {
+    "name": "MyProvider"
+  }
+}

data/spec/fixtures/MyConsumer-MyProvider.json

@@ -0,0 +1,37 @@
+{
+  "consumer": {
+    "name": "MyConsumer"
+  },
+  "interactions": [
+    {
+      "description": "request",
+      "providerStates": [
+        {
+          "name": "state 1"
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "path": "/1"
+      },
+      "response": {
+        "status": 200
+      }
+    }
+  ],
+  "metadata": {
+    "pact-js": {
+      "version": "11.0.2"
+    },
+    "pactRust": {
+      "ffi": "0.4.0",
+      "models": "1.0.4"
+    },
+    "pactSpecification": {
+      "version": "3.0.0"
+    }
+  },
+  "provider": {
+    "name": "MyProvider"
+  }
+}

data/spec/fixtures/certificates/ca_cert.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDATCCAemgAwIBAgIUWfQF2Mh+eFd3q+cSVgekpaMTh9MwDQYJKoZIhvcNAQEL
+BQAwDzENMAsGA1UEAwwETXlDQTAgFw0yMzA5MTkxMTA2MjZaGA8yMTIzMDgyNjEx
+MDYyNlowDzENMAsGA1UEAwwETXlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK9Qha2OdeFrSCUqiYRUBngNLn8PRGDaKPWmjd+3WOWJNM1RNgFfGpKY
+nxYJp4J6eW7aeQ6o94Q+QOZp+Yxm6thrtvjRbcEafAore4EwC4tjXvoFoy+mKwzm
+njlJw+ha3TsMAqD3GGDLF7uDnmliURRo8TOmJ++Mwss9Uhb5p9LArjWXa3sV8da+
+gsxP2aTgBZfznUhNKDGUfezYa5UEbHQ869rA1PAqL3tOC2M5LTX08C2PlzzLOF5S
+gBzicV1PPDkmkbxKmFV+D8LmkwWNsRhrzZ6TIxYoXIRhziS7JuYOGU7G0+6ZKpIP
+mo7WXSoSrd7GL5PQJzlHKCsTckd4so0CAwEAAaNTMFEwHQYDVR0OBBYEFCeovNXs
+r1mcbprFaLyll+LrBJmQMB8GA1UdIwQYMBaAFCeovNXsr1mcbprFaLyll+LrBJmQ
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHOsbZ0iDiKiRU8Q
+hIAav056dboPjTK19Q736DUD6oCbTbvecfxMv/wu9LmYGW5jt/DWP6s+jDYhcPpj
+c3U03pPKCnvsG5z60ZgmNSqzyVAVPW17UVdw/ZnkKK/SFxYgYQaF/1g6opS2Zana
+4aBGypqqGoD4KE+DAnRjuuCUpiz3zXwGd86auajY6soMlLNnVXteVa/whW6IZ84x
+w4LISeMGUr+MXw9ye4WhcZYKZ4vwJdUYst2PA0pDuGwBDbGnrYloGm2BSpaHXUUo
+XrwKFFkIxcK63IpAhoceTJpyfjI1BSmItfjEwToOUu6xDBsHLNiH6BKstSxk0DfX
+01PHz2I=
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/ca_cert.srl

@@ -0,0 +1 @@
+494F82D5FE5055D2C9C64941C421085B59521071

data/spec/fixtures/certificates/ca_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvUIWtjnXha0gl
+KomEVAZ4DS5/D0Rg2ij1po3ft1jliTTNUTYBXxqSmJ8WCaeCenlu2nkOqPeEPkDm
+afmMZurYa7b40W3BGnwKK3uBMAuLY176BaMvpisM5p45ScPoWt07DAKg9xhgyxe7
+g55pYlEUaPEzpifvjMLLPVIW+afSwK41l2t7FfHWvoLMT9mk4AWX851ITSgxlH3s
+2GuVBGx0POvawNTwKi97TgtjOS019PAtj5c8yzheUoAc4nFdTzw5JpG8SphVfg/C
+5pMFjbEYa82ekyMWKFyEYc4kuybmDhlOxtPumSqSD5qO1l0qEq3exi+T0Cc5Rygr
+E3JHeLKNAgMBAAECggEAF2EHQqWB24V2rIYnVT9DUZUobdyiWMF0aYtEK4uuzjAQ
+RjpzQkGQMJvWc0DnAW5wbTOzUHIrTTZkFJYYp6boiziUwPUPduCfnqznySBCxIbZ
+mUFRNBSBHzT4mq6B8qV+D9bChFFkrdvHlsOu8gzLaouyxsQnWo8MlxU0B55UHrWc
+nqIsPKVBeBtiF7c7eyZtpKmYgmWN8hnPzTZ2rtCL/BS3p2+/O+fFJKuul58Yo4t6
+bmMCPN5C6HxNhB6ADHm3lPVU3ap5g3a/4UHqVJ8c2SGKfAx6C1PgbajxiA74qMLS
+YOhMXzc3jSLmakqvSmVhQFJhFt7drbbGtx4oD3+XPQKBgQDj1k7O2A0yJRQPtvQJ
+A1m+H5fmynMnH6XuQuO8WzqCsDsE786EAG6AzY562SMEQrQ0zgpFx0A9ZmECNaOZ
+28OnzcA5xGKQh5dD0ou9lvRHXEavu7fYCrAG+wlQTo1eRHUDOAN4pQPoZ9r3bz1M
+tnGtG3rak4KemAsoX8aSy59ZswKBgQDE/C+eu012vzjyr2J1W0Gdms7fh5CWzMp8
+hCHk+kmLCY4DHIaUv0tT3IXGKebRH+PZObE3zZ5Hx2QXPjFQWsyTkd9D2tRIWHaZ
+ZpKPBLxYJJuBc3YWZM1qC2ZcRyvv1NgtNUFpB5xOGIUL3/QsfcOE25kC7Z21aN+e
+uXSi3CkivwKBgGFHSZLLcKbuaehjx0Jp6dFhj+v8mLolqyVV7gKoOQ0/zZNICLcX
+sBbSrXkKaQcSq/q31m8Aqg8NPXJCEL5KtPlawi5oCWWIXy+YIA4s+9PUNGIoFlDq
+D0qLuOhPAdE0DXn4WpMScd6zKSzolBXC+DpfN09IGEc6x9jPO+vFgR49AoGABPiw
+YvsrK1IMJ+PRQlD5SPb9PZr4RTYJ7jaPfG3sqTumf+Gaa+qgBg/MuIGaN7DsWTEh
+jdz8n6cimYuSRwrjmt3VmqrNLL4+0ARMsptV/Yt++TdmxY3puUFsZevN6hGfGxT6
+/6GXikkIIpKWYQETjCjWpcJFdqyc6C6aCPoxd5UCgYEA1B4AdDgxhZgXhz24sKM7
+aX2aY4glBsEZ7dxaqpqvwmsSshvdfudjuFxo5jjMKV2C9JmwrCGML9O6MvSP03n8
+B3R543JqKqWLTaSROHkcoil+LdIV9w7jrMBildOCHSDXwuM8Pl7YObIdKMq4pVwe
+87n9/ZihlrKGaZ8utMrrGmc=
+-----END PRIVATE KEY-----

data/spec/fixtures/certificates/client_cert.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICrDCCAZQCFElPgtX+UFXSycZJQcQhCFtZUhBxMA0GCSqGSIb3DQEBCwUAMA8x
+DTALBgNVBAMMBE15Q0EwIBcNMjMwOTE5MTEwNzM1WhgPMjEyMzA4MjYxMTA3MzVa
+MBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAJj6DF+bu0DhXmkBaC2+CkoqNlsO+LzW9bZnNCQk0Jw99fgCGTLifU3N
+eyAhKgHs+V3G/9ULbMrxYMSQ/psrrXpS7FM9xtA0WZ0VAg7Oi4WEi+wueE0R1GmO
+NMuCVT2JCYd5uDh8+mrWoVqb9L4xIsy0kaV0Nnl+NX1zDvHXUHzfo3T3roaxRbd6
+N92qNPzrj8TviwbapT0bo4GKwTCOO1ewPFGCjsWEeLZ4p2UfbOzW/zjIBEUD8Kqg
+FOht48y9J6XG3Tb61/7neT0xj6E7cn6hGSzuiIM/oZbtuUt72VDgbLbOrS02oHTz
+YmC9tVL35Qvfgzrqw0DEv7zpm/3iG0sCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
+nndLK/t6+dmoAwg4K7pdo8xqUEDnUx8K7sU2whZvLEUM+mO+jWOe3USHjR3aXYnU
+OjNhN90/TAy5wlIK6U2C36nHyZJUeScxuiaVwErwayE+GgwYmw9R7HVofgcVfTve
+IpjyrT7mDOCMYjkHgZv1dSHQTcc6uclaw7SgywEEjxjCNSJCN+WPjxCdcuno0td8
+i7F6FL7FeOiP1mtQrTo42Tq+knerUc55CbTW4anbQfL+6TFEVCPJKduLHFieGB0k
+BFilUR3JD2t8/f4fIilQ6FrMZpUzKcLbgW9cjts8mxq0zNV+z6lISgKbdxZFQp+2
+fvyYdnoNLP0YeRI6j9x1pg==
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCY+gxfm7tA4V5p
+AWgtvgpKKjZbDvi81vW2ZzQkJNCcPfX4Ahky4n1NzXsgISoB7Pldxv/VC2zK8WDE
+kP6bK616UuxTPcbQNFmdFQIOzouFhIvsLnhNEdRpjjTLglU9iQmHebg4fPpq1qFa
+m/S+MSLMtJGldDZ5fjV9cw7x11B836N0966GsUW3ejfdqjT864/E74sG2qU9G6OB
+isEwjjtXsDxRgo7FhHi2eKdlH2zs1v84yARFA/CqoBTobePMvSelxt02+tf+53k9
+MY+hO3J+oRks7oiDP6GW7blLe9lQ4Gy2zq0tNqB082JgvbVS9+UL34M66sNAxL+8
+6Zv94htLAgMBAAECggEAF2l9Z0yANgfH2S478XQ6Qut+8iSycMQ9SrM0yatQufjJ
+ojFABgefwb6G733j3fOUnoOMN+DNv6l9c9f0/26J2ETEomC8ArVgWagTboyx0bdd
+asIZ60GlTppS/ipuPUKx0KgSR6Lo+FzsyN9Bb7I5bzbba4UDqUhli1OGoACh8tpS
+pyhD58C0nWBCYUjgkB2ilVoguQnnTvYC0VDbGOWK1P8bw0to810mkKTyv7ztifW2
+lHUwTe8vbQk7jY52+crvtgVZWNaXEdma3ivDSDHUjK3WLmPw9MFgVSMVYFLDZUQN
+Btd7PyBSkjeHOzoS5b9l4qnjn2vhObpjrT5PZT6TMQKBgQDI+xrzk351kyqezHuZ
+Bqo5CqEN3BHvwKALh3DA3uxHVaLqOo/yALv86yHgue/9ksaxxDwufAnVvcg5eEEh
+XIsZrfKBIaNV5umqJAkbCbx4hVCX9mE45THv3Nc7XhiHuZZpUHb1i7qcab1lly5Y
+7lFoCd5dCQJUoBf3/9Bw76OjRwKBgQDC2sba56V0dahFxTE3bOIRR2HIYWNfPv0a
+7ejiNSHVHGTLrEfnya5ZcerT0j6QNA2IQcKw5ovPKn2xgjGlfPWgtBAz55r+lfU2
++/6CRf8v6tu9FdPs7RDHxBuicOGQlQGSAH2+tfcY9ZCB8wcdGYB3v5ko0OFsFdZY
++fJOIt4h3QKBgByFJanzADsHC0FFmzR38afujjQ9Sn5PQ2bfbWyxNa5ZxKigbtTU
+rdiSNViCij/dmDyZsECYcXzXVZZyLivhygt217bjYx5JilcOjgw8MXaY1Hr8B4ff
+Xlq/Z/uQusJn36RKOtdVYMHZb3r/HSCZkQvGeruRD7eakEwtDRM5rmr5AoGAZFt9
+s90/ED5RDq5DbQJ9ZNzY9fWC0tmETsxd97PZ2wMmvufamPz8+UB86+ALLQZCOf10
+otv7AhYmarhdjZhQghZ7ieAtqhXeGBWtvbcDedCCoF6PqiVnURwmB4IQCwFTr7jl
+CsZ5n7dKWEOtVEWALyzVW3pJv/t3TJhfPfMjaVkCgYAxmC4/jmBCLmQZ3eWbmZHx
+X7N2qAI7Cu2JVi1Wut4WnBgFNynYH+kt67LZSQ9Jf9lHDnlBe5gOTvF5/8UeoTMv
+MGI4R4WJ6ezWV12ugbmKAvzHB/SiJ9U0ph78ibejCxW3gomuDzY1T+xF56kCKXJ0
+uPaEN0rPMT6wMEegJHaE8A==
+-----END PRIVATE KEY-----

data/spec/fixtures/certificates/server.csr

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICWTCCAUECAQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAmPoMX5u7QOFeaQFoLb4KSio2Ww74vNb1tmc0JCTQ
+nD31+AIZMuJ9Tc17ICEqAez5Xcb/1QtsyvFgxJD+myutelLsUz3G0DRZnRUCDs6L
+hYSL7C54TRHUaY40y4JVPYkJh3m4OHz6atahWpv0vjEizLSRpXQ2eX41fXMO8ddQ
+fN+jdPeuhrFFt3o33ao0/OuPxO+LBtqlPRujgYrBMI47V7A8UYKOxYR4tninZR9s
+7Nb/OMgERQPwqqAU6G3jzL0npcbdNvrX/ud5PTGPoTtyfqEZLO6Igz+hlu25S3vZ
+UOBsts6tLTagdPNiYL21UvflC9+DOurDQMS/vOmb/eIbSwIDAQABoAAwDQYJKoZI
+hvcNAQELBQADggEBAEz74PiDtYCL1XiZV4On0l5jRjBrKTVEAnjEtWgygy9V6U1d
+BYE3AxwsdTUygl/cS2i3g8U2yZGQ1ZAh/qHq0sHB6TDePLmNSEiksP7KOJwXU9vO
+/pCS9qbOYcWucLlQpnHxySpUlcxFWmrl33pMaNCzxxLN1q3eRbNmxoxACI/+vZsX
+M6sm2fhhw6yZkU7D04BDgSwsddW8ApDqbtwbndyv/ZL13xjG9yow8noSF7uxGQnn
+UnVFMGVGp3I6M/E3VFIwRvUYA1MJeqh9tLIEItlGmqkrQmxOnMvXKzJnQ9nK1KBq
+2gaBXdvbabkXKAHnV0tYbDmZXvTO+7Ci7wgapNU=
+-----END CERTIFICATE REQUEST-----

data/spec/fixtures/certificates/unsigned_cert.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDCzCCAfOgAwIBAgIUN2/oKOttkdOretzyqc+Zv8IqpT8wDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTIzMDkxOTExMjEzM1oYDzIxMjMw
+ODI2MTEyMTMzWjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQD30tqrKrHa0p1RsGlDc7lUUS/ZF2/7ZtNWe0gRuuum
+6l/X5H8F+Ay1cO8DirGx3s/LPpj7DwvjjKo2eE+wcO2v/R5S+uPL4Bm0o+bPGwZP
+vw+XMMgBZUsNSMER6DUliP5bHQ/8TCXWpfP3rLJ9QitOAX/rD9bVrOs3g3I0uf2A
+RZ0O40//5q9fiXRC3PAfPbX7XdyI9Mr3duwmAW+nK2Gbd98ut27PkO0Fze27Xtk2
+EdIh3u5pajK/ub8rf5vyfk+c/6pcN9kMakPtlgIR/eqzTkfRWyIpMoFn/X8VumUQ
+X4ylj1SfSs+K47GBjrqknEh1BYlblW8WKg5cUjx/r/b/AgMBAAGjUzBRMB0GA1Ud
+DgQWBBQUEefafoC0qDhzThhEBMMwr/C5FTAfBgNVHSMEGDAWgBQUEefafoC0qDhz
+ThhEBMMwr/C5FTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDn
+dfkjZtgSdbsEPhUMfUlhZWXqxtLDQBoxM7xF+i5WC6w3yHpN/teA8SqA8CYiPb9d
+5rNfnmJLP4PeyfTu6Pc0EJpQsmK19i9z0FPrA7bqPIzgF4U4R1eQ5mvTzlNoGkp3
+1gnjDdwtTq0RFfuvHKm5EqECKX+hBEJKMiviEH/mGqQuoycpKifZ5WRTQonnWjGe
+BVkhdn4Psp83EWdnD/yQbo1XEbYRtsaPM4Dozr6uKbeq9Zbu+xDO9Uw4mTE/WSfb
+t4AXqOLDRafOP9w3twlFH2ZQxqpSaqXo8z1RkS9jtCm69JcDnsePKqkhesToMZAz
+2cylIQmuuNIRGLmCRsVK
+-----END CERTIFICATE-----

data/spec/fixtures/certificates/unsigned_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD30tqrKrHa0p1R
+sGlDc7lUUS/ZF2/7ZtNWe0gRuuum6l/X5H8F+Ay1cO8DirGx3s/LPpj7DwvjjKo2
+eE+wcO2v/R5S+uPL4Bm0o+bPGwZPvw+XMMgBZUsNSMER6DUliP5bHQ/8TCXWpfP3
+rLJ9QitOAX/rD9bVrOs3g3I0uf2ARZ0O40//5q9fiXRC3PAfPbX7XdyI9Mr3duwm
+AW+nK2Gbd98ut27PkO0Fze27Xtk2EdIh3u5pajK/ub8rf5vyfk+c/6pcN9kMakPt
+lgIR/eqzTkfRWyIpMoFn/X8VumUQX4ylj1SfSs+K47GBjrqknEh1BYlblW8WKg5c
+Ujx/r/b/AgMBAAECggEAR4aYzBwndvOgqioTR3+H9tjzyWFlVZbo2iX8t/lN+D/e
+562wJ6Xe7SMqKMiH3sFjEdMATj2afdNkcRIqVc9SGqAgd2yoAHiukp9Xh2DSYoPP
+WSCgKR72GWBtMODnLe0rFFr/+R51MU12a35xiYtmej4ekFZi+ArPXJdYh/VCQBnG
+BGF+EnUJqCAOXLz9zG3FoYVBWu071vEnpBtfblbHYfY2/o5CSoORkxcput6XDHxO
+7pOXN7IRt7DJZ0goda3OwZQ9suKyTLcOxa8cA+DteVP6cvh4u2l+ZMxUIYK5B1eh
+VAmJkIbcbAaz/SxyO9E2gWraz+pu6ArOGY/0krcBmQKBgQD9BlVtx7QTVzu+nLzF
+2++cB0LTsTD9T9rlMfIuQMBIOywmsivyvUDr9SjOPqICQUIRufHKqCgHs4TH7Ifs
+4AxyUEwQMG4xuYh3nU5eZlpUEjzUWbbe7o0NjhaJ4ZlUBvzHBcgptUlKTwvwamMs
+pnzQxWlFXFuh+pxPPdSXZVmWJQKBgQD6vN0pO/xc3bAqHSCavX95NBjUhFvkAsoo
+T8tfv2qoAN8RhI2/N8prix6tJk3AdhzdLmmMktv3MBDXd3cgLgmXQTYHIijWXPlF
+/WXWmZXK0E9fiDjfXI9eB7E237fYGOaSobOhLOLoHcuL0kndps67QP2BhtXhYB88
+1We7LoJVUwKBgQCnF1qtH5d0ukPTEdC73Q0z/buM7tPKRMTqXHxxPQN9782tVDYf
+nAlWiVTENqpoUM4fxKq/SSL+SvfhyvrMW/z8NLi2bDUpEzviufg58N+v60dOeFyC
+hgiSLgYGUfweeGrPx6qymGxo7SCWSLtrjhqZB/UIAADnTAeTcOKGhECQHQKBgAlM
+A29J+BuBZMzK87CJIjbeRaVrmvSjXdeMzd+o+01ratn9bjwO14SRTfvhlbRzLLLO
+y78YmutZbuZuWY5p5pUjJ9uv2o/INr3vnV0NqM4yVx8Vr/YoOnCkHGAKf4iVs8bw
+E/b/8RHmOOvgSjjbvIKY8E1jMH8Az2e0CfqYyOBdAoGAOlhTefyBGgAWFHqH/l4p
+ThbWupIMsw1ZXlArwBnTfsUFuz0Yq7B+0tqrV8lhS3P4/0jI2yWnzhluDk62clwz
+Xg187V85Ylagshsjv60mP5qBEF4N7Nf5fP2w6+GjMU+YiHEBsgGGt+2jPgKeCGQW
+IlV3ym59oL+wGyN9OK3z+aw=
+-----END PRIVATE KEY-----

data/spec/integration/can_i_deploy_spec.rb

@@ -18,15 +18,6 @@ describe "pact-broker can-i-deploy", skip_windows: true do
     end
   end
 
-  context "when the pacticipants can't be deployed" do
-    subject { `bundle exec bin/pact-broker can-i-deploy --pacticipant Wiffle --version 1.2.3 --pacticipant Meep --version 4.5.6 --broker-base-url http://localhost:5000` }
-
-    it "returns an error exit code" do
-      subject
-      expect($?.exitstatus).to_not eq 0
-    end
-  end
-
   after(:all) do
     Process.kill 'KILL', @pipe.pid
   end

data/spec/integration/unknown_options_spec.rb

@@ -0,0 +1,39 @@
+require "open3"
+require "pact_broker/client/cli/broker"
+
+# This is not the ideal way to write a test, but I tried to write it with an in memory invocation,
+# and I couldn't get the capture to work, and it became super complicated.
+
+RSpec.describe "using unknown options", skip_windows: true do
+  let(:unknown_switches_text) { "Unknown switches" }
+  let(:warning_text) { "This is a warning"}
+  let(:command) { "bundle exec bin/pact-broker can-i-deploy --pacticipant Foo --foo --broker-base-url http://example.org" }
+
+  it "prints an 'unknown switches' warning to stderr and also includes the normal output of the command" do
+    stderr_lines = nil
+
+    Open3.popen3(command) do |stdin, stdout, stderr, thread|
+       stderr_lines = stderr.readlines
+    end
+
+    expect(stderr_lines.join("\n")).to include(unknown_switches_text)
+    expect(stderr_lines.join("\n")).to include(warning_text)
+
+    expect(stderr_lines.size).to be > 2
+  end
+
+
+  context "with PACT_BROKER_ERROR_ON_UNKNOWN_OPTION=true" do
+    it "prints an 'unknown switches' message to stderr and does NOT include the normal output of the command as it exits straight after" do
+      stderr_lines = nil
+
+      Open3.popen3({ "PACT_BROKER_ERROR_ON_UNKNOWN_OPTION" => "true" }, command) do |stdin, stdout, stderr, thread|
+         stderr_lines = stderr.readlines
+      end
+
+      expect(stderr_lines.first).to include(unknown_switches_text)
+      expect(stderr_lines.join("\n")).to_not include(warning_text)
+      expect(stderr_lines.size).to eq 1
+    end
+  end
+end

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

@@ -4,10 +4,12 @@ require 'pact_broker/client/git'
 
 module PactBroker::Client::CLI
   describe Broker do
-    describe ".broker" do
+    describe '.broker' do
       before do
         allow(PactBroker::Client::PublishPacts).to receive(:call).and_return(result)
-        allow(PactBroker::Client::Git).to receive(:branch).and_return("bar")
+        allow(PactBroker::Client::Git).to receive(:branch).and_return('bar')
+        allow(PactBroker::Client::Git).to receive(:commit).and_return('6.6.6')
+        allow(PactBroker::Client::Git).to receive(:build_url).and_return('build_url')
         subject.options = OpenStruct.new(minimum_valid_options)
         allow($stdout).to receive(:puts)
       end
@@ -30,7 +32,7 @@ module PactBroker::Client::CLI
           expect(PactBroker::Client::PublishPacts).to receive(:call).with(
             "http://pact-broker",
             ["spec/support/cli_test_pacts/foo.json"],
-            { number: "1.2.3", tags: [], version_required: false },
+            { number: "1.2.3", tags: [] },
             {},
             { pact_broker_base_url: 'http://pact-broker' }
           )
@@ -151,7 +153,7 @@ module PactBroker::Client::CLI
           expect(PactBroker::Client::PublishPacts).to receive(:call).with(
             anything,
             anything,
-            hash_including(branch: "main", version_required: true),
+            hash_including(branch: "main"),
             anything,
             anything
           )
@@ -159,50 +161,55 @@ module PactBroker::Client::CLI
         end
       end
 
-      context "with --auto-detect-version-properties on by default" do
+      context "with --auto-detect-version-properties specified" do
         before do
           subject.options = OpenStruct.new(
-            minimum_valid_options.merge(auto_detect_version_properties: true)
+            minimum_valid_options.merge(auto_detect_version_properties: true, consumer_app_version: nil)
           )
-          allow(subject).to receive(:explict_auto_detect_version_properties).and_return(false)
         end
 
         it "determines the git branch name" do
-          expect(PactBroker::Client::Git).to receive(:branch).with(raise_error: false)
+          expect(PactBroker::Client::Git).to receive(:branch).with(raise_error: true)
           invoke_broker
         end
 
-        it "passes in the auto detected branch option with version_required: false" do
+        it "passes in the auto detected branch option" do
           expect(PactBroker::Client::PublishPacts).to receive(:call).with(
             anything,
             anything,
-            hash_including(branch: "bar", version_required: false),
+            hash_including(branch: "bar"),
             anything,
             anything
           )
           invoke_broker
         end
-      end
 
+        it 'determines the commit sha' do
+          expect(PactBroker::Client::Git).to receive(:commit).with(raise_error: true)
+          invoke_broker
+        end
 
-      context "with --auto-detect-version-properties specified explicitly" do
-        before do
-          subject.options = OpenStruct.new(
-            minimum_valid_options.merge(auto_detect_version_properties: true)
+        it 'passes in the auto detected commit sha option' do
+          expect(PactBroker::Client::PublishPacts).to receive(:call).with(
+            anything,
+            anything,
+            hash_including(number: '6.6.6'),
+            anything,
+            anything
           )
-          allow(subject).to receive(:explict_auto_detect_version_properties).and_return(true)
+          invoke_broker
         end
 
-        it "determines the git branch name" do
-          expect(PactBroker::Client::Git).to receive(:branch).with(raise_error: true)
+        it 'determines the build URL' do
+          expect(PactBroker::Client::Git).to receive(:build_url)
           invoke_broker
         end
 
-        it "passes in the auto detected branch option with version_required: true" do
+        it 'passes in the auto detected build URL' do
           expect(PactBroker::Client::PublishPacts).to receive(:call).with(
             anything,
             anything,
-            hash_including(branch: "bar", version_required: true),
+            hash_including(build_url: 'build_url'),
             anything,
             anything
           )
@@ -220,7 +227,7 @@ module PactBroker::Client::CLI
             expect(PactBroker::Client::PublishPacts).to receive(:call).with(
               anything,
               anything,
-              hash_including(branch: "specified-branch", version_required: true),
+              hash_including(branch: "specified-branch"),
               anything,
               anything
             )
@@ -248,6 +255,16 @@ module PactBroker::Client::CLI
         end
       end
 
+      context "with no consumer_app_version" do
+        before do
+          subject.options.consumer_app_version = nil
+        end
+
+        it "raises an error" do
+          expect { invoke_broker }.to raise_error ::Thor::RequiredArgumentMissingError, /--consumer-app-version/
+        end
+      end
+
       context "with basic auth options specified" do
         before do
           subject.options = OpenStruct.new(

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

@@ -7,6 +7,10 @@ module PactBroker::Client::CLI
   end
 
   class TestThor < CustomThor
+    def self.exit_on_failure?
+      false
+    end
+
     desc 'ARGUMENT', 'This is the description'
     def test_default(argument)
       Delegate.call(argument: argument)
@@ -96,6 +100,29 @@ module PactBroker::Client::CLI
       TestThor.start(%w{test_pact_broker_client_options})
     end
 
+    describe "when someone copy pastes from Word and uses an em dash instead of a normal dash" do
+      before do
+        allow(TestThor).to receive(:exit_with_error_code)
+      end
+
+      it "exits with an error message" do
+        expect($stdout).to receive(:puts).with(/contains an em dash/)
+        expect(TestThor).to receive(:exit_with_error_code)
+        TestThor.start(["test_default", "\u2014\u2014bar"])
+      end
+    end
+
+    describe ".handle_help" do
+      context "when the last argument is --help or -h" do
+        it "turns it into the form that Thor expects, which is a really odd one" do
+          expect(TestThor.handle_help(["foo", "--help"])).to eq ["help", "foo"]
+          expect(TestThor.handle_help(["foo", "-h"])).to eq ["help", "foo"]
+          expect(TestThor.handle_help(["-h"])).to eq ["help"]
+          expect(TestThor.handle_help(["--help"])).to eq ["help"]
+        end
+      end
+    end
+
     describe ".turn_muliple_tag_options_into_array" do
       it "turns '--tag foo --tag bar' into '--tag foo bar'" do
         input = %w{--ignore this --tag foo --tag bar --wiffle --that}