From 79606b0d4181e9018765472c7977c9fa77b41fc2 Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 10:53:15 -0600 Subject: [PATCH 1/9] Loosen faraday requirement to v1.x from v1.0.x We need to update faraday in order to use the latest version of splitclient-rb so we need to loosen the requirement in loogi_http first. Also updates byebug to v11 for Ruby v3.3 support. --- loogi_http.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loogi_http.gemspec b/loogi_http.gemspec index 094d1d5..af0abd4 100644 --- a/loogi_http.gemspec +++ b/loogi_http.gemspec @@ -27,12 +27,12 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_dependency 'faraday', '~> 1.0.1' + spec.add_dependency 'faraday', '~> 1.0' spec.add_dependency 'faraday-cookie_jar', '~> 0.0.6' spec.add_dependency 'faraday_middleware', '~> 1.0.0' spec.add_development_dependency 'bundler', '>= 2.0' - spec.add_development_dependency 'byebug', '~> 10.0.2' + spec.add_development_dependency 'byebug', '~> 11.0' spec.add_development_dependency 'rake', '~> 10.0' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'webmock', '~> 3.5.1' From 9fb50b9b443d8392aa5579290ceb33dd98577554 Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 10:56:54 -0600 Subject: [PATCH 2/9] Update test matrix for Ruby v3+ --- .github/workflows/specs.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/specs.yml b/.github/workflows/specs.yml index f7ec6a2..5283c1f 100644 --- a/.github/workflows/specs.yml +++ b/.github/workflows/specs.yml @@ -19,15 +19,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.6', '2.7', '3.0'] + ruby-version: ['3.0', '3.1', '3.2', '3.3'] steps: - uses: actions/checkout@v2 - name: Set up Ruby # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): - # uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically From 82c31596e1d3ea01f4177ab123ac91acc867c1d6 Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 10:57:11 -0600 Subject: [PATCH 3/9] Require Ruby v3+ --- loogi_http.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loogi_http.gemspec b/loogi_http.gemspec index af0abd4..ef8f859 100644 --- a/loogi_http.gemspec +++ b/loogi_http.gemspec @@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'loogi_http/version' Gem::Specification.new do |spec| - spec.required_ruby_version = '>= 2.6' + spec.required_ruby_version = '>= 3.0' spec.name = 'loogi_http' spec.version = LoogiHttp::VERSION spec.authors = ['Juul Labs, Inc.'] From 9f18fb5fd8c4e5b551f48699f04ef000475170bb Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 10:58:44 -0600 Subject: [PATCH 4/9] Update rake for CVE-2020-8130 --- loogi_http.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loogi_http.gemspec b/loogi_http.gemspec index ef8f859..03c45e0 100644 --- a/loogi_http.gemspec +++ b/loogi_http.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'bundler', '>= 2.0' spec.add_development_dependency 'byebug', '~> 11.0' - spec.add_development_dependency 'rake', '~> 10.0' + spec.add_development_dependency 'rake', '>= 12.3.3' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'webmock', '~> 3.5.1' end From d93327d3ebfe6f97a3b3d12e59309542ca312983 Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 11:04:42 -0600 Subject: [PATCH 5/9] Update to Ruby 3.3 for gem push workflow --- .github/workflows/gem-push.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index f40c580..10762e0 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -16,10 +16,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Ruby 2.6 - uses: actions/setup-ruby@v1 + - name: Set up Ruby 3.3 + uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.x + ruby-version: 3.3.0 - name: Publish to RubyGems run: | From 53f09543a519e136cd82191d0e82c94c9e046efd Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 11:09:29 -0600 Subject: [PATCH 6/9] Dont push new gem version on PRs --- .github/workflows/gem-push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml index 10762e0..c933fca 100644 --- a/.github/workflows/gem-push.yml +++ b/.github/workflows/gem-push.yml @@ -3,8 +3,8 @@ name: Ruby Gem on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] + # pull_request: + # branches: [ "main" ] jobs: build: From 95dd9227f8b7f4d144c9c9704d146c619ed11690 Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 11:17:17 -0600 Subject: [PATCH 7/9] Bump to version 2.0.0 for Ruby 3+ and dependency changes --- lib/loogi_http/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/loogi_http/version.rb b/lib/loogi_http/version.rb index f68c40b..d74f33c 100644 --- a/lib/loogi_http/version.rb +++ b/lib/loogi_http/version.rb @@ -1,3 +1,3 @@ module LoogiHttp - VERSION = '1.0.0'.freeze + VERSION = '2.0.0'.freeze end From 5168a60c67ff630a128f5b450b96f5aa64bb91de Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 11:18:14 -0600 Subject: [PATCH 8/9] Loosen webmock requirement --- loogi_http.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loogi_http.gemspec b/loogi_http.gemspec index 03c45e0..f7d458f 100644 --- a/loogi_http.gemspec +++ b/loogi_http.gemspec @@ -35,5 +35,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'byebug', '~> 11.0' spec.add_development_dependency 'rake', '>= 12.3.3' spec.add_development_dependency 'rspec', '~> 3.0' - spec.add_development_dependency 'webmock', '~> 3.5.1' + spec.add_development_dependency 'webmock', '~> 3.5' end From 5b2540d6db247a4f02374732b4683a93bad93a0c Mon Sep 17 00:00:00 2001 From: JDutil Date: Wed, 3 Apr 2024 11:19:38 -0600 Subject: [PATCH 9/9] Loosen faraday_middleware requirement --- loogi_http.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loogi_http.gemspec b/loogi_http.gemspec index f7d458f..a9fea77 100644 --- a/loogi_http.gemspec +++ b/loogi_http.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'faraday', '~> 1.0' spec.add_dependency 'faraday-cookie_jar', '~> 0.0.6' - spec.add_dependency 'faraday_middleware', '~> 1.0.0' + spec.add_dependency 'faraday_middleware', '~> 1.0' spec.add_development_dependency 'bundler', '>= 2.0' spec.add_development_dependency 'byebug', '~> 11.0'