capitate 0.3.5 → 0.3.6

data/lib/recipes/memcached.rb

@@ -3,49 +3,18 @@ namespace :memcached do
   desc <<-DESC
   Create memcached yaml in shared path.
     
-  <dl>
-  <dt>memcached_namespace</dt>
-  
-  <dt>memcached_ttl</dt>
-  <dd class="default">Defaults to @3600@</dd>
-  
-  <dt>memcached_readonly</dt>
-  <dd class="default">Defaults to @false@</dd>
-  
-  <dt>memcached_urlencode</dt>
-  <dd class="default">Defaults to @false@</dd>
-  
-  <dt>memcached_c_threshold</dt>
-  <dd class="default">Defaults to @10000@</dd>
-  
-  <dt>memcached_compression</dt>
-  <dd class="default">Defaults to @true@</dd>
-  
-  <dt>memcached_debug</dt>
-  <dd class="default">Defaults to @false@</dd>
-  
-  <dt>memcached_servers</dt>
-  <dd class="default">Defaults to @[ "localhost:11211" ]@</dd>
-  
-  <dt>memcached_yml_template</dt>
-  <dd class="default">Defaults to @"memcached/memcached.yml.erb"@</dd>
-  </dl>
-  
   "Source":#{link_to_source(__FILE__)}   
   DESC
-  task :setup do    
-
-    # Settings
-    fetch(:memcached_namespace)
-    fetch_or_default(:memcached_ttl, 3600)
-    fetch_or_default(:memcached_readonly, false)
-    fetch_or_default(:memcached_urlencode, false)
-    fetch_or_default(:memcached_c_threshold, 10000)
-    fetch_or_default(:memcached_compression, true)
-    fetch_or_default(:memcached_debug, false)
-    fetch_or_default(:memcached_servers, [ "localhost:11211" ])
-    fetch_or_default(:memcached_yml_template, "memcached/memcached.yml.erb")    
-
+  task_arg(:memcached_namespace, "Namespace")
+  task_arg(:memcached_ttl, "TTL in seconds", :default => 3600)
+  task_arg(:memcached_readonly, "Read only enabled", :default => false)
+  task_arg(:memcached_urlencode, "URL encode enabled", :default => false)
+  task_arg(:memcached_c_threshold, "C Threshold", :default => 10000)
+  task_arg(:memcached_compression, "Compression enabed", :default => true)
+  task_arg(:memcached_debug, "Debug enabled", :default => false)
+  task_arg(:memcached_servers, "List of servers", :default => ["localhost:11211"], :default_desc => "[\"localhost:11211\"]")
+  task_arg(:memcached_yml_template, "Memcached yml template", :default => "memcached/memcached.yml.erb")
+  task :setup do
     put(memcached_yml_template, "#{shared_path}/config/memcached.yml")
   end
 

data/lib/recipes/merb.rb

@@ -15,11 +15,10 @@ namespace :merb do
       set :migrate_env,    ""
       set :migrate_target, :latest
   DESC
+  task_arg(:rake, "Path to rake", :default => "rake")
+  task_arg(:merb_env, "Merb environment", :default => "")
+  task_arg(:migrate_target, "Migration target", :default => :latest)
   task :migrate, :roles => :db, :only => { :primary => true } do
-    rake = fetch(:rake, "rake")
-    merb_env = fetch(:merb_env, "production")
-    migrate_env = fetch(:migrate_env, "")
-    migrate_target = fetch(:migrate_target, :latest)
 
     current_directory = case migrate_target.to_sym
       when :current then current_path

data/lib/recipes/monit.rb

@@ -5,49 +5,30 @@ namespace :monit do
   
   HUP's the process from the pid file, if it exists.
   
-  <dl>
-  <dt>monit_pid_path</dt>
-  <dd>Path to monit pid file</dd>
-  <dd class="default">Defaults to @/var/run/monit.pid@</dd>
-  </dl>
   "Source":#{link_to_source(__FILE__)}
   DESC
