KBP-131 #time 30m - code fixed

lib/cybele.rb

@@ -11,5 +11,5 @@
 require 'cybele/helpers/recipient_interceptor'
 require 'cybele/helpers/haml'
 require 'cybele/helpers/locale_language'
-require 'cybele/helpers/bullet'
+require 'cybele/helpers/dotenv'
 require 'cybele/app_builder'

lib/cybele/app_builder.rb

@@ -11,7 +11,7 @@ class AppBuilder < Rails::AppBuilder
     include Cybele::Helpers::ShowFor
     include Cybele::Helpers::Haml
     include Cybele::Helpers::LocaleLanguage
-    include Cybele::Helpers::Bullet
+    include Cybele::Helpers::Dotenv
 
     def readme
       template 'README.md.erb',
@@ -62,6 +62,10 @@ def generate_rollbar
       generate 'rollbar'
     end
 
+    def configure_bullet
+      configure_environment 'development', template_content('bullet/bullet_settings.rb')
+    end
+
     private
 
     def configure_environment(rails_env, config)

lib/cybele/generators/app_generator.rb

@@ -182,6 +182,11 @@ def setup_bullet_config
       build :configure_bullet
     end
 
+    def setup_dotenv
+      say 'Generate env.sample and .env files', :green
+      build :configure_dotenv
+    end
+
     def goodbye
       say 'Congratulations! That\'s all...', :green
     end

lib/cybele/helpers/dotenv.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Cybele
+  module Helpers
+    module Dotenv
+      def configure_dotenv
+        # Add dotenv gem
+        inject_into_file 'Gemfile', template_content('dotenv/dotenv_Gemfile.erb'),
+                          before: "# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'"
+        run_bundle
+
+        # Create dotenv files
+        template 'dotenv/env.sample.erb',
+                 'env.sample',
+                 force: true
+        template 'dotenv/.env.local.erb',
+                 '.env.local',
+                 force: true
+        template 'dotenv/.env.staging.erb',
+                 '.env.staging',
+                 force: true
+        template 'dotenv/.env.production.erb',
+                 '.env.production',
+                 force: true
+      end
+    end
+  end
+end

spec/features/new_default_project_spec.rb

@@ -122,6 +122,11 @@
     expect(gemfile_file).to match("gem 'better_errors'")
   end
 
+  it 'uses rails-i18n' do
+    gemfile_file = content('Gemfile')
+    expect(gemfile_file).to match(/^gem 'rails-i18n'/)
+  end
+
   it 'uses show_for' do
     gemfile_file = content('Gemfile')
     expect(gemfile_file).to match(/^gem 'show_for'/)
@@ -217,6 +222,27 @@
     expect(secret_file).to match('staging')
   end
 
+  it 'control env.sample and .env files' do
+    gemfile_file = content('Gemfile')
+    expect(gemfile_file).to match(/^gem 'dotenv-rails'/)
+
+    expect(File).to exist(file_project_path('env.sample'))
+    env_sample_file = content('env.sample')
+    expect(env_sample_file).to match('ROOT_PATH=http://localhost:3000')
+
+    expect(File).to exist(file_project_path('.env.local'))
+    env_local_file = content('.env.local')
+    expect(env_local_file).to match('ROOT_PATH=http://localhost:3000')
+
+    expect(File).to exist(file_project_path('.env.staging'))
+    env_staging_file = content('.env.staging')
+    expect(env_staging_file).to match('ROOT_PATH=https://staging-dummy_app.herokuapp.com')
+
+    expect(File).to exist(file_project_path('.env.production'))
+    env_production_file = content('.env.production')
+    expect(env_production_file).to match('ROOT_PATH=https://dummy_app.herokuapp.com')
+  end
+
   it 'uses haml' do
     gemfile_file = content('Gemfile')
     expect(gemfile_file).to match(/^gem 'haml'/)
@@ -232,8 +258,5 @@
 
     locale_file = content('config/environments/development.rb')
     expect(locale_file).to match('Bullet')
-
-    locale_file = content('config/environments/test.rb')
-    expect(locale_file).not_to match('Bullet')
   end
 end

spec/features/new_not_default_project_spec.rb

