matross 0.4.1 → 0.4.2

data/README.md

@@ -94,11 +94,11 @@ Procfile task: `web: bundle exec unicorn -c <%= unicorn_config %> -E <%= rails_e
 
 > Variables
 
-| Variable           | Default value                        | Description                        |
-| ---                | ---                                  | ---                                |
-| `:unicorn_config`  | `"#{shared_path}/config/unicorn.rb"` | Location of the configuration file |
-| `:unicorn_log`     | `"#{shared_path}/log/unicorn.log"`   | Location of unicorn log            |
-| `:unicorn_workers` | `1`                                  | Number of unicorn workers          |
+| Variable           | Default value                               | Description                        |
+| ---                | ---                                         | ---                                |
+| `:unicorn_config`  | `"#{shared_path}/config/unicorn.rb"`        | Location of the configuration file |
+| `:unicorn_log`     | `"#{shared_path}/log/unicorn.log"`          | Location of unicorn log            |
+| `:unicorn_workers` | Number of cores specified by /proc/cpuinfo  | Number of unicorn workers          |
 
 > Tasks
 
@@ -273,7 +273,21 @@ Procfile task: `faye: bundle exec rackup  <%= faye_ru %> -s thin -E <%= rails_en
 
 ### Local Assets
 
-This recipe overwrites the default assets precompilation by compiling them locally and then uploading the result to the server.
+In order to deal with memory or CPU constrained production servers, this recipe overwrites the default assets precompilation by compiling them locally and then uploading the result to the server.
+
+Rake precompiles assets in a `production` to properly generate file names with hashes. One of the gotchas to this is that by default Rails initializes the entire applicaction when executing the `assets:precompile` task. If you use different databases in production and development and run into database connection errors with this task you can override this behavior.
+
+> `config/application.rb`
+
+```ruby
+module AwesomeApplication
+  class Application < Rails::Application
+    ...
+    config.assets.initialize_on_precompile = false if Rails.env.production?
+    ...
+  end
+end
+```
 
 ## Full Example
 

data/lib/matross/foreman.rb

@@ -17,7 +17,7 @@ namespace :foreman do
     cmd = <<-EOF.gsub(/^\s+/, '')
       rm -f #{shared_path}/Procfile-matross;
       for file in #{current_path}/Procfile #{shared_path}/Procfile.*; do \
-        cat $file >> #{shared_path}/Procfile-matross;
+        [ -f $file ] && cat $file >> #{shared_path}/Procfile-matross;
       done;
       rm -f #{shared_path}/Procfile.*;
       cat <(echo \"RAILS_ENV=#{rails_env.to_s.shellescape}\") \
@@ -71,14 +71,14 @@ namespace :foreman do
 
   desc "Symlink upstart logs to application shared/log"
   task :log, except: { no_release: true } do
-    capture("ls #{shared_path}/upstart -1").split(/\r?\n/).each { |line|
-      log = File.basename(line.sub(/\.conf\Z/, ".log"))
-      run <<-EOF.gsub(/^\s+/, '')
-        #{sudo} touch /var/log/upstart/#{log} &&
-        #{sudo} chmod o+r /var/log/upstart/#{log} &&
-        ln -nfs /var/log/upstart/#{log} #{shared_path}/log/#{log}
-      EOF
-    }
+    run <<-EOF.gsub(/^s+/, '')
+    ls #{shared_path}/upstart -1 | while read line; do
+      logname=$(basename $line | sed "s/.conf$/.log/");
+      #{sudo} touch /var/log/upstart/${logname} &&
+      #{sudo} chmod o+r /var/log/upstart/${logname} &&
+      ln -nfs /var/log/upstart/${logname} #{shared_path}/log/${logname};
+    done
+    EOF
   end
   after "foreman:export", "foreman:log"
 

data/lib/matross/mysql.rb

@@ -59,7 +59,7 @@ namespace :mysql do
       comment_open  = '# Begin Matross generated task for MySQL Backup'
       comment_close = '# End Matross generated task for MySQL Backup'
 
-      cron_command = "#{mysql_backup_script} 2>&1 >> #{shared_path}/log/mysql_backup.log"
+      cron_command = "#{mysql_backup_script} >> #{shared_path}/log/mysql_backup.log 2>&1"
       cron_entry   = "#{mysql_backup_cron_schedule} #{cron_command}"
       cron         = [comment_open, cron_entry, comment_close].compact.join("\n")
 

data/lib/matross/unicorn.rb

@@ -2,8 +2,7 @@ dep_included? 'unicorn'
 
 _cset(:unicorn_config)  { "#{shared_path}/config/unicorn.rb" }
 _cset(:unicorn_log)     { "#{shared_path}/log/unicorn.log" }
-_cset :unicorn_workers, 1
-
+_cset(:unicorn_workers) { capture("grep -c processor /proc/cpuinfo").to_i }
 namespace :unicorn do
 
   desc "Initial Setup"

data/lib/matross/version.rb

@@ -1,3 +1,3 @@
 module Matross
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matross
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler