diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2017-06-21 16:10:02 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2017-06-23 12:43:55 -0500 |
commit | 864fe937a1e587455592cddc098fd0131ba914cd (patch) | |
tree | 5c77a482638218f138674bbb582fabf15be4b2c3 | |
parent | 47256d20cb05ebc724ee67173094682153b6b4aa (diff) | |
download | bundler-864fe937a1e587455592cddc098fd0131ba914cd.tar.gz |
[Init] Don’t create a gems.rb when a Gemfile exists
-rw-r--r-- | lib/bundler/cli/init.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/bundler/cli/init.rb b/lib/bundler/cli/init.rb index 16330f6c6d..ce41b2d784 100644 --- a/lib/bundler/cli/init.rb +++ b/lib/bundler/cli/init.rb @@ -8,7 +8,7 @@ module Bundler def run if File.exist?(gemfile) - Bundler.ui.error "#{gemfile} already exists at #{SharedHelpers.pwd}/#{gemfile}" + Bundler.ui.error "#{gemfile} already exists at #{File.expand_path(gemfile)}" exit 1 end @@ -35,7 +35,11 @@ module Bundler private def gemfile - @gemfile ||= Bundler.feature_flag.init_gems_rb? ? "gems.rb" : "Gemfile" + @gemfile ||= begin + Bundler.default_gemfile + rescue GemfileNotFound + Bundler.feature_flag.init_gems_rb? ? "gems.rb" : "Gemfile" + end end end end |