@@ -109,6 +109,11 @@
     expect(gemfile_file).to match("gem 'better_errors'")
   end
 
+  it 'uses rails-i18n' do
+    gemfile_file = content('Gemfile')
+    expect(gemfile_file).to match(/^gem 'rails-i18n'/)
+  end
+
   it 'do not use show_for' do
     gemfile_file = content('Gemfile')
     expect(gemfile_file).not_to match(/^gem 'show_for'/)
@@ -188,9 +193,6 @@
 
     locale_file = content('config/environments/development.rb')
     expect(locale_file).to match('Bullet')
-
-    locale_file = content('config/environments/test.rb')
-    expect(locale_file).not_to match('Bullet')
   end
 
   it 'do not use simple_form' do
@@ -208,6 +210,27 @@
     expect(secret_file).to match('staging')
   end
 
+  it 'control env.sample and .env files' do
+    gemfile_file = content('Gemfile')
+    expect(gemfile_file).to match(/^gem 'dotenv-rails'/)
+
+    expect(File).to exist(file_project_path('env.sample'))
+    env_sample_file = content('env.sample')
+    expect(env_sample_file).to match('ROOT_PATH=http://localhost:3000')
+
+    expect(File).to exist(file_project_path('.env.local'))
+    env_local_file = content('.env.local')
+    expect(env_local_file).to match('ROOT_PATH=http://localhost:3000')
+
+    expect(File).to exist(file_project_path('.env.staging'))
+    env_staging_file = content('.env.staging')
+    expect(env_staging_file).to match('ROOT_PATH=https://staging-dummy_app.herokuapp.com')
+
+    expect(File).to exist(file_project_path('.env.production'))
+    env_production_file = content('.env.production')
+    expect(env_production_file).to match('ROOT_PATH=https://dummy_app.herokuapp.com')
+  end
+
   it 'do not use haml' do
     gemfile_file = content('Gemfile')
     expect(gemfile_file).not_to match(/^gem 'haml'/)

templates/Gemfile.erb

@@ -28,3 +28,6 @@ group :development, :test do
   gem 'better_errors', '~> 2.4'
   gem 'bullet', '~> 5.6', '>= 5.6.1'
 end
+
+# A set of common locale data and translations to internationalize and/or localize your Rails applications.
+gem 'rails-i18n', '~> 5.0', '>= 5.0.4'

templates/bullet/bullet_settings.rb

@@ -0,0 +1,8 @@
+  config.after_initialize do
+    Bullet.enable = true
+    Bullet.alert = true
+    Bullet.bullet_logger = true
+    Bullet.console = true
+    Bullet.rails_logger = true
+    Bullet.add_footer = false
+  end

templates/dotenv/.env.local.erb

@@ -0,0 +1,3 @@
+ROOT_PATH=http://localhost:3000
+
+ROLLBAR_ACCESS_TOKEN=

templates/dotenv/.env.production.erb

@@ -0,0 +1,5 @@
+ROOT_PATH=https://<%= app_name %>.herokuapp.com
+
+ROLLBAR_ACCESS_TOKEN=
+
+SECRET_KEY_BASE=

templates/dotenv/.env.staging.erb

@@ -0,0 +1,5 @@
+ROOT_PATH=https://staging-<%= app_name %>.herokuapp.com
+
+ROLLBAR_ACCESS_TOKEN=
+
+SECRET_KEY_BASE=

templates/dotenv/dotenv_Gemfile.erb

@@ -0,0 +1,2 @@
+# Dot-Env
+gem 'dotenv-rails', require: 'dotenv/rails-now'

templates/dotenv/env.sample.erb

@@ -0,0 +1,3 @@
+ROOT_PATH=http://localhost:3000
+
+ROLLBAR_ACCESS_TOKEN=

templates/recipient_interceptor/recipient_interceptor_staging.rb.erb

@@ -1 +1,2 @@
-Mail.register_interceptor RecipientInterceptor.new(Settings.email.sandbox, subject_prefix: '[STAGING]')
+
+  Mail.register_interceptor RecipientInterceptor.new(Settings.email.sandbox, subject_prefix: '[STAGING]')