Merge branch 'master' into fix-expected-body-when-using-generators

Author: karouf

.github/workflows/release_gem.yml

@@ -10,12 +10,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.6'
+        ruby-version: '3.2'
     - run: |
-        gem install bundler -v 2.1
+        gem install bundler -v 2.4
         bundle install
     - name: Test
       run: bundle exec rake
@@ -28,11 +28,11 @@ jobs:
       version: ${{ steps.release-gem.outputs.version }}
       increment: ${{ steps.release-gem.outputs.increment }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - id: release-gem
-      uses: pact-foundation/release-gem@v0.0.13
+      uses: pact-foundation/release-gem@v1
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
         GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
@@ -42,11 +42,11 @@ jobs:
     needs: release
     strategy:
       matrix:
-        repository: [pact-foundation/pact-ruby-cli, pact-foundation/pact-ruby-standalone, pact-foundation/pact_broker-client]
+        repository: [pact-foundation/pact-ruby-cli, pact-foundation/pact-ruby-standalone]
     runs-on: ubuntu-latest
     steps:
       - name: Notify ${{ matrix.repository }} of gem release
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.GHTOKENFORPACTCLIRELEASE }}
           repository: ${{ matrix.repository }}

.github/workflows/smartbear-issue-label-added.yml

@@ -0,0 +1,11 @@
+name: SmartBear Supported Issue Label Added
+
+on:
+  issues:
+    types:
+      - labeled
+
+jobs:
+  call-workflow:
+    uses: pact-foundation/.github/.github/workflows/smartbear-issue-label-added.yml@master
+    secrets: inherit

.github/workflows/test.yml

@@ -1,33 +1,65 @@
 name: Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
 
 jobs:
   test:
