orats 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ca394edc402343a74153e8b1b7a2f8f61eb4c4
-  data.tar.gz: 302ace76f892bc1d4e17e6c66a3ee5d02c749f45
+  metadata.gz: 86701c9d3879d19d5be1fdae7ba6322db003c08f
+  data.tar.gz: 2eca54c7c2359e3c71da893813cd61360f484951
 SHA512:
-  metadata.gz: 84ef1382a808fc7b08fbbe1bc99422e3560da9e198fb2fbf122b4b2671de61aece9b67c5f7cffd8fbfd00d483298d884dd3b895787d08c0dcedc4377601643a1
-  data.tar.gz: d06a4516543e945daa0c42fc8dc28d58f72b10f505b21efea7c985a2bcb3b479ff1c3ae669c93643a8e8968ef934371f5547a1ec9bc39d5a47c8baf1d530a511
+  metadata.gz: a8ee825ee47eaa23e1f240280f0d023b06c1256cb858d2c577acd822d5a744858cb5c26c2e2ec0542934aeafc5da6c8ce6096e6e1b4b373f0aa3f9f56255f94c
+  data.tar.gz: 93721d778eb7063a2b393735fbfd101d55841116972d6f72583acf0aa6b0c33dc7b229a92458abf69a0bb93053f72f8a53c396dd61aafd56a4c4326a508bf57a

data/README.md

