pact_broker-client 1.69.0 → 1.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d04543119f56e452c3c57968e73850a026d249e4db7a179b07d7fd9e08b1b39e
-  data.tar.gz: e29701ac23814dc00deea077e9dc318e21dcad486b5e01f28e3b422e0394310c
+  metadata.gz: c39e09b6dd262ec6baa6da53747ac6adfcac1b83e87050973d10624d6d0dbc85
+  data.tar.gz: 817e36de371bb43762e42c8103735f291a1645a782541581cbff501a70b309da
 SHA512:
-  metadata.gz: 79f0f70224a4991f745e25b04251831f6a57872247780a9c0a4de75f3c1e04116534f42501a0c5fec982305fe235887ab21b7d915651be9275f706fba334a097
-  data.tar.gz: 007d7e79f2ffe068775cecb79324f811371bec604f18d657befebbe597391e70fda5bca489719dcd1fc395d673518b2dcc5a11537a94155562d353a8fc37fa11
+  metadata.gz: 68d61e0fef6e96bd4acce08bc781aee2895b209cecbb0e3f453fe8e7e3843f417e5f3f62604dfda8ed5bee803c382c49eb552d17cc5fe06101fcab9848e1e34e
+  data.tar.gz: bf36dbe78ff7fdd10af8983be7130928389175c8b6770ee1772f9a31ccac6920d6316890850d33d8c179a8e9ce3dd1467338810e2879dd71079c751bc2e117a4

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+      interval: "monthly"

data/.github/workflows/release_gem.yml

@@ -31,7 +31,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - uses: pact-foundation/release-gem@v0.0.13
+    - uses: pact-foundation/release-gem@v0.0.14
       id: release
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="v1.70.0"></a>
+### v1.70.0 (2023-08-29)
+
+#### Features
+
+* sort can-i-deploy table by consumer name, then provider name	 ([83412e7](/../../commit/83412e7))
+* do not accept gzip responses when VERBOSE=true	 ([a72a529](/../../commit/a72a529))
+
 <a name="v1.69.0"></a>
 ### v1.69.0 (2023-08-29)
 

data/lib/pact_broker/client/hal/http_client.rb

@@ -50,6 +50,7 @@ module PactBroker
           request['Content-Type'] ||= "application/json" if ['Post', 'Put'].include?(http_method)
           request['Content-Type'] ||= "application/merge-patch+json" if ['Patch'].include?(http_method)
           request['Accept'] = "application/hal+json"
+          request['Accept-Encoding'] = nil if verbose?
           headers.each do | key, value |
             request[key] = value
           end

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

@@ -12,11 +12,11 @@ module PactBroker
         Line = Struct.new(:consumer, :consumer_version, :provider, :provider_version, :success, :ref, :ignored)
 
         def self.call(matrix)
-          matrix_rows = matrix[:matrix]
+          matrix_rows = sort_matrix_rows(matrix[:matrix] || [])
           return "" if matrix_rows.size == 0
           data = prepare_data(matrix_rows)
           printer = TablePrint::Printer.new(data, tp_options(data))
-          printer.table_print + verification_result_urls_text(matrix)
+          printer.table_print + verification_result_urls_text(matrix_rows)
         end
 
         def self.prepare_data(matrix_rows)
@@ -55,8 +55,8 @@ module PactBroker
           default
         end
 
-        def self.verification_results_urls_and_successes(matrix)
-          (matrix[:matrix] || []).collect do | row |
+        def self.verification_results_urls_and_successes(matrix_rows)
+          matrix_rows.collect do | row |
             url = row.dig(:verificationResult, :_links, :self, :href)
             if url
               success = row.dig(:verificationResult, :success)
@@ -67,8 +67,8 @@ module PactBroker
           end.compact
         end
 
-        def self.verification_result_urls_text(matrix)
-          text = self.verification_results_urls_and_successes(matrix).each_with_index.collect do |(url, success), i|
+        def self.verification_result_urls_text(matrix_rows)
+          text = self.verification_results_urls_and_successes(matrix_rows).each_with_index.collect do |(url, success), i|
             status = success ? 'success' : 'failure'
             "#{i+1}. #{url} (#{status})"
           end.join("\n")
@@ -83,6 +83,19 @@ module PactBroker
         def self.max_width(data, column, title)
           (data.collect{ |row| row.send(column) } + [title]).compact.collect(&:size).max
         end
+
+        def self.sort_matrix_rows(matrix_rows)
+          matrix_rows&.sort { |row_1, row_2| sortable_attributes(row_1) <=> sortable_attributes(row_2) }
+        end
+
+        def self.sortable_attributes(matrix_row)
+          [
+            matrix_row.dig(:consumer, :name)&.downcase || "",
+            matrix_row.dig(:provider, :name)&.downcase || "",
+            matrix_row.dig(:consumer, :version, :number) || "",
+            matrix_row.dig(:provider, :version, :number) || ""
+          ]
+        end
       end
     end
   end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.69.0'
+    VERSION = '1.70.0'
   end
 end

data/spec/lib/pact_broker/client/matrix/text_formatter_spec.rb

@@ -36,9 +36,18 @@ module PactBroker
           line_1 = line_creator.call
           line_2 = line_creator.call
           line_3 = line_creator.call
+
+          # ensure the data is as expected
+          expect(line_1.dig(:consumer, :version, :number)).to_not be nil
+          expect(line_1.dig(:provider, :version, :number)).to_not be nil
+
+          line_1[:consumer][:version][:number] = "4"
+          line_2[:consumer][:version][:number] = "3"
+          line_3[:consumer][:version][:number] = "5"
+
           line_2[:verificationResult] = nil
           line_3[:verificationResult][:success] = false
-          [line_1, line_2, line_3]
+          [line_1, line_2, line_3].shuffle
         end
 
         let(:matrix) { PactBroker::Client::Matrix::Resource.new(matrix: matrix_lines) }

data/spec/support/matrix_with_results.txt

@@ -1,8 +1,8 @@
 CONSUMER | C.VERSION | PROVIDER | P.VERSION | SUCCESS? | RESULT#
 ---------|-----------|----------|-----------|----------|--------
+Foo      | 3         | Bar      | 5         | ???      |
 Foo      | 4         | Bar      | 5         | true     | 1
-Foo      | 4         | Bar      | 5         | ???      |
-Foo      | 4         | Bar      | 5         | false    | 2
+Foo      | 5         | Bar      | 5         | false    | 2
 
 VERIFICATION RESULTS
 --------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.69.0
+  version: 1.70.0
 platform: ruby
 authors:
 - Beth Skurrie
@@ -214,6 +214,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/release_gem.yml"
 - ".github/workflows/smartbear-issue-label-added.yml"
 - ".github/workflows/test.yml"