KBP-127 #time 90m - Code was improved

lib/cybele.rb

@@ -5,4 +5,6 @@
 require 'cybele/helpers'
 require 'cybele/helpers/sidekiq'
 require 'cybele/helpers/responders'
+require 'cybele/helpers/simple_form'
+require 'cybele/helpers/recipient_interceptor'
 require 'cybele/app_builder'

lib/cybele/app_builder.rb

@@ -5,6 +5,8 @@ class AppBuilder < Rails::AppBuilder
     include Cybele::Helpers
     include Cybele::Helpers::Sidekiq
     include Cybele::Helpers::Responders
+    include Cybele::Helpers::SimpleForm
+    include Cybele::Helpers::RecipientInterceptor
 
     def readme
       template 'README.md.erb',
@@ -45,44 +47,24 @@ def create_database
       bundle_command 'exec rake db:create db:migrate'
     end
 
-    def configure_recipient_interceptor
-      configure_environment 'staging', template_content('staging.rb')
-    end
-
     def setup_staging_environment
       run 'cp config/environments/production.rb config/environments/staging.rb'
     end
 
     def generate_config
       generate 'config:install'
       run 'cp config/settings/development.yml config/settings/staging.yml'
-    end
-
-    def fill_settings_yml
-      prepend_file 'config/settings.yml', template_content('settings.yml.erb')
+      append_file('config/settings.yml', template_content('settings.yml.erb'))
     end
 
     def generate_rollbar
       generate 'rollbar'
     end
 
-    def generate_simple_form
-      bundle_command 'exec rails generate simple_form:install --bootstrap -force'
-      copy_file 'config/locales/simple_form.tr.yml', 'config/locales/simple_form.tr.yml'
-    end
-
     def add_staging_secret_key_to_secrets_yml
       append_file 'config/secrets.yml', template_content('secrets.yml.erb')
     end
 
-    # Copy files
-    def copy_files
-      # Locale files
-      say 'Coping files..'
-      remove_file 'config/locales/simple_form.en.yml', force: true
-      copy_file 'config/locales/simple_form.tr.yml', 'config/locales/simple_form.tr.yml'
-    end
-
     private
 
     def configure_environment(rails_env, config)

lib/cybele/generators/app_generator.rb

@@ -89,6 +89,11 @@ def remove_files_we_dont_need
       build :remove_readme_rdoc
     end
 
+    def setup_config
+      say 'Generate config', :green
+      build :generate_config
+    end
+
     def setup_database
       if @options[:database] == 'postgresql'
         say 'Set up postgresql template', :green
@@ -121,25 +126,15 @@ def configure_recipient_interceptor
       build :configure_recipient_interceptor
     end
 
-    def setup_config
-      say 'Generate config', :green
-      build :generate_config
-    end
-
-    def fill_settings_yml
-      say 'Fill to settings.yml file', :green
-      build :fill_settings_yml
-    end
-
     def setup_rollbar
       say 'Generate rollbar', :green
       build :generate_rollbar
     end
 
     def setup_simple_form
       return if @options[:skip_simple_form]
-      say 'Generate simple form files', :green
-      build :generate_simple_form
+      say 'Setting up simple_form', :green
+      build :configure_simple_form
     end
 
     def add_staging_secret_key

lib/cybele/helpers/recipient_interceptor.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Cybele
+  module Helpers
+    module RecipientInterceptor
+      def configure_recipient_interceptor
+
+        # Add recipient_interceptor staging settings to staging environment file
+        configure_environment 'staging', template_content('recipient_interceptor_staging.rb')
+
+        # Add recipient_interceptor staging settings to staging environment file
+        append_file 'config/settings.yml', template_content('recipient_interceptor_settings.yml.erb')
+
+      end
+    end
+  end
+end

lib/cybele/helpers/simple_form.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Cybele
+  module Helpers
+    module SimpleForm
+      def configure_simple_form
+
+        # Run the simple_form generator
+        bundle_command 'exec rails generate simple_form:install --bootstrap -force'
+
+        # Remove simple_form english file
+        remove_file 'config/locales/simple_form.en.yml', force: true
+
+        # Remove simple_form turkish file
+        copy_file 'config/locales/simple_form.tr.yml', 'config/locales/simple_form.tr.yml'
+      end
+    end
+  end
+end

templates/recipient_interceptor_settings.yml.erb

@@ -0,0 +1,4 @@
+email:
+  sandbox: sandbox@#{app_name}.com
+  noreply: no-reply@#{app_name}.com
+  admin: admin@#{app_name}.com

templates/settings.yml.erb

@@ -1,14 +1 @@
-email:
-  sandbox: sandbox@#{app_name}.com
-  noreply: no-reply@#{app_name}.com
-  admin: admin@#{app_name}.com
-
 root_path: <%= ENV['ROOT_PATH'] %>
-
-smtp:
-  address: <%= ENV['SMTP_ADDRESS'] %>
-  port: 587
-  enable_starttls_auto: true
-  user_name: <%= ENV['SMTP_USER_NAME'] %>
-  password: <%= ENV['SMTP_PASSWORD'] %>
-  authentication: 'plain'