diff options
| author | Ben Pickles <spideryoung@gmail.com> | 2015-05-22 13:24:48 +0100 |
|---|---|---|
| committer | Ben Pickles <spideryoung@gmail.com> | 2015-05-22 13:32:06 +0100 |
| commit | 46fedb478217a5bfbccd13ed87212e51f6e77469 (patch) | |
| tree | 55cd1dcdc4ca025d6b3fa2dddef9eddfb8bdabf9 /railties | |
| parent | 3873fc5c1c5836d41b288840773ecd1704953f29 (diff) | |
| download | rails-46fedb478217a5bfbccd13ed87212e51f6e77469.tar.gz rails-46fedb478217a5bfbccd13ed87212e51f6e77469.tar.bz2 rails-46fedb478217a5bfbccd13ed87212e51f6e77469.zip | |
Omit .keep in .gitignore when generated with --skip-keeps.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 6 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 2 | ||||
| -rw-r--r-- | railties/test/generators/shared_generator_tests.rb | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 119a7cb829..061fafb156 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -174,6 +174,10 @@ module Rails options[value] ? '# ' : '' end + def keeps? + !options[:skip_keeps] + end + def sqlite3? !options[:skip_active_record] && options[:database] == 'sqlite3' end @@ -355,7 +359,7 @@ module Rails end def keep_file(destination) - create_file("#{destination}/.keep") unless options[:skip_keeps] + create_file("#{destination}/.keep") if keeps? end end end diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index 7c6f2098b8..e4a00ad181 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore +++ b/railties/lib/rails/generators/rails/app/templates/gitignore @@ -15,5 +15,7 @@ <% end -%> # Ignore all logfiles and tempfiles. /log/* +<% if keeps? -%> !/log/.keep +<% end -%> /tmp diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index 3bcf3894ce..3a2195035f 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -138,7 +138,11 @@ module SharedGeneratorTests def test_skip_keeps run_generator [destination_root, '--skip-keeps', '--full'] - assert_file('.gitignore') + + assert_file '.gitignore' do |content| + assert_no_match(/\.keep/, content) + end + assert_no_file('app/mailers/.keep') end end |