Do not run bundle install when generating a new plugin.

Since bundler 1.12.0, the gemspec is validated so the `bundle install`
command will fail just after the gem is created causing confusion to the
users. This change was a bug fix to correctly validate gemspecs.

Author: rafaelfranca

railties/CHANGELOG.md

@@ -1,3 +1,12 @@
+*   Do not run `bundle install` when generating a new plugin.
+
+    Since bundler 1.12.0, the gemspec is validated so the `bundle install`
+    command will fail just after the gem is created causing confusion to the
+    users. This change was a bug fix to correctly validate gemspecs.
+
+    *Rafael Mendonça França*
+
+
 ## Rails 4.2.7.rc1 (June 30, 2016) ##
 
 *   No changes.

railties/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -241,7 +241,7 @@ def finish_template
         build(:leftovers)
       end
 
-      public_task :apply_rails_template, :run_bundle
+      public_task :apply_rails_template
 
       def name
         @name ||= begin

railties/test/generators/app_generator_test.rb

@@ -420,6 +420,21 @@ def test_web_console
     assert_gem 'web-console'
   end
 
+  def test_generation_runs_bundle_install
+    assert_generates_with_bundler
+  end
+
+  def test_dev_option
+    assert_generates_with_bundler dev: true
+    rails_path = File.expand_path('../../..', Rails.root)
+    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
+  end
+
+  def test_edge_option
+    assert_generates_with_bundler edge: true
+    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("4-2-stable")}["']$}
+  end
+
   def test_spring
     run_generator
     assert_gem 'spring'
@@ -518,15 +533,22 @@ def test_after_bundle_callback
 
   protected
 
-  def action(*args, &block)
-    capture(:stdout) { generator.send(*args, &block) }
-  end
+    def action(*args, &block)
+      capture(:stdout) { generator.send(*args, &block) }
+    end
 
-  def assert_gem(gem, constraint = nil)
-    if constraint
-      assert_file "Gemfile", /^\s*gem\s+["']#{gem}["'], #{constraint}$*/
-    else
-      assert_file "Gemfile", /^\s*gem\s+["']#{gem}["']$*/
+    def assert_gem(gem, constraint = nil)
+      if constraint
+        assert_file "Gemfile", /^\s*gem\s+["']#{gem}["'], #{constraint}$*/
+      else
+        assert_file "Gemfile", /^\s*gem\s+["']#{gem}["']$*/
+      end
+    end
+
+    def assert_generates_with_bundler(options = {})
+      generator([destination_root], options)
+      generator.expects(:bundle_command).with('install').once
+      generator.stubs(:bundle_command).with('exec spring binstub --all')
+      quietly { generator.invoke_all }
     end
-  end
 end

railties/test/generators/plugin_generator_test.rb

@@ -158,13 +158,32 @@ def test_ensure_that_database_option_is_passed_to_app_generator
     assert_file "test/dummy/config/database.yml", /postgres/
   end
 
-  def test_generation_runs_bundle_install_with_full_and_mountable
-    result = run_generator [destination_root, "--mountable", "--full", "--dev"]
-    assert_match(/run  bundle install/, result)
-    assert $?.success?, "Command failed: #{result}"
-    assert_file "#{destination_root}/Gemfile.lock" do |contents|
-      assert_match(/bukkits/, contents)
-    end
+  def test_generation_runs_bundle_install
+    generator([destination_root])
+    generator.expects(:bundle_command).with('install').never
+    quietly { generator.invoke_all }
+  end
+
+  def test_dev_option
+    generator([destination_root], dev: true)
+    generator.expects(:bundle_command).with('install').never
+    quietly { generator.invoke_all }
+    rails_path = File.expand_path('../../..', Rails.root)
+    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
+  end
+
+  def test_edge_option
+    generator([destination_root], edge: true)
+    generator.expects(:bundle_command).with('install').never
+    quietly { generator.invoke_all }
+    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("4-2-stable")}["']$}
+  end
+
+  def test_generation_does_not_run_bundle_install_with_full_and_mountable
+    generator([destination_root], mountable: true, full: true, dev: true)
+    generator.expects(:bundle_command).with('install').never
+    quietly { generator.invoke_all }
+    assert_no_file "#{destination_root}/Gemfile.lock"
   end
 
   def test_skipping_javascripts_without_mountable_option

railties/test/generators/shared_generator_tests.rb

@@ -26,17 +26,6 @@ def test_skeleton_is_created
     default_files.each { |path| assert_file path }
   end
 
-  def assert_generates_with_bundler(options = {})
-    generator([destination_root], options)
-    generator.expects(:bundle_command).with('install').once
-    generator.stubs(:bundle_command).with('exec spring binstub --all')
-    quietly { generator.invoke_all }
-  end
-
-  def test_generation_runs_bundle_install
-    assert_generates_with_bundler
-  end
-
   def test_plugin_new_generate_pretend
     run_generator ["testapp", "--pretend"]
     default_files.each{ |path| assert_no_file File.join("testapp",path) }
@@ -104,17 +93,6 @@ def test_template_is_executed_when_supplied_an_https_path
     quietly { assert_match(/It works!/, capture(:stdout) { generator.invoke_all }) }
   end
 
-  def test_dev_option
-    assert_generates_with_bundler dev: true
-    rails_path = File.expand_path('../../..', Rails.root)
-    assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
-  end
-
-  def test_edge_option
-    assert_generates_with_bundler edge: true
-    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("4-2-stable")}["']$$}
-  end
-
   def test_skip_gemfile
     generator([destination_root], skip_gemfile: true).expects(:bundle_command).never
     quietly { generator.invoke_all }