marcosgz-cap-recipe 0.0.5 → 0.0.6

data/lib/capistrano/recipe.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/hash/slice'
 require 'capistrano'
 
 Dir.glob(File.join(File.dirname(__FILE__), '/recipes/*.rb')).sort.each { |f| load f }

data/lib/capistrano/recipes/application.rb

@@ -19,11 +19,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :create do
       task :dirs, :roles => :app do
         deploy.setup
-        commands = %w(config uploads backup bundle pids tmp/cache public/cache).map do |path|
+        commands = %w(config uploads backup bundle pids tmp/cache public/cache public/assets).map do |path|
           "if [ ! -d '#{path}' ]; then mkdir -p #{path}; fi;"
         end
         run "cd #{shared_path}; #{commands.join(' ')}"
-        run "chmod 777 #{shared_path}/public/cache #{shared_path}/tmp/cache"
+        run "chmod 777 #{shared_path}/public/cache #{shared_path}/public/assets #{shared_path}/tmp/cache"
       end
 
 

data/lib/capistrano/recipes/gateways.rb

@@ -17,7 +17,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :gateways do
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:gateways_setup_settings)
           set(:recipe_settings) { fetch(:gateways_setup_settings, {}) }
           put template.render(fetch(:gateways_template)), fetch(:gateways_remote_file)

data/lib/capistrano/recipes/mailer.rb

@@ -13,7 +13,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :mailer do
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:mailer_setup_settings)
           set :recipe_settings, fetch(:mailer_setup_settings, {})
           put template.render(fetch(:mailer_template)), fetch(:mailer_remote_file)

data/lib/capistrano/recipes/newrelic.rb

@@ -194,7 +194,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :newrelic do
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:newrelic_setup_settings)
           set(:recipe_settings) { newrelic_template_settings }
           put template.render(fetch(:newrelic_template)), fetch(:newrelic_remote_file)

data/lib/capistrano/recipes/passenger.rb

@@ -7,20 +7,27 @@
 
 Capistrano::Configuration.instance(:must_exist).load do
 
-  set(:apache_sites_available) { "/home/#{user}/configs/apache/sites-available" }
-  set(:apache_sites_enabled) { "/home/#{user}/configs/apache/sites-enabled" }
-  set(:apache_remote_file) { File.join(apache_sites_available, "#{application}.conf") } unless exists?(:apache_remote_file)
-  set(:apache_template, 'passenger.conf.erb') unless exists?(:apache_template)
-
   # task: `passenger:setup'
   def passenger_template_settings
     fetch(:passenger_setup_settings, {}).reverse_merge({
+      'sites_available'   => fetch(:apache_sites_available, "/home/#{user}/configs/apache/sites-available"),
+      'sites_enabled'     => fetch(:apache_sites_enabled, "/home/#{user}/configs/apache/sites-enabled"),
+      'vhost_filename'    => fetch(:apache_vhost_filename) { "#{application}.conf" },
+      'template_filename' => fetch(:apache_template_filename) { 'passenger.conf.erb' },
       'server_name'       => fetch(:domain),
       'document_root'     => File.join(fetch(:current_path), 'public'),
       'rails_env'         => fetch(:rails_env, 'production')
     })
   end
 
+  def apache_available_vhost
+    File.join(*passenger_template_settings.slice('sites_available', 'vhost_filename').values)
+  end
+
+  def apache_enabled_vhost
+    File.join(*passenger_template_settings.slice('sites_enabled', 'vhost_filename').values)
+  end
+
   namespace :passenger do
     desc "Restart Rails app running under Phusion Passenger by touching restart.txt"
     task :restart, :roles => :app, :except => { :no_release => true } do
@@ -29,33 +36,38 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc "Inspect Phusion Passenger's memory usage."
     task :memory, :roles => :app do
-      run "sudo passenger-memory-stats"
+      run "#{try_sudo} passenger-memory-stats"
     end
 
     desc "Inspect Phusion Passenger's internal status."
     task :status, :roles => :app do
