Merge pull request #5530 from malclocke/add_option_to_skip_index.html_on_rails_generate

Added a generator option to skip the public/index.html file

3 files changed, 15 insertions, 0 deletions

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 8c8ed5010f..b677e974c8 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -49,6 +49,9 @@ module Rails
         class_option :skip_javascript,    :type => :boolean, :aliases => "-J", :default => false,
                                           :desc => "Skip JavaScript files"
 
+        class_option :skip_index_html,    :type => :boolean, :aliases => "-I", :default => false,
+                                          :desc => "Skip public/index.html and app/assets/images/rails.png files"
+
         class_option :dev,                :type => :boolean, :default => false,
                                           :desc => "Setup the #{name} with Gemfile pointing to your Rails checkout"
 
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index f0745df667..c06b0f8994 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -97,6 +97,11 @@ module Rails
 
     def public_directory
       directory "public", "public", :recursive => false
+      if options[:skip_index_html]
+        remove_file "public/index.html"
+        remove_file 'app/assets/images/rails.png'
+        git_keep 'app/assets/images'
+      end
     end
 
     def script
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index ef6877ed30..94983c504c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -250,6 +250,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_generator_if_skip_index_html_is_given
+    run_generator [destination_root, "--skip-index-html"]
+    assert_no_file "public/index.html"
+    assert_no_file "app/assets/images/rails.png"
+    assert_file "app/assets/images/.gitkeep"
+  end
+
   def test_creation_of_a_test_directory
     run_generator
     assert_file 'test'