From 41017a1b5d8efb7c2c56408ea57ec70244a78c99 Mon Sep 17 00:00:00 2001 From: Mikhail Doronin Date: Mon, 16 Sep 2024 16:27:17 +0200 Subject: [PATCH 1/5] Use ruby 3.3 and up-to-date bundler --- .github/workflows/tests.yml | 9 +++------ .ruby-version | 2 +- Gemfile.lock | 10 +++++++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b58214ae..90977e9a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,14 +13,11 @@ jobs: name: Tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1 - - name: Install dependencies - run: | - gem install bundler - bundle install + ruby-version: 3.3 + bundler-cache: true - name: Run tests run: | bundle exec ruby test_data.rb diff --git a/.ruby-version b/.ruby-version index ef538c28..fa7adc7a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.3.5 diff --git a/Gemfile.lock b/Gemfile.lock index 3e49814b..445529ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,5 +20,13 @@ DEPENDENCIES stringex (~> 2.5.2) tzinfo (~> 1.2.10) +CHECKSUMS + luhnacy (0.2.2) sha256=81d12741f96128c751790531ecec667422ac6bd80e6dd18b6330692f34359080 + minitest (5.6.1) sha256=c293d497049aa663dc6332b940bdac9dd3052b62ccfe943c4fb5b130154f86b1 + minitest-focus (1.1.2) sha256=a09a0f17d648c4e72696e2a53b8091a5bdea5b2ca9c8aa9165bf9d662ed5f2fd + stringex (2.5.2) sha256=27a8ee92a808a83284438e51ed391f3539ae6b39731b95cb4ad940974f6d0a94 + thread_safe (0.3.6) sha256=9ed7072821b51c57e8d6b7011a8e282e25aeea3a4065eab326e43f66f063b05a + tzinfo (1.2.10) sha256=c6d3fa6e6de19744171536dc1bd1142442f3f265efabe8d9f28c03f9874f8867 + BUNDLED WITH - 1.17.2 + 2.5.16 From 9dd3caa9d93f38c5e3a105fd7ba2716e58ffc9da Mon Sep 17 00:00:00 2001 From: Mikhail Doronin Date: Mon, 16 Sep 2024 16:32:32 +0200 Subject: [PATCH 2/5] Explicitly install CSV gem to avoid a warning --- Gemfile | 1 + Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 21aa6317..1f3689e3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" +gem "csv" gem "luhnacy" gem "stringex", "~> 2.5.2" gem "minitest", "~> 5.6.0" diff --git a/Gemfile.lock b/Gemfile.lock index 445529ff..5ce5a2e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + csv (3.3.0) luhnacy (0.2.2) minitest (5.6.1) minitest-focus (1.1.2) @@ -14,6 +15,7 @@ PLATFORMS ruby DEPENDENCIES + csv luhnacy minitest (~> 5.6.0) minitest-focus @@ -21,6 +23,7 @@ DEPENDENCIES tzinfo (~> 1.2.10) CHECKSUMS + csv (3.3.0) sha256=0bbd1defdc31134abefed027a639b3723c2753862150f4c3ee61cab71b20d67d luhnacy (0.2.2) sha256=81d12741f96128c751790531ecec667422ac6bd80e6dd18b6330692f34359080 minitest (5.6.1) sha256=c293d497049aa663dc6332b940bdac9dd3052b62ccfe943c4fb5b130154f86b1 minitest-focus (1.1.2) sha256=a09a0f17d648c4e72696e2a53b8091a5bdea5b2ca9c8aa9165bf9d662ed5f2fd From 4857ca461a466bdb38758878c4ca8dc819efd308 Mon Sep 17 00:00:00 2001 From: Mikhail Doronin Date: Mon, 16 Sep 2024 16:43:21 +0200 Subject: [PATCH 3/5] Update tzinfo --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ test_data.rb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 1f3689e3..cd8095a8 100644 --- a/Gemfile +++ b/Gemfile @@ -5,4 +5,4 @@ gem "luhnacy" gem "stringex", "~> 2.5.2" gem "minitest", "~> 5.6.0" gem "minitest-focus" -gem "tzinfo", "~> 1.2.10" +gem "tzinfo", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 5ce5a2e9..e47ed94d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,15 @@ GEM remote: https://rubygems.org/ specs: + concurrent-ruby (1.3.4) csv (3.3.0) luhnacy (0.2.2) minitest (5.6.1) minitest-focus (1.1.2) minitest (>= 4, < 6) stringex (2.5.2) - thread_safe (0.3.6) - tzinfo (1.2.10) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) PLATFORMS ruby @@ -20,16 +20,16 @@ DEPENDENCIES minitest (~> 5.6.0) minitest-focus stringex (~> 2.5.2) - tzinfo (~> 1.2.10) + tzinfo (~> 2.0) CHECKSUMS + concurrent-ruby (1.3.4) sha256=d4aa926339b0a86b5b5054a0a8c580163e6f5dcbdfd0f4bb916b1a2570731c32 csv (3.3.0) sha256=0bbd1defdc31134abefed027a639b3723c2753862150f4c3ee61cab71b20d67d luhnacy (0.2.2) sha256=81d12741f96128c751790531ecec667422ac6bd80e6dd18b6330692f34359080 minitest (5.6.1) sha256=c293d497049aa663dc6332b940bdac9dd3052b62ccfe943c4fb5b130154f86b1 minitest-focus (1.1.2) sha256=a09a0f17d648c4e72696e2a53b8091a5bdea5b2ca9c8aa9165bf9d662ed5f2fd stringex (2.5.2) sha256=27a8ee92a808a83284438e51ed391f3539ae6b39731b95cb4ad940974f6d0a94 - thread_safe (0.3.6) sha256=9ed7072821b51c57e8d6b7011a8e282e25aeea3a4065eab326e43f66f063b05a - tzinfo (1.2.10) sha256=c6d3fa6e6de19744171536dc1bd1142442f3f265efabe8d9f28c03f9874f8867 + tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b BUNDLED WITH 2.5.16 diff --git a/test_data.rb b/test_data.rb index b96fb7d9..a5a4bbaf 100644 --- a/test_data.rb +++ b/test_data.rb @@ -83,7 +83,7 @@ def test_is_station_useful def test_valid_timezone Constants::COUNTRIES.values.each do |timezone| - tz = TZInfo::Timezone.get(timezone) + assert TZInfo::Timezone.get(timezone) end end From dc626be6afb3ffb230b5e898504abc6aeabcc3d5 Mon Sep 17 00:00:00 2001 From: Mikhail Doronin Date: Mon, 16 Sep 2024 16:46:24 +0200 Subject: [PATCH 4/5] Use up-to-date minitest --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index cd8095a8..b862f05e 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,6 @@ source "https://rubygems.org" gem "csv" gem "luhnacy" gem "stringex", "~> 2.5.2" -gem "minitest", "~> 5.6.0" +gem "minitest", "~> 5.25" gem "minitest-focus" gem "tzinfo", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index e47ed94d..eec54ce2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ GEM concurrent-ruby (1.3.4) csv (3.3.0) luhnacy (0.2.2) - minitest (5.6.1) - minitest-focus (1.1.2) + minitest (5.25.1) + minitest-focus (1.4.0) minitest (>= 4, < 6) stringex (2.5.2) tzinfo (2.0.6) @@ -17,7 +17,7 @@ PLATFORMS DEPENDENCIES csv luhnacy - minitest (~> 5.6.0) + minitest (~> 5.25) minitest-focus stringex (~> 2.5.2) tzinfo (~> 2.0) @@ -26,8 +26,8 @@ CHECKSUMS concurrent-ruby (1.3.4) sha256=d4aa926339b0a86b5b5054a0a8c580163e6f5dcbdfd0f4bb916b1a2570731c32 csv (3.3.0) sha256=0bbd1defdc31134abefed027a639b3723c2753862150f4c3ee61cab71b20d67d luhnacy (0.2.2) sha256=81d12741f96128c751790531ecec667422ac6bd80e6dd18b6330692f34359080 - minitest (5.6.1) sha256=c293d497049aa663dc6332b940bdac9dd3052b62ccfe943c4fb5b130154f86b1 - minitest-focus (1.1.2) sha256=a09a0f17d648c4e72696e2a53b8091a5bdea5b2ca9c8aa9165bf9d662ed5f2fd + minitest (5.25.1) sha256=3db6795a80634def1cf86fda79d2d83b59b25ce5e186fa675f73c565589d2ad8 + minitest-focus (1.4.0) sha256=4cf04bd2b5fe0649922db56f9f2ae30af91475a0f51e02c2baa33f5c5a47ff6c stringex (2.5.2) sha256=27a8ee92a808a83284438e51ed391f3539ae6b39731b95cb4ad940974f6d0a94 tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b From a42c942a20a7e68a948c3395b0125d08fb04aaf0 Mon Sep 17 00:00:00 2001 From: Mikhail Doronin Date: Mon, 16 Sep 2024 16:51:01 +0200 Subject: [PATCH 5/5] Use up-to-date stringex --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index b862f05e..4243849d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "csv" gem "luhnacy" -gem "stringex", "~> 2.5.2" +gem "stringex", "~> 2.8" gem "minitest", "~> 5.25" gem "minitest-focus" gem "tzinfo", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index eec54ce2..a9e697b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GEM minitest (5.25.1) minitest-focus (1.4.0) minitest (>= 4, < 6) - stringex (2.5.2) + stringex (2.8.6) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -19,7 +19,7 @@ DEPENDENCIES luhnacy minitest (~> 5.25) minitest-focus - stringex (~> 2.5.2) + stringex (~> 2.8) tzinfo (~> 2.0) CHECKSUMS @@ -28,7 +28,7 @@ CHECKSUMS luhnacy (0.2.2) sha256=81d12741f96128c751790531ecec667422ac6bd80e6dd18b6330692f34359080 minitest (5.25.1) sha256=3db6795a80634def1cf86fda79d2d83b59b25ce5e186fa675f73c565589d2ad8 minitest-focus (1.4.0) sha256=4cf04bd2b5fe0649922db56f9f2ae30af91475a0f51e02c2baa33f5c5a47ff6c - stringex (2.5.2) sha256=27a8ee92a808a83284438e51ed391f3539ae6b39731b95cb4ad940974f6d0a94 + stringex (2.8.6) sha256=c7b382d2b2a47a1e1646f256df201c48d487d6296fbb289d76802f67f5e929c4 tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b BUNDLED WITH