From 78efbaefa10f9a4e5b4dd1515c77038c54489be6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 21:35:53 -0800 Subject: [PATCH] chore: wrapper Ruby client Gemfiles fall back to released GAPICs when a major version bump has occurred at HEAD (#28920) --- google-cloud-assured_workloads/Gemfile | 18 ++++++++++++++++-- google-cloud-automl/Gemfile | 18 ++++++++++++++++-- google-cloud-backupdr/Gemfile | 17 ++++++++++++++++- google-cloud-bare_metal_solution/Gemfile | 17 ++++++++++++++++- google-cloud-batch/Gemfile | 17 ++++++++++++++++- google-cloud-beyond_corp/Gemfile | 20 ++++++++++++++++---- google-cloud-bigquery-analytics_hub/Gemfile | 17 ++++++++++++++++- google-cloud-bigquery-connection/Gemfile | 17 ++++++++++++++++- google-cloud-bigquery-data_exchange/Gemfile | 17 ++++++++++++++++- google-cloud-bigquery-data_policies/Gemfile | 18 ++++++++++++++++-- google-cloud-bigquery-data_transfer/Gemfile | 17 ++++++++++++++++- google-cloud-bigquery-migration/Gemfile | 17 ++++++++++++++++- google-cloud-bigquery-reservation/Gemfile | 17 ++++++++++++++++- google-cloud-bigquery-storage/Gemfile | 17 ++++++++++++++++- google-cloud-billing-budgets/Gemfile | 18 ++++++++++++++++-- google-cloud-billing/Gemfile | 17 ++++++++++++++++- google-cloud-binary_authorization/Gemfile | 18 ++++++++++++++++-- google-cloud-build/Gemfile | 17 ++++++++++++++++- google-cloud-certificate_manager/Gemfile | 17 ++++++++++++++++- google-cloud-channel/Gemfile | 17 ++++++++++++++++- 20 files changed, 320 insertions(+), 28 deletions(-) diff --git a/google-cloud-assured_workloads/Gemfile b/google-cloud-assured_workloads/Gemfile index dedf9c0f8f9d..60d7242ebcad 100644 --- a/google-cloud-assured_workloads/Gemfile +++ b/google-cloud-assured_workloads/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-assured_workloads-v1", path: "../google-cloud-assured_workloads-v1" -gem "google-cloud-assured_workloads-v1beta1", path: "../google-cloud-assured_workloads-v1beta1" +local_dependencies = ["google-cloud-assured_workloads-v1", "google-cloud-assured_workloads-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-assured_workloads.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-automl/Gemfile b/google-cloud-automl/Gemfile index 258a7177a46a..a4147805e6d6 100644 --- a/google-cloud-automl/Gemfile +++ b/google-cloud-automl/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-automl-v1", path: "../google-cloud-automl-v1" -gem "google-cloud-automl-v1beta1", path: "../google-cloud-automl-v1beta1" +local_dependencies = ["google-cloud-automl-v1", "google-cloud-automl-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-automl.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-backupdr/Gemfile b/google-cloud-backupdr/Gemfile index 364a8eb09572..be57dad3e1fb 100644 --- a/google-cloud-backupdr/Gemfile +++ b/google-cloud-backupdr/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-backupdr-v1", path: "../google-cloud-backupdr-v1" +local_dependencies = ["google-cloud-backupdr-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-backupdr.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bare_metal_solution/Gemfile b/google-cloud-bare_metal_solution/Gemfile index 95a133b19812..3fc308913c66 100644 --- a/google-cloud-bare_metal_solution/Gemfile +++ b/google-cloud-bare_metal_solution/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bare_metal_solution-v2", path: "../google-cloud-bare_metal_solution-v2" +local_dependencies = ["google-cloud-bare_metal_solution-v2"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bare_metal_solution.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-batch/Gemfile b/google-cloud-batch/Gemfile index 558e1980b20a..5779d364fbdd 100644 --- a/google-cloud-batch/Gemfile +++ b/google-cloud-batch/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-batch-v1", path: "../google-cloud-batch-v1" +local_dependencies = ["google-cloud-batch-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-batch.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-beyond_corp/Gemfile b/google-cloud-beyond_corp/Gemfile index 90d936f83b4c..f3f858ebb4f8 100644 --- a/google-cloud-beyond_corp/Gemfile +++ b/google-cloud-beyond_corp/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-beyond_corp-app_connections-v1", path: "../google-cloud-beyond_corp-app_connections-v1" +local_dependencies = ["google-cloud-beyond_corp-app_connections-v1", "google-cloud-beyond_corp-app_connectors-v1", "google-cloud-beyond_corp-app_gateways-v1", "google-cloud-beyond_corp-client_gateways-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-beyond_corp.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.30.1" gem "minitest", "~> 5.22" @@ -11,6 +26,3 @@ gem "minitest-rg", "~> 5.3" gem "rake", ">= 13.0" gem "redcarpet", "~> 3.6" gem "yard", "~> 0.9" -gem "google-cloud-beyond_corp-app_connectors-v1", path: "../google-cloud-beyond_corp-app_connectors-v1" -gem "google-cloud-beyond_corp-app_gateways-v1", path: "../google-cloud-beyond_corp-app_gateways-v1" -gem "google-cloud-beyond_corp-client_gateways-v1", path: "../google-cloud-beyond_corp-client_gateways-v1" diff --git a/google-cloud-bigquery-analytics_hub/Gemfile b/google-cloud-bigquery-analytics_hub/Gemfile index 1f7cc1b1f9b5..411cd6da5e61 100644 --- a/google-cloud-bigquery-analytics_hub/Gemfile +++ b/google-cloud-bigquery-analytics_hub/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-analytics_hub-v1", path: "../google-cloud-bigquery-analytics_hub-v1" +local_dependencies = ["google-cloud-bigquery-analytics_hub-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-analytics_hub.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bigquery-connection/Gemfile b/google-cloud-bigquery-connection/Gemfile index bbf1c982a286..8427adae88e9 100644 --- a/google-cloud-bigquery-connection/Gemfile +++ b/google-cloud-bigquery-connection/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-connection-v1", path: "../google-cloud-bigquery-connection-v1" +local_dependencies = ["google-cloud-bigquery-connection-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-connection.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bigquery-data_exchange/Gemfile b/google-cloud-bigquery-data_exchange/Gemfile index 213f4fb65057..9c77c5770bca 100644 --- a/google-cloud-bigquery-data_exchange/Gemfile +++ b/google-cloud-bigquery-data_exchange/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-data_exchange-v1beta1", path: "../google-cloud-bigquery-data_exchange-v1beta1" +local_dependencies = ["google-cloud-bigquery-data_exchange-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-data_exchange.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bigquery-data_policies/Gemfile b/google-cloud-bigquery-data_policies/Gemfile index 43befae5d8be..371af45fba07 100644 --- a/google-cloud-bigquery-data_policies/Gemfile +++ b/google-cloud-bigquery-data_policies/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-data_policies-v1", path: "../google-cloud-bigquery-data_policies-v1" -gem "google-cloud-bigquery-data_policies-v1beta1", path: "../google-cloud-bigquery-data_policies-v1beta1" +local_dependencies = ["google-cloud-bigquery-data_policies-v1", "google-cloud-bigquery-data_policies-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-data_policies.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bigquery-data_transfer/Gemfile b/google-cloud-bigquery-data_transfer/Gemfile index b587b31ef4dd..fd0deff11cd5 100644 --- a/google-cloud-bigquery-data_transfer/Gemfile +++ b/google-cloud-bigquery-data_transfer/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-data_transfer-v1", path: "../google-cloud-bigquery-data_transfer-v1" +local_dependencies = ["google-cloud-bigquery-data_transfer-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-data_transfer.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bigquery-migration/Gemfile b/google-cloud-bigquery-migration/Gemfile index f2b6e2d41c98..08116cb1317f 100644 --- a/google-cloud-bigquery-migration/Gemfile +++ b/google-cloud-bigquery-migration/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-migration-v2", path: "../google-cloud-bigquery-migration-v2" +local_dependencies = ["google-cloud-bigquery-migration-v2"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-migration.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bigquery-reservation/Gemfile b/google-cloud-bigquery-reservation/Gemfile index 8ffb15c7f8d9..63546f1bd9e4 100644 --- a/google-cloud-bigquery-reservation/Gemfile +++ b/google-cloud-bigquery-reservation/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-reservation-v1", path: "../google-cloud-bigquery-reservation-v1" +local_dependencies = ["google-cloud-bigquery-reservation-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-reservation.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-bigquery-storage/Gemfile b/google-cloud-bigquery-storage/Gemfile index 54c7958d4e7d..4c084e13ca9a 100644 --- a/google-cloud-bigquery-storage/Gemfile +++ b/google-cloud-bigquery-storage/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-bigquery-storage-v1", path: "../google-cloud-bigquery-storage-v1" +local_dependencies = ["google-cloud-bigquery-storage-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-bigquery-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-style", "~> 1.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-billing-budgets/Gemfile b/google-cloud-billing-budgets/Gemfile index 40a64db3985f..cbbe127d4105 100644 --- a/google-cloud-billing-budgets/Gemfile +++ b/google-cloud-billing-budgets/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-billing-budgets-v1", path: "../google-cloud-billing-budgets-v1" -gem "google-cloud-billing-budgets-v1beta1", path: "../google-cloud-billing-budgets-v1beta1" +local_dependencies = ["google-cloud-billing-budgets-v1", "google-cloud-billing-budgets-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-billing-budgets.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-billing/Gemfile b/google-cloud-billing/Gemfile index 232eb4e8aac5..678f81174897 100644 --- a/google-cloud-billing/Gemfile +++ b/google-cloud-billing/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-billing-v1", path: "../google-cloud-billing-v1" +local_dependencies = ["google-cloud-billing-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-billing.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-binary_authorization/Gemfile b/google-cloud-binary_authorization/Gemfile index 3077a2767a3b..b0990e2b40d7 100644 --- a/google-cloud-binary_authorization/Gemfile +++ b/google-cloud-binary_authorization/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-binary_authorization-v1", path: "../google-cloud-binary_authorization-v1" -gem "google-cloud-binary_authorization-v1beta1", path: "../google-cloud-binary_authorization-v1beta1" +local_dependencies = ["google-cloud-binary_authorization-v1", "google-cloud-binary_authorization-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-binary_authorization.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-build/Gemfile b/google-cloud-build/Gemfile index 112257fa5295..da48df8679b7 100644 --- a/google-cloud-build/Gemfile +++ b/google-cloud-build/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-build-v1", path: "../google-cloud-build-v1" +local_dependencies = ["google-cloud-build-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-build.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.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-certificate_manager/Gemfile b/google-cloud-certificate_manager/Gemfile index 5223eba46704..3d564be8f15d 100644 --- a/google-cloud-certificate_manager/Gemfile +++ b/google-cloud-certificate_manager/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-certificate_manager-v1", path: "../google-cloud-certificate_manager-v1" +local_dependencies = ["google-cloud-certificate_manager-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-certificate_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 "google-style", "~> 1.30.1" gem "minitest", "~> 5.22" diff --git a/google-cloud-channel/Gemfile b/google-cloud-channel/Gemfile index 282646ca602b..f509baac3758 100644 --- a/google-cloud-channel/Gemfile +++ b/google-cloud-channel/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-channel-v1", path: "../google-cloud-channel-v1" +local_dependencies = ["google-cloud-channel-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-channel.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.30.1" gem "minitest", "~> 5.22"