+  task_arg(:monit_pid_path, "Path to monit pid file", :default => "/var/run/monit.pid")
   task :restart do    
-    fetch_or_default(:monit_pid_path, "/var/run/monit.pid")
-    
-    run_via %{sh -c "[ ! -e '#{monit_pid_path}' ] || kill -HUP `cat #{monit_pid_path}`"}
-    
+    run_via %{sh -c "[ ! -e '#{monit_pid_path}' ] || kill -HUP `cat #{monit_pid_path}`"}    
   end
   
   desc <<-DESC
   Unmonitor all.
   
-  <dl>
-  <dt>monit_bin_path</dt>
-  <dd>Path to monit bin.</dd>
-  <dd>Defaults to @monit@</dd>
-  </dl>
   "Source":#{link_to_source(__FILE__)}
   DESC
+  task_arg(:monit_bin_path, "Path to monit bin.", :default => "monit")
   task :unmonitor_all do
-    fetch_or_default(:monit_bin_path, "monit")
-    
     run_via "#{monit_bin_path} unmonitor all"
   end
   
   desc <<-DESC
   Monitor all.
   
-  <dl>
-  <dt>monit_bin_path</dt>
-  <dd>Path to monit bin.</dd>
-  <dd>Defaults to @monit@</dd>
-  </dl>
   "Source":#{link_to_source(__FILE__)}
   DESC
+  task_arg(:monit_bin_path, "Path to monit bin.", :default => "monit")
   task :monitor_all do
-    fetch_or_default(:monit_bin_path, "monit")
-    
     run_via "#{monit_bin_path} monitor all"
   end
   

data/lib/recipes/monit/merb.rb

@@ -8,17 +8,13 @@ namespace :merb do
     
     "Source":#{link_to_source(__FILE__)}
     DESC
+    task_arg(:merb_nodes, "Number of nodes in merb cluster")
+    task_arg(:merb_port, "Starting port")
+    task_arg(:monit_conf_dir, "Monit config directory", :default => "/etc/monit")
+    task_arg(:merb_pid_dir, "Merb pid directory", :default => Proc.new {"#{shared_path}/pids"}, :default_desc => "\#{shared_path}/pids")
+    task_arg(:merb_monitrc_template, "Merb monitrc template", :default => "merb/merb.monitrc.erb")
     task :setup do
   
-      # Settings
-      fetch(:merb_nodes)
-      fetch(:merb_port)
-      fetch_or_default(:merb_application, "merb_#{application}")
-      fetch_or_default(:merb_initscript_name, "merb_#{application}")
-      fetch_or_default(:monit_conf_dir, "/etc/monit")
-  
-      fetch_or_default(:merb_pid_dir, "#{shared_path}/pids")
-  
       processes = []
       ports = (0...merb_nodes).collect { |i| merb_port + i }
       ports.each do |port|
@@ -32,9 +28,8 @@ namespace :merb do
       end
   
       set :processes, processes
-  
-      put template.load("merb/merb.monitrc.erb"), "/tmp/#{merb_application}.monitrc"    
-      sudo "install -o root /tmp/#{merb_application}.monitrc #{monit_conf_dir}/#{merb_application}.monitrc"
+      
+      utils.install_template(merb_monitrc_template, "#{monit_conf_dir}/#{merb_application}.monitrc") 
     end
     
     desc "Restart merb (for application)"

data/lib/recipes/monit/mysql.rb

@@ -5,28 +5,12 @@ namespace :mysql do
     desc <<-DESC
     Install mysql monit hooks. 
     
-    <dl>
-    <dt>mysql_pid_path</dt>
-    <dd>Path to mysql pid file</dd>
-
-    <dt>db_port</dt>
-    <dd>Mysql port</dd>
-    <dd class="default">Defaults to @3306@</dd>
-    
-    <dt>monit_conf_dir</dt>
-    <dd>Monitrd directory.</dd>
-    <dd class="default">Defaults to @"/etc/monit"@</dd>
-    </dl>    
-    
     "Source":#{link_to_source(__FILE__)}  
     DESC
