Skip to content

Commit

Permalink
chore: Update gemfiles for local dependencies in handwritten librarie…
Browse files Browse the repository at this point in the history
…s and fix some corner cases (#28935)
  • Loading branch information
dazuma authored Feb 5, 2025
1 parent 78efbae commit e25792b
Show file tree
Hide file tree
Showing 15 changed files with 208 additions and 36 deletions.
21 changes: 18 additions & 3 deletions google-cloud-bigquery/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,25 @@ source "https://rubygems.org"

gemspec

local_dependencies = ["google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "autotest-suffix", "~> 1.1"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-data_catalog", "~> 1.2"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-cloud-data_catalog", path: "../google-cloud-data_catalog"
gem "google-cloud-storage", path: "../google-cloud-storage"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
Expand Down
26 changes: 22 additions & 4 deletions google-cloud-bigtable/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,28 @@ source "https://rubygems.org"

gemspec

gem "google-cloud-bigtable-admin-v2", path: "../google-cloud-bigtable-admin-v2"
gem "google-cloud-bigtable-v2", path: "../google-cloud-bigtable-v2"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-errors", path: "../google-cloud-errors"
local_dependencies = [
"google-cloud-bigtable-admin-v2",
"google-cloud-bigtable-v2",
"google-cloud-core",
"google-cloud-errors"
]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigtable.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
gem "minitest-focus", "~> 1.1"
Expand Down
20 changes: 17 additions & 3 deletions google-cloud-datastore/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,24 @@ source "https://rubygems.org"

gemspec

local_dependencies = ["google-cloud-datastore-v1", "google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-datastore.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "autotest-suffix", "~> 1.1"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-datastore-v1", path: "../google-cloud-datastore-v1"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
gem "minitest-autotest", "~> 1.0"
Expand Down
19 changes: 17 additions & 2 deletions google-cloud-dns/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,24 @@ source "https://rubygems.org"

gemspec

local_dependencies = ["google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-dns.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "autotest-suffix", "~> 1.1"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
gem "minitest-autotest", "~> 1.0"
Expand Down
26 changes: 22 additions & 4 deletions google-cloud-error_reporting/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,28 @@ source "https://rubygems.org"

gemspec

gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-error_reporting-v1beta1", path: "../google-cloud-error_reporting-v1beta1"
gem "google-cloud-errors", path: "../google-cloud-errors"
local_dependencies = [
"google-cloud-error_reporting-v1beta1",
"google-cloud-core",
"google-cloud-errors",
"stackdriver-core"
]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-error_reporting.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.14"
gem "minitest-autotest", "~> 1.0"
Expand All @@ -15,6 +34,5 @@ gem "railties", ">= 5.0", "< 7.1.4"
gem "rake"
gem "redcarpet", "~> 3.0"
gem "simplecov", "~> 0.9"
gem "stackdriver-core", path: "../stackdriver-core"
gem "yard", "~> 0.9"
gem "yard-doctest", "~> 0.1.13"
20 changes: 17 additions & 3 deletions google-cloud-firestore/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,24 @@ source "https://rubygems.org"

gemspec

local_dependencies = ["google-cloud-firestore-v1", "google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-firestore.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "autotest-suffix", "~> 1.1"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-cloud-firestore-v1", path: "../google-cloud-firestore-v1"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
gem "minitest-autotest", "~> 1.0"
Expand Down
20 changes: 17 additions & 3 deletions google-cloud-logging/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,25 @@ source "https://rubygems.org"

gemspec

local_dependencies = ["google-cloud-logging-v2", "google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-logging.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "autotest-suffix", "~> 1.1"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-error_reporting", path: "../google-cloud-error_reporting"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-cloud-logging-v2", path: "../google-cloud-logging-v2"
gem "google-cloud-storage", path: "../google-cloud-storage"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
Expand Down
20 changes: 17 additions & 3 deletions google-cloud-pubsub/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,26 @@ source "https://rubygems.org"

gemspec

local_dependencies = ["google-cloud-pubsub-v1", "google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-pubsub.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "autotest-suffix", "~> 1.1"
gem "avro", "~> 1.10"
gem "bigdecimal", "~> 3.0"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-cloud-pubsub-v1", path: "../google-cloud-pubsub-v1"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
gem "minitest-autotest", "~> 1.0"
Expand Down
19 changes: 17 additions & 2 deletions google-cloud-resource_manager/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,24 @@ source "https://rubygems.org"

gemspec

local_dependencies = ["google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-resource_manager.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "autotest-suffix", "~> 1.1"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
gem "minitest-autotest", "~> 1.0"
Expand Down
1 change: 1 addition & 0 deletions google-cloud-run-client/.owlbot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
".repo-metadata.json",
".rubocop.yml",
"AUTHENTICATION.md",
"Gemfile",
"google-cloud-run-client.gemspec",
"Rakefile",
"README.md",
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-run-client/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec

local_dependencies = ["google-cloud-run-v2"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-run.gemspec"))
main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-run-client.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
Expand Down
19 changes: 17 additions & 2 deletions google-cloud-storage/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,23 @@ source "https://rubygems.org"

gemspec

gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-errors", path: "../google-cloud-errors"
local_dependencies = ["google-cloud-core", "google-cloud-errors"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-storage.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "google-cloud-pubsub", path: "../google-cloud-pubsub"
gem "google-cloud-pubsub-v1", path: "../google-cloud-pubsub-v1"
gem "minitest-reporters", "~> 1.5.0", require: false
Expand Down
28 changes: 23 additions & 5 deletions google-cloud-trace/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,32 @@ source "https://rubygems.org"

gemspec

local_dependencies = [
"google-cloud-trace-v1",
"google-cloud-trace-v2",
"google-cloud-core",
"google-cloud-errors",
"stackdriver-core"
]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-trace.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
warn "WARNING: Disabled local dependency for #{name} because gemspec not found."
next
end
version = Bundler.load_gemspec(spec_path).version
if main_spec.dependencies.any? { |dep| dep.name == name && !dep.requirement.satisfied_by?(version) }
warn "WARNING: Disabled local dependency for #{name} because the gemspec disallows version #{version}."
next
end
gem name, path: "../#{name}"
end

gem "activerecord", ">= 5.0", "< 7.1.4"
gem "autotest-suffix", "~> 1.1"
gem "faraday", ">= 1.3", "< 3"
gem "google-cloud-core", path: "../google-cloud-core"
gem "google-cloud-errors", path: "../google-cloud-errors"
gem "google-cloud-trace-v1", path: "../google-cloud-trace-v1"
gem "google-cloud-trace-v2", path: "../google-cloud-trace-v2"
gem "google-style", "~> 1.27.1"
gem "minitest", "~> 5.16"
gem "minitest-autotest", "~> 1.0"
Expand All @@ -18,6 +37,5 @@ gem "railties", ">= 5.0", "< 7.1.4"
gem "rake"
gem "redcarpet", "~> 3.0"
gem "simplecov", "~> 0.9"
gem "stackdriver-core", path: "../stackdriver-core"
gem "yard", "~> 0.9"
gem "yard-doctest" # , "~> 0.1.6"
1 change: 1 addition & 0 deletions google-iam-client/.owlbot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
".repo-metadata.json",
".rubocop.yml",
"AUTHENTICATION.md",
"Gemfile",
"google-iam-client.gemspec",
"Rakefile",
"README.md",
Expand Down
2 changes: 1 addition & 1 deletion google-iam-client/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gemspec

local_dependencies = ["google-iam-v2"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-iam.gemspec"))
main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-iam-client.gemspec"))
local_dependencies.each do |name|
spec_path = File.expand_path "../#{name}/#{name}.gemspec", __dir__
unless File.file? spec_path
Expand Down

0 comments on commit e25792b

Please sign in to comment.