From c38156fc99467dee8b86d47155430a1e0a953fd8 Mon Sep 17 00:00:00 2001 From: Yuri Smirnov Date: Fri, 13 Sep 2024 18:36:22 +0300 Subject: [PATCH] return Gemfile.lock and remove version suffix --- .gitignore | 1 - Gemfile | 20 +-- Gemfile.lock | 153 ++++++++++++++++++ .../extensions/fibered_connection_pool.rb | 12 +- umbrellio-sequel-plugins.gemspec | 8 +- 5 files changed, 167 insertions(+), 27 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index cab715b..e59ef9d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,3 @@ log *.gemspec -Gemfile.lock diff --git a/Gemfile b/Gemfile index 3ebc162..7f86371 100644 --- a/Gemfile +++ b/Gemfile @@ -4,13 +4,13 @@ source "https://rubygems.org" gemspec -gem "async", "~> 1.31.0" -gem "money", "~> 6.19.0" -gem "pg", "~> 1.5.7" -gem "pry", "~> 0.14.2" -gem "rake", "~> 13.2.1" -gem "rspec", "~> 3.13.0" -gem "rubocop-config-umbrellio", "~> 1.63.0.93" -gem "simplecov", "~> 0.22.0" -gem "simplecov-lcov", "~> 0.8.0" -gem "symbiont-ruby", "~> 0.7.0" +gem "async" +gem "money" +gem "pg" +gem "pry" +gem "rake" +gem "rspec" +gem "rubocop-config-umbrellio" +gem "simplecov" +gem "simplecov-lcov" +gem "symbiont-ruby" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..1aea1c8 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,153 @@ +PATH + remote: . + specs: + umbrellio-sequel-plugins (0.16.0) + sequel + +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.1.4) + 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) + async (1.32.1) + console (~> 1.10) + nio4r (~> 2.3) + timers (~> 4.1) + base64 (0.2.0) + bigdecimal (3.1.8) + coderay (1.1.3) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + console (1.24.0) + fiber-annotation + fiber-local + json + diff-lcs (1.5.1) + docile (1.4.1) + drb (2.2.1) + fiber-annotation (0.2.0) + fiber-local (1.0.0) + i18n (1.14.5) + concurrent-ruby (~> 1.0) + json (2.7.2) + language_server-protocol (3.17.0.3) + method_source (1.1.0) + minitest (5.25.1) + money (6.19.0) + i18n (>= 0.6.4, <= 2) + mutex_m (0.2.0) + nio4r (2.7.3) + parallel (1.26.3) + parser (3.3.5.0) + ast (~> 2.4.1) + racc + pg (1.5.8) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + racc (1.8.1) + rack (3.1.7) + rainbow (3.1.1) + rake (13.2.1) + regexp_parser (2.9.2) + rexml (3.3.7) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.63.5) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.31.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) + rubocop (~> 1.41) + rubocop-config-umbrellio (1.63.0.93) + rubocop (~> 1.63.0) + rubocop-performance (~> 1.21.0) + rubocop-rails (~> 2.24.0) + rubocop-rake (~> 0.6.0) + rubocop-rspec (~> 2.29.0) + rubocop-sequel (~> 0.3.3) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) + rubocop-performance (1.21.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.24.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.29.2) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) + rubocop-sequel (0.3.4) + rubocop (~> 1.0) + ruby-progressbar (1.13.0) + sequel (5.84.0) + bigdecimal + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov-lcov (0.8.0) + simplecov_json_formatter (0.1.4) + symbiont-ruby (0.7.0) + timers (4.3.5) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.6.0) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + async + money + pg + pry + rake + rspec + rubocop-config-umbrellio + simplecov + simplecov-lcov + symbiont-ruby + umbrellio-sequel-plugins! + +BUNDLED WITH + 2.5.18 diff --git a/lib/sequel/extensions/fibered_connection_pool.rb b/lib/sequel/extensions/fibered_connection_pool.rb index b2aa73f..6d82180 100644 --- a/lib/sequel/extensions/fibered_connection_pool.rb +++ b/lib/sequel/extensions/fibered_connection_pool.rb @@ -77,14 +77,8 @@ def connection_pool_class(*) end end -# NOTE: Ruby 2.7 DOES NOT SUPPORT class methods prepend in this way -# https://bugs.ruby-lang.org/issues/17423 -if RUBY_VERSION > "3" - Sequel::ConnectionPool::ClassMethods.prepend(Sequel::ConnectionPoolPatch) -else - class Sequel::ConnectionPool - class << self - prepend Sequel::ConnectionPoolPatch - end +class Sequel::ConnectionPool + class << self + prepend Sequel::ConnectionPoolPatch end end diff --git a/umbrellio-sequel-plugins.gemspec b/umbrellio-sequel-plugins.gemspec index 97946e9..cde6ea5 100644 --- a/umbrellio-sequel-plugins.gemspec +++ b/umbrellio-sequel-plugins.gemspec @@ -4,14 +4,8 @@ lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) Gem::Specification.new do |spec| - gem_version = "0.16.0" - - if ENV.fetch("PUBLISH_JOB", nil) - release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}" - end - spec.name = "umbrellio-sequel-plugins" - spec.version = release_version || gem_version + spec.version = "0.16.0" spec.required_ruby_version = ">= 3.0" spec.authors = ["Team Umbrellio"]