diff --git a/lib/engine_cart/configuration.rb b/lib/engine_cart/configuration.rb index 093136e..ebd9ce2 100644 --- a/lib/engine_cart/configuration.rb +++ b/lib/engine_cart/configuration.rb @@ -50,7 +50,13 @@ def templates_path ## # Additional options when generating a test rails application def rails_options - options[:rails_options] + [rails_options_defaults, options[:rails_options]].flatten.uniq + end + + ## + # Default options when generating a test rails application + def rails_options_defaults + ['--skip-git', '--skip_spring'] end def default_destination @@ -95,4 +101,4 @@ def default_configuration_paths ['~/.engine_cart.yml', '.engine_cart.yml'] end end -end \ No newline at end of file +end diff --git a/lib/engine_cart/tasks/engine_cart.rake b/lib/engine_cart/tasks/engine_cart.rake index e5a5061..5e174a9 100644 --- a/lib/engine_cart/tasks/engine_cart.rake +++ b/lib/engine_cart/tasks/engine_cart.rake @@ -36,7 +36,7 @@ namespace :engine_cart do # Using the Rails generator directly, instead of shelling out, to # ensure we use the right version of Rails. - Rails::Generators::AppGenerator.start(['internal', '--skip_spring', EngineCart.rails_options, ("-m #{EngineCart.template}" if EngineCart.template)].compact) + Rails::Generators::AppGenerator.start(['internal', *EngineCart.rails_options, ("-m #{EngineCart.template}" if EngineCart.template)].compact) end exit 0 end