capitate 0.2.14 → 0.2.15

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.15 2008-03-31
+
+* Adding backgroundjob recipes and templates.
+* Fixed backgroundrb monit host port check (removed)
+
 == 0.2.14 2008-03-27
 
 * Removing my lame monkey patches

data/Manifest.txt

@@ -27,6 +27,7 @@ lib/capitate/task_node.rb
 lib/capitate/version.rb
 lib/deployment/centos-5.1-64-web/install.rb
 lib/recipes/backgroundrb.rb
+lib/recipes/centos/backgroundjob.rb
 lib/recipes/centos/backgroundrb.rb
 lib/recipes/centos/centos.rb
 lib/recipes/centos/imagemagick.rb
@@ -38,6 +39,7 @@ lib/recipes/centos/nginx.rb
 lib/recipes/centos/ruby.rb
 lib/recipes/centos/sphinx.rb
 lib/recipes/docs.rb
+lib/recipes/logrotate/backgroundjob.rb
 lib/recipes/logrotate/backgroundrb.rb
 lib/recipes/logrotate/mongrel_cluster.rb
 lib/recipes/logrotate/monit.rb
@@ -48,6 +50,7 @@ lib/recipes/logrotate/sphinx.rb
 lib/recipes/logrotated.rb
 lib/recipes/memcached.rb
 lib/recipes/monit.rb
+lib/recipes/monit/backgroundjob.rb
 lib/recipes/monit/backgroundrb.rb
 lib/recipes/monit/database.rb
 lib/recipes/monit/memcached.rb
@@ -62,6 +65,8 @@ lib/recipes/rails.rb
 lib/recipes/sphinx.rb
 lib/recipes/sshd.rb
 lib/recipes/syslogd.rb
+lib/templates/backgroundjob/backgroundjob.initd.centos.erb
+lib/templates/backgroundjob/backgroundjob.monitrc.erb
 lib/templates/backgroundrb/backgroundrb.initd.centos.erb
 lib/templates/backgroundrb/backgroundrb.monitrc.erb
 lib/templates/backgroundrb/backgroundrb.yml.erb

data/lib/capitate/task_node.rb

@@ -127,9 +127,17 @@ class Capitate::TaskNode
           names.pop
         end
       end
