orats 0.6.4 → 0.6.5

data/lib/orats/templates/base.rb

@@ -21,8 +21,8 @@ end
 
 def log_task(message)
   puts
-  say_status  'task', "#{method_to_sentence(message.to_s)}:", :yellow
-  puts        '-'*80, ''; sleep 0.25
+  say_status 'task', "#{method_to_sentence(message.to_s)}:", :yellow
+  puts '-'*80, ''; sleep 0.25
 end
 
 def git_commit(message)
@@ -31,7 +31,7 @@ def git_commit(message)
 end
 
 def copy_from_local_gem(source, dest)
-  base_path = "#{File.expand_path File.dirname(__FILE__)}/includes"
+  base_path           = "#{File.expand_path File.dirname(__FILE__)}/includes"
   file_name_of_source = File.basename(source)
 
   run "mkdir -p #{File.dirname(dest)}" if dest.present? && file_name_of_source != dest
@@ -50,7 +50,8 @@ end
 def update_gitignore
   log_task __method__
 
-  append_to_file '.gitignore' do <<-S
+  append_to_file '.gitignore' do
+    <<-S
 # OS and editor files
 .DS_Store
 */**.DS_Store
@@ -65,7 +66,7 @@ def update_gitignore
 # app specific folders
 /vendor/bundle
 /public/assets/*
-  S
+    S
   end
   git_commit 'Add common OS files, editor files and other paths'
 end
@@ -89,10 +90,13 @@ end
 def add_dotenv
   log_task 'add_dotenv'
 
-  file '.env' do <<-S
+  file '.env' do
+    <<-S
 RAILS_ENV: development
 
 PROJECT_PATH: /full/path/to/your/project
+TIME_ZONE: Eastern Time (US & Canada)
+DEFAULT_LOCALE: en
 
 GOOGLE_ANALYTICS_UA: ""
 DISQUS_SHORT_NAME: ""
@@ -131,7 +135,7 @@ PUMA_THREADS_MAX: 1
 PUMA_WORKERS: 0
 
 SIDEKIQ_CONCURRENCY: 25
-  S
+    S
   end
   git_commit 'Add development environment file'
 end
@@ -139,20 +143,36 @@ end
 def add_procfile
   log_task __method__
 
-  file 'Procfile' do <<-S
-web: puma -C config/puma.rb
+  file 'Procfile' do
+    <<-S
+web: puma -C config/puma.rb | grep -v --line-buffered ' 304 -'
 worker: sidekiq -C config/sidekiq.yml
-log: tail -f log/development.log
-  S
+log: tail -f log/development.log | grep -xv --line-buffered '^[[:space:]]*' | grep -v --line-buffered '/assets/'
+    S
   end
-  git_commit 'Add a Procfile'
+  git_commit 'Add Procfile'
+end
+
+def add_markdown_readme
+  log_task __method__
+
+  run 'rm README.rdoc'
+  file 'README.md' do
+    <<-S
+## Project information
+
+This project was generated with [orats](https://github.com/nickjj/orats) vVERSION.
+    S
+  end
+  git_commit 'Add markdown readme'
 end
 
 def update_app_secrets
   log_task __method__
 
   gsub_file 'config/secrets.yml', /.*\n/, ''
-  append_file 'config/secrets.yml' do <<-S
+  append_file 'config/secrets.yml' do
+    <<-S
 development: &default
   secret_key_base: <%= ENV['TOKEN_RAILS_SECRET'] %>
 
@@ -164,7 +184,7 @@ staging:
 
 production:
   <<: *default
-  S
+    S
   end
   git_commit 'DRY out the yaml'
 end
@@ -172,7 +192,8 @@ end
 def update_app_config
   log_task __method__
 
-  inject_into_file 'config/application.rb', after: "automatically loaded.\n" do <<-S
+  inject_into_file 'config/application.rb', after: "automatically loaded.\n" do
+    <<-S
     config.action_mailer.delivery_method = :smtp
     config.action_mailer.smtp_settings = {
       :address              => ENV['SMTP_ADDRESS'],
@@ -196,12 +217,17 @@ def update_app_config
 
     redis_store_options[:password] = ENV['CACHE_PASSWORD'] if ENV['CACHE_PASSWORD'].present?
     config.cache_store = :redis_store, redis_store_options
-  S
+
+    # run `bundle exec rake time:zones:all` to get a complete list of valid time zone names
+    config.time_zone = ENV['TIME_ZONE'] unless ENV['TIME_ZONE'] == 'UTC'
+
+    # http://www.loc.gov/standards/iso639-2/php/English_list.php
+    config.i18n.default_locale = ENV['DEFAULT_LOCALE'] unless ENV['DEFAULT_LOCALE'] == 'en'
+    S
   end
 
-  gsub_file 'config/application.rb',
-            "# config.time_zone = 'Central Time (US & Canada)'","config.time_zone = 'Eastern Time (US & Canada)'"
-  append_file 'config/application.rb' do <<-'S'
+  append_file 'config/application.rb' do
+    <<-'S'
 
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
   if html_tag =~ /\<label/
@@ -211,7 +237,7 @@ ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
     %(#{html_tag}<p class="validation-error"> #{errors}</p>).html_safe
   end
 end
-  S
+    S
   end
   git_commit 'Configure the mailer/redis, update the timezone and adjust the validation output'
 end
@@ -220,7 +246,8 @@ def update_database_config
   log_task __method__
 
   gsub_file 'config/database.yml', /.*\n/, ''
-  append_file 'config/database.yml' do <<-S
+  append_file 'config/database.yml' do
+    <<-S
 development: &default
   adapter: postgresql
   database: <%= ENV['DATABASE_NAME'] %>
@@ -239,7 +266,7 @@ staging:
 
 production:
   <<: *default
-  S
+    S
   end
   git_commit 'DRY out the yaml'
 end
@@ -384,24 +411,44 @@ end
   git_commit 'Add a staging environment'
 end
 
+def update_development_environment
+  log_task __method__
+
+  inject_into_file 'config/environments/development.rb',
+                   before: "\nend" do
+    <<-'S'
+  # Set the default generator asset engines
+  config.generators.stylesheet_engine = :scss
+  config.generators.javascript_engine = :coffee
+    S
+  end
+  git_commit 'Update the default generator asset engines'
+end
+
 def update_production_environment
   log_task __method__
 
-  inject_into_file 'config/environments/production.rb', after: "config.log_level = :info\n" do <<-'S'
-config.logger = Logger.new(config.paths['log'].first, 'daily')
-  S
+  inject_into_file 'config/environments/production.rb', after: "config.log_level = :info\n" do
+    <<-'S'
+  config.logger = Logger.new(config.paths['log'].first, 'daily')
+    S
   end
   git_commit 'Update the logger to rotate daily'
 
-  inject_into_file 'config/environments/production.rb', after: "%w( search.js )\n" do <<-'S'
-config.assets.precompile << Proc.new { |path|
-  if path =~ /\.(eot|svg|ttf|woff|png)\z/
-    true
-  end
-}
-  S
+  inject_into_file 'config/environments/production.rb', after: "%w( search.js )\n" do
+    <<-'S'
+  config.assets.precompile << Proc.new { |path|
+    if path =~ /\.(eot|svg|ttf|woff|png)\z/
+      true
+    end
+  }
+    S
   end
   git_commit 'Update the assets precompiler to include common file types'
+
+  gsub_file 'config/environments/production.rb',
+            '# config.assets.css_compressor', 'config.assets.css_compressor'
+  git_commit 'Add sass asset compression'
 end
 
 def update_routes
@@ -409,14 +456,15 @@ def update_routes
 
   prepend_file 'config/routes.rb', "require 'sidekiq/web'\n\n"
 
-  inject_into_file 'config/routes.rb', after: "draw do\n" do <<-S
+  inject_into_file 'config/routes.rb', after: "draw do\n" do
+    <<-S
   concern :pageable do
     get 'page/:page', action: :index, on: :collection
   end
 
   # you may want to protect this behind authentication
   mount Sidekiq::Web => '/sidekiq'
-  S
+    S
   end
   git_commit 'Add a concern for pagination and mount sidekiq'
 end
@@ -689,7 +737,8 @@ end
 def add_helpers
   log_task __method__
 
-  inject_into_file 'app/helpers/application_helper.rb', after: "ApplicationHelper\n" do <<-S
+  inject_into_file 'app/helpers/application_helper.rb', after: "ApplicationHelper\n" do
+    <<-S
   def title(page_title)
     content_for(:title) { page_title }
   end
@@ -741,7 +790,7 @@ def add_helpers
       'danger'
     end
   end
-  S
+    S
   end
   git_commit 'Add various helpers'
 end
@@ -981,7 +1030,8 @@ def update_sass
   inject_into_file 'app/assets/stylesheets/application.css.scss',
                    " *= require font-awesome\n",
                    before: " *= require_self\n"
-  append_file 'app/assets/stylesheets/application.css.scss' do <<-S
+  append_file 'app/assets/stylesheets/application.css.scss' do
+    <<-S
 
 // Core variables and mixins
 @import "bootstrap/variables";
@@ -1050,7 +1100,7 @@ img {
   color: $brand-danger;
   font-size: $font-size-small;
 }
-  S
+    S
   end
   git_commit 'Add font-awesome, bootstrap and a few default styles'
 end
@@ -1064,7 +1114,8 @@ def update_coffeescript
   inject_into_file 'app/assets/javascripts/application.js',
                    "//= require jquery.turbolinks\n",
                    before: "//= require_tree .\n"
-  inject_into_file 'app/assets/javascripts/application.js', before: "//= require_tree .\n" do <<-S
+  inject_into_file 'app/assets/javascripts/application.js', before: "//= require_tree .\n" do
+    <<-S
 //= require bootstrap/affix
 //= require bootstrap/alert
 //= require bootstrap/button
@@ -1077,7 +1128,7 @@ def update_coffeescript
 //= require bootstrap/scrollspy
 //= require bootstrap/tab
 //= require bootstrap/transition
-  S
+    S
   end
   git_commit 'Add jquery.turbolinks and bootstrap'
 end
@@ -1097,6 +1148,7 @@ copy_gemfile
 copy_base_favicon
 add_dotenv
 add_procfile
+add_markdown_readme
 update_app_secrets
 update_app_config
 update_database_config
@@ -1107,6 +1159,7 @@ add_whenever_config
 add_sidekiq_initializer
 add_mini_profiler_initializer
 add_staging_environment
+update_development_environment
 update_production_environment
 update_routes
 add_backup_lib

data/lib/orats/templates/includes/Galaxyfile

@@ -1,12 +1,12 @@
 nickjj.user,v0.1.0
 nickjj.security,v0.1.1
-nickjj.postgres,v0.1.2
-nickjj.ruby,v0.1.4
+nickjj.postgres,v0.1.3
+nickjj.ruby,v0.1.5
 nickjj.nodejs,v0.1.1
-nickjj.nginx,v0.1.3
+nickjj.nginx,v0.1.4
 nickjj.rails,v0.1.92
 nickjj.whenever,v0.1.1
 nickjj.pumacorn,v0.1.1
 nickjj.sidekiq,v0.1.1
-nickjj.monit,v0.1.2
-DavidWittman.redis
+nickjj.monit,v0.1.3
+DavidWittman.redis

data/lib/orats/templates/includes/Gemfile

@@ -4,6 +4,7 @@ gem 'rails', '~> 4.1.1'
 gem 'turbolinks', '~> 2.2.2'
 gem 'jquery-rails', '~> 3.1.0'
 gem 'jquery-turbolinks', '~> 2.0.2'
+#gem 'jbuilder'
 
 gem 'bootstrap-sass', '~> 3.1.1'
 gem 'font-awesome-rails', '~> 4.1.0'
@@ -15,8 +16,6 @@ gem 'puma', '~> 2.8.2'
 gem 'sidekiq', '~> 3.1.2'
 gem 'sinatra', '>= 1.4.5', require: false
 
-#gem 'jbuilder'
-
 gem 'whenever', '~> 0.9.2', require: false
 gem 'backup', '~> 4.0.1', require: false
 

data/lib/orats/templates/includes/inventory/group_vars/all.yml

@@ -1,11 +1,9 @@
 ---
-# the user name used to make a connection to the server
-ansible_ssh_user: deploy
-
-# the user created on the system
-user_name: "{{ ansible_ssh_user }}"
-
+# -----------------------------------------------------------------------------
+# secrets
 # load all passwords from a local location outside of version control
+# -----------------------------------------------------------------------------
+
 # do not add a trailing slash to the path
 secrets_load_path: /home/yourname/dev/testproj/secrets
 
@@ -16,19 +14,54 @@ secrets_rails_token: "{{ lookup('password', secrets_load_path + '/rails_token')
 secrets_devise_token: "{{ lookup('password', secrets_load_path + '/devise_token') }}"
 secrets_devise_pepper_token: "{{ lookup('password', secrets_load_path + '/devise_pepper_token') }}"
 
-# postgres login credentials
+# -----------------------------------------------------------------------------
+# ansible
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# http://docs.ansible.com/intro_inventory.html#list-of-behavioral-inventory-parameters
+# -----------------------------------------------------------------------------
+
+ansible_ssh_user: deploy
+
+# -----------------------------------------------------------------------------
+# user
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-user/#role-variables
+# -----------------------------------------------------------------------------
+
+user_name: "{{ ansible_ssh_user }}"
+
+# -----------------------------------------------------------------------------
+# postgres
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-postgres/#role-variables
+# -----------------------------------------------------------------------------
+
 postgres_user: "{{ user_name }}"
 postgres_password: "{{ secrets_postgres_password }}"
 
-# redis configuration
+# -----------------------------------------------------------------------------
+# redis
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/DavidWittman/ansible-redis/blob/master/defaults/main.yml
+# -----------------------------------------------------------------------------
+
 redis_bind: 0.0.0.0
 redis_port: 6379
-redis_version: 2.8.9
 redis_install_dir: /usr/local
 redis_dir: /usr/local/redis
 redis_password: "{{ secrets_redis_password }}"
 
-# rails application configuration
+# -----------------------------------------------------------------------------
+# rails
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-rails/#role-variables
+# -----------------------------------------------------------------------------
+
 rails_deploy_app_name: testproj
 rails_deploy_user: "{{ user_name }}"
 
@@ -36,21 +69,15 @@ rails_deploy_ssh_keypair_local_path: "{{ secrets_load_path }}"
 
 rails_deploy_git_url: "git@bitbucket.org:yourname/testproj.git"
 
-# you may have 1 or 100 app servers but you only want the migration
-# to be ran on a single app server. The server you specify as the
-# rails_deploy_migrate_master_host will be the server that the
-# migration gets ran on
-
-# the default value is the first server listed under your [app] group
 rails_deploy_migrate_master_host: "{{ groups['app'][0] }}"
 
-# environment variables for the rails application
-# edit this list to account for any variables your app needs
 rails_deploy_env:
   RAILS_ENV: production
+  SOURCE_ENV_PATH: "/etc/default/{{ rails_deploy_app_name }}"
 
   PROJECT_PATH: "{{ rails_deploy_path }}"
-  SOURCE_ENV_PATH: "/etc/default/{{ rails_deploy_app_name }}"
+  TIME_ZONE: Eastern Time (US & Canada)
+  DEFAULT_LOCALE: en
 
   GOOGLE_ANALYTICS_UA: ""
   DISQUS_SHORT_NAME: ""
@@ -90,22 +117,53 @@ rails_deploy_env:
   PUMA_THREADS_MIN: 0
   PUMA_THREADS_MAX: 16
 
-  # ensure there are always at least 2 workers so puma can properly do phased restarts
   PUMA_WORKERS: "{{ ansible_processor_cores if ansible_processor_cores > 1 else 2 }}"
 
   SIDEKIQ_CONCURRENCY: 25
 
-# whenever configuration
+# -----------------------------------------------------------------------------
+# whenever
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-whenever/#role-variables
+# -----------------------------------------------------------------------------
+
 whenever_update: rails_deploy_app_name
 
-# nginx configuration
-nginx_base_domain: localhost
+# -----------------------------------------------------------------------------
+# pumacorn
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-pumacorn/#role-variables
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# sidekiq
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-sidekiq/#role-variables
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
+# nginx
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-nginx/#role-variables
+# -----------------------------------------------------------------------------
+
+nginx_base_domain: localhost # change this to yourdomain.com
 nginx_upstream_name: "{{ rails_deploy_app_name }}"
 nginx_upstream_server: unix://{{ rails_deploy_path }}/tmp/puma.sock
 nginx_root_path: "{{ rails_deploy_path }}/public"
 nginx_ssl_local_path: "{{ secrets_load_path }}"
 
-# monit configuration
+# -----------------------------------------------------------------------------
+# monit
+# -----------------------------------------------------------------------------
+# default values you can overwrite with documentation:
+# https://github.com/nickjj/ansible-monit/#role-variables
+# -----------------------------------------------------------------------------
+
 monit_process_list: |
   check process {{ rails_deploy_app_name }} with pidfile {{ rails_deploy_path }}/tmp/{{ pumacorn_server }}.pid
     start program = "/etc/init.d/{{ rails_deploy_app_name }} start"