diff --git a/.rubocop.yml b/.rubocop.yml index 82230c3..494c276 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,7 @@ require: # inherit_from: .rubocop_todo.yml AllCops: - TargetRubyVersion: 2.6 + TargetRubyVersion: 3.0.0 CacheRootDirectory: .cache NewCops: enable Layout/ArgumentAlignment: diff --git a/.ruby-version b/.ruby-version index a4dd9db..ff365e0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +3.1.3 diff --git a/Dockerfile b/Dockerfile index e0f3f2c..66e2733 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.4-slim-buster@sha256:afc5840d7214ce2f39f2ab18a32115a5b88b282394f286c00131f2799c49f76b AS ruby-base +FROM ruby:3.1.3-slim-bullseye@sha256:a6f940b1fca8a057561ac86f431539df2e77b954370fa17348f5a5ec3cba1cad AS ruby-base ENV RUBY_BUNDLER_VERSION '2.2.30' ENV BUNDLE_PATH /usr/local/bundle diff --git a/Gemfile.lock b/Gemfile.lock index c71964b..f411cf7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ PATH amazing_print (~> 1.3) google-cloud-bigquery (~> 1.35) paint (~> 2.2) - sequel (~> 5.48) + sequel (~> 5.63) GEM remote: https://rubygems.org/ @@ -145,7 +145,7 @@ GEM rubocop (~> 1.19) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) - sequel (5.50.0) + sequel (5.63.0) signet (0.16.0) addressable (~> 2.8) faraday (>= 0.17.3, < 2.0) @@ -158,6 +158,8 @@ GEM webrick (1.7.0) PLATFORMS + x86_64-darwin-20 + x86_64-darwin-22 x86_64-linux DEPENDENCIES @@ -172,4 +174,4 @@ DEPENDENCIES sequel-bigquery! BUNDLED WITH - 2.2.30 + 2.3.26 diff --git a/lib/sequel-bigquery.rb b/lib/sequel-bigquery.rb index 74e55bc..80cd45f 100644 --- a/lib/sequel-bigquery.rb +++ b/lib/sequel-bigquery.rb @@ -17,8 +17,8 @@ module Bigquery class Database < Sequel::Database # rubocop:disable Metrics/ClassLength set_adapter_scheme :bigquery - def initialize(*args, **kwargs) - @bigquery_config = kwargs.fetch(:orig_opts) + def initialize(opts) + @bigquery_config = opts.fetch(:orig_opts) @sql_buffer = [] @sql_buffering = false super @@ -32,7 +32,7 @@ def connect(*_args) def bigquery # ObjectSpace.each_object(HTTPClient).each { |c| c.debug_dev = STDOUT } - @bigquery ||= Google::Cloud::Bigquery.new(google_cloud_bigquery_gem_config) + @bigquery ||= Google::Cloud::Bigquery.new(**google_cloud_bigquery_gem_config) end def disconnect_connection(_c) diff --git a/sequel-bigquery.gemspec b/sequel-bigquery.gemspec index 1cf282b..a68af18 100644 --- a/sequel-bigquery.gemspec +++ b/sequel-bigquery.gemspec @@ -10,7 +10,7 @@ Gem::Specification.new do |spec| spec.summary = "A Sequel adapter for Google's BigQuery" spec.homepage = 'https://github.com/ZimbiX/sequel-bigquery' - spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0') + spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0') spec.metadata['homepage_uri'] = spec.homepage spec.metadata['source_code_uri'] = spec.homepage @@ -32,5 +32,5 @@ Gem::Specification.new do |spec| spec.add_dependency 'amazing_print', '~> 1.3' spec.add_dependency 'google-cloud-bigquery', '~> 1.35' spec.add_dependency 'paint', '~> 2.2' - spec.add_dependency 'sequel', '~> 5.48' + spec.add_dependency 'sequel', '~> 5.63' end