+      
       # Write breadcrumb
       file.puts %{ "home":../index.html > "recipes":index.html > #{links.reverse.join(" > ")} }
     
+      # Write task count
+      # count = 0
+      # each_node do |snode, level|
+      #   count += snode.tasks.length
+      # end
+      # file.puts %{\n\n*#{count}* tasks!\n\n}
+      
       #
       # Namespace
       #
@@ -137,8 +145,9 @@ class Capitate::TaskNode
         file.puts "\n\nh2. Namespaces\n\n"
         each_node do |snode, level|
           #li_level = (0..level).collect { "*" }.join
+          li_level = "*"
           if snode.tasks.length > 0
-            file.puts %{* "#{snode.full_name(":")}":#{snode.full_name}.html (#{snode.tasks.length}) \n}                  
+            file.puts %{#{li_level} "#{snode.full_name(":")}":#{snode.full_name}.html (#{snode.tasks.length}) \n}                  
           end
         end        
       end

data/lib/capitate/version.rb

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

data/lib/recipes/centos/backgroundjob.rb

@@ -0,0 +1,51 @@
+namespace :backgroundjob do
+  
+  namespace :centos do
+    
+    desc <<-DESC
+    Setup backgroundjob for application.
+    
+    <dl>
+    <dt>backgroundjob_bin_path</dt>
+    <dd>Path to start.
+    <dd class="default">Defaults to: 
+    <pre>
+      \#{current_path}/script/bj --forever --rails_env=production --rails_root=\#{current_path} --redirect \
+      --redirect=\#{backgroundjob_log_path} --pidfile=\#{backgroundjob_pid_path} &
+    </pre>
+    </dd>
+    <dt>backgroundjob_pid_path</dt>
+    <dd>Path to backgroundjob pid file</dd>
+    <dd class="default">Defaults to @\#{shared_path}/pids/bj.pid@</dd>
+    
+    <dt>backgroundjob_log_path</dt>
+    <dd>Path to backgroundjob log file</dd>
+    <dd class="default">Defaults to @\#{shared_path}/logs/bj.log@</dd>
+    </dl>
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task :setup do       
+      
+      
+      
+      # Settings
+      fetch_or_default(:backgroundjob_pid_path, "#{shared_path}/pids/bj.pid")
+      fetch_or_default(:backgroundjob_log_path, "#{shared_path}/log/bj.log")
+      
+      default_bin_path = "#{current_path}/script/bj run --forever --rails_env=production --rails_root=#{current_path} \
+--redirect=#{backgroundjob_log_path} --pidfile=#{backgroundjob_pid_path} &"
+      
+      fetch_or_default(:backgroundjob_bin_path, default_bin_path)
+      
+
+      # Install initscript      
+      utils.install_template("backgroundjob/backgroundjob.initd.centos.erb", "/etc/init.d/backgroundjob_#{application}")
+
+      # Enable service
+      run_via "/sbin/chkconfig --level 345 backgroundjob_#{application} on"    
+      
+    end
+    
+  end
+  
+end

data/lib/recipes/logrotate/backgroundjob.rb

@@ -0,0 +1,26 @@
+namespace :backgroundjob do
+  
+  namespace :logrotate do
+    
+    desc <<-DESC
+    Install logrotated conf for backgroundjob.
+  
+    <dl>
+    <dt>backgroundjob_logrotate_path<dt>
+    <dd>Backgroundjob logrotate paths.</dd>
+    <dd class="default">Defaults to @\#{shared_path}/log/bj*.log@</dd>
+    </dl>
+    "Source":#{link_to_source(__FILE__)}    
+    DESC
+    task :install do
+      fetch_or_default(:backgroundjob_logrotate_path, "#{shared_path}/log/bj*.log")
+    
+      set :logrotate_name, "backgroundjob_#{application}"
+      set :logrotate_log_path, backgroundjob_logrotate_path
+      set :logrotate_options, [ { :rotate => 2 }, :weekly, :missingok, :notifempty, :copytruncate ]
+    
+      logrotated.install_conf      
+    end
+  end
+  
+end

data/lib/recipes/monit/backgroundjob.rb

@@ -0,0 +1,38 @@
+namespace :backgroundjob do
+  
+  namespace :monit do
+  
+    desc <<-DESC
+    Generate and install backgroundjob (for application) monitrc.
+    
+    "Source":#{link_to_source(__FILE__)}
+    DESC
+    task :install do
+    
+      # Settings
+      fetch_or_default(:backgroundjob_pid_path, "#{shared_path}/pids/bj.pid")
+      fetch_or_default(:monit_conf_dir, "/etc/monit")
+    
+      utils.install_template("backgroundjob/backgroundjob.monitrc.erb", "#{monit_conf_dir}/backgroundjob.monitrc")
+    end
+    
+    desc "Restart backgroundrb (for application)"
+    task :restart do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} restart backgroundjob_#{application}"
+    end
+    
+    desc "Start backgroundrb (for application)"
+    task :start do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} start backgroundjob_#{application}" 
+    end
+    
+    desc "Stop backgroundrb (for application)"
+    task :stop do
+      fetch_or_default(:monit_bin_path, "monit")
+      sudo "#{monit_bin_path} stop backgroundjob_#{application}"
+    end
+  end
+  
+end

data/lib/recipes/monit/backgroundrb.rb

@@ -10,7 +10,6 @@ namespace :backgroundrb do
     task :install do
     
       # Settings
-      fetch_or_default(:backgroundrb_port, 11006)
       fetch_or_default(:backgroundrb_pid_path, "#{shared_path}/pids/backgroundrb.pid")
       fetch_or_default(:monit_conf_dir, "/etc/monit")
     

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

@@ -0,0 +1,55 @@
+#! /bin/sh
+# backgroundjob_<%= application %>: Backgroundjob daemon for <%= application %>
+#
+# chkconfig: - 86 14
+# description: backgroundjob daemon
+# processname: bj
+#
+# Author: Gabriel Handford http://ducktyper.com
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+
+DESC="backgroundjob daemon (<%= application %>)"
+DAEMON="<%= backgroundjob_bin_path %>"
+PIDFILE="<%= backgroundjob_pid_path %>"
+
+start() {
+  daemon --user <%= user %> --pidfile $PIDFILE $DAEMON
+  RETVAL=$?
+  echo
+  return $RETVAL;  
+}
+
+stop() {
+  kill -TERM `cat $PIDFILE` || echo -n " not running"
+}
+
+case "$1" in
+  start)
+  	echo -n "Starting $DESC: $NAME"
+  	start
+    RETVAL=$?;
+	;;
+  stop)
+  	echo -n "Stopping $DESC: $NAME"
+  	stop
+  	RETVAL=$?;
+	;;
+  restart)
+  	echo -n "Restarting $DESC: $NAME"
+  	stop
+  	# Sleep after stop
+  	sleep 1
+  	start
+  	RETVAL=$?;
+	;;
+  *)
+	  echo "Usage: $0 {start|stop|restart}" >&2
+	  RETVAL=3;
+	;;
+esac
+
+exit $RETVAL;

