Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Avoid undefined Bundler::Plugin::API::Source exception #5459

Merged
merged 1 commit into from
Feb 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/bundler/plugin/api/source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,12 @@ def gem_install_dir
def root
Bundler.root
end

# @private
# Returns true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol this comment 😂

def bundler_plugin_api_source?
true
end
end
end
end
Expand Down
6 changes: 5 additions & 1 deletion lib/bundler/rubygems_ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ def source
attr_writer :full_gem_path unless instance_methods.include?(:full_gem_path=)

def full_gem_path
if source.respond_to?(:path) || source.is_a?(Bundler::Plugin::API::Source)
# this cannot check source.is_a?(Bundler::Plugin::API::Source)
# because that _could_ trip the autoload, and if there are unresolved
# gems at that time, this method could be called inside another require,
# thus raising with that constant being undefined. Better to check a method
if source.respond_to?(:path) || (source.respond_to?(:bundler_plugin_api_source?) && source.bundler_plugin_api_source?)
Pathname.new(loaded_from).dirname.expand_path(source.root).to_s.untaint
else
rg_full_gem_path
Expand Down
20 changes: 20 additions & 0 deletions spec/install/gemfile/gemspec_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,26 @@
expect(@err).not_to match(/ahh/)
end

it "allows the gemspec to activate other gems" do
# see https://github.com/bundler/bundler/issues/5409
#
# issue was caused by rubygems having an unresolved gem during a require,
# so emulate that
system_gems %w(rack-1.0.0 rack-0.9.1 rack-obama-1.0)

build_lib("foo", :path => bundled_app)
gemspec = bundled_app("foo.gemspec").read
bundled_app("foo.gemspec").open("w") do |f|
f.write "#{gemspec.strip}.tap { gem 'rack-obama'; require 'rack-obama' }"
end

install_gemfile! <<-G
gemspec
G

expect(the_bundle).to include_gem "foo 1.0"
end

it "allows conflicts" do
build_lib("foo", :path => tmp.join("foo")) do |s|
s.version = "1.0.0"
Expand Down