-    runs-on: "ubuntu-latest"
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ["2.4", "2.7", "3.0"]
+        ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3"]
+        os: ["ubuntu-latest","windows-latest","macos-latest"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
           bundler-cache: true
       - run: "bundle exec rake"
+      - run: "bundle install && bundle exec rake spec"
+        if: matrix.ruby_version > '3.0'
+        working-directory: example/zoo-app
+      - run: "bundle install && bundle exec rake pact:verify"
+        if: matrix.os != 'windows-latest' && matrix.ruby_version > '3.0'
+        working-directory: example/animal-service
+  test-with-rack-2:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby_version: ["3.2"]
+        os: ["ubuntu-latest","windows-latest","macos-latest"]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+      - run: "bundle exec appraisal install"
+      - run: "bundle exec appraisal rack-2 rake"
   test-with-active-support:
-    runs-on: "ubuntu-latest"
-    env:
-      BUNDLE_GEMFILE: active-support.gemfile
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ["2.7", "3.0"]
+        ruby_version: ["2.7", "3.0", "3.1", "3.2"]
+        os: ["ubuntu-latest","windows-latest","macos-latest"]
+    defaults:
+      run:
+        shell: bash
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
           bundler-cache: true
-      - run: "bundle exec rake spec_with_active_support"
+      - run: "bundle exec appraisal install"
+      - run: "bundle exec appraisal activesupport rake spec_with_active_support"

.gitignore

@@ -32,4 +32,5 @@ Gemfile.lock
 gemfiles/*.gemfile.lock
 reports/pacts
 spec/examples.txt
-*bethtest*
+*bethtest*
+.DS_Store

Appraisals

@@ -0,0 +1,11 @@
+appraise "rack-2" do
+  gem "rack", "~> 2.0"
+
+  group :test do
+    remove_gem "rackup"
+  end
+end
+
+appraise "activesupport" do
+  gem "activesupport", "~> 5.1"
+end

CHANGELOG.md

@@ -1,3 +1,84 @@
+<a name="v1.66.1"></a>
+### v1.66.1 (2025-01-20)
+
+#### Bug Fixes
+
+* HTTP_HOST headers for sinatra 4.x	 ([173bfb7](/../../commit/173bfb7))
+
+<a name="v1.66.0"></a>
+### v1.66.0 (2024-11-29)
+
+#### Features
+
+* **generators**
+  * Add more generators as per spec	 ([f55adf1](/../../commit/f55adf1))
+  * Pass context and add ProviderState generator	 ([7a1cf3b](/../../commit/7a1cf3b))
+
+#### Bug Fixes
+
+* add HTTPS_HOST header if invoking a Sinatra app	 ([ed44189](/../../commit/ed44189))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([981ebee](/../../commit/981ebee))
+
+<a name="v1.65.3"></a>
+### v1.65.3 (2024-10-23)
+
+#### Bug Fixes
+
+* **test**
+  * explicitly require ostruct as non stdlib in ruby 3.5.x	 ([c9a8525](/../../commit/c9a8525))
+
+<a name="v1.65.2"></a>
+### v1.65.2 (2024-09-26)
+
+<a name="v1.65.1"></a>
+### v1.65.1 (2024-08-08)
+
+#### Bug Fixes
+
+* set color codes even on dumb terms (prev behaviour)	 ([4f01bc9](/../../commit/4f01bc9))
+* use .empty? in handling_no_pacts_found	 ([43bce74](/../../commit/43bce74))
+
+<a name="v1.65.0"></a>
+### v1.65.0 (2024-08-06)
+
+#### Features
+
+* support app_version_branch in MessageProviderDSL	 ([1653128](/../../commit/1653128))
+* allow setting fail_if_no_pacts_found in honours_pacts_from_pact_broker	 ([f0f142e](/../../commit/f0f142e))
+
+#### Bug Fixes
+
+* handle case in no_pacts_found - undefined method empty? for nil	 ([0145d2d](/../../commit/0145d2d))
+* remove unused ConsumerContractBuilder contract_details accessor	 ([fb5488e](/../../commit/fb5488e))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([2bbefe2](/../../commit/2bbefe2))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([e10f914](/../../commit/e10f914))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([7560918](/../../commit/7560918))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([b4cbe85](/../../commit/b4cbe85))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([4028087](/../../commit/4028087))
+* ConsumerContractBuilder exposing incorrect field	 ([c805c3e](/../../commit/c805c3e))
+
+* **test**
+  * alias Rack/Rackup WEBrick handler in x509 test for backwards compat	 ([cc77498](/../../commit/cc77498))
+
+<a name="v1.64.0"></a>
+### v1.64.0 (2023-11-09)
+
+#### Features
+
+* support x509 certs in HTTP Client (#298)	 ([3ed5680](/../../commit/3ed5680))
+
+* **CI**
+  * use setup-ruby's bundle installer and cache (#275)	 ([f5621b6](/../../commit/f5621b6))
+
+#### Bug Fixes
+
+* assert provider retrieved successfully before using link	 ([0af0691](/../../commit/0af0691))
+* update call to Rack::Builder.parse_file for rack 3	 ([652047c](/../../commit/652047c))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([b4ca8cb](/../../commit/b4ca8cb))
+* example/animal-service/Gemfile to reduce vulnerabilities	 ([7ad2073](/../../commit/7ad2073))
+* example/zoo-app/Gemfile to reduce vulnerabilities	 ([dd417fd](/../../commit/dd417fd))
+* example/animal-service/Gemfile to reduce vulnerabilities (#281)	 ([4ea07cd](/../../commit/4ea07cd))
+
 <a name="v1.63.0"></a>
 ### v1.63.0 (2022-09-28)
 

Gemfile

@@ -11,6 +11,7 @@ gemspec
 # Diff:
 
 gem "rspec-mocks", "3.10.2"
+gem "appraisal", "~> 2.5"
 
 if ENV['X_PACT_DEVELOPMENT']
   gem "pact-support", path: '../pact-support'
@@ -21,3 +22,9 @@ end
 group :local_development do
   gem "pry-byebug"
 end
+
+group :test do
+  gem 'faraday', '~>2.0', '<3.0'
+  gem 'faraday-retry', '~>2.0'
+  gem 'rackup', '~> 2.1'
+end

active-support.gemfile

@@ -7,6 +7,7 @@
 * [log_dir](#log_dir)
 * [logger](#logger)
 * [logger.level](#loggerlevel)
+* [SSL certificate](#SSL-Certificate)
 
 #### Consumer only configuration options
 * [pact_dir](#pact_dir)
@@ -51,6 +52,14 @@ end
 
 Default value: `Logger::DEBUG`
 
+### SSL Certificate
+
+To connect to a Pact Broker that uses custom SSL certificates, set the environment variable `$SSL_CERT_FILE` or `$SSL_CERT_DIR` to a path that contains the appropriate certificate.
+
+#### Using x509 Certificates
+
+To connect to a Pact Broker that uses x509 certificates for client authentication, set the environment variable `$X509_CLIENT_CERT_FILE` to the path of the client's x509 certificate and `$X509_CLIENT_KEY_FILE` to the path of the client's private key.
+
 ### diff_formatter
 
 ```ruby
@@ -184,7 +193,7 @@ To make modules available in the provider state set_up and tear_down blocks, inc
 Default value: `:recorded`
 Options: `:recorded`, `:random`
 
-Replays interactions in a specific order. In combination with pactfile_write_order will allow you to have a consistent pact contract replayed in random order.  
+Replays interactions in a specific order. In combination with pactfile_write_order will allow you to have a consistent pact contract replayed in random order.
 
 ```ruby
 Pact.configure do | config |

documentation/configuration.md

@@ -7,7 +7,7 @@ group :development, :test do
 end
 
 gem 'rake'
-gem 'rack', '~> 2.2', '>= 2.2.3.1'
+gem 'rack', '>= 3.1.12'
 gem 'sqlite3'
 gem 'sequel'
-gem 'sinatra', '>= 2.2.0'
+gem 'sinatra', '>= 4.1.0'