data/lib/templates/backgroundjob/backgroundjob.monitrc.erb

@@ -0,0 +1,3 @@
+check process backgroundjob_<%= application %> with pidfile <%= backgroundjob_pid_path %>
+  start program = "/sbin/service backgroundjob_<%= application %> start" 
+  stop program =  "/sbin/service backgroundjob_<%= application %> stop" 

data/lib/templates/backgroundrb/backgroundrb.monitrc.erb

@@ -1,4 +1,3 @@
 check process backgroundrb_<%= application %> with pidfile <%= backgroundrb_pid_path %>
   start program = "/sbin/service backgroundrb_<%= application %> start" 
   stop program =  "/sbin/service backgroundrb_<%= application %> stop" 
-  if failed host 127.0.0.1 port <%= backgroundrb_port %> then restart

data/lib/templates/mysql/my.cnf.innodb_1024.erb

@@ -20,7 +20,7 @@
 [client]
 port = <%= db_port %>
 socket = <%= db_socket %>
-max_allowed_packet = 32M
+#max_allowed_packet = 32M
 
 [mysqld]
 ######### engine and access interfaces

data/website/index.html

@@ -8,9 +8,6 @@
       → ‘capitate’: Capistrano recipes, plugins and templates.
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
-
-</style>
   <script type="text/javascript">
     window.onload = function() {
       settings = {
@@ -38,7 +35,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.14</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.15</a>
     </div>
     
     <div id="recipes">
@@ -138,7 +135,7 @@
 	<p>Comments are welcome. Send an email to <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a> via the <a href="http://groups.google.com/group/capitate">forum</a></p>
     </div>
     <p class="coda">
-      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, 13th March 2008<br>
+      <a href="http://ducktyper.com">ducktyper.com</a>, 13th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/template.rhtml

@@ -8,9 +8,6 @@
       <%= title %>: Capistrano recipes, plugins and templates.
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
-<style>
-
-</style>
   <script type="text/javascript">
     window.onload = function() {
       settings = {
@@ -53,7 +50,7 @@
     <%= body %>
     </div>
     <p class="coda">
-      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, <%= modified.pretty %><br>
+      <a href="http://ducktyper.com">ducktyper.com</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/template_recipe.rhtml

@@ -18,9 +18,13 @@
 <div id="main" class="recipes">
     
     <h1><%= title %></h1>
+    
+    <div>
     <%= body %>
+    </div>
+    
     <p class="coda">
-      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, <%= modified.pretty %><br>
+      <a href="http://ducktyper.com">ducktyper.com</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.2.14
+  version: 0.2.15
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-27 00:00:00 -04:00
+date: 2008-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - lib/capitate/version.rb
 - lib/deployment/centos-5.1-64-web/install.rb
 - lib/recipes/backgroundrb.rb
+- lib/recipes/centos/backgroundjob.rb
 - lib/recipes/centos/backgroundrb.rb
 - lib/recipes/centos/centos.rb
 - lib/recipes/centos/imagemagick.rb
@@ -75,6 +76,7 @@ files:
 - lib/recipes/centos/ruby.rb
 - lib/recipes/centos/sphinx.rb
 - lib/recipes/docs.rb
+- lib/recipes/logrotate/backgroundjob.rb
 - lib/recipes/logrotate/backgroundrb.rb
 - lib/recipes/logrotate/mongrel_cluster.rb
 - lib/recipes/logrotate/monit.rb
@@ -85,6 +87,7 @@ files:
 - lib/recipes/logrotated.rb
 - lib/recipes/memcached.rb
 - lib/recipes/monit.rb
+- lib/recipes/monit/backgroundjob.rb
 - lib/recipes/monit/backgroundrb.rb
 - lib/recipes/monit/database.rb
 - lib/recipes/monit/memcached.rb
@@ -99,6 +102,8 @@ files:
 - lib/recipes/sphinx.rb
 - lib/recipes/sshd.rb
 - lib/recipes/syslogd.rb
+- lib/templates/backgroundjob/backgroundjob.initd.centos.erb
+- lib/templates/backgroundjob/backgroundjob.monitrc.erb
 - lib/templates/backgroundrb/backgroundrb.initd.centos.erb
 - lib/templates/backgroundrb/backgroundrb.monitrc.erb
 - lib/templates/backgroundrb/backgroundrb.yml.erb