orats 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eab03ca425d310966be31c40d5665307545cd274
-  data.tar.gz: 34739793810ba50d861e41adb375b413116fee8e
+  metadata.gz: 84783844b3e3057b3d2954896e9cbeede3be6194
+  data.tar.gz: a7e7d5a60229a20cc69010bcaf1d0633c96f9f2b
 SHA512:
-  metadata.gz: 98ae72b09b93e0ca2cd85f9d4370e23be4ea79c4cca892d548c36c4e1919c71969b75ecc1f3c562f1019a40e0d67afe0b4086bf0f4edd1cb805bfc7990bbf7a3
-  data.tar.gz: 2240f9eba87c08ae51b681ef77d55d31ee1815dcb274ea96f5c1ec0a61956766e6bb4da3fd5731167379af8f8ef25418e161298458ccd24feebc37208cebac91
+  metadata.gz: f3b070ff1ebbd3ba5e1a32e04b07c3c6762bf6fa4163c09db19dc475a2d8a91a8ad1c7d4da5f6278347366a0e79991091be70dddb493baee8365671970f7c060
+  data.tar.gz: 29bd81f9ef9dc0ebfee71c717f654270e2869e1678827975ea93fedc842c10feec0730c2a5556c19ebfc3a98778ce7494508bd2847878ca2546dbe706b314e0f

data/README.md

