nesquena-cap-recipes 0.2.1 → 0.2.2

data/README.textile

@@ -31,9 +31,14 @@ h3. Passenger
 
 h4. Configuration
 
- * ruby_lib_path - the path to the ruby lib folder [default: '/usr/lib/ruby']
- * ruby_bin_path - the path to the ruby binary [default: '/usr/bin/ruby1.8']
+ * base_ruby_path - the base path to the ruby installation [default: "/usr"]
+
+The following files and folders are expected to exist:
  
+ * "#{base_ruby_path}/lib/ruby"
+ * "#{base_ruby_path}/bin/ruby"
+ * "#{base_ruby_path}/bin/gem"
+
 h4. Tasks
 
   deploy
@@ -43,10 +48,13 @@ h4. Tasks
     :with_migrations
     :copy_config
     :tail
-    :install_passenger
+  install
+    :passenger
+    :gems
   sweep
     :cache
     :log
+    :gems
     
 h3. Apache
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
  
 GEM = "cap-recipes"
-GEM_VERSION = "0.2.0"
+GEM_VERSION = "0.2.2"
 SUMMARY = "Collection of capistrano recipes for apache, passenger, juggernaut and backgroundrb"
 AUTHOR = "Nathan Esquenazi"
 EMAIL = "nesquena@gmail.com"

data/lib/cap_recipes/tasks/passenger.rb

@@ -1,6 +1,5 @@
 Capistrano::Configuration.instance(true).load do
-  set :ruby_lib_path, '/usr/lib/ruby'
-  set :ruby_bin_path, '/usr/bin/ruby1.8'
+  set :base_ruby_path, '/usr'  
 
   # ===============================================================
   # DEPLOYMENT SCRIPTS
@@ -59,23 +58,32 @@ Capistrano::Configuration.instance(true).load do
     task :tail, :role => :app do
       stream "tail -f #{shared_path}/log/production.log"
     end
-
-    # ===============================================================
-    # INSTALLATION
-    # ===============================================================
-
+    
+  end
+  
+  # ===============================================================
+  # INSTALLATION
+  # ===============================================================
+  
+  namespace :install do
+    
+    desc "Updates all installed ruby gems"
+    task :gems, :role => :app do
+      sudo "gem update"
+    end
+    
     desc "Installs Phusion Passenger"
-    task :install_passenger, :role => :app do
+    task :passenger, :role => :app do
       puts 'Installing passenger module'
-      deploy.passenger_module
-      deploy.config_passenger
+      install.passenger_apache_module
+      install.config_passenger
     end
-    
+  
     desc "Setup Passenger Module"
-    task :passenger_module do
-      sudo "gem install passenger --no-ri --no-rdoc"
+    task :passenger_apache_module do
+      sudo "#{base_ruby_path}/bin/gem install passenger --no-ri --no-rdoc"
       input = ''
-      run "sudo passenger-install-apache2-module" do |ch, stream, out|
+      run "sudo #{base_ruby_path}/bin/passenger-install-apache2-module" do |ch, stream, out|
         next if out.chomp == input.chomp || out.chomp == ''
         print out
         ch.send_data(input = $stdin.gets) if out =~ /(Enter|ENTER)/
@@ -85,22 +93,23 @@ Capistrano::Configuration.instance(true).load do
     desc "Configure Passenger"
     task :config_passenger do
       version = 'ERROR' # default
-      
+    
       # passenger (2.X.X, 1.X.X)
       run("gem list | grep passenger") do |ch, stream, data|
-        version = data.sub(/passenger \(([^,]+).*/,"\\1").strip
+        version = data.sub(/passenger \(([^,]+).*?\)/,"\\1").strip
       end
 
       puts "  passenger version #{version} configured"
 
       passenger_config =<<-EOF
-        LoadModule passenger_module #{ruby_lib_path}/gems/1.8/gems/passenger-#{version}/ext/apache2/mod_passenger.so
-        PassengerRoot #{ruby_lib_path}/gems/1.8/gems/passenger-#{version}
-        PassengerRuby /usr/bin/ruby1.8
+        LoadModule passenger_module #{base_ruby_path}/lib/ruby/gems/1.8/gems/passenger-#{version}/ext/apache2/mod_passenger.so
+        PassengerRoot #{base_ruby_path}/lib/ruby/gems/1.8/gems/passenger-#{version}
+        PassengerRuby #{base_ruby_path}/bin/ruby
       EOF
-      
-      put passenger_config, "src/passenger"
-      sudo "mv src/passenger /etc/apache2/conf.d/passenger"
+    
+      put passenger_config, "/tmp/passenger"
+      sudo "mv /tmp/passenger /etc/apache2/conf.d/passenger"
+      apache.restart
     end
     
   end
@@ -119,7 +128,7 @@ Capistrano::Configuration.instance(true).load do
     task :cache, :role => :app do
       puts "Sweeping the fragment and action cache stores"
       run "cd #{release_path} && #{sudo} rake tmp:cache:clear RAILS_ENV=production"
-    end
+    end    
   end
 
   # ===============================================================

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nesquena-cap-recipes
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Nathan Esquenazi