rename feature flag to `init_gems_rb` and PR feedback

5 files changed, 22 insertions, 9 deletions

diff --git a/lib/bundler/cli/init.rb b/lib/bundler/cli/init.rb
index ae5d68853e..16330f6c6d 100644
--- a/lib/bundler/cli/init.rb
+++ b/lib/bundler/cli/init.rb
@@ -21,21 +21,21 @@ module Bundler
 
         spec = Bundler.load_gemspec_uncached(gemspec)
 
-        puts "Writing new Gemfile to #{SharedHelpers.pwd}/#{gemfile}"
         File.open(gemfile, "wb") do |file|
           file << "# Generated from #{gemspec}\n"
           file << spec.to_gemfile
         end
       else
-        puts "Writing new #{gemfile} to #{SharedHelpers.pwd}/#{gemfile}"
         FileUtils.cp(File.expand_path("../../templates/#{gemfile}", __FILE__), gemfile)
       end
+
+      puts "Writing new #{gemfile} to #{SharedHelpers.pwd}/#{gemfile}"
     end
 
   private
 
     def gemfile
-      @gemfile ||= Bundler.feature_flag.new_gemfile_name? ? "gems.rb" : "Gemfile"
+      @gemfile ||= Bundler.feature_flag.init_gems_rb? ? "gems.rb" : "Gemfile"
     end
   end
 end
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
index a75bcfb5f7..3a4353f2af 100644
--- a/lib/bundler/feature_flag.rb
+++ b/lib/bundler/feature_flag.rb
@@ -18,7 +18,7 @@ module Bundler
     settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
     settings_flag(:error_on_stderr) { bundler_2_mode? }
-    settings_flag(:new_gemfile_name) { bundler_2_mode? }
+    settings_flag(:init_gems_rb) { bundler_2_mode? }
 
     def initialize(bundler_version)
       @bundler_version = Gem::Version.create(bundler_version)
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index d5927afd87..95833fca28 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -28,7 +28,7 @@ module Bundler
       plugins
       silence_root_warning
       error_on_stderr
-      new_gemfile_name
+      init_gems_rb
     ].freeze
 
     NUMBER_KEYS = %w[
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index 6747c2521b..18773017f8 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -224,7 +224,7 @@ learn more about their operation in [bundle install(1)][bundle-install].
    command with a private gemstash server.
 * `error_on_stderr` (`BUNDLE_ERROR_ON_STDERR`)
    Print Bundler errors to stderr
-* `new_gemfile_name` (`BUNDLE_NEW_GEMFILE_NAME`)
+* `init_gems_rb` (`BUNDLE_NEW_GEMFILE_NAME`)
    generate a new gems.rb on `bundle init` instead of the `Gemfile`
 
 In general, you should set these settings per-application by using the applicable
diff --git a/spec/commands/init_spec.rb b/spec/commands/init_spec.rb
index 7edcabd85e..7be379b510 100644
--- a/spec/commands/init_spec.rb
+++ b/spec/commands/init_spec.rb
@@ -6,6 +6,11 @@ RSpec.describe "bundle init" do
     expect(bundled_app("Gemfile")).to exist
   end
 
+  it "prints a message to the user" do
+    bundle :init
+    expect(out).to include("Writing new Gemfile")
+  end
+
   context "when a Gemfile already exists" do
     before do
       gemfile <<-G
@@ -63,8 +68,8 @@ RSpec.describe "bundle init" do
     end
   end
 
-  context "when new_gemfile_name setting is enabled" do
-    before { bundle "config new_gemfile_name true" }
+  context "when init_gems_rb setting is enabled" do
+    before { bundle "config init_gems_rb true" }
 
     it "generates a gems.rb file" do
       bundle :init
@@ -91,7 +96,7 @@ RSpec.describe "bundle init" do
     context "given --gemspec option" do
       let(:spec_file) { tmp.join("test.gemspec") }
 
-      it "should generate from an existing gemspec" do
+      before do
         File.open(spec_file, "w") do |file|
           file << <<-S
             Gem::Specification.new do |s|
@@ -101,7 +106,9 @@ RSpec.describe "bundle init" do
             end
           S
         end
+      end
 
+      it "should generate from an existing gemspec" do
         bundle :init, :gemspec => spec_file
 
         gemfile = bundled_app("gems.rb").read
@@ -110,6 +117,12 @@ RSpec.describe "bundle init" do
         expect(gemfile.scan(/gem "rspec", "= 1.2"/).size).to eq(1)
         expect(gemfile.scan(/group :development/).size).to eq(1)
       end
+
+      it "prints message to user" do
+        bundle :init, :gemspec => spec_file
+
+        expect(out).to include("Writing new gems.rb")
+      end
     end
   end
 end