@@ -75,7 +75,7 @@ running `orats <command name> help` from your terminal. You can also type `orats
         - Optionally takes: `--template []`
     - Project features:
         - Optionally takes: `--skip-extras [false]`
-        - Optionally takes: `--skip-foreman-start [false]`
+        - Optionally takes: `--skip-server-start [false]`
     - Ansible features:
         - Optionally takes: `--sudo-password []`
         - Optionally takes: `--skip-galaxy [false]`
@@ -134,7 +134,7 @@ it includes these features and when I do not want a specific thing it is much qu
 - Use sidekiq as a background worker.
 - Use puma as the server with settings capable of doing phased restarts.
 - Use foreman in development mode to manage starting both the rails server using puma and sidekiq.
-- Add a rake task to handle upgrades using the `backup` gem.
+- Add a rake task to handle backups using the `backup` gem.
 - Set the production asset precompiler to include fonts and png files.
 - Set the production logger to rotate the logs daily.
 - Set the timezone to EST.

data/lib/orats/cli.rb

@@ -14,7 +14,7 @@ module Orats
     option :auth, type: :boolean, default: false, aliases: '-a'
     option :template, default: '', aliases: '-m'
     option :skip_extras, type: :boolean, default: false, aliases: '-E'
-    option :skip_foreman_start, type: :boolean, default: false, aliases: '-F'
+    option :skip_server_start, type: :boolean, default: false, aliases: '-F'
     option :sudo_password, default: '', aliases: '-s'
     option :skip_galaxy, type: :boolean, default: false, aliases: '-G'
     desc 'new TARGET_PATH [options]', ''
@@ -45,7 +45,7 @@ module Orats
 
       `--skip-extras` skip creating the services directory and ansible inventory/secrets [false]
 
-      `--skip-foreman-start` skip automatically running puma and sidekiq [false]
+      `--skip-server-start` skip automatically running puma and sidekiq [false]
 
       Ansible features:
 
@@ -71,6 +71,7 @@ module Orats
     end
 
     option :skip_data, type: :boolean, default: false, aliases: '-D'
+    option :redis_password, default: '', aliases: '-d'
     desc 'nuke TARGET_PATH [options]', ''
     long_desc <<-D
       `orats nuke target_path` will delete the directory and optionally all data associated to it.
@@ -78,6 +79,8 @@ module Orats
       Options:
 
       `--skip-data` will skip deleting app specific postgres databases and redis namespaces [false]
+
+      `--redis-password` to supply your development redis password []
     D
     def nuke(target_path)
       Commands::Nuke.new(target_path, options).init

data/lib/orats/commands/new/ansible.rb

@@ -52,15 +52,8 @@ module Orats
           log_thor_task 'shell', 'Creating ansible secrets'
           run "mkdir #{secrets_path}"
 
-          if @options[:redis_password].empty?
-            run "touch #{secrets_path}/redis_password"
-          else
-            save_secret_string "#{secrets_path}/redis_password"
-            gsub_file "#{@target_path}/#{fix_path_for_user(Commands::Common::RELATIVE_PATHS[:inventory])}",
-                      'redis_password: false', 'redis_password: true'
-          end
-
           save_secret_string "#{secrets_path}/postgres_password"
+          save_secret_string "#{secrets_path}/redis_password"
           save_secret_string "#{secrets_path}/mail_password"
           save_secret_string "#{secrets_path}/rails_token"
           save_secret_string "#{secrets_path}/devise_token"

data/lib/orats/commands/new/exec.rb

@@ -1,7 +1,7 @@
 require 'orats/commands/common'
 require 'orats/commands/new/ansible'
 require 'orats/commands/new/rails'
-require 'orats/commands/new/foreman'
+require 'orats/commands/new/server'
 
 module Orats
   module Commands
@@ -9,7 +9,7 @@ module Orats
       class Exec < Commands::Common
         include Ansible
         include Rails
-        include Foreman
+        include Server
 
         def initialize(target_path = '', options = {})
           super
@@ -28,6 +28,7 @@ module Orats
             spring_binstub
 
             create_and_migrate_database
+            run_rake 'orats:favicons'
           end
 
           if @options[:auth]
@@ -40,7 +41,7 @@ module Orats
 
           custom_rails_template unless @options[:template].empty?
 
-          foreman_start unless @options[:skip_foreman_start]
+          server_start unless @options[:skip_server_start]
         end
 
         private

data/lib/orats/commands/new/rails.rb

@@ -31,11 +31,9 @@ module Orats
         end
 
         def gsub_redis_info
-          log_thor_task 'root', 'Adding the redis password'
-          gsub_file "#{@active_path}/config/initializers/sidekiq.rb", '//', "//:#{ENV['CACHE_PASSWORD']}@"
-          gsub_file "#{@active_path}/.env", 'HE_PASSWORD: ', "HE_PASSWORD: #{@options[:redis_password]}"
+          log_thor_task 'root', 'Changing the redis 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'
 
           git_commit 'Add the redis password'
         end

data/lib/orats/commands/new/{foreman.rb → server.rb}

@@ -4,9 +4,9 @@ require 'timeout'
 module Orats
   module Commands
     module New
-      module Foreman
-        def foreman_start
-          @options[:skip_foreman_start] ? message = 'Start your' : message = 'Starting'
+      module Server
+        def server_start
+          @options[:skip_server_start] ? message = 'Start your' : message = 'Starting'
 
           puts  '', '='*80
           log_status_top 'action', "#{message} server with the following commands", :cyan

data/lib/orats/commands/nuke.rb

@@ -60,7 +60,21 @@ module Orats
 
       def nuke_redis(namespace)
         log_thor_task 'root', 'Removing redis keys'
-        run "redis-cli KEYS '#{namespace}:*' | xargs --delim='\n' redis-cli DEL"
+
+        while not_able_to_nuke_redis?(@options[:redis_password], namespace)
+          log_status_top 'error', "The redis password you supplied was incorrect\n", :red
+          new_password = ask('Enter the correct password or CTRL+C to quit:', :cyan)
+          puts
+
+          break unless not_able_to_nuke_redis?(new_password, namespace)
+        end
+      end
+
+      def not_able_to_nuke_redis?(password, namespace)
+        password.empty? ? redis_password = '' : redis_password = "-a #{password}"
+        redis_out = run("redis-cli #{redis_password} KEYS '#{namespace}:*' | xargs --delim='\n' redis-cli #{redis_password} DEL", capture: true)
+
+        redis_out.include?('NOAUTH Authentication required')
       end
 
       def nuke_directory

data/lib/orats/templates/base.rb

@@ -1,5 +1,5 @@
 # =====================================================================================================
-# Template for generating an opinionated base Rails 4.1.0 project using Ruby 2.1.0
+# Template for generating an opinionated base Rails 4.1.0 project using Ruby 2.1.2
 # =====================================================================================================
 
 # ----- Helper functions and variables ----------------------------------------------------------------
@@ -51,16 +51,12 @@ append_to_file '.gitignore' do <<-TEXT
 *~
 .idea/
 
-# Ignore the main environment file.
+# Ignore the dotenv file.
 .env
 
 # Ignore app specific folders.
 /vendor/bundle
 /public/assets/*
-
-# Ignore backup paths.
-/lib/backup/log/*
-/lib/backup/tmp/*
 TEXT
 end
 
@@ -69,43 +65,24 @@ git commit: "-m 'Add common OS and editor files to the .gitignore file'"
 
 # ----- Add a bundler config --------------------------------------------------------------------
 
-puts
-say_status  'bundler', 'Creating bundler config...', :yellow
-puts        '-'*80, ''; sleep 0.25
-
-file '.bundler/config' do <<-CODE
----
-BUNDLE_WITHOUT: production:staging
-CODE
-end
-
-git add: '-A'
-git commit: "-m 'Add .bundler/config to ignore production:staging'"
-
-# ----- Create a few root files -----------------------------------------------------------------------
-
-puts
-say_status  'root', 'Creating root files...', :yellow
-puts        '-'*80, ''; sleep 0.25
-
-file '.ruby-version', '2.1.2'
-
-git add:    '-A'
-git commit: "-m 'Add .ruby-version file for common ruby version managers'"
-
-file 'Procfile' do <<-CODE
-web: puma -C config/puma.rb
-worker: sidekiq -C config/sidekiq.yml
-CODE
-end
+# puts
+# say_status  'bundle', 'Creating bundle config...', :yellow
+# puts        '-'*80, ''; sleep 0.25
+#
+# file '.bundle/config' do <<-CODE
+# ---
+# BUNDLE_WITHOUT: production:staging
+# CODE
+# end
+#
+# git add: '-A'
+# git commit: "-m 'Add .bundle/config to ignore production:staging in development mode'"
 
-git add:    '-A'
-git commit: "-m 'Add a basic Procfile to start the puma and sidekiq processes'"
 
-# ----- Create an .env file ---------------------------------------------------------------------------
+# ----- Create a development environment file ---------------------------------------------------
 
 puts
-say_status  'root', 'Creating .env file...', :yellow
+say_status  'root', 'Creating development environment file...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
 file '.env' do <<-CODE
@@ -153,6 +130,24 @@ SIDEKIQ_CONCURRENCY: 25
 CODE
 end
 
+git add: '-A'
+git commit: "-m 'Add development environment file'"
+
+# ----- Create the foreman Procfile ------------------------------------------------------------------------
+
+puts
+say_status  'start', 'Creating the Procfile for foreman...', :yellow
+puts        '-'*80, ''; sleep 0.25
+
+file 'Procfile' do <<-CODE
+web: puma -C config/puma.rb
+worker: sidekiq -C config/sidekiq.yml
+CODE
+end
+
+git add:    '-A'
+git commit: "-m 'Add a basic Procfile to start the puma and sidekiq processes'"
+
 # ----- Modify the secrets yaml file -----------------------------------------------------------------------
 
 gsub_file 'config/secrets.yml', /.*\n/, ''
@@ -208,12 +203,14 @@ inject_into_file 'config/application.rb', after: "automatically loaded.\n" do <<
     config.action_mailer.default_options = { from: ENV['ACTION_MAILER_DEFAULT_FROM'] }
     config.action_mailer.default_url_options = { host: ENV['ACTION_MAILER_HOST'] }
 
-    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'],
-                                         namespace: '#{app_name}::cache'
-                                       }
+    redis_store_options = { host: ENV['CACHE_HOST'],
+                            port: ENV['CACHE_PORT'].to_i,
+                            db: ENV['CACHE_DATABASE'].to_i,
+                            namespace: '#{app_name}::cache'
+                          }
+    redis_store_options[:password] = ENV['CACHE_PASSWORD'] if ENV['CACHE_PASSWORD'].present?
+
+    config.cache_store = :redis_store, redis_store_options
 CODE
 end
 
@@ -339,7 +336,7 @@ git commit: "-m 'Add the sitemap config'"
 
 file 'config/schedule.rb', <<-CODE
 every 1.day, at: '3:00 am' do
-  rake 'backup:production'
+  rake 'orats:backup'
 end
 
 every 1.day, at: '4:00 am' do
@@ -391,8 +388,12 @@ say_status  'config', 'Modifying the initializer files...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
 file 'config/initializers/sidekiq.rb', <<-'CODE'
+ENV['CACHE_PASSWORD'].present? ? pass_string = ":#{ENV['CACHE_PASSWORD']}@" :  pass_string = ''
+
+redis_host = "#{pass_string}#{ENV['CACHE_HOST']}"
+
 sidekiq_config = {
-  url: "redis://#{ENV['CACHE_HOST']}:#{ENV['CACHE_PORT']}/#{ENV['CACHE_DATABASE']}",
+  url: "redis://#{redis_host}:#{ENV['CACHE_PORT']}/#{ENV['CACHE_DATABASE']}",
   namespace: "ns_app::sidekiq_#{Rails.env}"
 }
 
@@ -447,31 +448,52 @@ puts
 say_status  'tasks', 'Creating application tasks...', :yellow
 puts        '-'*80, ''; sleep 0.25
 
-file 'lib/tasks/favicon.rake', <<-'CODE'
-namespace :assets do
+file 'lib/tasks/orats/favicon.rake', <<-'CODE'
+namespace :orats do
   desc 'Create favicons from a single base png'
-  task favicon: :environment do
+  task :favicons do
     require 'favicon_maker'
 
-    options = {
-      versions: [:apple_144, :apple_120, :apple_114, :apple_72, :apple_57, :apple_pre, :apple, :fav_png, :fav_ico],
-      custom_versions: {
-                         apple_extreme_retina: {
-                           filename: 'apple-touch-icon-228x228-precomposed.png', dimensions: '228x228', format: 'png'
-                         },
-                         speeddial: {
-                           filename: 'speeddial-160px.png', dimensions: '160x160', format: 'png'
-                         }
-                       },
-      root_dir: Rails.root,
-      input_dir: File.join('app', 'assets', 'favicon'),
-      base_image: 'favicon_base.png',
-      output_dir: File.join('app', 'assets', 'images'),
-      copy: true
-    }
-
-    FaviconMaker::Generator.create_versions(options) do |filepath|
-      puts "Created favicon: #{filepath}"
+    FaviconMaker.generate do
+      setup do
+        template_dir Rails.root.join('app', 'assets', 'favicon')
+        output_dir Rails.root.join('public')
+      end
+
+      favicon_base_path = "#{template_dir}/favicon_base.png"
+
+      unless File.exist?(favicon_base_path)
+        puts
+        puts 'A base favicon could not be found, make sure one exists at:'
+        puts base_favicon
+        puts
+        exit 1
+      end
+
+      from File.basename(favicon_base_path) do
+        icon 'speeddial-160x160.png'
+        icon 'apple-touch-icon-228x228-precomposed.png'
+        icon 'apple-touch-icon-152x152-precomposed.png'
+        icon 'apple-touch-icon-144x144-precomposed.png'
+        icon 'apple-touch-icon-120x120-precomposed.png'
+        icon 'apple-touch-icon-114x114-precomposed.png'
+        icon 'apple-touch-icon-76x76-precomposed.png'
+        icon 'apple-touch-icon-72x72-precomposed.png'
+        icon 'apple-touch-icon-60x60-precomposed.png'
+        icon 'apple-touch-icon-57x57-precomposed.png'
+        icon 'favicon-196x196.png'
+        icon 'favicon-160x160.png'
+        icon 'favicon-96x96.png'
+        icon 'favicon-64x64.png'
+        icon 'favicon-32x32.png'
+        icon 'favicon-24x24.png'
+        icon 'favicon-16x16.png'
+        icon 'favicon.ico', size: '64x64,32x32,24x24,16x16'
+      end
+
+      each_icon do |filepath|
+        puts "Creating favicon for: #{File.basename filepath}"
+      end
     end
   end
 end
@@ -480,24 +502,32 @@ CODE
 git add:    '-A'
 git commit: "-m 'Add a favicon generator task'"
 
-file 'lib/tasks/backup.rake', <<-'CODE'
-namespace :backup do
-  desc 'Create a backup of your production application'
-  task :production do
-    project_name = File.basename(Rails.root)
-    project_name = project_name.split('.').first if project_name.include?('.')
+file 'lib/tasks/orats/backup.rake', <<-'CODE'
+namespace :orats do
+  desc 'Create a backup of your application for a specific environment'
+  task :backup do
+    if File.exist?('.env') && File.file?('.env')
+      require 'dotenv'
+      Dotenv.load
+
+      source_external_env = ''
+    else
+      source_external_env = '. /etc/default/app_name &&'
+    end
 
-    # source the production environment
-    # using a best guess of the name based on the folder name, you may have to change it if it does not match
-    sourced_env = ". /etc/default/#{project_name}"
+    # hack'ish way to run the backup command with elevated privileges, it won't prompt for a password on the production
+    # server because passwordless sudo has been enabled if you use the ansible setup provided by orats
+    system 'sudo whoami'
 
-    system "#{sourced_env} && backup perform -t production_backup -c '#{Rails.root.join('lib', 'backup', 'config.rb')}'"
+    system "#{source_external_env} backup perform -t backup -c '#{File.join('lib', 'backup', 'config.rb')}' --log-path='#{File.join('log')}'"
   end
 end
 CODE
 
+gsub_file 'lib/tasks/orats/backup.rake', 'app_name', app_name
+
 git add:    '-A'
-git commit: "-m 'Add a favicon generator task'"
+git commit: "-m 'Add a backup task'"
 
 # ----- Creating application backup --------------------------------------------------------------------
 
@@ -544,7 +574,7 @@ root_path 'lib/backup'
 # May be an absolute path, or relative to the current directory or +root_path+.
 #
 
-tmp_path  'tmp'
+tmp_path  '../../tmp'
 
 #
 # Sets the path where backup stores persistent information.
@@ -552,7 +582,7 @@ tmp_path  'tmp'
 # May be an absolute path, or relative to the current directory or +root_path+.
 #
 
-data_path 'data'
+data_path '../../tmp/backup/data'
 
 ##
 # Utilities
@@ -637,12 +667,14 @@ CODE
 git add:    '-A'
 git commit: "-m 'Add backup config'"
 
-file 'lib/backup/models/production_backup.rb', <<-'CODE'
-Model.new(:production_backup, 'Production backup') do
+file 'lib/backup/models/backup.rb', <<-'CODE'
+Model.new(:backup, 'Backup for the current RAILS_ENV') do
   split_into_chunks_of 10
   compress_with Gzip
 
   database PostgreSQL do |db|
+    db.sudo_user          = ENV['DATABASE_USERNAME']
+
     # To dump all databases, set `db.name = :all` (or leave blank)
     db.name               = ENV['DATABASE_NAME']
     db.username           = ENV['DATABASE_USERNAME']
@@ -672,7 +704,7 @@ Model.new(:production_backup, 'Production backup') do
   #   s3.secret_access_key = ENV['S3_SECRET_ACCESS_KEY']
   #   s3.region = ENV['S3_REGION']
   #   s3.bucket = 'backup'
-  #   s3.path = '/production/database'
+  #   s3.path = "/database/#{ENV['RAILS_ENV']}"
   # end
 
   ENV['SMTP_ENCRYPTION'].empty? ? mail_encryption = 'none' : mail_encryption = ENV['SMTP_ENCRYPTION']
@@ -718,20 +750,25 @@ inject_into_file 'app/helpers/application_helper.rb', after: "ApplicationHelper\
   end
 
   def link_to_all_favicons
-    capture do
-      concat favicon_link_tag 'speeddial-160px.png', rel: 'icon', type: 'image/png'
-      concat favicon_link_tag 'favicon.ico', rel: 'icon', type: 'image/x-icon'
-      concat favicon_link_tag 'favicon.ico', rel: 'shortcut icon', type: 'image/x-icon'
-      concat favicon_link_tag 'favicon.png', rel: 'icon', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon-228x228-precomposed.png', sizes: '72x72', rel: 'apple-touch-icon-precomposed', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', sizes: '144x144', rel: 'apple-touch-icon-precomposed', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon-120x120-precomposed.png', sizes: '120x120', rel: 'apple-touch-icon-precomposed', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', sizes: '114x114', rel: 'apple-touch-icon-precomposed', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', sizes: '72x72', rel: 'apple-touch-icon-precomposed', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon-57x57-precomposed.png', sizes: '57x57', rel: 'apple-touch-icon-precomposed', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon-precomposed.png', sizes: '57x54', rel: 'apple-touch-icon-precomposed', type: 'image/png'
-      concat favicon_link_tag 'apple-touch-icon.png', sizes: '57x54', rel: 'apple-touch-icon', type: 'image/png'
-    end
+    '<link href="speeddial-160x160.png" rel="icon" type="image/png" />
+    <link href="apple-touch-icon-228x228-precomposed.png" rel="apple-touch-icon-precomposed" sizes="228x228" type="image/png" />
+    <link href="apple-touch-icon-152x152-precomposed.png" rel="apple-touch-icon-precomposed" sizes="152x152" type="image/png" />
+    <link href="apple-touch-icon-144x144-precomposed.png" rel="apple-touch-icon-precomposed" sizes="144x144" type="image/png" />
+    <link href="apple-touch-icon-120x120-precomposed.png" rel="apple-touch-icon-precomposed" sizes="120x120" type="image/png" />
+    <link href="apple-touch-icon-114x114-precomposed.png" rel="apple-touch-icon-precomposed" sizes="114x114" type="image/png" />
+    <link href="apple-touch-icon-76x76-precomposed.png" rel="apple-touch-icon-precomposed" sizes="76x76" type="image/png" />
+    <link href="apple-touch-icon-72x72-precomposed.png" rel="apple-touch-icon-precomposed" sizes="72x72" type="image/png" />
+    <link href="apple-touch-icon-60x60-precomposed.png" rel="apple-touch-icon-precomposed" sizes="60x60" type="image/png" />
+    <link href="apple-touch-icon-57x57-precomposed.png" rel="apple-touch-icon-precomposed" sizes="57x57" type="image/png" />
+    <link href="favicon-196x196.png" rel="icon" sizes="196x196" type="image/png" />
+    <link href="favicon-160x160.png" rel="icon" sizes="160x160" type="image/png" />
+    <link href="favicon-96x96.png" rel="icon" sizes="96x96" type="image/png" />
+    <link href="favicon-64x64.png" rel="icon" sizes="64x64" type="image/png" />
+    <link href="favicon-32x32.png" rel="icon" sizes="32x32" type="image/png" />
+    <link href="favicon-24x24.png" rel="icon" sizes="24x24" type="image/png" />
+    <link href="favicon-16x16.png" rel="icon" sizes="16x16" type="image/png" />
+    <link href="favicon.ico" rel="icon" type="image/x-icon" />
+    <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />'.html_safe
   end
 
   def humanize_boolean(input)
@@ -1167,4 +1204,17 @@ run 'rm -f Gemfile'
 from_gem 'Gemfile', 'Gemfile'
 
 git add:    '-A'
-git commit: "-m 'Add basic gems to the Gemfile'"
+git commit: "-m 'Add basic gems to the Gemfile'"
+
+# ----- Adding default favicon-------------------------------------------------------------------------
+
+puts
+say_status  'assets', 'Copying default favicon...', :yellow
+puts        '-'*80, ''; sleep 0.25
+
+base_path = "#{File.expand_path File.dirname(__FILE__)}/includes"
+run 'mkdir -p app/assets/favicon'
+run "cp #{base_path}/app/assets/favicon/favicon_base.png app/assets/favicon/favicon_base.png"
+
+git add:    '-A'
+git commit: "-m 'Add default 256x256 favicon'"

data/lib/orats/templates/includes/Galaxyfile

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

data/lib/orats/templates/includes/Gemfile

@@ -15,22 +15,22 @@ gem 'sidekiq', '~> 3.1.2'
 gem 'sinatra', '>= 1.4.5', require: false
 #gem 'jbuilder'
 
-gem 'kaminari', '~> 0.15.1'
+gem 'kaminari', '~> 0.16.0'
 
 gem 'sitemap_generator', '~> 5.0.2'
-gem 'favicon_maker', '~> 1.1.2'
+gem 'favicon_maker', '~> 1.3'
 
 group :development do
   gem 'spring', '~> 1.1.2'
   gem 'foreman', require: false
   gem 'rack-mini-profiler', '~> 0.9.1'
-  gem 'bullet', '~> 4.8.0'
+  gem 'bullet', '~> 4.10.0'
   gem 'meta_request', '~> 0.3.0'
   gem 'railroady', '~> 1.1.1', require: false
 end
 
 group :development, :test do
-  gem 'dotenv-rails', '~> 0.7.0'
+  gem 'dotenv-rails', '~> 0.11.1'
 end
 
 group :staging, :production do

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

@@ -26,7 +26,7 @@ redis_port: 6379
 redis_version: 2.8.9
 redis_install_dir: /usr/local
 redis_dir: /usr/local/redis
-redis_password: false # must be set to true if you want to use a password
+redis_password: "{{ secrets_redis_password }}"
 
 # rails application configuration
 rails_deploy_app_name: testproj
@@ -50,6 +50,7 @@ rails_deploy_env:
   RAILS_ENV: production
 
   PROJECT_PATH: "{{ rails_deploy_path }}"
+  SOURCE_ENV_PATH: "/etc/default/{{ rails_deploy_app_name }}"
 
   GOOGLE_ANALYTICS_UA: ""
   DISQUS_SHORT_NAME: ""
@@ -94,8 +95,11 @@ rails_deploy_env:
 
   SIDEKIQ_CONCURRENCY: 25
 
+# whenever configuration
+whenever_update: rails_deploy_app_name
+
 # nginx configuration
-nginx_base_domain: 0.0.0.0
+nginx_base_domain: localhost
 nginx_upstream_name: "{{ rails_deploy_app_name }}"
 nginx_upstream_server: unix://{{ rails_deploy_path }}/tmp/puma.sock
 nginx_root_path: "{{ rails_deploy_path }}/public"

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/test/test_helper.rb

@@ -1,14 +1,14 @@
 require 'minitest/autorun'
 require 'securerandom'
-require_relative '../lib/orats/foreman'
+require_relative '../lib/orats/server'
 
 module Orats
   module Test
-    include Foreman
+    include Server
 
     BINARY_PATH = File.absolute_path('../../bin/orats',__FILE__)
     TEST_PATH = '/tmp/orats/test'
-    ORATS_FLAGS = '--pg-password pleasedonthackme --skip-foreman-start'
+    ORATS_FLAGS = '--pg-password pleasedonthackme --skip-server-start'
 
     def orats(command, options = {})
       cmd, app_name = command.split(' ')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,8 +86,8 @@ files:
 - lib/orats/commands/common.rb
 - lib/orats/commands/new/ansible.rb
 - lib/orats/commands/new/exec.rb
-- lib/orats/commands/new/foreman.rb
 - lib/orats/commands/new/rails.rb
+- lib/orats/commands/new/server.rb
 - lib/orats/commands/nuke.rb
 - lib/orats/commands/outdated/compare.rb
 - lib/orats/commands/outdated/exec.rb
@@ -98,6 +98,7 @@ files:
 - lib/orats/templates/base.rb
 - lib/orats/templates/includes/Galaxyfile
 - lib/orats/templates/includes/Gemfile
+- lib/orats/templates/includes/app/assets/favicon/favicon_base.png
 - lib/orats/templates/includes/inventory/group_vars/all.yml
 - lib/orats/templates/includes/inventory/hosts
 - lib/orats/templates/play.rb