@@ -86,8 +86,8 @@ running `orats <command name> help` from your terminal. You can also type `orats
 
 - Detect whether or not orats, the playbook or inventory is outdated
     - `orats outdated [options]`
-    - Optionally takes: `--playbook-file []`
-    - Optionally takes: `--inventory-file []`
+    - Optionally takes: `--playbook []`
+    - Optionally takes: `--inventory []`
 
 #### Why is it asking me for my development postgres password?
 
@@ -102,7 +102,7 @@ Remember, this is only your development postgres password. It will **never** ask
 The version comparisons can be fully trusted but when comparing a specific playbook or inventory file it's not really
 possible to guarantee a valid comparison.
 
-When passing in `--playbook-file` or `--inventory-file` it will look for certain keywords in the file. If it finds the
+When passing in `--playbook` or `--inventory` it will look for certain keywords in the file. If it finds the
 keyword then it will assume that keyword is working and up to date. Since you can edit these files freely there may be
 cases where it reports a false positive.
 
@@ -130,7 +130,6 @@ it includes these features and when I do not want a specific thing it is much qu
 - Use foreman in development mode to manage starting both the rails server using puma and sidekiq.
 - Set the production asset precompiler to include fonts and png files.
 - Set the production logger to rotate the logs daily.
-- Use DHH's config gem to store application wide configuration variables.
 - Set the timezone to EST.
 - Change how validation errors are reported by having them be displayed inline for each element.
 - Dry out the `database.yml` and use postgres.
@@ -140,7 +139,8 @@ it includes these features and when I do not want a specific thing it is much qu
 - Add 2 view helpers, `humanize_boolean` and `css_for_boolean` to nicely output true/false values and they can be changed easily.
 - Add 3 view helpers to easily set a page's title, meta description and page heading. All of which are optional.
 - Bootstrap ~3 layout file with conditionally loaded `html5shiv`, `json3` and `respondjs` libs for IE < 9 support.
-- Separate the navigation, navigation links, flash messages, footer and google analytics snippets into partials.
+- Separate the navigation, navigation links, flash messages and footer partials.
+- Add partials and environment variables for both google analytics and disqus.
 - Public 404, 422, 500 and 502 pages so they can be served directly from your web server.
 - Use sass and coffeescript.
 - jquery 1.10.x loaded through a CDN.

data/lib/orats/cli.rb

@@ -72,11 +72,11 @@ module Orats
       Command.new(app_name, options).nuke
     end
 
-    option :playbook_file, default: ''
-    option :inventory_file, default: ''
+    option :playbook, default: ''
+    option :inventory, default: ''
     desc 'outdated [options]', ''
     long_desc <<-D
-      `orats outdated` will run various comparisons on your ansible files.
+      `orats outdated` will run various comparisons on orats and your ansible files.
 
       Help:
 
@@ -86,9 +86,9 @@ module Orats
 
       Options:
 
-      `--playbook-file` to supply a playbook file for comparison []
+      `--playbook` to supply a playbook file for comparison []
 
-      `--inventory-file` to supply an inventory file for comparison []
+      `--inventory` to supply an inventory file for comparison []
     D
     def outdated
       Command.new(nil, options).outdated

data/lib/orats/shell.rb

@@ -29,7 +29,7 @@ module Orats
     end
 
     def git_commit(message)
-      run_from @active_path, "git add . && git commit -m '#{message}'"
+      run_from @active_path, "git add -A && git commit -m '#{message}'"
     end
 
     def gsub_postgres_info
@@ -43,7 +43,7 @@ module Orats
     def gsub_redis_info
       log_message 'root', 'Adding the redis password'
 
-      gsub_file "#{@active_path}/config/initializers/sidekiq.rb", '//', "//:#{ENV['#{@app_name.upcase}_CACHE_PASSWORD']}@"
+      gsub_file "#{@active_path}/config/initializers/sidekiq.rb", '//', "//:#{ENV['CACHE_PASSWORD']}@"
       gsub_file "#{@active_path}/.env", 'HE_PASSWORD: ', "HE_PASSWORD: #{@options[:redis_password]}"
       gsub_file "#{@active_path}/.env", 'CACHE_HOST: localhost', "CACHE_HOST: #{@options[:redis_location]}"
       gsub_file "#{@active_path}/config/application.rb", '# pass', 'pass'
@@ -191,20 +191,18 @@ module Orats
     end
 
     def outdated_init
-      github_repo = 'https://raw.githubusercontent.com/nickjj/orats/master/lib/orats'
+      latest_gem_version = compare_gem_version
+
+      github_repo = "https://raw.githubusercontent.com/nickjj/orats/#{latest_gem_version}/lib/orats"
 
-      version_url = "#{github_repo}/version.rb"
       galaxy_url = "#{github_repo}/templates/includes/Galaxyfile"
       playbook_url = "#{github_repo}/templates/play.rb"
       inventory_url = "#{github_repo}/templates/includes/inventory/group_vars/all.yml"
 
-      remote_version_contents = url_to_string(version_url)
       remote_galaxy_contents = url_to_string(galaxy_url)
       remote_playbook_contents = url_to_string(playbook_url)
       remote_inventory_contents = url_to_string(inventory_url)
 
-      compare_gem_version remote_version_contents
-
       compare_remote_role_version_to_local remote_galaxy_contents
 
       local_playbook = compare_remote_to_local('playbook',
@@ -217,15 +215,15 @@ module Orats
                               inventory_file_stats(remote_inventory_contents),
                               inventory_file_stats(IO.read(inventory_file_path)))
 
-      unless @options[:playbook_file].empty?
-        compare_user_to_local('playbook', 'roles', @options[:playbook_file], local_playbook) do
-          playbook_file_stats IO.read(@options[:playbook_file])
+      unless @options[:playbook].empty?
+        compare_user_to_local('playbook', 'roles', @options[:playbook], local_playbook) do
+          playbook_file_stats IO.read(@options[:playbook])
         end
       end
 
-      unless @options[:inventory_file].empty?
-        compare_user_to_local('inventory', 'variables', @options[:inventory_file], local_inventory) do
-          inventory_file_stats IO.read(@options[:inventory_file])
+      unless @options[:inventory].empty?
+        compare_user_to_local('inventory', 'variables', @options[:inventory], local_inventory) do
+          inventory_file_stats IO.read(@options[:inventory])
         end
       end
     end
@@ -282,11 +280,21 @@ module Orats
         roles_list.uniq
       end
 
-      def compare_gem_version(latest_contents)
-        latest = latest_contents.match(/\'(.*)\'/)[1..-1].first
+      def compare_gem_version
+        latest_gem_contents = `gem list orats --remote`.split.last
+
+        if latest_gem_contents.include?('ERROR')
+          say_status 'error', "\e[1mError running `gem list orats --remote`:\e[0m", :red
+          say_status 'msg', 'Chances are their API is down, try again soon', :yellow
+          exit 1
+        end
+
+        latest_gem_version = "v#{latest_gem_contents.split.first[1...-1]}"
 
         log_status 'gem', 'Comparing this version of orats to the latest orats version:', :green
-        log_status_under 'version', "Latest: v#{latest}, Yours: v#{VERSION}", :yellow
+        log_status_under 'version', "Latest: #{latest_gem_version}, Yours: v#{VERSION}", :yellow
+
+        latest_gem_version
       end
 
       def compare_remote_role_version_to_local(remote_galaxy_contents)
@@ -353,9 +361,6 @@ module Orats
           log_status label, "Comparing this version of orats' #{label} to #{just_file_name}:", :blue
           log_status_under 'path', user_path, :cyan
 
-          # really ugly hack to not count rails ENV variables as "missing" for each inventory that was generated
-          local_list = local_list.join("\n").gsub!('TESTPROJ_', '').split("\n") if label == 'inventory'
-
           missing_count = log_unmatched local_list, user_list, 'missing', :red
           extra_count = log_unmatched user_list, local_list, 'extra', :yellow
 
@@ -394,15 +399,10 @@ module Orats
       def log_unmatched(compare, against, label, color)
         count = 0
 
-        against = against.join
-
         compare.each do |item|
           unless against.include?(item)
-            # really ugly hack to not count rails ENV variables as "extra" for each inventory that was generated
-            unless item == item.upcase && item.count('_') > 1
-              say_status label, item, color
-              count += 1
-            end
+            say_status label, item, color
+            count += 1
           end
         end
 

data/lib/orats/templates/auth.rb

@@ -44,7 +44,7 @@ gem 'pundit', '~> 0.2.3'
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add devise, devise-async and pundit gems'"
 
 # ----- Run bundle install ----------------------------------------------------------------------------
@@ -66,7 +66,7 @@ append_file 'config/sidekiq.yml' do <<-FILE
 FILE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the devise mailer queue to the sidekiq config'"
 
 # ----- Create the account fixtures -------------------------------------------------------------------
@@ -105,7 +105,7 @@ beep:
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the account model'"
 
 # ----- Modify the test helper ------------------------------------------------------------------------
@@ -122,7 +122,7 @@ end
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the devise helpers to test helper'"
 
 # ----- Create the account unit tests -----------------------------------------------------------------
@@ -181,7 +181,7 @@ end
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the account unit tests'"
 
 # ----- Create the account model ----------------------------------------------------------------------
@@ -234,7 +234,7 @@ end
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the account model'"
 
 # ----- Create devise migration -----------------------------------------------------------------------
@@ -279,7 +279,7 @@ create_migration :accounts, %{
     add_index :accounts, :unlock_token,         :unique => true
   }
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add devise model migration'"
 
 # ----- Create a seed user ----------------------------------------------------------------------------
@@ -290,7 +290,7 @@ puts        '-'*80, ''; sleep 0.25
 
 append_file 'db/seeds.rb', "\nAccount.create({ email: \"admin@#{app_name}.com\", password: \"password\", role: \"admin\" })"
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add a seed user'"
 
 # ----- Create en i18n entries ------------------------------------------------------------------------
@@ -307,7 +307,7 @@ authorization:
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add en i18n entries'"
 
 # ----- Modify the application controller -------------------------------------------------------------
@@ -322,7 +322,7 @@ inject_into_file 'app/controllers/application_controller.rb', after: "::Base\n"
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Alias current_user to current_account to play nice with other gems'"
 
 inject_into_file 'app/controllers/application_controller.rb', before: "end\n" do <<-'CODE'
@@ -340,7 +340,7 @@ inject_into_file 'app/controllers/application_controller.rb', before: "end\n" do
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Change the application controller to allow overriding the devise sign in path'"
 
 # ----- Create the devise views -----------------------------------------------------------------------
@@ -677,7 +677,7 @@ file 'app/views/devise/shared/_links.html.erb' do <<-'HTML'
 HTML
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the devise views'"
 
 # ----- Modify the layout files ------------------------------------------------------------------------
@@ -721,7 +721,7 @@ append_file 'app/assets/stylesheets/application.css.scss' do <<-CODE
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add account management links to the layout and add the necessary css selectors'"
 
 # ----- Modify the .env file --------------------------------------------------------------------------
@@ -730,18 +730,18 @@ puts
 say_status  'root', 'Modifying the .env file...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
-inject_into_file '.env', before: "\n#{app_name_upper}_SMTP_ADDRESS" do <<-CODE
-#{app_name_upper}_TOKEN_DEVISE_SECRET: #{generate_token}
-#{app_name_upper}_TOKEN_DEVISE_PEPPER: #{generate_token}
+inject_into_file '.env', before: "\nSMTP_ADDRESS" do <<-CODE
+TOKEN_DEVISE_SECRET: #{generate_token}
+TOKEN_DEVISE_PEPPER: #{generate_token}
 CODE
 end
 
-inject_into_file '.env', before: "\n#{app_name_upper}_DATABASE_NAME" do <<-CODE
-#{app_name_upper}_ACTION_MAILER_DEVISE_DEFAULT_EMAIL: info@#{app_name}.com
+inject_into_file '.env', before: "\nDATABASE_NAME" do <<-CODE
+ACTION_MAILER_DEVISE_DEFAULT_EMAIL: info@#{app_name}.com
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the devise tokens and default email to the .env file'"
 
 # ----- Create the config files -----------------------------------------------------------------------
@@ -753,7 +753,7 @@ puts        '-'*80, ''; sleep 0.25
 file 'config/initializers/devise_async.rb', 'Devise::Async.backend = :sidekiq'
 generate 'devise:install'
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add the devise and devise async initializers'"
 
 # ----- Modify the config files -----------------------------------------------------------------------
@@ -763,9 +763,9 @@ say_status  'config', 'Modifying the devise initializer...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
 gsub_file 'config/initializers/devise.rb',
-          "'please-change-me-at-config-initializers-devise@example.com'", "ENV['#{app_name_upper}_ACTION_MAILER_DEVISE_DEFAULT_EMAIL']"
-gsub_file 'config/initializers/devise.rb', /(?<=key = )'\w{128}'/, "ENV['#{app_name_upper}_TOKEN_DEVISE_SECRET']"
-gsub_file 'config/initializers/devise.rb', /(?<=pepper = )'\w{128}'/, "ENV['#{app_name_upper}_TOKEN_DEVISE_PEPPER']"
+          "'please-change-me-at-config-initializers-devise@example.com'", "ENV['ACTION_MAILER_DEVISE_DEFAULT_EMAIL']"
+gsub_file 'config/initializers/devise.rb', /(?<=key = )'\w{128}'/, "ENV['TOKEN_DEVISE_SECRET']"
+gsub_file 'config/initializers/devise.rb', /(?<=pepper = )'\w{128}'/, "ENV['TOKEN_DEVISE_PEPPER']"
 
 gsub_file 'config/initializers/devise.rb', '# config.timeout_in = 30.minutes',
           'config.timeout_in = 2.hours'
@@ -788,7 +788,7 @@ gsub_file 'config/initializers/devise.rb', '# config.unlock_in = 1.hour',
 gsub_file 'config/initializers/devise.rb', '# config.last_attempt_warning = false',
           'config.last_attempt_warning = true'
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Change the devise initializer default values'"
 
 # ----- Modify the routes file ------------------------------------------------------------------------
@@ -815,7 +815,7 @@ inject_into_file 'config/routes.rb', after: "collection\n  end\n" do <<-CODE
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add devise to the routes file'"
 
 # ----- Add pundit support ----------------------------------------------------------------------------
@@ -826,7 +826,7 @@ puts        '-'*80, ''; sleep 0.25
 
 generate 'pundit:install'
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add pundit application policy'"
 
 inject_into_file 'app/controllers/application_controller.rb', after: "::Base\n" do <<-'CODE'
@@ -849,5 +849,5 @@ inject_into_file 'app/controllers/application_controller.rb', after: "  #end\n"
 CODE
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add pundit logic to the application controller'"

data/lib/orats/templates/base.rb

@@ -23,7 +23,6 @@ def from_gem(source, destination = nil)
   run "cp #{base_path}/#{file_name} #{destination}"
 end
 
-app_name_upper = app_name.upcase
 app_name_class = app_name.humanize
 
 # ----- Create the git repo ----------------------------------------------------------------------------
@@ -33,7 +32,7 @@ say_status  'git', 'Creating a new local git repo...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
 git :init
-git add: '.'
+git add: '-A'
 git commit: "-m 'Initial commit'"
 
 # ----- Modify the .gitignore file --------------------------------------------------------------------
@@ -61,7 +60,7 @@ append_to_file '.gitignore' do <<-TEXT
 TEXT
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add common OS and editor files to the .gitignore file'"
 
 # ----- Create a few root files -----------------------------------------------------------------------
@@ -72,7 +71,7 @@ puts        '-'*80, ''; sleep 0.25
 
 file '.ruby-version', '2.1.1'
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add .ruby-version file for common ruby version managers'"
 
 file 'Procfile' do <<-CODE
@@ -81,7 +80,7 @@ worker: sidekiq -C config/sidekiq.yml
 CODE
 end
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add a basic Procfile to start the puma and sidekiq processes'"
 
 # ----- Create an .env file ---------------------------------------------------------------------------
@@ -93,47 +92,76 @@ puts        '-'*80, ''; sleep 0.25
 file '.env' do <<-CODE
 RAILS_ENV: development
 
-#{app_name_upper}_PROJECT_PATH: /full/path/to/your/project
+PROJECT_PATH: /full/path/to/your/project
 
-#{app_name_upper}_TOKEN_RAILS_SECRET: #{generate_token}
+GOOGLE_ANALYTICS_UA:
+DISQUS_SHORT_NAME:
 
-#{app_name_upper}_SMTP_ADDRESS: smtp.gmail.com
-#{app_name_upper}_SMTP_PORT: 587
-#{app_name_upper}_SMTP_DOMAIN: gmail.com
-#{app_name_upper}_SMTP_USERNAME: #{app_name}@gmail.com
-#{app_name_upper}_SMTP_PASSWORD: thebestpassword
-#{app_name_upper}_SMTP_AUTH: plain
-#{app_name_upper}_SMTP_STARTTTLS_AUTO: true
+TOKEN_RAILS_SECRET: #{generate_token}
 
-#{app_name_upper}_ACTION_MAILER_HOST: localhost:3000
-#{app_name_upper}_ACTION_MAILER_DEFAULT_EMAIL: info@#{app_name}.com
+SMTP_ADDRESS: smtp.gmail.com
+SMTP_PORT: 587
+SMTP_DOMAIN: gmail.com
+SMTP_USERNAME: #{app_name}@gmail.com
+SMTP_PASSWORD: thebestpassword
+SMTP_AUTH: plain
+SMTP_STARTTTLS_AUTO: true
 
-#{app_name_upper}_DATABASE_NAME: #{app_name}
-#{app_name_upper}_DATABASE_HOST: localhost
-#{app_name_upper}_DATABASE_POOL: 25
-#{app_name_upper}_DATABASE_TIMEOUT: 5000
-#{app_name_upper}_DATABASE_USERNAME: postgres
-#{app_name_upper}_DATABASE_PASSWORD: supersecrets
+ACTION_MAILER_HOST: localhost:3000
+ACTION_MAILER_DEFAULT_EMAIL: info@#{app_name}.com
 
-#{app_name_upper}_CACHE_HOST: localhost
-#{app_name_upper}_CACHE_PORT: 6379
-#{app_name_upper}_CACHE_DATABASE: 0
-#{app_name_upper}_CACHE_PASSWORD:
+DATABASE_NAME: #{app_name}
+DATABASE_HOST: localhost
+DATABASE_POOL: 25
+DATABASE_TIMEOUT: 5000
+DATABASE_USERNAME: postgres
+DATABASE_PASSWORD: supersecrets
 
-#{app_name_upper}_PUMA_THREADS_MIN: 0
-#{app_name_upper}_PUMA_THREADS_MAX: 1
-#{app_name_upper}_PUMA_WORKERS: 0
+CACHE_HOST: localhost
+CACHE_PORT: 6379
+CACHE_DATABASE: 0
+CACHE_PASSWORD:
 
-#{app_name_upper}_SIDEKIQ_CONCURRENCY: 25
+PUMA_THREADS_MIN: 0
+PUMA_THREADS_MAX: 1
+PUMA_WORKERS: 0
+
+SIDEKIQ_CONCURRENCY: 25
 CODE
 end
 
 # ----- Modify the secrets yaml file -----------------------------------------------------------------------
 
-env_rails_secret_token = "<%= ENV['#{app_name_upper}_TOKEN_RAILS_SECRET'] %>"
+gsub_file 'config/secrets.yml', /.*\n/, ''
+append_file 'config/secrets.yml' do <<-FILE
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development: &default
+  secret_key_base: <%= ENV['TOKEN_RAILS_SECRET'] %>
+
+test:
+  <<: *default
+
+staging:
+  <<: *default
+
+production:
+  <<: *default
+FILE
+end
 
-gsub_file 'config/secrets.yml', /\w{128}/, env_rails_secret_token
-gsub_file 'config/secrets.yml', '<%= ENV["SECRET_KEY_BASE"] %>', env_rails_secret_token
+git add:    '-A'
+git commit: "-m 'Dry up the secrets settings'"
 
 # ----- Modify the application file -------------------------------------------------------------------
 
@@ -142,27 +170,23 @@ say_status  'config', 'Modifying the application file...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
 inject_into_file 'config/application.rb', after: "automatically loaded.\n" do <<-CODE
-    config.x.track.google_analytics = ''
-    config.x.track.disqus_shortname = 'test-#{app_name}'
-    config.x.email.default_to = ENV['#{app_name_upper}_ACTION_MAILER_DEFAULT_EMAIL']
-
     config.action_mailer.delivery_method = :smtp
     config.action_mailer.smtp_settings = {
-      :address              => ENV['#{app_name_upper}_SMTP_ADDRESS'],
-      :port                 => ENV['#{app_name_upper}_SMTP_PORT'].to_i,
-      :domain               => ENV['#{app_name_upper}_SMTP_DOMAIN'],
-      :user_name            => ENV['#{app_name_upper}_SMTP_USERNAME'],
-      :password             => ENV['#{app_name_upper}_SMTP_PASSWORD'],
-      :authentication       => ENV['#{app_name_upper}_SMTP_AUTH'],
-      :enable_starttls_auto => ENV['#{app_name_upper}_SMTP_STARTTTLS_AUTO'] == 'true'
+      :address              => ENV['SMTP_ADDRESS'],
+      :port                 => ENV['SMTP_PORT'].to_i,
+      :domain               => ENV['SMTP_DOMAIN'],
+      :user_name            => ENV['SMTP_USERNAME'],
+      :password             => ENV['SMTP_PASSWORD'],
+      :authentication       => ENV['SMTP_AUTH'],
+      :enable_starttls_auto => ENV['SMTP_STARTTTLS_AUTO'] == 'true'
     }
 
-    config.action_mailer.default_url_options = { host: ENV['#{app_name_upper}_ACTION_MAILER_HOST'] }
+    config.action_mailer.default_url_options = { host: ENV['ACTION_MAILER_HOST'] }
 
-    config.cache_store = :redis_store, { host: ENV['#{app_name_upper}_CACHE_HOST'],
-                                         port: ENV['#{app_name_upper}_CACHE_PORT'].to_i,
-                                         db: ENV['#{app_name_upper}_CACHE_DATABASE'].to_i,
-                                         # password: ENV['#{app_name_upper}_CACHE_PASSWORD'].to_i,
+    config.cache_store = :redis_store, { host: ENV['CACHE_HOST'],
+                                         port: ENV['CACHE_PORT'].to_i,
+                                         db: ENV['CACHE_DATABASE'].to_i,
+                                         # password: ENV['CACHE_PASSWORD'].to_i,
                                          namespace: '#{app_name}::cache'
                                        }
 CODE
@@ -183,7 +207,7 @@ end
 FILE
 end
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add tweakable settings, update the timezone and change the way validation errors are shown'"
 
 # ----- Modify the config files -----------------------------------------------------------------------
@@ -196,16 +220,16 @@ gsub_file 'config/database.yml', /.*\n/, ''
 append_file 'config/database.yml' do <<-FILE
 development: &default
   adapter: postgresql
-  database: <%= ENV['#{app_name_upper}_DATABASE_NAME'] %>
-  host: <%= ENV['#{app_name_upper}_DATABASE_HOST'] %>
-  pool: <%= ENV['#{app_name_upper}_DATABASE_POOL'] %>
-  timeout: <%= ENV['#{app_name_upper}_DATABASE_TIMEOUT'] %>
-  username: <%= ENV['#{app_name_upper}_DATABASE_USERNAME'] %>
-  password: <%= ENV['#{app_name_upper}_DATABASE_PASSWORD'] %>
+  database: <%= ENV['DATABASE_NAME'] %>
+  host: <%= ENV['DATABASE_HOST'] %>
+  pool: <%= ENV['DATABASE_POOL'] %>
+  timeout: <%= ENV['DATABASE_TIMEOUT'] %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
 
 test:
   <<: *default
-  database: <%= ENV['#{app_name_upper}_DATABASE_NAME'] %>_test
+  database: <%= ENV['DATABASE_NAME'] %>_test
 
 staging:
   <<: *default
@@ -215,19 +239,19 @@ production:
 FILE
 end
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Dry up the database settings'"
 
 file 'config/puma.rb', <<-'CODE'
 environment ENV['RAILS_ENV']
 
-threads ENV['app_name_upper_PUMA_THREADS_MIN'].to_i,ENV['app_name_upper_PUMA_THREADS_MAX'].to_i
-workers ENV['app_name_upper_PUMA_WORKERS'].to_i
+threads ENV['PUMA_THREADS_MIN'].to_i,ENV['PUMA_THREADS_MAX'].to_i
+workers ENV['PUMA_WORKERS'].to_i
 
-pidfile "#{ENV['app_name_upper_PROJECT_PATH']}/tmp/puma.pid"
+pidfile "#{ENV['PROJECT_PATH']}/tmp/puma.pid"
 
 if ENV['RAILS_ENV'] == 'production'
-  bind "unix://#{ENV['app_name_upper_PROJECT_PATH']}/tmp/puma.sock"
+  bind "unix://#{ENV['PROJECT_PATH']}/tmp/puma.sock"
 else
   port '3000'
 end
@@ -246,20 +270,18 @@ on_worker_boot do
 end
 CODE
 
-gsub_file 'config/puma.rb', 'app_name_upper', app_name_upper
-
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add the puma config'"
 
 file 'config/sidekiq.yml', <<-CODE
 ---
-:pidfile: <%= ENV['#{app_name_upper}_PROJECT_PATH'] %>/tmp/sidekiq.pid
-:concurrency: <%= ENV['#{app_name_upper}_SIDEKIQ_CONCURRENCY'].to_i %>
+:pidfile: <%= ENV['PROJECT_PATH'] %>/tmp/sidekiq.pid
+:concurrency: <%= ENV['SIDEKIQ_CONCURRENCY'].to_i %>
 :queues:
   - default
 CODE
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add the sidekiq config'"
 
 file 'config/sitemap.rb', <<-'CODE'
@@ -287,7 +309,7 @@ CODE
 
 gsub_file 'config/sitemap.rb', 'app_name', app_name
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add the sitemap config'"
 
 file 'config/schedule.rb', <<-CODE
@@ -296,7 +318,7 @@ every 1.day, at: '4:00 am' do
 end
 CODE
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add a sitemap rake task that occurs at 4am'"
 
 # ----- Modify the environment files ------------------------------------------------------------------
@@ -309,19 +331,12 @@ file 'config/environments/staging.rb', <<-CODE
 require_relative 'production.rb'
 
 #{app_name_class}::Application.configure do
-  config.x.track.google_analytics = ''
-  config.x.track.disqus_shortname = 'test-#{app_name}'
+  # Overwrite any production settings here, or if you want to start from scratch then remove line 1.
 end
 CODE
 
-git add:    '.'
-git commit: "-m 'Add tweakable settings'"
-
-inject_into_file 'config/environments/production.rb', after: "config/application.rb.\n" do <<-"CODE"
-    config.x.track.google_analytics = 'YOUR_UA_CODE'
-    config.x.track.disqus_shortname = '#{app_name}'
-CODE
-end
+git add:    '-A'
+git commit: "-m 'Add add staging environment'"
 
 inject_into_file 'config/environments/production.rb', after: "config.log_level = :info\n" do <<-"CODE"
   config.logger = Logger.new(config.paths['log'].first, 'daily')
@@ -337,8 +352,8 @@ inject_into_file 'config/environments/production.rb', after: "%w( search.js )\n"
 CODE
 end
 
-git add:    '.'
-git commit: "-m 'Add tweakable settings, setup daily log rotation and add fonts/pngs to the asset precompiler'"
+git add:    '-A'
+git commit: "-m 'Change production config options'"
 
 # ----- Modify the initializer files ------------------------------------------------------------------
 
@@ -348,7 +363,7 @@ puts        '-'*80, ''; sleep 0.25
 
 file 'config/initializers/sidekiq.rb', <<-'CODE'
 sidekiq_config = {
-  url: "redis://#{ENV['app_name_CACHE_HOST']}:#{ENV['app_name_CACHE_PORT']}/#{ENV['app_name_CACHE_DATABASE']}",
+  url: "redis://#{ENV['CACHE_HOST']}:#{ENV['CACHE_PORT']}/#{ENV['CACHE_DATABASE']}",
   namespace: "ns_app::sidekiq_#{Rails.env}"
 }
 
@@ -361,10 +376,9 @@ Sidekiq.configure_client do |config|
 end
 CODE
 
-gsub_file 'config/initializers/sidekiq.rb', 'app_name', app_name_upper
 gsub_file 'config/initializers/sidekiq.rb', 'ns_app', app_name
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add the sidekiq initializer'"
 
 file 'config/initializers/mini_profiler.rb', <<-CODE
@@ -374,7 +388,7 @@ if defined? Rack::MiniProfiler
 end
 CODE
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add the rack mini profiler initializer'"
 
 # ----- Modify the routes file ------------------------------------------------------------------------
@@ -385,7 +399,7 @@ puts        '-'*80, ''; sleep 0.25
 
 prepend_file 'config/routes.rb', "require 'sidekiq/web'\n\n"
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add sidekiq to the routes file'"
 
 inject_into_file 'config/routes.rb', after: "draw do\n" do <<-CODE
@@ -395,7 +409,7 @@ inject_into_file 'config/routes.rb', after: "draw do\n" do <<-CODE
 CODE
 end
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add a route concern for pagination'"
 
 # ----- Creating application tasks --------------------------------------------------------------------
@@ -434,7 +448,7 @@ namespace :assets do
 end
 CODE
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add a favicon generator task'"
 
 # ----- Creating application helpers ------------------------------------------------------------------
@@ -494,7 +508,7 @@ inject_into_file 'app/helpers/application_helper.rb', after: "ApplicationHelper\
 CODE
 end
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add favicon and boolean view helpers'"
 
 # ----- Creating view files ---------------------------------------------------------------------------
@@ -523,8 +537,10 @@ file 'app/views/layouts/application.html.erb', <<-HTML
     <script src="//cdnjs.cloudflare.com/ajax/libs/json3/3.3.0/json3.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
   <![endif]-->
+  <%= render 'layouts/google_analytics_snippet' %>
 </head>
 <body>
+  <%= render 'layouts/google_analytics_tracker' %>
   <header>
     <%= render 'layouts/navigation' %>
   </header>
@@ -533,6 +549,26 @@ file 'app/views/layouts/application.html.erb', <<-HTML
     <div class="page-header">
       <h1><%= yield :heading %></h1>
     </div>
+    <h4>Using disqus</h4>
+    <p>Disqus related html and javascript will only be loaded when the short name is not empty.</p>
+    <ul>
+      <li>Set the <code>DISQUS_SHORT_NAME</code> env variable in <code>.env</code> and restart the server</li>
+      <li>
+        To output the main comments (place this where you want it):
+        <ul><li>&lt;%= render 'layouts/disqus_comments_snippet' %&gt;</li></ul>
+      </li>
+      <li>
+        <strong>(optional)</strong> The count snippet is already right before &lt;/body&gt;
+        <ul>
+          <li>
+            <strong>(optional)</strong> Append #disqus_thread to the href attribute in your links.<br />
+            This will tell Disqus which links to look up and return the comment count.<br />
+            For example: <a href="http://foo.com/bar.html#disqus_thread">Link</a>.
+          </li>
+        </ul>
+      </li>
+    </ul>
+
     <%= render 'layouts/flash' %>
     <%= yield %>
   </main>
@@ -544,12 +580,12 @@ file 'app/views/layouts/application.html.erb', <<-HTML
     </div>
   </footer>
 
-  <% render 'layouts/google_analytics' %>
+  <%= render 'layouts/disqus_count_snippet' %>
 </body>
 </html>
 HTML
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add new layout view'"
 
 file 'app/views/layouts/_flash.html.erb', <<-'HTML'
@@ -565,7 +601,7 @@ file 'app/views/layouts/_flash.html.erb', <<-'HTML'
 <% end %>
 HTML
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add flash message partial'"
 
 file 'app/views/layouts/_navigation.html.erb', <<-HTML
@@ -589,7 +625,7 @@ file 'app/views/layouts/_navigation.html.erb', <<-HTML
 </nav>
 HTML
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add navigation partial'"
 
 file 'app/views/layouts/_navigation_links.html.erb', <<-HTML
@@ -598,21 +634,75 @@ file 'app/views/layouts/_navigation_links.html.erb', <<-HTML
 </li>
 HTML
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add navigation links partial'"
 
 file 'app/views/layouts/_footer.html.erb', <<-HTML
 <p class="text-muted">&copy; #{Time.now.year.to_s} #{app_name} - All rights reserved</p>
 HTML
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add footer partial'"
 
-file 'app/views/layouts/_google_analytics.html.erb', <<-HTML
+file 'app/views/layouts/_google_analytics_snippet.html.erb', <<-HTML
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+<% if ENV['GOOGLE_ANALYTICS_UA'].present? %>
+  _gaq.push(['_setAccount', '<%= ENV["GOOGLE_ANALYTICS_UA"] %>']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+<% end %>
+</script>
+HTML
+
+file 'app/views/layouts/_google_analytics_tracker.html.erb', <<-HTML
+<script type="text/javascript">
+  // This is added in the body to track both turbolinks and regular hits.
+  _gaq.push(['_trackPageview']);
+</script>
+HTML
+
+git add:    '-A'
+git commit: "-m 'Add google analytics partials'"
+
+file 'app/views/layouts/_disqus_comments_snippet.html.erb', <<-HTML
+<% if ENV['DISQUS_SHORT_NAME'].present? %>
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+    var disqus_shortname = '<%= ENV["DISQUS_SHORT_NAME"] %>';
+
+    (function() {
+        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
+<% end %>
+HTML
+
+file 'app/views/layouts/_disqus_count_snippet.html.erb', <<-HTML
+<% if ENV['DISQUS_SHORT_NAME'].present? %>
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+    var disqus_shortname = '<%= ENV["DISQUS_SHORT_NAME"] %>';
+
+    (function () {
+        var s = document.createElement('script'); s.async = true;
+        s.type = 'text/javascript';
+        s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+<% end %>
 HTML
 
-git add:    '.'
-git commit: "-m 'Add google analytics partial'"
+git add:    '-A'
+git commit: "-m 'Add disqus partials'"
 
 # ----- Creating public files -------------------------------------------------------------------------
 
@@ -688,7 +778,7 @@ file 'public/502.html', <<-HTML
 </html>
 HTML
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add public 404, 422, 500 and 502 error pages'"
 
 # ----- Modifying sass files --------------------------------------------------------------------------
@@ -699,7 +789,7 @@ puts        '-'*80, ''; sleep 0.25
 
 run 'mv app/assets/stylesheets/application.css app/assets/stylesheets/application.css.scss'
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Rename application.css to application.scss'"
 git add:    '-u'
 
@@ -707,7 +797,7 @@ inject_into_file 'app/assets/stylesheets/application.css.scss',
                  " *= require font-awesome\n",
                  before: " *= require_self\n"
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add font-awesome to the application.scss file'"
 
 append_file 'app/assets/stylesheets/application.css.scss' do <<-SCSS
@@ -791,14 +881,14 @@ puts        '-'*80, ''; sleep 0.25
 
 gsub_file 'app/assets/javascripts/application.js', "//= require jquery\n", ''
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Remove jquery from the application.js file because it is loaded from a CDN'"
 
 inject_into_file 'app/assets/javascripts/application.js',
                  "//= require jquery.turbolinks\n",
                  before: "//= require_tree .\n"
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add jquery-turbolinks to the application.js file'"
 
 inject_into_file 'app/assets/javascripts/application.js', before: "//= require_tree .\n" do <<-CODE
@@ -817,7 +907,7 @@ inject_into_file 'app/assets/javascripts/application.js', before: "//= require_t
 CODE
 end
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add bootstrap to the application.js file'"
 
 # ----- Modifying gem file ----------------------------------------------------------------------------
@@ -829,5 +919,5 @@ puts        '-'*80, ''; sleep 0.25
 run 'rm -f Gemfile'
 from_gem 'Gemfile', 'Gemfile'
 
-git add:    '.'
+git add:    '-A'
 git commit: "-m 'Add basic gems to the Gemfile'"

data/lib/orats/templates/includes/Gemfile

@@ -7,8 +7,6 @@ gem 'jquery-turbolinks', '~> 2.0.2'
 gem 'bootstrap-sass', '~> 3.1.1'
 gem 'font-awesome-rails', '~> 4.1.0'
 
-gem 'custom_configuration', '~> 0.0.2'
-
 gem 'pg', '~> 0.17.1'
 gem 'redis-rails', '~> 4.0.0'
 

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

@@ -48,43 +48,46 @@ rails_deploy_migrate_master_host: "{{ groups['app'][0] }}"
 rails_deploy_env:
   RAILS_ENV: production
 
-  TESTPROJ_PROJECT_PATH: "{{ rails_deploy_path }}"
-
-  TESTPROJ_DATABASE_HOST: localhost
-  TESTPROJ_DATABASE_NAME: "{{ rails_deploy_app_name }}"
-  TESTPROJ_DATABASE_USERNAME: "{{ postgres_user }}"
-  TESTPROJ_DATABASE_PASSWORD: "{{ postgres_password }}"
-  TESTPROJ_DATABASE_POOL: 25
-  TESTPROJ_DATABASE_TIMEOUT: 5000
-
-  TESTPROJ_CACHE_HOST: "{{ redis_bind }}"
-  TESTPROJ_CACHE_PORT: "{{ redis_port }}"
-  TESTPROJ_CACHE_DATABASE: 0
-  TESTPROJ_CACHE_PASSWORD: "{{ secrets_redis_password }}"
-
-  TESTPROJ_TOKEN_RAILS_SECRET: "{{ secrets_rails_token }}"
-  TESTPROJ_TOKEN_DEVISE_SECRET: "{{ secrets_devise_token }}"
-  TESTPROJ_TOKEN_DEVISE_PEPPER: "{{ secrets_devise_pepper_token }}"
-
-  TESTPROJ_SMTP_ADDRESS: smtp.testproj.com
-  TESTPROJ_SMTP_PORT: 25
-  TESTPROJ_SMTP_DOMAIN: testproj.com
-  TESTPROJ_SMTP_USERNAME: info@testproj.com
-  TESTPROJ_SMTP_PASSWORD: "{{ secrets_mail_password }}"
-  TESTPROJ_SMTP_AUTH: plain
-  TESTPROJ_SMTP_STARTTTLS_AUTO: true
-
-  TESTPROJ_ACTION_MAILER_HOST: www.testproj.com
-  TESTPROJ_ACTION_MAILER_DEFAULT_EMAIL: info@testproj.com
-  TESTPROJ_ACTION_MAILER_DEVISE_DEFAULT_EMAIL: info@testproj.com
-
-  TESTPROJ_PUMA_THREADS_MIN: 0
-  TESTPROJ_PUMA_THREADS_MAX: 16
+  PROJECT_PATH: "{{ rails_deploy_path }}"
+
+  GOOGLE_ANALYTICS_UA:
+  DISQUS_SHORT_NAME:
+
+  DATABASE_HOST: localhost
+  DATABASE_NAME: "{{ rails_deploy_app_name }}"
+  DATABASE_USERNAME: "{{ postgres_user }}"
+  DATABASE_PASSWORD: "{{ postgres_password }}"
+  DATABASE_POOL: 25
+  DATABASE_TIMEOUT: 5000
+
+  CACHE_HOST: "{{ redis_bind }}"
+  CACHE_PORT: "{{ redis_port }}"
+  CACHE_DATABASE: 0
+  CACHE_PASSWORD: "{{ secrets_redis_password }}"
+
+  TOKEN_RAILS_SECRET: "{{ secrets_rails_token }}"
+  TOKEN_DEVISE_SECRET: "{{ secrets_devise_token }}"
+  TOKEN_DEVISE_PEPPER: "{{ secrets_devise_pepper_token }}"
+
+  SMTP_ADDRESS: smtp.testproj.com
+  SMTP_PORT: 25
+  SMTP_DOMAIN: testproj.com
+  SMTP_USERNAME: info@testproj.com
+  SMTP_PASSWORD: "{{ secrets_mail_password }}"
+  SMTP_AUTH: plain
+  SMTP_STARTTTLS_AUTO: true
+
+  ACTION_MAILER_HOST: www.testproj.com
+  ACTION_MAILER_DEFAULT_EMAIL: info@testproj.com
+  ACTION_MAILER_DEVISE_DEFAULT_EMAIL: info@testproj.com
+
+  PUMA_THREADS_MIN: 0
+  PUMA_THREADS_MAX: 16
 
   # ensure there are always at least 2 workers so puma can properly do phased restarts
-  TESTPROJ_PUMA_WORKERS: "{{ ansible_processor_cores if ansible_processor_cores > 1 else 2 }}"
+  PUMA_WORKERS: "{{ ansible_processor_cores if ansible_processor_cores > 1 else 2 }}"
 
-  TESTPROJ_SIDEKIQ_CONCURRENCY: 25
+  SIDEKIQ_CONCURRENCY: 25
 
 # nginx configuration
 nginx_base_domain: 0.0.0.0

data/lib/orats/templates/play.rb

@@ -56,7 +56,7 @@ say_status  'git', 'Creating initial commit...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
 git :init
-git add: '.'
+git add: '-A'
 git commit: "-m 'Initial commit'"
 
 # ----- Create the license ----------------------------------------------------------------------------
@@ -93,7 +93,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 TEXT
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add MIT license'"
 
 # ----- Create the site file --------------------------------------------------------------------------
@@ -159,7 +159,7 @@ file 'site.yml' do <<-TEXT
 TEXT
 end
 
-git add: '.'
+git add: '-A'
 git commit: "-m 'Add site.yml file'"
 
 # ----- Installation complete message -----------------------------------------------------------------

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor