From c36eb853480133c447f21b9394ccaa8dc4ca6130 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:20:12 +0000 Subject: [PATCH] chore: wrapper Ruby client Gemfiles fall back to released GAPICs when a major version bump has occurred at HEAD (#28921) --- google-cloud-cloud_controls_partner/Gemfile | 17 ++++++++++++++++- google-cloud-cloud_dms/Gemfile | 17 ++++++++++++++++- google-cloud-cloud_quotas/Gemfile | 17 ++++++++++++++++- .../Gemfile | 17 ++++++++++++++++- google-cloud-compute/Gemfile | 17 ++++++++++++++++- google-cloud-confidential_computing/Gemfile | 17 ++++++++++++++++- google-cloud-config_service/Gemfile | 17 ++++++++++++++++- google-cloud-connectors/Gemfile | 17 ++++++++++++++++- google-cloud-contact_center_insights/Gemfile | 17 ++++++++++++++++- google-cloud-container/Gemfile | 18 ++++++++++++++++-- google-cloud-container_analysis/Gemfile | 17 ++++++++++++++++- google-cloud-data_catalog-lineage/Gemfile | 17 ++++++++++++++++- google-cloud-data_catalog/Gemfile | 17 ++++++++++++++++- google-cloud-data_fusion/Gemfile | 17 ++++++++++++++++- google-cloud-data_labeling/Gemfile | 17 ++++++++++++++++- google-cloud-dataflow/Gemfile | 17 ++++++++++++++++- google-cloud-dataform/Gemfile | 17 ++++++++++++++++- google-cloud-dataplex/Gemfile | 17 ++++++++++++++++- google-cloud-dataproc/Gemfile | 17 ++++++++++++++++- google-cloud-dataqna/Gemfile | 17 ++++++++++++++++- 20 files changed, 320 insertions(+), 21 deletions(-) diff --git a/google-cloud-cloud_controls_partner/Gemfile b/google-cloud-cloud_controls_partner/Gemfile index 842b6ff12078..495d1e028dd5 100644 --- a/google-cloud-cloud_controls_partner/Gemfile +++ b/google-cloud-cloud_controls_partner/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-cloud_controls_partner-v1", path: "../google-cloud-cloud_controls_partner-v1" +local_dependencies = ["google-cloud-cloud_controls_partner-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-cloud_controls_partner.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-cloud_dms/Gemfile b/google-cloud-cloud_dms/Gemfile index 2918a288797d..7a01d47670ca 100644 --- a/google-cloud-cloud_dms/Gemfile +++ b/google-cloud-cloud_dms/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-cloud_dms-v1", path: "../google-cloud-cloud_dms-v1" +local_dependencies = ["google-cloud-cloud_dms-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-cloud_dms.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-cloud_quotas/Gemfile b/google-cloud-cloud_quotas/Gemfile index d97757a8d513..a7aaaf9e411b 100644 --- a/google-cloud-cloud_quotas/Gemfile +++ b/google-cloud-cloud_quotas/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-cloud_quotas-v1", path: "../google-cloud-cloud_quotas-v1" +local_dependencies = ["google-cloud-cloud_quotas-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-cloud_quotas.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-commerce-consumer-procurement/Gemfile b/google-cloud-commerce-consumer-procurement/Gemfile index 214e79d39e60..0eac92f7626b 100644 --- a/google-cloud-commerce-consumer-procurement/Gemfile +++ b/google-cloud-commerce-consumer-procurement/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-commerce-consumer-procurement-v1", path: "../google-cloud-commerce-consumer-procurement-v1" +local_dependencies = ["google-cloud-commerce-consumer-procurement-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-commerce-consumer-procurement.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-compute/Gemfile b/google-cloud-compute/Gemfile index c97de134a39b..313e46b4236e 100755 --- a/google-cloud-compute/Gemfile +++ b/google-cloud-compute/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-compute-v1", path: "../google-cloud-compute-v1" +local_dependencies = ["google-cloud-compute-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-compute.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-confidential_computing/Gemfile b/google-cloud-confidential_computing/Gemfile index ff6a94af0785..a4a07438419f 100644 --- a/google-cloud-confidential_computing/Gemfile +++ b/google-cloud-confidential_computing/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-confidential_computing-v1", path: "../google-cloud-confidential_computing-v1" +local_dependencies = ["google-cloud-confidential_computing-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-confidential_computing.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-config_service/Gemfile b/google-cloud-config_service/Gemfile index 2efcfbb78582..ab2b495905c8 100644 --- a/google-cloud-config_service/Gemfile +++ b/google-cloud-config_service/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-config_service-v1", path: "../google-cloud-config_service-v1" +local_dependencies = ["google-cloud-config_service-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-config_service.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-connectors/Gemfile b/google-cloud-connectors/Gemfile index 8b749e654484..7d64398fd64e 100644 --- a/google-cloud-connectors/Gemfile +++ b/google-cloud-connectors/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-connectors-v1", path: "../google-cloud-connectors-v1" +local_dependencies = ["google-cloud-connectors-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-connectors.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-contact_center_insights/Gemfile b/google-cloud-contact_center_insights/Gemfile index 8d518426ba8c..5a3987b7b3c0 100644 --- a/google-cloud-contact_center_insights/Gemfile +++ b/google-cloud-contact_center_insights/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-contact_center_insights-v1", path: "../google-cloud-contact_center_insights-v1" +local_dependencies = ["google-cloud-contact_center_insights-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-contact_center_insights.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-container/Gemfile b/google-cloud-container/Gemfile index 14cd553e41a7..8fd3d8d4f08c 100644 --- a/google-cloud-container/Gemfile +++ b/google-cloud-container/Gemfile @@ -2,8 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-container-v1", path: "../google-cloud-container-v1" -gem "google-cloud-container-v1beta1", path: "../google-cloud-container-v1beta1" +local_dependencies = ["google-cloud-container-v1", "google-cloud-container-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-container.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-container_analysis/Gemfile b/google-cloud-container_analysis/Gemfile index 2f0172b8153a..602756e7b448 100644 --- a/google-cloud-container_analysis/Gemfile +++ b/google-cloud-container_analysis/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-container_analysis-v1", path: "../google-cloud-container_analysis-v1" +local_dependencies = ["google-cloud-container_analysis-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-container_analysis.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-data_catalog-lineage/Gemfile b/google-cloud-data_catalog-lineage/Gemfile index 56bc10cf69d1..fbaf7ead4f24 100644 --- a/google-cloud-data_catalog-lineage/Gemfile +++ b/google-cloud-data_catalog-lineage/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-data_catalog-lineage-v1", path: "../google-cloud-data_catalog-lineage-v1" +local_dependencies = ["google-cloud-data_catalog-lineage-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-data_catalog-lineage.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-data_catalog/Gemfile b/google-cloud-data_catalog/Gemfile index 820d93b52896..5c9b6da3168a 100644 --- a/google-cloud-data_catalog/Gemfile +++ b/google-cloud-data_catalog/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-data_catalog-v1", path: "../google-cloud-data_catalog-v1" +local_dependencies = ["google-cloud-data_catalog-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-data_catalog.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-data_fusion/Gemfile b/google-cloud-data_fusion/Gemfile index cbc750d44144..902d950af5c6 100644 --- a/google-cloud-data_fusion/Gemfile +++ b/google-cloud-data_fusion/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-data_fusion-v1", path: "../google-cloud-data_fusion-v1" +local_dependencies = ["google-cloud-data_fusion-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-data_fusion.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-data_labeling/Gemfile b/google-cloud-data_labeling/Gemfile index 2425d59306cd..4f314b915612 100644 --- a/google-cloud-data_labeling/Gemfile +++ b/google-cloud-data_labeling/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-data_labeling-v1beta1", path: "../google-cloud-data_labeling-v1beta1" +local_dependencies = ["google-cloud-data_labeling-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-data_labeling.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-dataflow/Gemfile b/google-cloud-dataflow/Gemfile index 6befda26d6ef..ece8e74cdf50 100644 --- a/google-cloud-dataflow/Gemfile +++ b/google-cloud-dataflow/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-dataflow-v1beta3", path: "../google-cloud-dataflow-v1beta3" +local_dependencies = ["google-cloud-dataflow-v1beta3"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-dataflow.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-dataform/Gemfile b/google-cloud-dataform/Gemfile index 3d73003526e1..4f14da2df24e 100644 --- a/google-cloud-dataform/Gemfile +++ b/google-cloud-dataform/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-dataform-v1beta1", path: "../google-cloud-dataform-v1beta1" +local_dependencies = ["google-cloud-dataform-v1beta1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-dataform.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-dataplex/Gemfile b/google-cloud-dataplex/Gemfile index 65f3f09227e7..49bcfa3bf37c 100644 --- a/google-cloud-dataplex/Gemfile +++ b/google-cloud-dataplex/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-dataplex-v1", path: "../google-cloud-dataplex-v1" +local_dependencies = ["google-cloud-dataplex-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-dataplex.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-dataproc/Gemfile b/google-cloud-dataproc/Gemfile index 582964a8654b..a058b38b7ffd 100644 --- a/google-cloud-dataproc/Gemfile +++ b/google-cloud-dataproc/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-dataproc-v1", path: "../google-cloud-dataproc-v1" +local_dependencies = ["google-cloud-dataproc-v1"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-dataproc.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-dataqna/Gemfile b/google-cloud-dataqna/Gemfile index 66d50c167464..656bde5a9ff1 100644 --- a/google-cloud-dataqna/Gemfile +++ b/google-cloud-dataqna/Gemfile @@ -2,7 +2,22 @@ source "https://rubygems.org" gemspec -gem "google-cloud-dataqna-v1alpha", path: "../google-cloud-dataqna-v1alpha" +local_dependencies = ["google-cloud-dataqna-v1alpha"] + +main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-dataqna.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"