From 07fedc3f9ee972d5da43f8a77a162bf2c9ca4b1b Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Fri, 14 Jul 2017 17:59:30 +0300 Subject: Default the install path to ./bundle in Bundler 2 --- lib/bundler/source/rubygems.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bundler/source') diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index 0ac45b3d70..511216a5c5 100644 --- a/lib/bundler/source/rubygems.rb +++ b/lib/bundler/source/rubygems.rb @@ -377,7 +377,6 @@ module Bundler return false unless spec.remote spec.fetch_platform - Bundler.ui.confirm("Fetching #{version_message(spec)}") download_path = requires_sudo? ? Bundler.tmp(spec.full_name) : rubygems_dir gem_path = "#{rubygems_dir}/cache/#{spec.full_name}.gem" @@ -443,6 +442,7 @@ module Bundler end else uri = spec.remote.uri + Bundler.ui.confirm("Fetching #{version_message(spec)}") Bundler.rubygems.download_gem(spec, uri, download_path) cache_globally(spec, local_path) end -- cgit v1.2.1 From dcd9963876f1405a19671a6bd34d42a6add9e16a Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Fri, 21 Jul 2017 14:21:56 -0500 Subject: Update the specs for the default bundle path being ./.bundle --- lib/bundler/source/git.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/bundler/source') diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb index 020cf74766..eb605771f4 100644 --- a/lib/bundler/source/git.rb +++ b/lib/bundler/source/git.rb @@ -172,13 +172,11 @@ module Bundler print_using_message "Using #{version_message(spec)} from #{self}" - if requires_checkout? && !@copied && !force + if (requires_checkout? && !@copied) || force Bundler.ui.debug " * Checking out revision: #{ref}" git_proxy.copy_to(install_path, submodules) serialize_gemspecs_in(install_path) @copied = true - elsif force - git_proxy.copy_to(install_path, submodules) end generate_bin_options = { :disable_extensions => !Bundler.rubygems.spec_missing_extensions?(spec), :build_args => options[:build_args] } -- cgit v1.2.1