pact_broker-client 1.75.1 → 1.75.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25fa6bc80f249b0fab107d35df31217cb95384936f35d3fcbf91edb81a1e14b2
-  data.tar.gz: 62f6989736a53ce0088b6e13304d4ed5812704a8bba9ead8b6eb03f02e1863a8
+  metadata.gz: 2d85daa10328b3c815584473aca64d42fb2f2139098782e39249956a14239f9f
+  data.tar.gz: 92e4204165393e3c6de26a8dad87bd199e199b1bc0bcf1f6323cde11d8b2e523
 SHA512:
-  metadata.gz: a01cea196f9a7b6825424777cdafbf03d3365ec022f8659f9253b44dc13867876a2b2072ffa6b2690144abfda24ab5523cfbf103b64b7096c22f2f6cadfd6620
-  data.tar.gz: cf2a61065048ef7800502414d8b9f58f79c062857d56151c89d6c8b4cd444b84d345c77bcf77eb2ea9ca278872425f9fa2a1f4c9cddcd33eccd48257798a822a
+  metadata.gz: be3514dcba91fb1153e227be1bc2f0e419ec40799b1a81426db87a28c2c7610634c84f312c3c58142088ef098c0059ceaa9d23f19dae698618b8c41358e30643
+  data.tar.gz: 18d34ff71ee33a0d16b72726ad9d2e95a778d3b997447b122665f50a2afef725c7f42d47c6bf39e6bafec481a8abd762b1621aa5fd36b2f581f1cd014b78f915

data/.github/workflows/delete_branch_in_pactflow.yml

@@ -0,0 +1,24 @@
+name: Delete application branch in Pactflow
+
+on:
+  delete:
+    branches:
+      - "*"
+
+jobs:
+  delete-branch-in-pactflow:
+    name: delete
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      # Requires Ruby to encode the URL path correctly - could use any other scripting language here
+      - uses: ruby/setup-ruby@v1
+
+      - name: Delete branch in Pactflow
+        run: script/ci/delete-branch-in-pactflow.sh
+        env:
+          GIT_BRANCH: ${{ github.event.ref }}
+          PACTICIPANT: "Pact Broker Client"
+          PACT_BROKER_TOKEN: ${{ secrets.PACT_BROKER_TOKEN_PACT_FOUNDATION }}
+          PACT_BROKER_BASE_URL: "https://pact-foundation.pactflow.io"

data/.github/workflows/release_gem.yml

@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Notify ${{ matrix.repository }} of gem release
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.GHTOKENFORPACTCLIRELEASE }}
           repository: ${{ matrix.repository }}

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ["2.7", "3.0", "3.1", "3.2"]
+        ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3"]
         os: ["ubuntu-latest","windows-latest","macos-latest"]
     steps:
       - uses: actions/checkout@v4
@@ -34,13 +34,12 @@ jobs:
           ruby-version: "3.2"
       - run: "bundle install"
       # Publish to old and new account until we can disable the old account
-      - run: |
+      - name: Generate and publish pacts
+        run: |
           rm -rf spec/pacts/*
           bundle exec rspec spec/service_providers/
-          VERBOSE=true bundle exec rake pact:publish:pactflow_oss
-          VERBOSE=true bundle exec rake pact:publish:pactflow_pact_foundation
+          bundle exec rake pact:publish:pactflow_pact_foundation
         env:
-          PACT_BROKER_TOKEN: ${{ secrets.PACTFLOW_PACT_OSS_TOKEN }}
           PACT_BROKER_TOKEN_PACT_FOUNDATION: ${{ secrets.PACT_BROKER_TOKEN_PACT_FOUNDATION }}
           PACT_BROKER_FEATURES: ${{ matrix.feature }}
           TEST_FEATURE: ${{ matrix.feature }}

data/.github/workflows/trigger_pact_docs_update.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger docs.pact.io update workflow
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.GHTOKENFORTRIGGERINGPACTDOCSUPDATE }}
           repository: pact-foundation/docs.pact.io

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.75.3"></a>
+### v1.75.3 (2024-06-17)
+
+<a name="v1.75.2"></a>
+### v1.75.2 (2024-05-13)
+
+#### Bug Fixes
+
+* explicitly require openstruct	 ([fdb70cf](/../../commit/fdb70cf))
+
 <a name="v1.75.1"></a>
 ### v1.75.1 (2023-11-23)
 

data/lib/pact_broker/client/pacts/list_latest_versions.rb

@@ -1,6 +1,7 @@
 require 'pact_broker/client/hal'
 require 'pact_broker/client/command_result'
 require 'pact_broker/client/hal_client_methods'
+require 'ostruct'
 
 module PactBroker
   module Client

data/lib/pact_broker/client/publish_pacts.rb

@@ -4,6 +4,7 @@ require 'base64'
 require 'pact_broker/client/publish_pacts_the_old_way'
 require 'pact_broker/client/colorize_notices'
 require 'pact_broker/client/hash_refinements'
+require 'ostruct'
 
 module PactBroker
   module Client

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.75.1'
+    VERSION = '1.75.3'
   end
 end

data/lib/pact_broker/client/webhooks/create.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'pact_broker/client/command_result'
 require "pact_broker/client/backports"
 require "pact_broker/client/hash_refinements"
+require 'ostruct'
 
 module PactBroker
   module Client

data/lib/pactflow/client/provider_contracts/publish.rb

@@ -2,6 +2,7 @@ require "base64"
 require "pact_broker/client/base_command"
 require "pact_broker/client/colorize_notices"
 require "pactflow/client/provider_contracts/publish_the_old_way"
+require 'ostruct'
 
 module Pactflow
   module Client

data/lib/pactflow/client/provider_contracts/publish_the_old_way.rb

@@ -2,6 +2,7 @@ require "pact_broker/client/base_command"
 require "pact_broker/client/versions/create"
 require 'pact_broker/client/colorize_notices'
 require "base64"
+require 'ostruct'
 
 module Pactflow
   module Client

data/pact-broker-client.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thor', '>= 0.20', '< 2.0'
   gem.add_runtime_dependency 'rake', '~> 13.0' #For FileList
   gem.add_runtime_dependency 'dig_rb', '~> 1.0'
+  gem.add_runtime_dependency 'base64', '~> 0.2'
 end

data/script/ci/delete-branch-in-pactflow.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+echo "Deleting branch ${GIT_BRANCH} for ${PACTICIPANT} in Pactflow..."
+ENCODED_GIT_BRANCH=$(echo "$GIT_BRANCH" | ruby -e "require 'erb'; puts ERB::Util.url_encode(ARGF.read.chomp)")
+ENCODED_PACTICIPANT=$(echo "$PACTICIPANT" | ruby -e "require 'erb'; puts ERB::Util.url_encode(ARGF.read.chomp)")
+BRANCH_URL="${PACT_BROKER_BASE_URL}/pacticipants/${ENCODED_PACTICIPANT}/branches/${ENCODED_GIT_BRANCH}"
+
+output_file=$(mktemp)
+
+status=$(curl -v -X DELETE "${BRANCH_URL}" -H "Authorization: Bearer ${PACT_BROKER_TOKEN}" 2>&1 | tee "${output_file}" | awk '/^< HTTP/{print $3}')
+
+if [ "$status" = "404" ]; then
+  echo "Branch ${GIT_BRANCH} for ${PACTICIPANT} does not exist in Pactflow"
+elif [ $status -ge 400 ]; then
+  cat "${output_file}"
+  echo "Error deleting branch in Pactflow"
+  exit 1
+else
+  echo "Deleted branch ${GIT_BRANCH} for ${PACTICIPANT} in Pactflow"
+fi

data/spec/integration/can_i_merge_spec.rb

@@ -1,4 +1,5 @@
 require "pact_broker/client/cli/broker"
+require 'ostruct'
 
 module PactBroker
   module Client

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

@@ -1,6 +1,7 @@
 require 'pact_broker/client/cli/broker'
 require 'pact_broker/client/cli/version_selector_options_parser'
 require 'pact_broker/client/can_i_deploy'
+require 'ostruct'
 
 module PactBroker
   module Client

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

@@ -1,6 +1,7 @@
 require 'pact_broker/client/cli/broker'
 require 'pact_broker/client/publish_pacts'
 require 'pact_broker/client/git'
+require 'ostruct'
 
 module PactBroker::Client::CLI
   describe Broker do

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

@@ -1,5 +1,6 @@
 require 'pact_broker/client/cli/broker'
 require 'pact_broker/client/webhooks/create'
+require 'ostruct'
 
 module PactBroker
   module Client

data/spec/lib/pactflow/client/provider_contracts/publish_spec.rb

@@ -1,4 +1,5 @@
 require "pactflow/client/provider_contracts/publish"
+require 'ostruct'
 
 module Pactflow
   module Client

data/spec/support/ssl_server.rb

@@ -36,7 +36,7 @@ if __FILE__ == $0
 
   opts = webrick_opts(4444)
 
-  Rack::Handler::WEBrick.run(app, **opts) do |server|
+  Rackup::Handler::WEBrick.run(app, **opts) do |server|
     @server = server
   end
 end

data/tasks/pact.rake

@@ -18,26 +18,6 @@ PactBroker::Client::PublicationTask.new(:remote) do | task |
   task.pact_broker_basic_auth = { username: ENV.fetch("PACT_BROKER_USERNAME"), password: ENV.fetch("PACT_BROKER_PASSWORD") }
 end
 
-PactBroker::Client::PublicationTask.new(:pactflow_oss) do | task |
-  version = ENV.fetch("GITHUB_SHA")
-  branch = ENV.fetch("GITHUB_REF").gsub("refs/heads/", "")
-  feature = ENV.fetch("TEST_FEATURE", "")
-  tag = branch
-
-  if feature != ''
-    version = "#{version}+#{feature}"
-    tag = "#{tag}+#{feature}"
-  end
-
-  require "pact_broker/client/version"
-  task.auto_detect_version_properties = false
-  task.tags = [tag]
-  task.branch = nil
-  task.consumer_version = version
-  task.pact_broker_base_url = "https://pact-oss.pactflow.io"
-  task.pact_broker_token = ENV['PACT_BROKER_TOKEN']
-  task.build_url = PactBroker::Client::Git.build_url
-end
 
 PactBroker::Client::PublicationTask.new(:pactflow_pact_foundation) do | task |
   version = ENV.fetch("GITHUB_SHA")
@@ -53,7 +33,7 @@ PactBroker::Client::PublicationTask.new(:pactflow_pact_foundation) do | task |
   require "pact_broker/client/version"
   task.auto_detect_version_properties = false
   task.tags = [tag]
-  task.branch = nil
+  task.branch = branch
   task.consumer_version = version
   task.pact_broker_base_url = "https://pact-foundation.pactflow.io"
   task.pact_broker_token = ENV["PACT_BROKER_TOKEN_PACT_FOUNDATION"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.75.1
+  version: 1.75.3
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -106,6 +106,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Client for the Pact Broker. Publish, retrieve and query pacts and verification
   results. Manage webhooks and environments.
 email:
@@ -117,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/delete_branch_in_pactflow.yml"
 - ".github/workflows/release_gem.yml"
 - ".github/workflows/smartbear-issue-label-added.yml"
 - ".github/workflows/test.yml"
@@ -244,6 +259,7 @@ files:
 - pact-broker-client.gemspec
 - script/approve-all.sh
 - script/can-i-deploy.sh
+- script/ci/delete-branch-in-pactflow.sh
 - script/ci/record-release.sh
 - script/create-pacticipant.sh
 - script/foo-bar.json
@@ -381,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.13
 signing_key:
 specification_version: 4
 summary: See description