Skip to content

Commit

Permalink
Merge pull request #140 from pact-foundation/fix/issue_43
Browse files Browse the repository at this point in the history
fix(deps): use rack-reverse-proxy pact-foundation fork
  • Loading branch information
YOU54F authored Nov 29, 2024
2 parents f77520f + 4b2395b commit 252f820
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ group :development do
gem 'conventional-changelog', '~> 1.3', git: 'https://github.com/bethesque/conventional-changelog-ruby.git', ref: 'feat/pact-foundation'
gem 'bump', '~> 0.9'
end

gem 'rack-reverse-proxy', git: 'https://github.com/pact-foundation/rack-reverse-proxy.git',
branch: 'feat/rack_2_and_3_compat'
22 changes: 15 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ GIT
specs:
conventional-changelog (1.3.0)

GIT
remote: https://github.com/pact-foundation/rack-reverse-proxy.git
revision: 7ed51994123363a6969da5c6c89e04320715494b
branch: feat/rack_2_and_3_compat
specs:
rack-reverse-proxy (1.0.0.pre.unreleased)
rack (>= 3.0, < 4.0)
rack-proxy (~> 0.6, >= 0.6.1)
rackup (~> 2.0)

PATH
remote: .
specs:
Expand All @@ -14,7 +24,7 @@ PATH
pact-mock_service
pact-provider-verifier
pact_broker-client (~> 1.28)
rack-test (>= 0.6.3, < 2.0.0)
rack-test (>= 0.6.3, < 3.0.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -111,16 +121,13 @@ GEM
rack (3.1.8)
rack-proxy (0.7.7)
rack
rack-reverse-proxy (0.12.0)
rack (>= 1.0.0)
rack-proxy (~> 0.6, >= 0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.2.1)
rack (>= 3)
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.2)
regexp_parser (2.9.3)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand Down Expand Up @@ -157,6 +164,7 @@ DEPENDENCIES
conventional-changelog (~> 1.3)!
pact-cli!
pry
rack-reverse-proxy!
rake (~> 13.0)
rspec (~> 3.0)

Expand Down
3 changes: 1 addition & 2 deletions pact-cli.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "json", "~>2.8" # must match native lib install in the Dockerfile
spec.add_dependency "bigdecimal", "~>3.1" # must match native lib install in the Dockerfile

# Locking this until we have given rack-test 3.0 a good shake out in pure Ruby
spec.add_dependency "rack-test", ">= 0.6.3", "< 2.0.0"
spec.add_dependency "rack-test", ">= 0.6.3", "< 3.0.0"

spec.add_development_dependency "bump", "~> 0.9"
spec.add_development_dependency "rake", "~> 13.0"
Expand Down

0 comments on commit 252f820

Please sign in to comment.