Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.
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
24 changes: 13 additions & 11 deletions lib/bundler/plugin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,22 @@ def list
# @param [Pathname] gemfile path
# @param [Proc] block that can be evaluated for (inline) Gemfile
def gemfile_install(gemfile = nil, &inline)
builder = DSL.new
if block_given?
builder.instance_eval(&inline)
else
builder.eval_gemfile(gemfile)
end
definition = builder.to_definition(nil, true)
Bundler.settings.temporary(:frozen => false, :deployment => false) do
builder = DSL.new
if block_given?
builder.instance_eval(&inline)
else
builder.eval_gemfile(gemfile)
end
definition = builder.to_definition(nil, true)

return if definition.dependencies.empty?
return if definition.dependencies.empty?

plugins = definition.dependencies.map(&:name).reject {|p| index.installed? p }
installed_specs = Installer.new.install_definition(definition)
plugins = definition.dependencies.map(&:name).reject {|p| index.installed? p }
installed_specs = Installer.new.install_definition(definition)

save_plugins plugins, installed_specs, builder.inferred_plugins
save_plugins plugins, installed_specs, builder.inferred_plugins
end
rescue RuntimeError => e
unless e.is_a?(GemfileError)
Bundler.ui.error "Failed to install plugin: #{e.message}\n #{e.backtrace[0]}"
Expand Down
22 changes: 22 additions & 0 deletions spec/plugins/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,28 @@ def exec(command, args)
expect(out).to include("Installed plugin ga-plugin")
plugin_should_be_installed("ga-plugin")
end

context "in deployment mode" do
it "installs plugins" do
install_gemfile! <<-G
source 'file://#{gem_repo2}'
gem 'rack', "1.0.0"
G

install_gemfile! <<-G, forgotten_command_line_options(:deployment => true)
source 'file://#{gem_repo2}'
plugin 'foo'
gem 'rack', "1.0.0"
G

expect(out).to include("Installed plugin foo")

expect(out).to include("Bundle complete!")

expect(the_bundle).to include_gems("rack 1.0.0")
plugin_should_be_installed("foo")
end
end
end

context "inline gemfiles" do
Expand Down