-      run "sudo passenger-status"
+      run "#{try_sudo} passenger-status"
     end
 
     desc "Remove passenger config"
     task :remove, :roles => :app, :except => { :no_release => true } do
       passenger.disable
-      run "rm #{apache_sites_available}/#{application}.conf"
+      run "rm #{apache_available_vhost}"
     end
 
     desc "Disable passenger config"
     task :disable, :roles => :app, :except => { :no_release => true } do
-      run "rm #{apache_sites_enabled}/#{application}.conf"
+      run "rm #{apache_enabled_vhost}"
     end
 
+    desc "Enable passenger config"
+    task :enable, :roles => :app, :except => { :no_release => true } do
+      run "ln -nsf #{apache_available_vhost} #{apache_enabled_vhost}"
+    end
 
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:passenger_setup_settings)
-          run "mkdir -p #{apache_sites_available} #{apache_sites_enabled}"
+          run "mkdir -p #{ passenger_template_settings.slice('sites_available', 'sites_enabled').map{|k,v| v}.join(' ') }"
           set(:recipe_settings) { passenger_template_settings }
-          put template.render(fetch(:apache_template)), fetch(:apache_remote_file)
+          put template.render( passenger_template_settings['template_filename'] ), apache_available_vhost
+          passenger.enable
         else
           puts "[FATAL] - Passenger template settings were not found"
           abort
@@ -64,7 +76,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Download configs"
       task :get, :roles => :db do
-        download fetch(:apache_remote_file), File.join(local_rails_root, "configs/#{application}.conf")
+        download apache_available_vhost, File.join(local_rails_root, "config/#{application}.conf")
       end
     end
 

data/lib/capistrano/recipes/settler.rb

@@ -23,7 +23,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :settler do
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:settler_setup_settings)
            set(:recipe_settings) { settler_template_settings }
            put template.render(fetch(:settler_template)), fetch(:settler_remote_file)

data/lib/capistrano/recipes/shards.rb

@@ -26,7 +26,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :shards do
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:shards_setup_settings)
           set(:recipe_settings) do
             {

data/lib/capistrano/recipes/thin.rb

@@ -43,7 +43,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:thin_setup_settings)
           set(:recipe_settings) { thin_template_settings }
           put template.render(fetch(:thin_template)), fetch(:thin_remote_file)

data/lib/capistrano/recipes/tire.rb

@@ -14,7 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :tire do
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:tire_setup_settings)
           set :recipe_settings, fetch(:tire_setup_settings, {})
           put template.render(fetch(:tire_template)), fetch(:tire_remote_file)

data/lib/capistrano/recipes/unicorn.rb

@@ -75,7 +75,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     # *port* 80
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:unicorn_setup_settings)
           set(:recipe_settings) { unicorn_template_settings }
           put template.render(fetch(:unicorn_template)), File.join(shared_path, 'config/unicorn.rb')

data/lib/capistrano/recipes/uploader.rb

@@ -16,7 +16,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :uploader do
     namespace :setup do
       desc "Upload configs"
-      task :default, :roles => :db do
+      task :default, :roles => :app do
         if exists?(:uploader_setup_settings)
           set :recipe_settings, fetch(:uploader_setup_settings, {})
           put template.render(fetch(:uploader_template)), fetch(:uploader_remote_file)

data/marcosgz-cap-recipe.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "marcosgz-cap-recipe"
-  s.version     = "0.0.5"
+  s.version     = "0.0.6"
   s.authors     = ["Marcos G. Zimmermann"]
   s.email       = ["mgzmaster@gmail.com"]
   s.homepage    = "https://github.com/marcosgz/capistrano-recipe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marcosgz-cap-recipe
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -93,4 +93,3 @@ signing_key:
 specification_version: 3
 summary: Capistrano recipe
 test_files: []
-has_rdoc: