lib/bundler/source/rubygems.rb in bundler-1.4.0.pre.1 vs lib/bundler/source/rubygems.rb in bundler-1.4.0.pre.2
- old
+ new
@@ -67,15 +67,14 @@
@specs ||= fetch_specs
end
def install(spec)
if installed_specs[spec].any?
- Bundler.ui.info "Using #{spec.name} (#{spec.version})"
- return
+ return ["Using #{spec.name} (#{spec.version})", nil]
end
- Bundler.ui.info "Installing #{spec.name} (#{spec.version})"
+ install_message = "Installing #{spec.name} (#{spec.version})"
path = cached_gem(spec)
if Bundler.requires_sudo?
install_path = Bundler.tmp
bin_path = install_path.join("bin")
else
@@ -103,13 +102,12 @@
spec.executables.each do |exe|
Bundler.mkdir_p Bundler.system_bindir
Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.system_bindir}"
end
end
- Bundler.ui.info "Installed #{spec.name} (#{spec.version})"
installed_spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
- spec.post_install_message
+ [install_message, spec.post_install_message]
end
def cache(spec)
cached_path = cached_gem(spec)
raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." unless cached_path