diff --git a/lib/cybele/app_builder.rb b/lib/cybele/app_builder.rb index d500aef..8ae2794 100644 --- a/lib/cybele/app_builder.rb +++ b/lib/cybele/app_builder.rb @@ -80,6 +80,7 @@ def generate_config generate 'config:install' run 'cp config/settings/development.yml config/settings/staging.yml' append_file('config/settings.yml', template_content('settings.yml.erb')) + remove_file 'config/settings.local.yml', force: true end def generate_rollbar @@ -95,10 +96,6 @@ def setup_gitignore_files copy_file 'cybele_gitignore', '.gitignore' end - def remove_setting_local_yml_file - remove_file 'config/settings.local.yml', force: true - end - def setup_gitignore_folders %w[ app/assets/images diff --git a/lib/cybele/generators/app_generator.rb b/lib/cybele/generators/app_generator.rb index a83b8f3..80811d5 100644 --- a/lib/cybele/generators/app_generator.rb +++ b/lib/cybele/generators/app_generator.rb @@ -175,11 +175,6 @@ def configure_locale_language build :configure_locale_language end - def remove_settings_local_yml_files - say 'Remove config/settings.local.yml file', :green - build :remove_setting_local_yml_file - end - def setup_show_for return if @options[:skip_show_for] say 'Generate show_for', :green diff --git a/spec/features/new_default_project_spec.rb b/spec/features/new_default_project_spec.rb index da27a0b..0b7393c 100644 --- a/spec/features/new_default_project_spec.rb +++ b/spec/features/new_default_project_spec.rb @@ -368,8 +368,4 @@ it 'uses pronto' do pronto_test end - - it 'remove settings.local.yml file' do - expect(File).not_to exist(file_project_path('config/settings.local.yml')) - end end diff --git a/spec/features/new_not_default_project_spec.rb b/spec/features/new_not_default_project_spec.rb index b639783..21f01ae 100644 --- a/spec/features/new_not_default_project_spec.rb +++ b/spec/features/new_not_default_project_spec.rb @@ -305,8 +305,4 @@ it 'uses pronto' do pronto_test end - - it 'remove settings.local.yml file' do - expect(File).not_to exist(file_project_path('config/settings.local.yml')) - end end diff --git a/spec/support/config_test_helper.rb b/spec/support/config_test_helper.rb index feee423..806f4bd 100644 --- a/spec/support/config_test_helper.rb +++ b/spec/support/config_test_helper.rb @@ -4,6 +4,7 @@ module ConfigTestHelper def config_test gemfile_file = content('Gemfile') expect(gemfile_file).to match(/^gem 'config'/) + expect(File).not_to exist(file_project_path('config/settings.local.yml')) config_development_file_test config_staging_file_test