Permalink
Browse files

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
  • Loading branch information...
2 parents aa89bf7 + 5c1109a commit 64a54c3f9e01da5a86564de613191b03195a858c @josevalim josevalim committed Apr 30, 2012
@@ -49,6 +49,9 @@ def self.add_shared_options_for(name)
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"
@@ -97,6 +97,11 @@ def log
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
@@ -250,6 +250,13 @@ def test_inclusion_of_javascript_runtime
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'

0 comments on commit 64a54c3

Please sign in to comment.