diff options
author | Andre Arko <andre@arko.net> | 2015-05-18 11:45:03 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2015-05-18 11:45:03 -0700 |
commit | bac16a99b814a193d5c722f87171e764cddf7f2a (patch) | |
tree | cef9f12fe0a725b82945ae97e07f351b4fc9cf12 | |
parent | 99dae2ae54ac2ebe745d47f1ef0896eb2d18c71e (diff) | |
download | bundler-bac16a99b814a193d5c722f87171e764cddf7f2a.tar.gz |
consistent use of Bundler.ui in inline installs
-rw-r--r-- | lib/bundler/cli.rb | 1 | ||||
-rw-r--r-- | lib/bundler/cli/install.rb | 1 | ||||
-rw-r--r-- | lib/bundler/inline.rb | 11 | ||||
-rw-r--r-- | spec/runtime/inline_spec.rb | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index cf30589673..e679e5e172 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -19,7 +19,6 @@ module Bundler custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile] ENV['BUNDLE_GEMFILE'] = File.expand_path(custom_gemfile) if custom_gemfile Bundler.settings[:retry] = options[:retry] if options[:retry] - Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui) auto_install if AUTO_INSTALL_CMDS.include?(current_cmd) rescue UnknownArgumentError => e raise InvalidOption, e.message diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index f7c046d433..445040e1ea 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -103,6 +103,7 @@ module Bundler definition = Bundler.definition definition.validate_ruby! + Installer.install(Bundler.root, definition, options) Bundler.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.settings[:frozen] diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb index b38a925df2..6f674822d2 100644 --- a/lib/bundler/inline.rb +++ b/lib/bundler/inline.rb @@ -37,10 +37,19 @@ def gemfile(install = false, &gemfile) builder = Bundler::Dsl.new builder.instance_eval(&gemfile) + definition = builder.to_definition(nil, true) def definition.lock(file); end definition.validate_ruby! - Bundler::Installer.install(Bundler.root, definition, :system => true) if install + + if install + Bundler.ui = Bundler::UI::Shell.new + Bundler::Installer.install(Bundler.root, definition, :system => true) + Bundler::Installer.post_install_messages.each do |name, message| + Bundler.ui.info "Post install message from #{name}:\n#{message}" + end + end + runtime = Bundler::Runtime.new(nil, definition) runtime.setup_environment runtime.setup.require diff --git a/spec/runtime/inline_spec.rb b/spec/runtime/inline_spec.rb index 176c962953..1e07692636 100644 --- a/spec/runtime/inline_spec.rb +++ b/spec/runtime/inline_spec.rb @@ -82,7 +82,7 @@ describe "bundler/inline#gemfile" do end RUBY - expect(out).to eq("Rack's post install message") + expect(out).to include("Rack's post install message") expect(exitstatus).to be_zero if exitstatus end end |