+    task_arg(:mysql_pid_path, "Path to mysql pid file", :default => "/var/run/mysqld/mysqld.pid")
+    task_arg(:mysql_port, "Mysql port", :default => 3306)   
+    task_arg(:monit_conf_dir, "Monitrd directory", :default => "/etc/monit")
     task :install do
-    
-      # Settings 
-      fetch_or_default(:mysql_pid_path, "/var/run/mysqld/mysqld.pid")
-      fetch_or_default(:mysql_port, 3306)   
-      fetch_or_default(:monit_conf_dir, "/etc/monit") 
-    
       put template.load("mysql/mysql.monitrc.erb", binding), "/tmp/mysql.monitrc"    
       run_via "install -o root /tmp/mysql.monitrc #{monit_conf_dir}/mysql.monitrc"
     end      

data/lib/recipes/monit/nginx.rb

@@ -5,25 +5,11 @@ namespace :nginx do
     desc <<-DESC 
     Install nginx monit hooks.
   
-    <dl>    
-    <dt>nginx_pid_path</dt>
-    <dd>Path to nginx pid file</dd>
-    <dd>Defaults to /var/run/nginx.pid</dd>
-    <dd>@set :nginx_pid_path, "/var/run/nginx.pid"@</dd>
-    
-    <dt>monit_conf_dir</dt>
-    <dd>Destination for monitrc.</dd>
-    <dd>Defaults to "/etc/monit"</dd>
-    <dd>@set :monit_conf_dir, "/etc/monit"@</dd>
-    </dl>
     "Source":#{link_to_source(__FILE__)}
     DESC
+    task_arg(:nginx_pid_path, "Path to nginx pid file", :default => "/var/run/nginx.pid")
+    task_arg(:monit_conf_dir, "Destination for monitrc", :default => "/etc/monit")
     task :install do
-    
-      # Settings
-      fetch_or_default(:nginx_pid_path, "/var/run/nginx.pid")
-      fetch_or_default(:monit_conf_dir, "/etc/monit")
-    
       put template.load("nginx/nginx.monitrc.erb", binding), "/tmp/nginx.monitrc"    
       run_via "install -o root /tmp/nginx.monitrc #{monit_conf_dir}/nginx.monitrc"
     end

data/lib/recipes/monit/sphinx.rb

@@ -4,25 +4,34 @@ namespace :sphinx do
   
     desc <<-DESC
     Create monit configuration for sphinx.\n  
-    *monit_conf_dir*: Destination for monitrc. _Defaults to "/etc/monit"_\n
-    *sphinx_pid_path*: Location for sphinx pid. _Defaults to "[shared_path]/pids/searchd.pid"_\n
-    
+
     "Source":#{link_to_source(__FILE__)}
     DESC
+    task_arg(:monit_conf_dir, :default => "/etc/monit")
+    task_arg(:sphinx_pid_path, :default => Proc.new{"#{shared_path}/pids/searchd.pid"}, :default_desc => "\#{shared_path}/pids/searchd.pid")
     task :setup do    
-    
-      # Settings
-      fetch_or_default(:monit_conf_dir, "/etc/monit")
-      fetch_or_default(:sphinx_pid_path, "#{shared_path}/pids/searchd.pid")
-    
       put template.load("sphinx/sphinx.monitrc.erb"), "/tmp/sphinx_#{application}.monitrc"            
       sudo "install -o root /tmp/sphinx_#{application}.monitrc #{monit_conf_dir}/sphinx_#{application}.monitrc"
     end
   
-    desc "Restart sphinx"
+    desc "Restart sphinx application (through monit)"
     task :restart do
-      sudo "/sbin/service monit restart sphinx_#{application}"
-    end    
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} restart sphinx_#{application}"
+    end
+    
+    desc "Start sphinx application (through monit)"
+    task :start do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} start sphinx_#{application}"
+    end
+    
+    desc "Stop sphinx application (through monit)"
+    task :stop do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} stop sphinx_#{application}"
+    end
+    
     
   end
     

