Skip to content

Commit 1fd9089

Browse files
dazumadazuma
authored
feat(multi): Update minimum supported Ruby version to 2.7 (#25298)
1 parent 3988714 commit 1fd9089

83 files changed

Lines changed: 295 additions & 324 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎google-cloud-bigquery/.rubocop.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ Naming/FileName:
3636
Naming/MethodParameterName:
3737
Exclude:
3838
- "lib/google/cloud/bigquery/external/**/*.rb"
39+
Style/ReturnNilInPredicateMethodDefinition:
40+
Exclude:
41+
- "lib/google/cloud/bigquery/table.rb"
42+
- "lib/google/cloud/bigquery/table/async_inserter.rb"

‎google-cloud-bigquery/Gemfile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,19 @@ source "https://rubygems.org"
22

33
gemspec
44

5+
gem "autotest-suffix", "~> 1.1"
56
gem "google-cloud-core", path: "../google-cloud-core"
7+
gem "google-cloud-data_catalog", "~> 1.2"
68
gem "google-cloud-errors", path: "../google-cloud-errors"
79
gem "google-cloud-storage", path: "../google-cloud-storage"
8-
10+
gem "google-style", "~> 1.27.1"
11+
gem "minitest", "~> 5.16"
12+
gem "minitest-autotest", "~> 1.0"
13+
gem "minitest-focus", "~> 1.1"
914
gem "minitest-reporters", "~> 1.5.0", require: false
15+
gem "minitest-rg", "~> 5.2"
1016
gem "rake"
17+
gem "redcarpet", "~> 3.0"
18+
gem "simplecov", "~> 0.18"
19+
gem "yard", "~> 0.9"
20+
gem "yard-doctest", "~> 0.1.13"

‎google-cloud-bigquery/google-cloud-bigquery.gemspec‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,12 @@ Gem::Specification.new do |gem|
1616
"CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
1717
gem.require_paths = ["lib"]
1818

19-
gem.required_ruby_version = ">= 2.6"
19+
gem.required_ruby_version = ">= 2.7"
2020

2121
gem.add_dependency "concurrent-ruby", "~> 1.0"
2222
gem.add_dependency "google-apis-bigquery_v2", "~> 0.62"
2323
gem.add_dependency "google-apis-core", "~> 0.13"
2424
gem.add_dependency "googleauth", "~> 1.9"
2525
gem.add_dependency "google-cloud-core", "~> 1.6"
2626
gem.add_dependency "mini_mime", "~> 1.0"
27-
28-
gem.add_development_dependency "autotest-suffix", "~> 1.1"
29-
gem.add_development_dependency "google-cloud-data_catalog", "~> 1.2"
30-
gem.add_development_dependency "google-style", "~> 1.26.1"
31-
gem.add_development_dependency "minitest", "~> 5.16"
32-
gem.add_development_dependency "minitest-autotest", "~> 1.0"
33-
gem.add_development_dependency "minitest-focus", "~> 1.1"
34-
gem.add_development_dependency "minitest-rg", "~> 5.2"
35-
gem.add_development_dependency "redcarpet", "~> 3.0"
36-
gem.add_development_dependency "simplecov", "~> 0.18"
37-
gem.add_development_dependency "yard", "~> 0.9"
38-
gem.add_development_dependency "yard-doctest", "~> 0.1.13"
3927
end

‎google-cloud-bigquery/lib/google-cloud-bigquery.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ module Cloud
7171
# bigquery = gcloud.bigquery scope: platform_scope
7272
#
7373
def bigquery scope: nil, retries: nil, timeout: nil
74+
retries ||= @retries
75+
timeout ||= @timeout
7476
Google::Cloud.bigquery @project, @keyfile, scope: scope,
75-
retries: (retries || @retries),
76-
timeout: (timeout || @timeout)
77+
retries: retries,
78+
timeout: timeout
7779
end
7880

7981
##

‎google-cloud-bigquery/lib/google/cloud/bigquery.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def self.new project_id: nil, credentials: nil, scope: nil, retries: nil, timeou
7272
retries ||= configure.retries
7373
timeout ||= configure.timeout
7474
endpoint ||= configure.endpoint
75-
credentials ||= (keyfile || default_credentials(scope: scope))
75+
credentials ||= keyfile || default_credentials(scope: scope)
7676
universe_domain ||= configure.universe_domain
7777

7878
unless credentials.is_a? Google::Auth::Credentials

‎google-cloud-bigquery/lib/google/cloud/bigquery/project.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ def query_job query,
633633
create_session: nil,
634634
session_id: nil
635635
ensure_service!
636+
project ||= self.project
636637
options = {
637638
params: params,
638639
types: types,
@@ -644,7 +645,7 @@ def query_job query,
644645
write: write,
645646
dryrun: dryrun,
646647
dataset: dataset,
647-
project: (project || self.project),
648+
project: project,
648649
standard_sql: standard_sql,
649650
legacy_sql: legacy_sql,
650651
large_results: large_results,

‎google-cloud-bigquery/lib/google/cloud/bigquery/service.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,13 +558,15 @@ def job_ref_from job_id, prefix, location: nil
558558
def dataset_ref_from dts, pjt = nil
559559
return nil if dts.nil?
560560
if dts.respond_to? :dataset_id
561+
pjt ||= dts.project_id || @project
561562
Google::Apis::BigqueryV2::DatasetReference.new(
562-
project_id: (pjt || dts.project_id || @project),
563+
project_id: pjt,
563564
dataset_id: dts.dataset_id
564565
)
565566
else
567+
pjt ||= @project
566568
Google::Apis::BigqueryV2::DatasetReference.new(
567-
project_id: (pjt || @project),
569+
project_id: pjt,
568570
dataset_id: dts
569571
)
570572
end

‎google-cloud-bigtable/Gemfile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ gem "google-cloud-bigtable-admin-v2", path: "../google-cloud-bigtable-admin-v2"
66
gem "google-cloud-bigtable-v2", path: "../google-cloud-bigtable-v2"
77
gem "google-cloud-core", path: "../google-cloud-core"
88
gem "google-cloud-errors", path: "../google-cloud-errors"
9-
9+
gem "google-style", "~> 1.27.1"
10+
gem "minitest", "~> 5.16"
11+
gem "minitest-focus", "~> 1.1"
1012
gem "minitest-reporters", "~> 1.5.0", require: false
13+
gem "minitest-rg", "~> 5.2"
1114
gem "rake"
15+
gem "redcarpet", "~> 3.0"
16+
gem "simplecov", "~> 0.9"
17+
gem "yard", "~> 0.9"
18+
gem "yard-doctest", "~> 0.1.13"

‎google-cloud-bigtable/google-cloud-bigtable.gemspec‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,10 @@ Gem::Specification.new do |gem|
2121
"TROUBLESHOOTING.md", "CHANGELOG.md", "CODE_OF_CONDUCT.md", "LICENSE", ".yardopts"]
2222
gem.require_paths = ["lib"]
2323

24-
gem.required_ruby_version = ">= 2.6"
24+
gem.required_ruby_version = ">= 2.7"
2525

2626
gem.add_dependency "concurrent-ruby", "~> 1.0"
2727
gem.add_dependency "google-cloud-bigtable-admin-v2", "~> 0.0"
2828
gem.add_dependency "google-cloud-bigtable-v2", "~> 0.14"
2929
gem.add_dependency "google-cloud-core", "~> 1.5"
30-
31-
gem.add_development_dependency "google-style", "~> 1.26.1"
32-
gem.add_development_dependency "minitest", "~> 5.16"
33-
gem.add_development_dependency "minitest-focus", "~> 1.1"
34-
gem.add_development_dependency "minitest-rg", "~> 5.2"
35-
gem.add_development_dependency "redcarpet", "~> 3.0"
36-
gem.add_development_dependency "simplecov", "~> 0.9"
37-
gem.add_development_dependency "yard", "~> 0.9"
38-
gem.add_development_dependency "yard-doctest", "~> 0.1.13"
3930
end

‎google-cloud-bigtable/lib/google-cloud-bigtable.rb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ module Cloud
6565
# bigtable = gcloud.bigtable
6666
#
6767
def bigtable scope: nil, timeout: nil, credentials: nil
68+
credentials ||= @keyfile
69+
timeout ||= @timeout
6870
Google::Cloud.bigtable(
6971
project_id: @project,
70-
credentials: (credentials || @keyfile),
72+
credentials: credentials,
7173
scope: scope,
72-
timeout: (timeout || @timeout)
74+
timeout: timeout
7375
)
7476
end
7577

0 commit comments

Comments
 (0)