From 7305449b3d8b9e086e6fb8205895ce2651249a79 Mon Sep 17 00:00:00 2001 From: Drew Caddell Date: Wed, 7 May 2025 10:39:46 -0700 Subject: [PATCH] OCTO-311: Change faraday dependency to >= 1.0 --- Appraisals | 5 + CHANGELOG.md | 4 + Gemfile | 3 + Gemfile.lock | 13 +- faraday-highly_available_retries.gemspec | 2 +- gemfiles/faraday_1.gemfile | 19 +++ gemfiles/faraday_1.gemfile.lock | 128 ++++++++++++++++++ gemfiles/faraday_2.gemfile | 19 +++ gemfiles/faraday_2.gemfile.lock | 113 ++++++++++++++++ .../highly_available_retries/version.rb | 2 +- 10 files changed, 304 insertions(+), 4 deletions(-) create mode 100644 Appraisals create mode 100644 gemfiles/faraday_1.gemfile create mode 100644 gemfiles/faraday_1.gemfile.lock create mode 100644 gemfiles/faraday_2.gemfile create mode 100644 gemfiles/faraday_2.gemfile.lock diff --git a/Appraisals b/Appraisals new file mode 100644 index 0000000..6169c5c --- /dev/null +++ b/Appraisals @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +require "appraisal/matrix" + +appraisal_matrix(faraday: { versions: [">= 1.0"], step: :major }) diff --git a/CHANGELOG.md b/CHANGELOG.md index a327231..a7c3a3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Inspired by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). **Note:** this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.2.0 - Unreleased +### Changed +- Relaxed faraday dependency to allow v1.x + ## [0.1.1] - 2023-08-16 ### Fixed - Fixed a bug where the `hosts` list was not be re-resolved on each new request made diff --git a/Gemfile b/Gemfile index 7b81a9d..1b341d7 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,9 @@ source 'https://rubygems.org' gemspec +gem 'appraisal' +gem 'appraisal-matrix' + gem 'base64' gem 'byebug' gem 'pry-byebug' diff --git a/Gemfile.lock b/Gemfile.lock index e524277..3b08905 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,18 @@ PATH remote: . specs: - faraday-highly_available_retries (0.1.1) - faraday (~> 2.0) + faraday-highly_available_retries (0.2.0.pre.dc.0) + faraday (>= 1.0) GEM remote: https://rubygems.org/ specs: + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + appraisal-matrix (0.3.0) + appraisal (~> 2.2) ast (2.4.2) base64 (0.2.0) byebug (11.1.3) @@ -74,6 +80,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + thor (1.3.2) unicode-display_width (2.4.2) PLATFORMS @@ -82,6 +89,8 @@ PLATFORMS x86_64-linux DEPENDENCIES + appraisal + appraisal-matrix base64 byebug faraday-highly_available_retries! diff --git a/faraday-highly_available_retries.gemspec b/faraday-highly_available_retries.gemspec index d0b4966..f559ccd 100644 --- a/faraday-highly_available_retries.gemspec +++ b/faraday-highly_available_retries.gemspec @@ -31,5 +31,5 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.7', '< 4' - spec.add_dependency 'faraday', '~> 2.0' + spec.add_dependency 'faraday', '>= 1.0' end diff --git a/gemfiles/faraday_1.gemfile b/gemfiles/faraday_1.gemfile new file mode 100644 index 0000000..1dee5d0 --- /dev/null +++ b/gemfiles/faraday_1.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal" +gem "appraisal-matrix" +gem "base64" +gem "byebug" +gem "pry-byebug" +gem "rake", "~> 13.0" +gem "rspec", "~> 3.0" +gem "simplecov", "~> 0.21.0" +gem "rubocop", "~> 1.31.0" +gem "rubocop-packaging", "~> 0.5.0" +gem "rubocop-performance", "~> 1.0" +gem "rubocop-rspec", "~> 2.0" +gem "faraday", "~> 1.0" + +gemspec path: "../" diff --git a/gemfiles/faraday_1.gemfile.lock b/gemfiles/faraday_1.gemfile.lock new file mode 100644 index 0000000..4aa096e --- /dev/null +++ b/gemfiles/faraday_1.gemfile.lock @@ -0,0 +1,128 @@ +PATH + remote: .. + specs: + faraday-highly_available_retries (0.1.1) + faraday (>= 1.0) + +GEM + remote: https://rubygems.org/ + specs: + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + appraisal-matrix (0.3.0) + appraisal (~> 2.2) + ast (2.4.3) + base64 (0.2.0) + byebug (12.0.0) + coderay (1.1.3) + diff-lcs (1.6.1) + docile (1.4.1) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + json (2.11.3) + method_source (1.1.0) + multipart-post (2.4.1) + parallel (1.27.0) + parser (3.3.8.0) + ast (~> 2.4.1) + racc + prism (1.4.0) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.11.0) + byebug (~> 12.0) + pry (>= 0.13, < 0.16) + racc (1.8.1) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.10.0) + rexml (3.4.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.3) + rubocop (1.31.2) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.18.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.44.1) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) + rubocop-performance (1.19.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + simplecov (0.21.2) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) + thor (1.3.2) + unicode-display_width (2.6.0) + +PLATFORMS + x86_64-darwin-24 + +DEPENDENCIES + appraisal + appraisal-matrix + base64 + byebug + faraday (~> 1.0) + faraday-highly_available_retries! + pry-byebug + rake (~> 13.0) + rspec (~> 3.0) + rubocop (~> 1.31.0) + rubocop-packaging (~> 0.5.0) + rubocop-performance (~> 1.0) + rubocop-rspec (~> 2.0) + simplecov (~> 0.21.0) + +BUNDLED WITH + 2.4.17 diff --git a/gemfiles/faraday_2.gemfile b/gemfiles/faraday_2.gemfile new file mode 100644 index 0000000..ecb1e03 --- /dev/null +++ b/gemfiles/faraday_2.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal" +gem "appraisal-matrix" +gem "base64" +gem "byebug" +gem "pry-byebug" +gem "rake", "~> 13.0" +gem "rspec", "~> 3.0" +gem "simplecov", "~> 0.21.0" +gem "rubocop", "~> 1.31.0" +gem "rubocop-packaging", "~> 0.5.0" +gem "rubocop-performance", "~> 1.0" +gem "rubocop-rspec", "~> 2.0" +gem "faraday", "~> 2.0" + +gemspec path: "../" diff --git a/gemfiles/faraday_2.gemfile.lock b/gemfiles/faraday_2.gemfile.lock new file mode 100644 index 0000000..5882427 --- /dev/null +++ b/gemfiles/faraday_2.gemfile.lock @@ -0,0 +1,113 @@ +PATH + remote: .. + specs: + faraday-highly_available_retries (0.1.1) + faraday (>= 1.0) + +GEM + remote: https://rubygems.org/ + specs: + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + appraisal-matrix (0.3.0) + appraisal (~> 2.2) + ast (2.4.3) + base64 (0.2.0) + byebug (12.0.0) + coderay (1.1.3) + diff-lcs (1.6.1) + docile (1.4.1) + faraday (2.13.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + json (2.11.3) + logger (1.7.0) + method_source (1.1.0) + net-http (0.6.0) + uri + parallel (1.27.0) + parser (3.3.8.0) + ast (~> 2.4.1) + racc + prism (1.4.0) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.11.0) + byebug (~> 12.0) + pry (>= 0.13, < 0.16) + racc (1.8.1) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.10.0) + rexml (3.4.1) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.4) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.3) + rubocop (1.31.2) + json (~> 2.3) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.18.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.44.1) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-packaging (0.5.1) + rubocop (>= 0.89, < 2.0) + rubocop-performance (1.19.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) + ruby-progressbar (1.13.0) + simplecov (0.21.2) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) + thor (1.3.2) + unicode-display_width (2.6.0) + uri (1.0.3) + +PLATFORMS + x86_64-darwin-24 + +DEPENDENCIES + appraisal + appraisal-matrix + base64 + byebug + faraday (~> 2.0) + faraday-highly_available_retries! + pry-byebug + rake (~> 13.0) + rspec (~> 3.0) + rubocop (~> 1.31.0) + rubocop-packaging (~> 0.5.0) + rubocop-performance (~> 1.0) + rubocop-rspec (~> 2.0) + simplecov (~> 0.21.0) + +BUNDLED WITH + 2.4.17 diff --git a/lib/faraday/highly_available_retries/version.rb b/lib/faraday/highly_available_retries/version.rb index e1fea37..5a28bd9 100644 --- a/lib/faraday/highly_available_retries/version.rb +++ b/lib/faraday/highly_available_retries/version.rb @@ -2,6 +2,6 @@ module Faraday module HighlyAvailableRetries - VERSION = '0.1.1' + VERSION = '0.2.0.pre.dc.0' end end