From e1e665552fe350752b9ddf9c0823f2fd97f891f4 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 04:19:55 +0000 Subject: [PATCH] chore: wrapper Ruby client Gemfiles fall back to released GAPICs when a major version bump has occurred at HEAD (#28927) --- google-cloud-web_security_scanner/Gemfile | 18 +++++++++++++++-- google-cloud-workflows/Gemfile | 20 +++++++++++++++---- google-cloud-workstations/Gemfile | 18 +++++++++++++++-- google-iam-client/Gemfile | 17 +++++++++++++++- google-iam-credentials/Gemfile | 17 +++++++++++++++- .../Gemfile | 17 +++++++++++++++- google-maps-fleet_engine-delivery/Gemfile | 17 +++++++++++++++- google-maps-fleet_engine/Gemfile | 17 +++++++++++++++- google-shopping-css/Gemfile | 17 +++++++++++++++- google-shopping-merchant-accounts/Gemfile | 17 +++++++++++++++- google-shopping-merchant-conversions/Gemfile | 17 +++++++++++++++- google-shopping-merchant-data_sources/Gemfile | 17 +++++++++++++++- google-shopping-merchant-inventories/Gemfile | 17 +++++++++++++++- google-shopping-merchant-lfp/Gemfile | 17 +++++++++++++++- .../Gemfile | 17 +++++++++++++++- google-shopping-merchant-products/Gemfile | 17 +++++++++++++++- google-shopping-merchant-promotions/Gemfile | 17 +++++++++++++++- google-shopping-merchant-quota/Gemfile | 17 +++++++++++++++- google-shopping-merchant-reports/Gemfile | 17 +++++++++++++++- google-shopping-merchant-reviews/Gemfile | 17 +++++++++++++++- 20 files changed, 320 insertions(+), 25 deletions(-) diff --git a/google-cloud-web_security_scanner/Gemfile b/google-cloud-web_security_scanner/Gemfile index c04e9d9ee866..c910a5d2e41e 100644 --- a/google-cloud-web_security_scanner/Gemfile +++ b/google-cloud-web_security_scanner/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-web_security_scanner-v1", path: "../google-cloud-web_security_scanner-v1" -gem "google-cloud-web_security_scanner-v1beta", path: "../google-cloud-web_security_scanner-v1beta" +local_dependencies = ["google-cloud-web_security_scanner-v1", "google-cloud-web_security_scanner-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-web_security_scanner.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-workflows/Gemfile b/google-cloud-workflows/Gemfile index 0ab7ffd4c7e4..f812b371cc5f 100644 --- a/google-cloud-workflows/Gemfile +++ b/google-cloud-workflows/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-workflows-v1", path: "../google-cloud-workflows-v1" -gem "google-cloud-workflows-v1beta", path: "../google-cloud-workflows-v1beta" +local_dependencies = ["google-cloud-workflows-v1", "google-cloud-workflows-v1beta", "google-cloud-workflows-executions-v1", "google-cloud-workflows-executions-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-workflows.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" @@ -12,5 +26,3 @@ gem "minitest-rg", "~> 5.3" gem "rake", ">= 13.0" gem "redcarpet", "~> 3.6" gem "yard", "~> 0.9" -gem "google-cloud-workflows-executions-v1", path: "../google-cloud-workflows-executions-v1" -gem "google-cloud-workflows-executions-v1beta", path: "../google-cloud-workflows-executions-v1beta" diff --git a/google-cloud-workstations/Gemfile b/google-cloud-workstations/Gemfile index 314589de5147..22f3d67587c7 100644 --- a/google-cloud-workstations/Gemfile +++ b/google-cloud-workstations/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-workstations-v1", path: "../google-cloud-workstations-v1" -gem "google-cloud-workstations-v1beta", path: "../google-cloud-workstations-v1beta" +local_dependencies = ["google-cloud-workstations-v1", "google-cloud-workstations-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-workstations.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-iam-client/Gemfile b/google-iam-client/Gemfile index 65e03a4cc5f8..18bab2b116b8 100644 --- a/google-iam-client/Gemfile +++ b/google-iam-client/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-iam-v2", path: "../google-iam-v2" +local_dependencies = ["google-iam-v2"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-iam.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-iam-credentials/Gemfile b/google-iam-credentials/Gemfile index c1a6b756f5a2..40c5f0fcef06 100644 --- a/google-iam-credentials/Gemfile +++ b/google-iam-credentials/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-iam-credentials-v1", path: "../google-iam-credentials-v1" +local_dependencies = ["google-iam-credentials-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-iam-credentials.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-identity-access_context_manager/Gemfile b/google-identity-access_context_manager/Gemfile index c3735d76c267..5ea4a8c8aba4 100644 --- a/google-identity-access_context_manager/Gemfile +++ b/google-identity-access_context_manager/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-identity-access_context_manager-v1", path: "../google-identity-access_context_manager-v1" +local_dependencies = ["google-identity-access_context_manager-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-identity-access_context_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-maps-fleet_engine-delivery/Gemfile b/google-maps-fleet_engine-delivery/Gemfile index 14bde4ae903d..b7c2e68dd604 100644 --- a/google-maps-fleet_engine-delivery/Gemfile +++ b/google-maps-fleet_engine-delivery/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-maps-fleet_engine-delivery-v1", path: "../google-maps-fleet_engine-delivery-v1" +local_dependencies = ["google-maps-fleet_engine-delivery-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-maps-fleet_engine-delivery.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-maps-fleet_engine/Gemfile b/google-maps-fleet_engine/Gemfile index f623bbf2097d..994c51ba1cba 100644 --- a/google-maps-fleet_engine/Gemfile +++ b/google-maps-fleet_engine/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-maps-fleet_engine-v1", path: "../google-maps-fleet_engine-v1" +local_dependencies = ["google-maps-fleet_engine-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-maps-fleet_engine.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-shopping-css/Gemfile b/google-shopping-css/Gemfile index 06bf080e35ab..387131c81102 100644 --- a/google-shopping-css/Gemfile +++ b/google-shopping-css/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-css-v1", path: "../google-shopping-css-v1" +local_dependencies = ["google-shopping-css-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-css.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-shopping-merchant-accounts/Gemfile b/google-shopping-merchant-accounts/Gemfile index a28224986e63..29af037666da 100644 --- a/google-shopping-merchant-accounts/Gemfile +++ b/google-shopping-merchant-accounts/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-accounts-v1beta", path: "../google-shopping-merchant-accounts-v1beta" +local_dependencies = ["google-shopping-merchant-accounts-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-accounts.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-shopping-merchant-conversions/Gemfile b/google-shopping-merchant-conversions/Gemfile index 3264d4cea710..3bd17bb71d69 100644 --- a/google-shopping-merchant-conversions/Gemfile +++ b/google-shopping-merchant-conversions/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-conversions-v1beta", path: "../google-shopping-merchant-conversions-v1beta" +local_dependencies = ["google-shopping-merchant-conversions-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-conversions.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-shopping-merchant-data_sources/Gemfile b/google-shopping-merchant-data_sources/Gemfile index f3a8fa983644..302b383eff10 100644 --- a/google-shopping-merchant-data_sources/Gemfile +++ b/google-shopping-merchant-data_sources/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-data_sources-v1beta", path: "../google-shopping-merchant-data_sources-v1beta" +local_dependencies = ["google-shopping-merchant-data_sources-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-data_sources.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-shopping-merchant-inventories/Gemfile b/google-shopping-merchant-inventories/Gemfile index 97949c8c5fa7..407a26942eaa 100644 --- a/google-shopping-merchant-inventories/Gemfile +++ b/google-shopping-merchant-inventories/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-inventories-v1beta", path: "../google-shopping-merchant-inventories-v1beta" +local_dependencies = ["google-shopping-merchant-inventories-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-inventories.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-shopping-merchant-lfp/Gemfile b/google-shopping-merchant-lfp/Gemfile index fb4c69612bb6..4cc637bc6aca 100644 --- a/google-shopping-merchant-lfp/Gemfile +++ b/google-shopping-merchant-lfp/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-lfp-v1beta", path: "../google-shopping-merchant-lfp-v1beta" +local_dependencies = ["google-shopping-merchant-lfp-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-lfp.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-shopping-merchant-notifications/Gemfile b/google-shopping-merchant-notifications/Gemfile index ca62698cda9e..fb430309f37d 100644 --- a/google-shopping-merchant-notifications/Gemfile +++ b/google-shopping-merchant-notifications/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-notifications-v1beta", path: "../google-shopping-merchant-notifications-v1beta" +local_dependencies = ["google-shopping-merchant-notifications-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-notifications.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-shopping-merchant-products/Gemfile b/google-shopping-merchant-products/Gemfile index 24b207a70ffb..c3f7b5a35ed9 100644 --- a/google-shopping-merchant-products/Gemfile +++ b/google-shopping-merchant-products/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-products-v1beta", path: "../google-shopping-merchant-products-v1beta" +local_dependencies = ["google-shopping-merchant-products-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-products.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-shopping-merchant-promotions/Gemfile b/google-shopping-merchant-promotions/Gemfile index 485001f6b7c9..17c927f07d33 100644 --- a/google-shopping-merchant-promotions/Gemfile +++ b/google-shopping-merchant-promotions/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-promotions-v1beta", path: "../google-shopping-merchant-promotions-v1beta" +local_dependencies = ["google-shopping-merchant-promotions-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-promotions.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-shopping-merchant-quota/Gemfile b/google-shopping-merchant-quota/Gemfile index f4d1f3dca67a..692d08fccb7b 100644 --- a/google-shopping-merchant-quota/Gemfile +++ b/google-shopping-merchant-quota/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-quota-v1beta", path: "../google-shopping-merchant-quota-v1beta" +local_dependencies = ["google-shopping-merchant-quota-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-quota.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-shopping-merchant-reports/Gemfile b/google-shopping-merchant-reports/Gemfile index 07b4ad313049..1d0e7f4e9102 100644 --- a/google-shopping-merchant-reports/Gemfile +++ b/google-shopping-merchant-reports/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-reports-v1beta", path: "../google-shopping-merchant-reports-v1beta" +local_dependencies = ["google-shopping-merchant-reports-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-reports.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-shopping-merchant-reviews/Gemfile b/google-shopping-merchant-reviews/Gemfile index 926bd2bba85a..6a18dfd6c28f 100644 --- a/google-shopping-merchant-reviews/Gemfile +++ b/google-shopping-merchant-reviews/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-shopping-merchant-reviews-v1beta", path: "../google-shopping-merchant-reviews-v1beta" +local_dependencies = ["google-shopping-merchant-reviews-v1beta"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-shopping-merchant-reviews.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"