capitate 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.3 2008-02-25
+
+* Various task and recipe fixes.
+* Taking sh -c default out of script, doesn't escape right
+
 == 0.2.2 2008-02-24
 
 * Fixes to setup tasks.

data/Manifest.txt

@@ -57,7 +57,6 @@ lib/recipes/centos/mysql.rb
 lib/recipes/centos/nginx.rb
 lib/recipes/centos/ruby.rb
 lib/recipes/centos/sphinx.rb
-lib/recipes/deploy.rb
 lib/recipes/docs.rb
 lib/recipes/memcached.rb
 lib/recipes/mongrel_cluster.rb

data/docs/recipes/deploy.txt

@@ -89,7 +89,11 @@ Deploy and run pending migrations. This will work similarly to the     `deploy'
 
 h3(#deploy:restart). deploy:restart
 
+Restarts your application. This works by calling the script/process/reaper     script under the current path.
 
+By default, this will be invoked via sudo as the `app' user. If     you wish to run it as a different user, set the :runner variable to     that user. If you are in an environment where you can't use sudo, set     the :use_sudo variable to false:
+
+  set :use_sudo, false
 
 
 
@@ -117,13 +121,17 @@ It is safe to run this task on servers that have already been set up; it     wil
 
 h3(#deploy:start). deploy:start
 
+Start the application servers. This will attempt to invoke a script     in your application called `script/spin', which must know how to start     your application listeners. For Rails applications, you might just have     that script invoke `script/process/spawner' with the appropriate     arguments.
 
+By default, the script will be executed via sudo as the `app' user. If     you wish to run it as a different user, set the :runner variable to     that user. If you are in an environment where you can't use sudo, set     the :use_sudo variable to false.
 
 
 
 h3(#deploy:stop). deploy:stop
 
+Stop the application servers. This will call script/process/reaper for     both the spawner process, and all of the application processes it has     spawned. As such, it is fairly Rails specific and may need to be     overridden for other systems.
 
+By default, the script will be executed via sudo as the `app' user. If     you wish to run it as a different user, set the :runner variable to     that user. If you are in an environment where you can't use sudo, set     the :use_sudo variable to false.
 
 
 

data/docs/recipes/index.txt

@@ -15,7 +15,7 @@ h2. Namespaces
 * "memcached:centos":memcached-centos.html (1) 
 * "mongrel_cluster":mongrel_cluster.html (1) 
 * "mongrel_cluster:centos":mongrel_cluster-centos.html (1) 
-* "monit:centos":monit-centos.html (1) 
+* "monit:centos":monit-centos.html (2) 
 * "mysql":mysql.html (2) 
 * "mysql:centos":mysql-centos.html (1) 
 * "nginx":nginx.html (2) 

data/docs/recipes/monit-centos.txt

@@ -6,6 +6,7 @@ h1. monit:centos
 h2. Tasks
 
 * "monit:centos:install":#monit:centos:install 
+* "monit:centos:restart":#monit:centos:restart 
 
 
 h2. Task documentation
@@ -27,6 +28,20 @@ Install monit.
 *monit_conf_dir*: Directory for monitrc files.
 
 @set :monit_conf_dir, "/etc/monit"@
+  
+*monit_pid_path*: Path to monit pid.
+
+@set :monit_pid_path, "/var/run/monit.pid"@
+
+
+
+h3(#monit:centos:restart). monit:centos:restart
+
+Monit HUP.
+
+*monit_pid_path*: Path to monit pid.
+
+@set :monit_pid_path, "/var/run/monit.pid"@
 
 
 

data/docs/recipes/monit.txt

@@ -5,4 +5,4 @@ h1. monit
 
 h2. Namespaces
 
-* "monit:centos":monit-centos.html (1) 
+* "monit:centos":monit-centos.html (2) 

data/docs/recipes/rails.txt

@@ -41,6 +41,12 @@ Create database yaml in shared path.
 *db_pass*: Database password (rails).
 
 @set :db_pass, "the_password"@
+  
+*db_host*: Database host (can be nil, if you are using socket). _Defaults to nil_
+
+*db_socket*: Database socket (can be nil, if you are using host). _Defaults to nil_
+
+@set :db_socket, "/var/lib/mysql/mysql.sock"@
 
 
 

data/lib/capitate/plugins/script.rb

@@ -27,9 +27,9 @@ module Capitate::Plugins::Script
       end
       
       run_all <<-CMDS
-        cd #{dir} && ./configure #{configure_options} #{to_log}
-        cd #{dir} && make #{to_log}
-        cd #{dir} && make install #{to_log}
+        sh -c "cd #{dir} && ./configure #{configure_options} #{to_log}"
+        sh -c "cd #{dir} && make #{to_log}"
+        sh -c "cd #{dir} && make install #{to_log}"
       CMDS
     end
   end
@@ -116,7 +116,7 @@ module Capitate::Plugins::Script
     
     run_all <<-CMDS
       mkdir -p #{dest} && cd #{dest} && #{http_get_method} #{url}
-      cd #{dest} && tar zxf #{file}
+      sh -c "cd #{dest} && tar zxf #{file}"
     CMDS
     
     if block_given?
@@ -136,8 +136,8 @@ module Capitate::Plugins::Script
   def run_all(cmds, options = {}, &block)
     cmds.split("\n").each do |cmd|
       cmd = cmd.gsub(/^\s+/, "")
-      sh_cmd = %{sh -c "#{cmd.gsub("\"", "\"\"")}"}
-      run_via(sh_cmd, options, &block)
+      #sh_cmd = %{sh -c "#{cmd.gsub("\"", "\"\"")}"}
+      run_via(cmd, options, &block)
     end    
   end
   

data/lib/capitate/version.rb

@@ -2,7 +2,7 @@ module Capitate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/recipes/centos/monit.rb

@@ -12,6 +12,8 @@ namespace :monit do
     @set :monit_password, prompt.password('Monit admin password (to set): ')@\n    
     *monit_conf_dir*: Directory for monitrc files.\n    
     @set :monit_conf_dir, "/etc/monit"@\n      
+    *monit_pid_path*: Path to monit pid.\n
+    @set :monit_pid_path, "/var/run/monit.pid"@\n
     DESC
     task :install do
       
@@ -19,6 +21,7 @@ namespace :monit do
       fetch_or_default(:monit_port, 2812)
       fetch_or_default(:monit_password, prompt.password('Monit admin password (to set): ', true))
       fetch_or_default(:monit_conf_dir, "/etc/monit")
+      fetch_or_default(:monit_pid_path, "/var/run/monit.pid")
       fetch(:monit_build_options)
         
       # Install dependencies
@@ -42,6 +45,20 @@ namespace :monit do
       put template.load("monit/monit.cnf"), "/tmp/monit.cnf"
       script.sh("monit/cert.sh")
     end
+    
+    desc <<-DESC
+    Monit HUP.
+    
+    *monit_pid_path*: Path to monit pid.\n
+    @set :monit_pid_path, "/var/run/monit.pid"@\n
+    DESC
+    task :restart do
+      
+      # Settings
+      fetch_or_default(:monit_pid_path, "/var/run/monit.pid")
+      
+      sudo "kill -HUP `cat #{monit_pid_path}`"
+    end
 
   end
   

data/lib/recipes/centos/nginx.rb

@@ -48,7 +48,6 @@ namespace :nginx do
     # Restart nginx
     desc "Restart nginx (service)"
     task :restart do
-      # TODO: Monit
       sudo "/sbin/service nginx restart"
     end
     

data/lib/recipes/rails.rb

@@ -10,6 +10,9 @@ namespace :rails do
   @set :db_user, "app_db_user"@\n    
   *db_pass*: Database password (rails).\n  
   @set :db_pass, "the_password"@\n    
+  *db_host*: Database host (can be nil, if you are using socket). _Defaults to nil_\n
+  *db_socket*: Database socket (can be nil, if you are using host). _Defaults to nil_\n
+  @set :db_socket, "/var/lib/mysql/mysql.sock"@\n
   DESC
   task :setup do    
     
@@ -17,6 +20,8 @@ namespace :rails do
     fetch(:db_name)
     fetch(:db_user)
     fetch(:db_pass)
+    fetch_or_default(:db_host, nil)
+    fetch_or_default(:db_socket, nil)
     
     run "mkdir -p #{shared_path}/config"
     put template.load("rails/database.yml.erb"), "#{shared_path}/config/database.yml"

data/lib/templates/monit/monit.initd.centos.erb

@@ -17,7 +17,7 @@ NAME=monit
 DAEMON=/usr/local/bin/monit
 CONFFILE=/etc/monitrc
 LOGFILE=/var/log/monit.log
-PIDFILE=/var/run/monit.pid
+PIDFILE=<%= monit_pid_path %>
 
 start() {
   daemon $DAEMON -l $LOGFILE -p $PIDFILE -c $CONFFILE

data/lib/templates/rails/database.yml.erb

@@ -1,42 +1,8 @@
-# MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MySQL driver:
-#   gem install mysql
-# On Mac OS X:
-#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
-# On Mac OS X Leopard:
-#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-#       This sets the ARCHFLAGS environment variable to your native architecture
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql
-  encoding: utf8
-  database: <%= db_name %>_development
-  username: root
-  password: 
-  socket: /tmp/mysql.sock
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql
-  encoding: utf8
-  database: <%= db_name %>_test
-  username: root
-  password:
-  socket: /tmp/mysql.sock
-
 production:
   adapter: mysql
   encoding: utf8
   database: <%= db_name %>
   username: <%= db_user %>
   password: <%= db_pass %>
-  socket: /var/lib/mysql/mysql.sock
+  <%= "host: #{db_host}" unless db_host.blank? %>
+  <%= "socket: #{db_socket}" unless db_socket.blank? %>

data/website/index.html

@@ -38,7 +38,7 @@
 
     <div id="version" class="clickable box" onclick='document.location = "http://rubyforge.org/projects/capitate"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.2</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.3</a>
     </div>
     
     <div id="recipes">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ""
 authors: 
 - Gabriel Handford
@@ -117,7 +117,6 @@ files:
 - lib/recipes/centos/nginx.rb
 - lib/recipes/centos/ruby.rb
 - lib/recipes/centos/sphinx.rb
-- lib/recipes/deploy.rb
 - lib/recipes/docs.rb
 - lib/recipes/memcached.rb
 - lib/recipes/mongrel_cluster.rb

data/lib/recipes/deploy.rb

@@ -1,18 +0,0 @@
-# Override default deploy tasks here (using Monit). 
-# If not using monit, use service start/stop:
-#   sudo "/sbin/service mongrel_cluster_#{application} restart"     
-namespace :deploy do
-  
-  task :restart, :roles => :web do     
-    sudo "/usr/local/bin/monit -g mongrel_cluster_#{application} restart all"
-  end
-  
-  task :start, :roles => :web do 
-    sudo "/usr/local/bin/monit -g mongrel_cluster_#{application} start all" 
-  end
-  
-  task :stop, :roles => :web do 
-    sudo "/usr/local/bin/monit -g mongrel_cluster_#{application} stop all" 
-  end
-  
-end