pact_broker-client 1.33.0 → 1.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032b2528b1b15b999a2824688a69cfd919727aaf04e5740114a0394073fb10ca
-  data.tar.gz: 615954f63d19d03e5da05ae4c5ee70b754f166d5c09778248fa95b160f057bab
+  metadata.gz: 108c1ab15ca6e36cc62cd630bdd73e716d83ed78ae9cdf718edb5abc7741ac3b
+  data.tar.gz: fa0e07f37153ce67e4b76a9e2ed32635e613d38972b60687e4eeff659e8d6dff
 SHA512:
-  metadata.gz: 9c044af8573cf9fa6d42745eb19ebbb0b106f2581c8072666ec3969cee09d676a7bbf3d69d6c76f80ed7c53623e96c854a6124fc378140d3047fe7aaef69fe9b
-  data.tar.gz: a9fdfed90ff342d500b4dd10973bbf3a45b1c12a37cbc8a8f705f2d98770244f6da59c0a7615e48df77425d90a8870d32dcc6230271045b0f4f6de25292b2c5a
+  metadata.gz: b3a851164b96ca422c7c3e683c389f5731c86e85fa8a7fe29501fb9b0719b4ac20fc8caed19654324765c2f29e1b253dfd12055268b45e59d75eef73507c834f
+  data.tar.gz: c9f836d70e375a8a6205855184fefaf0712cfeb4c46a14bd71433406ddf6aa445c50d76a3d36044d4427ac63b4ad14b2eab5890a16d502e68a4704a4b3cac540

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="v1.34.0"></a>
+### v1.34.0 (2020-11-20)
+
+#### Features
+
+* **pact publish**
+  * strip new lines from version numbers and tags	 ([5842d24](/../../commit/5842d24))
+
+* **publish**
+  * update output text when pact already exists and merging	 ([9b849d3](/../../commit/9b849d3))
+
 <a name="v1.33.0"></a>
 ### v1.33.0 (2020-11-10)
 

data/lib/pact_broker/client/publish_pacts.rb

@@ -16,8 +16,8 @@ module PactBroker
       def initialize pact_broker_base_url, pact_file_paths, consumer_version, tags, pact_broker_client_options={}
         @pact_broker_base_url = pact_broker_base_url
         @pact_file_paths = pact_file_paths
-        @consumer_version = consumer_version
-        @tags = tags
+        @consumer_version = consumer_version.respond_to?(:strip) ? consumer_version.strip : consumer_version
+        @tags = tags ? tags.collect{ |tag| tag.respond_to?(:strip) ? tag.strip : tag } : tags
         @pact_broker_client_options = pact_broker_client_options
       end
 
@@ -37,6 +37,10 @@ module PactBroker
         @pact_broker_client ||= PactBroker::Client::PactBrokerClient.new(base_url: pact_broker_base_url, client_options: pact_broker_client_options)
       end
 
+      def merge_on_server?
+        pact_broker_client_options[:write] == :merge
+      end
+
       def publish_pacts
         pact_files.group_by(&:pact_name).collect do | pact_name, pact_files |
           $stdout.puts "Merging #{pact_files.collect(&:path).join(", ")}" if pact_files.size > 1
@@ -91,7 +95,11 @@ module PactBroker
         Retry.while_error do
           pacts = pact_broker_client.pacticipants.versions.pacts
           if pacts.version_published?(consumer: pact.consumer_name, provider: pact.provider_name, consumer_version: consumer_version)
-            $stdout.puts ::Term::ANSIColor.yellow("A pact for this consumer version is already published. Overwriting. (Note: Overwriting pacts is not recommended as it can lead to race conditions. Best practice is to provide a unique consumer version number for each publication.)")
+            if merge_on_server?
+              $stdout.puts "A pact for this consumer version is already published. Merging contents."
+            else
+              $stdout.puts ::Term::ANSIColor.yellow("A pact for this consumer version is already published. Overwriting. (Note: Overwriting pacts is not recommended as it can lead to race conditions. Best practice is to provide a unique consumer version number for each publication.)")
+            end
           end
 
           latest_pact_url = pacts.publish(pact_hash: pact, consumer_version: consumer_version)

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.33.0'
+    VERSION = '1.34.0'
   end
 end

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

@@ -62,12 +62,12 @@ module PactBroker
         end
 
         context "when publishing is successful" do
-
           it "puts the location of the latest pact" do
             allow($stdout).to receive(:puts)
             expect($stdout).to receive(:puts).with(/#{latest_pact_url}/)
             subject.call
           end
+
           it "returns true" do
             expect(subject.call).to be true
           end
@@ -142,6 +142,15 @@ module PactBroker
           end
         end
 
+        context "when consumer_version has a new line" do
+          let(:consumer_version) { "1\n" }
+
+          it "strips the new line" do
+            expect(pacts_client).to receive(:publish).with(pact_hash: pact_hash, consumer_version: "1")
+            subject.call
+          end
+        end
+
         context "when pact_broker_base_url is blank" do
           let(:pact_broker_base_url) { " " }
           it "raises a validation errror" do
@@ -164,6 +173,16 @@ module PactBroker
             subject.call
           end
 
+          context "when the tag has a new line on the end of it" do
+            let(:tags) { ["foo\n"] }
+
+            it "strips the newline" do
+              expect(pact_versions_client).to receive(:tag).with({pacticipant: "Consumer",
+                version: consumer_version, tag: "foo"})
+              subject.call
+            end
+          end
+
           context "when an error occurs tagging the pact" do
 
             before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.33.0
+  version: 1.34.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty