From 2c8df2f80b538a17d3d93bb8ed1510d5b7d9664d Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 9 Dec 2023 13:04:08 +0300 Subject: [PATCH 1/7] update-some-deps --- Gemfile.lock | 129 ++++++++++++++++++++++++++-------------------- ci_helper.gemspec | 4 +- 2 files changed, 76 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c879b7e..61eaf02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,90 +2,110 @@ PATH remote: . specs: ci-helper (0.5.0) - colorize (~> 0.8) - dry-inflector (~> 0.2) + colorize (~> 1.1) + dry-inflector (~> 1.0) umbrellio-sequel-plugins (~> 0.4) GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.4) + activesupport (7.1.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) ast (2.4.2) - bundler-audit (0.9.0.1) + base64 (0.2.0) + bigdecimal (3.1.4) + bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) thor (~> 1.0) coderay (1.1.3) - colorize (0.8.1) - concurrent-ruby (1.1.10) + colorize (1.1.0) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) diff-lcs (1.5.0) docile (1.4.0) - dry-inflector (0.2.1) - i18n (1.10.0) + drb (2.2.0) + ruby2_keywords + dry-inflector (1.0.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) + json (2.7.1) method_source (1.0.0) - minitest (5.15.0) - parallel (1.22.1) - parser (3.1.2.0) + minitest (5.20.0) + mutex_m (0.2.0) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) - pry (0.14.1) + racc + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - rack (2.2.3) + racc (1.7.3) + rack (3.0.8) rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.3.1) - rexml (3.2.5) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rake (13.1.0) + regexp_parser (2.8.3) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - rubocop (1.25.1) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubocop (1.50.2) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.15.1, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) - parser (>= 3.1.1.0) - rubocop-config-umbrellio (1.25.0.61) - rubocop (~> 1.25.0) - rubocop-performance (~> 1.13.0) - rubocop-rails (~> 2.13.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-config-umbrellio (1.50.0.85) + rubocop (~> 1.50.0) + rubocop-performance (~> 1.17.0) + rubocop-rails (~> 2.19.0) rubocop-rake (~> 0.6.0) - rubocop-rspec (~> 2.7.0) + rubocop-rspec (~> 2.20.0) rubocop-sequel (~> 0.3.3) - rubocop-performance (1.13.3) + rubocop-performance (1.17.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.13.2) + rubocop-rails (2.19.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.7.0, < 2.0) + rubocop (>= 1.33.0, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.7.0) - rubocop (~> 1.19) - rubocop-sequel (0.3.3) + rubocop-rspec (2.20.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-sequel (0.3.4) rubocop (~> 1.0) - ruby-progressbar (1.11.0) - sequel (5.56.0) - simplecov (0.21.2) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + sequel (5.75.0) + bigdecimal + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) @@ -93,17 +113,16 @@ GEM simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) symbiont-ruby (0.7.0) - thor (1.2.1) - tzinfo (2.0.4) + thor (1.3.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - umbrellio-sequel-plugins (0.5.1.27) + umbrellio-sequel-plugins (0.14.0.189) sequel symbiont-ruby - unicode-display_width (2.1.0) + unicode-display_width (2.5.0) PLATFORMS - ruby - x86_64-linux + arm64-darwin-23 DEPENDENCIES bundler @@ -117,4 +136,4 @@ DEPENDENCIES simplecov-lcov BUNDLED WITH - 2.3.13 + 2.4.21 diff --git a/ci_helper.gemspec b/ci_helper.gemspec index 6ce6e78..7433587 100644 --- a/ci_helper.gemspec +++ b/ci_helper.gemspec @@ -24,8 +24,8 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_runtime_dependency "colorize", "~> 0.8" - spec.add_runtime_dependency "dry-inflector", "~> 0.2" + spec.add_runtime_dependency "colorize", "~> 1.1" + spec.add_runtime_dependency "dry-inflector", "~> 1.0" spec.add_runtime_dependency "umbrellio-sequel-plugins", "~> 0.4" spec.add_development_dependency "bundler" From 27d215f77ad752ed0e5612876a71738c9d22707c Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 9 Dec 2023 13:05:39 +0300 Subject: [PATCH 2/7] bump --- Gemfile.lock | 4 ++-- ci_helper.gemspec | 2 +- lib/ci_helper/version.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 61eaf02..112fd6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - ci-helper (0.5.0) + ci-helper (0.6.0) colorize (~> 1.1) dry-inflector (~> 1.0) - umbrellio-sequel-plugins (~> 0.4) + umbrellio-sequel-plugins (~> 0.14) GEM remote: https://rubygems.org/ diff --git a/ci_helper.gemspec b/ci_helper.gemspec index 7433587..5855934 100644 --- a/ci_helper.gemspec +++ b/ci_helper.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "colorize", "~> 1.1" spec.add_runtime_dependency "dry-inflector", "~> 1.0" - spec.add_runtime_dependency "umbrellio-sequel-plugins", "~> 0.4" + spec.add_runtime_dependency "umbrellio-sequel-plugins", "~> 0.14" spec.add_development_dependency "bundler" spec.add_development_dependency "bundler-audit" diff --git a/lib/ci_helper/version.rb b/lib/ci_helper/version.rb index 67e092f..9f95d27 100644 --- a/lib/ci_helper/version.rb +++ b/lib/ci_helper/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module CIHelper - VERSION = "0.5.0" + VERSION = "0.6.0" end From 0b40d6d3bd29674c57b402a71d7ec35bee303303 Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 9 Dec 2023 18:23:13 +0300 Subject: [PATCH 3/7] try new ruby vers --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef0807d..6ff82b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.1" + ruby-version: "3.2" bundler-cache: true - name: Build and install gem to systems gems run: bundle exec rake install @@ -39,13 +39,13 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["2.7", "3.0"] + ruby: ["2.7", "3.0", "3.1"] steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler-cache: true + bundler-cache: false - name: Run specs run: bundle exec rspec From 18b44cca68c45aa5ceeab85d6ec0fc3c6e6fb3b7 Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 9 Dec 2023 18:24:56 +0300 Subject: [PATCH 4/7] rebundle --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ff82b1..2dc9056 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - bundler-cache: true + bundler-cache: false - name: Build and install gem to systems gems run: bundle exec rake install - name: Run Linter From c0400404826a77d52c8f695c3f2d21d78fc79806 Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 9 Dec 2023 18:27:14 +0300 Subject: [PATCH 5/7] update checkout --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2dc9056..e179a3d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - bundler-cache: false + bundler-cache: true - name: Build and install gem to systems gems run: bundle exec rake install - name: Run Linter @@ -42,10 +42,10 @@ jobs: ruby: ["2.7", "3.0", "3.1"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - bundler-cache: false + bundler-cache: true - name: Run specs run: bundle exec rspec From 2a1df16a14cb51933eaf9c0b56c67524e78009ca Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 9 Dec 2023 18:27:55 +0300 Subject: [PATCH 6/7] add new platform --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index 112fd6d..f362e3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,6 +123,7 @@ GEM PLATFORMS arm64-darwin-23 + x86_64-linux DEPENDENCIES bundler From eb4319dec6abec75be4008568d317d38f4614ff7 Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 9 Dec 2023 18:29:54 +0300 Subject: [PATCH 7/7] rubocop POLICIA --- Gemfile | 9 +++++++++ ci_helper.gemspec | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index be173b2..934ca3c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,12 @@ source "https://rubygems.org" gemspec + +gem "bundler" +gem "bundler-audit" +gem "pry" +gem "rake" +gem "rspec" +gem "rubocop-config-umbrellio" +gem "simplecov" +gem "simplecov-lcov" diff --git a/ci_helper.gemspec b/ci_helper.gemspec index 5855934..44f84b4 100644 --- a/ci_helper.gemspec +++ b/ci_helper.gemspec @@ -27,13 +27,4 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "colorize", "~> 1.1" spec.add_runtime_dependency "dry-inflector", "~> 1.0" spec.add_runtime_dependency "umbrellio-sequel-plugins", "~> 0.14" - - spec.add_development_dependency "bundler" - spec.add_development_dependency "bundler-audit" - spec.add_development_dependency "pry" - spec.add_development_dependency "rake" - spec.add_development_dependency "rspec" - spec.add_development_dependency "rubocop-config-umbrellio" - spec.add_development_dependency "simplecov" - spec.add_development_dependency "simplecov-lcov" end