data/lib/recipes/mysql.rb

@@ -4,45 +4,19 @@ namespace :mysql do
   desc <<-DESC
   Create database, database user, and set grant permissions.
   
-  <dl>
-  <dt>db_name</dt>
-  <dd>Database name (application).</dd>
-  
-  <dt>db_user</dt>
-  <dd>Database user (application).</dd>
-  
-  <dt>db_pass</dt>
-  <dd>Database password (application).</dd>
-  
-  <dt>mysql_grant_locations</dt>
-  <dd>Grant locations. </dd>
-  <dd>Defaults to @[ "localhost" ]@</dd>
-  
-  <dt>mysql_grant_priv_type</dt>
-  <dd>Grant privilege types.</dd>
-  <dd>Defaults to @ALL@</dd>
-  
-  <dt>mysql_admin_user</dt>
-  <dd>Mysql admin user.</dd>
-  <dd>Defaults to password prompt.</dd>
-  
-  <dt>mysql_admin_password</dt>
-  <dd>Mysql admin password.</dd>
-  <dd>Defaults to password prompt.</dd>
-  </dl>
   "Source":#{link_to_source(__FILE__)}
   DESC
-  task :setup do    
-    
-    # Settings
-    fetch(:db_name)
-    fetch(:db_user)
-    fetch(:db_pass)
-    fetch_or_default(:mysql_admin_user, "root")
-    fetch_or_default(:mysql_admin_password, prompt.password('Mysql admin password: '))
-    fetch_or_default(:mysql_grant_priv_type, "ALL")
-    fetch_or_default(:mysql_grant_locations, [ "localhost" ])
+  task_arg(:db_name, "Database name (application)")
+  task_arg(:db_user, "Database user (application)")
+  task_arg(:db_pass, "Database password (application)")
+  task_arg(:mysql_admin_user, "Mysql admin user", :default => "root")
+  task_arg(:mysql_admin_password, "Mysql admin password", 
+    :default => Proc.new { prompt.password('Mysql admin password: ') }, 
+    :example => "prompt.password('Mysql admin password: ')")
     
+  task_arg(:mysql_grant_priv_type, "Grant privilege types", :default => "ALL")
+  task_arg(:mysql_grant_locations, "Grant locations", :default => ["localhost"])
+  task :setup do    
     sql = template.load("mysql/install_db.sql.erb")       
     
     logger.trace "Running sql:\n#{sql}\n"
@@ -55,26 +29,12 @@ namespace :mysql do
   desc <<-DESC
   Create my.cnf based on template.
   
-  <dl>
-  <dt>my_cnf_template</dt>
-  <dd>Path to my.cnf template</dd>
-  
-  <dt>db_socket</dt>
-  <dd>Path to mysql .sock</dd>
-  <dd class="default">Defaults to @"/var/lib/mysql/mysql.sock"@</dd>
-  
-  <dt>db_port</dt>
-  <dd>Mysql port</dd>
-  <dd class="default">Defaults to @3306@</dd>
-  </dl>
-  
   "Source":#{link_to_source(__FILE__)}
   DESC
+  task_arg(:my_cnf_template, "Path to my.cnf template", :default => "mysql/my.cnf.innodb_1024.erb")      
+  task_arg(:db_socket, "Path to mysql .sock", :default => "/var/lib/mysql/mysql.sock")
+  task_arg(:db_port, "Mysql port", :default => 3306)
   task :install_my_cnf do      
-    fetch_or_default(:my_cnf_template, "mysql/my.cnf.innodb_1024.erb")      
-    fetch_or_default(:db_socket, "/var/lib/mysql/mysql.sock")
-    fetch_or_default(:db_port, 3306)
-    
     utils.install_template(my_cnf_template, "/etc/my.cnf")    
   end
   

data/lib/recipes/nginx.rb

@@ -6,80 +6,24 @@ namespace :nginx do
     desc <<-DESC
     Generate the nginx vhost include.
     
