From 77ab5f63678a1ecd434be1d6a9182b5f89fd5ef5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 21:24:00 +0000 Subject: [PATCH 1/9] Update gc_ruboconfig requirement from ~> 4.4.2 to ~> 5.0.2 Updates the requirements on [gc_ruboconfig](https://github.com/gocardless/ruboconfig) to permit the latest version. - [Release notes](https://github.com/gocardless/ruboconfig/releases) - [Changelog](https://github.com/gocardless/gc_ruboconfig/blob/master/CHANGELOG.md) - [Commits](https://github.com/gocardless/ruboconfig/compare/v4.4.2...v5.0.2) --- updated-dependencies: - dependency-name: gc_ruboconfig dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- bucket_store.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bucket_store.gemspec b/bucket_store.gemspec index 4522550..966ea7f 100644 --- a/bucket_store.gemspec +++ b/bucket_store.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "aws-sdk-s3", ">= 1.147" s.add_dependency "google-cloud-storage", ">= 1.50" - s.add_development_dependency "gc_ruboconfig", "~> 4.4.2" + s.add_development_dependency "gc_ruboconfig", "~> 5.0.2" s.add_development_dependency "pry-byebug", "~> 3.10" s.add_development_dependency "rspec", "~> 3.13" s.add_development_dependency "rspec-github", "~> 2.4.0" From 18f7bf09725a8dfcd49505d079b64a1097733354 Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Thu, 9 Jan 2025 11:41:25 +0000 Subject: [PATCH 2/9] Remove unused cop This has been moved ot the rubocop-rails gem, so can't be reference here --- .rubocop.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index ec75785..fcbef76 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -30,9 +30,6 @@ RSpec/LetSetup: RSpec/MultipleExpectations: Max: 10 -RSpec/Rails/AvoidSetupHook: - Enabled: true - RSpec/ExampleWording: Enabled: false From baf68b11d27abfd579aadd0fb0f775104171e7dd Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Thu, 9 Jan 2025 11:49:07 +0000 Subject: [PATCH 3/9] Fix DevelopmentDependencies cop --- Gemfile | 6 ++++++ bucket_store.gemspec | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index be173b2..2eb3099 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,9 @@ source "https://rubygems.org" gemspec + +gem "gc_ruboconfig", "~> 5.0.2" +gem "pry-byebug", "~> 3.10" +gem "rspec", "~> 3.13" +gem "rspec-github", "~> 2.4.0" +gem "rubocop", ">= 1.63" diff --git a/bucket_store.gemspec b/bucket_store.gemspec index 966ea7f..fa1f8bb 100644 --- a/bucket_store.gemspec +++ b/bucket_store.gemspec @@ -21,10 +21,5 @@ Gem::Specification.new do |s| s.add_dependency "aws-sdk-s3", ">= 1.147" s.add_dependency "google-cloud-storage", ">= 1.50" - s.add_development_dependency "gc_ruboconfig", "~> 5.0.2" - s.add_development_dependency "pry-byebug", "~> 3.10" - s.add_development_dependency "rspec", "~> 3.13" - s.add_development_dependency "rspec-github", "~> 2.4.0" - s.add_development_dependency "rubocop", ">= 1.63" s.metadata["rubygems_mfa_required"] = "true" end From 0133fdbe96e4eff54aca97248241b33e717006b1 Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Thu, 9 Jan 2025 11:49:49 +0000 Subject: [PATCH 4/9] Don't print warnings about new cops --- .rubocop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.rubocop.yml b/.rubocop.yml index fcbef76..af644d9 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,6 +6,7 @@ inherit_gem: AllCops: TargetRubyVersion: 2.6 DisplayCopNames: true + NewCops: enable Layout/LineLength: Max: 100 From 3868fb5f3dc3899792858daef090aa03fe0ddf05 Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Thu, 9 Jan 2025 11:53:44 +0000 Subject: [PATCH 5/9] Use docker-compose v2 Part of the latest iteration ubuntu latest's `latest` tag. --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 654777c..e462210 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,9 +38,9 @@ jobs: env: STORAGE_EMULATOR_HOST: "http://localhost:9023/" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Start minio and GCS simulator - run: docker-compose up -d + run: docker compose up -d - name: Set up Ruby uses: ruby/setup-ruby@v1 with: From 82958ef2110c41dc0709f03e71891ec74eca1d1c Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Thu, 9 Jan 2025 13:16:10 +0000 Subject: [PATCH 6/9] Add nokogiri dependency for development Seems to be needed by AWS now --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 2eb3099..7b9952e 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ source "https://rubygems.org" gemspec gem "gc_ruboconfig", "~> 5.0.2" +gem "nokogiri", "~> 1.17.2" gem "pry-byebug", "~> 3.10" gem "rspec", "~> 3.13" gem "rspec-github", "~> 2.4.0" From 4dbdecebe59769faa16c99fc1576a04a7748ee18 Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Thu, 9 Jan 2025 13:18:34 +0000 Subject: [PATCH 7/9] Increase minimum supported version of ruby to 3.0 --- .github/workflows/tests.yml | 4 ++-- bucket_store.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e462210..886bd7a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: tests: strategy: matrix: - ruby-version: [2.7, 3.0, 3.1, 3.2] + ruby-version: [3.0, 3.1, 3.2] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -33,7 +33,7 @@ jobs: integration: strategy: matrix: - ruby-version: [2.7, 3.0, 3.1, 3.2] + ruby-version: [3.0, 3.1, 3.2] runs-on: ubuntu-latest env: STORAGE_EMULATOR_HOST: "http://localhost:9023/" diff --git a/bucket_store.gemspec b/bucket_store.gemspec index fa1f8bb..1b3b794 100644 --- a/bucket_store.gemspec +++ b/bucket_store.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.files = Dir["lib/**/*", "README.md"] - s.required_ruby_version = ">= 2.7" + s.required_ruby_version = ">= 3.0" s.add_dependency "aws-sdk-s3", ">= 1.147" s.add_dependency "google-cloud-storage", ">= 1.50" From f35db066289a517a08db0ceade32bf4e0794dbb1 Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Thu, 9 Jan 2025 13:19:59 +0000 Subject: [PATCH 8/9] Run tests for ruby 3.3 and 3.4 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 886bd7a..da5d915 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: tests: strategy: matrix: - ruby-version: [3.0, 3.1, 3.2] + ruby-version: [3.0, 3.1, 3.2, 3.3, 3.4] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -33,7 +33,7 @@ jobs: integration: strategy: matrix: - ruby-version: [3.0, 3.1, 3.2] + ruby-version: [3.0, 3.1, 3.2, 3.3, 3.4] runs-on: ubuntu-latest env: STORAGE_EMULATOR_HOST: "http://localhost:9023/" From 923caaaacee3c8b42f13ce84ee4227bba89da118 Mon Sep 17 00:00:00 2001 From: Ivan Giuliani Date: Fri, 10 Jan 2025 09:09:24 +0000 Subject: [PATCH 9/9] Update issues link to the correct page --- docs/COMPATIBILITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index 73ebad5..2fd2650 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -10,7 +10,7 @@ is supported. To that end, [our build matrix](../.circleci/config.yml) includes all these versions. Any time BucketStore doesn't work on a supported version of Ruby, it's a bug, and can be -reported [here](https://github.com/gocardless/file-storage/issues). +reported [here](https://github.com/gocardless/bucket-store/issues). # Deprecation