Skip to content

Commit

Permalink
fix: Wrappers load release dependencies if local dependencies do not …
Browse files Browse the repository at this point in the history
…match (#1158)
  • Loading branch information
dazuma authored Feb 4, 2025
1 parent 74d5c01 commit c073304
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 13 deletions.
4 changes: 2 additions & 2 deletions gapic-generator-ads/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ GEM
rainbow (3.1.1)
redcarpet (3.6.0)
regexp_parser (2.10.0)
rubocop (1.71.0)
rubocop (1.71.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.38.0)
Expand Down
4 changes: 2 additions & 2 deletions gapic-generator-cloud/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ GEM
rainbow (3.1.1)
redcarpet (3.6.0)
regexp_parser (2.10.0)
rubocop (1.71.0)
rubocop (1.71.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.38.0)
Expand Down
19 changes: 16 additions & 3 deletions gapic-generator-cloud/templates/cloud/wrapper_gem/gemfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,22 @@ source "https://rubygems.org"

gemspec

<%- gem.versioned_gems.each do |name| -%>
gem "<%= name %>", path: "../<%= name %>"
<%- end -%>
local_dependencies = <%= gem.versioned_gems.inspect %>

main_spec = gemspecs.last || Bundler.load_gemspec(File.join __dir__, "<%= gem.name %>.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"
Expand Down
4 changes: 2 additions & 2 deletions gapic-generator/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ GEM
rainbow (3.1.1)
redcarpet (3.6.0)
regexp_parser (2.10.0)
rubocop (1.71.0)
rubocop (1.71.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
rubocop-ast (>= 1.38.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.38.0)
Expand Down
17 changes: 16 additions & 1 deletion shared/output/cloud/compute_small_wrapper/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
17 changes: 16 additions & 1 deletion shared/output/cloud/language_wrapper/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,22 @@ source "https://rubygems.org"

gemspec

gem "google-cloud-language-v1", path: "../google-cloud-language-v1"
local_dependencies = ["google-cloud-language-v1"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-language.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"
Expand Down
18 changes: 16 additions & 2 deletions shared/output/cloud/secretmanager_wrapper/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,22 @@ source "https://rubygems.org"

gemspec

gem "google-cloud-secret_manager-v1", path: "../google-cloud-secret_manager-v1"
gem "google-cloud-secret_manager-v1beta1", path: "../google-cloud-secret_manager-v1beta1"
local_dependencies = ["google-cloud-secret_manager-v1", "google-cloud-secret_manager-v1beta1"]

main_spec = gemspecs.last || Bundler.load_gemspec(File.join(__dir__, "google-cloud-secret_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"
Expand Down

0 comments on commit c073304

Please sign in to comment.