-    <dl>
-    <dt>nginx_upstream_name</dt>
-    <dd>Application name (for upstream definition).</dd>
-    <dd class="default">Defaults to @:application@</dd>
-    
-    <dt>nginx_upstream_size</dt>
-    <dd>Number of nodes for upstream.</dd>
-    <dd>@set :nginx_upstream_size, 3@</dd>  
-    
-    <dt>nginx_upstream_port</dt>
-    <dd>Starting port for upstream. If there are 3 nodes with port 9000, then instances will be at 9000, 9001, and 9002</dd>
-    <dd>@set :nginx_upstream_port, 9000@</dd>
-    
-    <dt>domain_name</dt>: Domain name for nginx virtual host, (without www prefix).</dd>
-    <dd>@set :domain_name, "foo.com"@</dd>
-    </dl>
-    
     "Source":#{link_to_source(__FILE__)}
     DESC
+    task_arg(:nginx_upstream_name, "Application name (for upstream definition)", 
+      :default => Proc.new { fetch(:application) }, 
+      :default_desc => "fetch(:application)")
+      
+    task_arg(:nginx_upstream_size, "Number of nodes for upstream")
+    task_arg(:nginx_upstream_port, "Starting port for upstream. If there are 3 nodes with port 9000, then instances will be at 9000, 9001, and 9002")    
+    task_arg(:domain_name, "Domain name")
+    task_arg(:nginx_vhost_template, "Path to nginx vhost template", :default => "nginx/nginx_vhost_generic.conf.erb")    
     task :setup do 
     
-      # Settings
-      fetch_or_default(:nginx_upstream_name, fetch(:application))
-      fetch(:nginx_upstream_size)
-      fetch(:nginx_upstream_port)
-    
       set :nginx_upstream_ports, (0...nginx_upstream_size.to_i).collect { |i| nginx_upstream_port.to_i + i }
       set :public_path, current_path + "/public"
     
-      utils.install_template("nginx/nginx_vhost_generic.conf.erb", "/etc/nginx/vhosts/#{nginx_upstream_name}.conf")
+      utils.install_template(:nginx_vhost_template, "/etc/nginx/vhosts/#{nginx_upstream_name}.conf")
     end
     
   end
   
-  namespace :mongrel do
-    desc <<-DESC
-    Generate the nginx vhost include (for a mongrel setup).
-    
-    *THIS IS DEPRECATED*: Use @nginx:host:setup@
-  
-    <dl>
-    <dt>mongrel_application</dt>
-    <dd>Mongrel application.</dd>
-    <dd class="default">Defaults to @:application@</dd>
-    
-    <dt>mongrel_size</dt>
-    <dd>Number of mongrels.</dd>
-    <dd>@set :mongrel_size, 3@</dd>  
-    
-    <dt>*mongrel_port</dt>
-    <dd>Starting port for mongrels. If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002</dd>
-    <dd>@set :mongrel_port, 9000@</dd>
-    
-    <dt>domain_name</dt>: Domain name for nginx virtual host, (without www prefix).</dd>
-    <dd>@set :domain_name, "foo.com"@</dd>
-    </dl>
-    "Source":#{link_to_source(__FILE__)}
-    DESC
-    task :setup do 
-    
-      # Settings
-      fetch(:mongrel_size)
-      fetch(:mongrel_port)
-      fetch(:domain_name)
-      fetch_or_default(:mongrel_application, fetch(:application))
-    
-      set :ports, (0...mongrel_size).collect { |i| mongrel_port + i }
-      set :public_path, current_path + "/public"
-    
-      run "mkdir -p #{shared_path}/config"
-      put template.load("nginx/nginx_vhost.conf.erb"), "/tmp/nginx_#{mongrel_application}.conf"    
-    
-      sudo "install -o root /tmp/nginx_#{mongrel_application}.conf /etc/nginx/vhosts/#{mongrel_application}.conf"        
-    end
-  end
-        
 end