capitate 0.1.9 → 0.2.1

data/website/index.html

@@ -5,7 +5,7 @@
   <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>
-      &#x2192; &#8216;capitate&#8217;
+      &#x2192; &#8216;capitate&#8217;: Capistrano recipes, plugins and templates.
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
 <style>
@@ -23,7 +23,7 @@
           validTags: ["div"]
       };
       
-      curvy_ids = [ "version", "recipes" ];
+      curvy_ids = [ "version" ];
       for(id in curvy_ids) {        
         var box = new curvyCorners(settings, document.getElementById(curvy_ids[id]));
         box.applyCornersToAll();
@@ -38,16 +38,18 @@
 
     <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.1.9</a>
+      <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.1</a>
     </div>
     
-    <div id="recipes" class="box">
+    <div id="recipes">
+      <p>Documentation:
       <a href="recipes/index.html">Recipes</a> &#x2192;
       <a href="http://svn.ducktyper.com/capitate/trunk/lib/capitate/plugins/">Plugins</a> &#x2192;
       <a href="http://svn.ducktyper.com/capitate/trunk/lib/templates/">Templates</a>
+      </p>
     </div>
 
-    <div style="clear:both">
+    <div>
     <h2>What</h2>
 
 
@@ -74,54 +76,38 @@
 	<h2>The basics</h2>
 
 
-	<p>Capitate has recipes for:</p>
+	<p>Capitate has:</p>
 
 
 	<ul>
-	<li>Installing applications, via package manager or manually building with make.</li>
+	<li>Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, and run scripts.</li>
+		<li>Templates for init scripts and application configuration.</li>
 		<li>Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.</li>
-		<li><span class="caps">ERB</span> templates for application configuration files, init scripts, monit configuration, etc.</li>
-		<li>And more&#8230;</li>
 	</ul>
 
 
-	<h3>Beefing up your deploy</h3>
+	<h3>Example: Using capitate to write an install task:</h3>
 
 
-	<p>For an example deploy, see <a href="http://svn.ducktyper.com/capitate/trunk/lib/profiles/centos-sick.rb">centos-sick.rb</a></p>
+	<p>See <a href="http://svn.ducktyper.com/capitate/trunk/lib/deployment/install-centos-rubyweb.rb">install-centos-rubyweb.rb</a></p>
 
 
-	<p>You could copy this profile into config/deployment/ and add it to your Capfile:</p>
+	<p>Load this in your Capfile:</p>
 
 
-	<pre><code>load "config/deployment/centos-sick.rb"</code></pre>
+	<pre><code>load "lib/deployment/install-centos-rubyweb.rb"</code></pre>
 
 
-	<h3>Use recipes</h3>
+	<p>and then:</p>
 
 
-	<p><a href="recipes/index.html">View recipes documentation</a></p>
-
-
-	<p>For example, to script the install of a group of applications as root, use <a href="recipes/recipes.html">recipes:run</a>:</p>
+	<pre><code>cap HOSTS=x.x.x.x install</code></pre>
 
 
-	<p>Configure your Capfile to run it:</p>
-
-
-	<p><pre class='syntax'>
-<span class="ident">set</span> <span class="symbol">:recipes_run</span><span class="punct">,</span> <span class="punct">[</span> <span class="punct">&quot;</span><span class="string">ruby:centos:install</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">memcached:centos:install</span><span class="punct">&quot;</span> <span class="punct">]</span>
-<span class="ident">set</span> <span class="symbol">:recipes_user</span><span class="punct">,</span> <span class="punct">&quot;</span><span class="string">root</span><span class="punct">&quot;</span>
-</pre></p>
+	<h3>Use it</h3>
 
 
-	<p>Then run:</p>
-
-
-	<pre><code>cap recipes:run</code></pre>
-
-
-	<p>This is just a basic example.</p>
+	<p><a href="recipes/index.html">View recipes documentation</a></p>
 
 
 	<h2>Forum</h2>
@@ -136,7 +122,7 @@
 	<p>Read the <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/">8 steps for fixing other people&#8217;s code</a> and for section <a href="http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups">8b: Submit patch to Google Groups</a>, use the Google Group above.</p>
 
 
-	<p>The trunk repository is <code>http://svn.ducktyper.com/capitate/trunk</code> for anonymous access.</p>
+	<p>The trunk repository is <a href="http://svn.ducktyper.com/capitate/trunk">http://svn.ducktyper.com/capitate/trunk</a> for anonymous access.</p>
 
 
 	<h2>License</h2>
@@ -151,7 +137,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="FIXME email">Gabriel Handford</a>, 22nd February 2008<br>
+      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, 23rd February 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -21,42 +21,32 @@ set :project_root, File.dirname(__FILE__)
 
 h2. The basics
 
-Capitate has recipes for:
+Capitate has:
 
-* Installing applications, via package manager or manually building with make.
+* Plugins to help install applications, via yum or manually unpacking, and building. Also to help upload files sanely, prompt for input, install gems, and run scripts.
+* Templates for init scripts and application configuration.
 * Common deployment setup and update_code tasks, such as symlinking in database.yml and more advanced recipes such as sphinx configuration.
-* ERB templates for application configuration files, init scripts, monit configuration, etc.
-* And more...
 
 
-h3. Beefing up your deploy
+h3. Example: Using capitate to write an install task:
 
-For an example deploy, see "centos-sick.rb":http://svn.ducktyper.com/capitate/trunk/lib/profiles/centos-sick.rb
+See "install-centos-rubyweb.rb":http://svn.ducktyper.com/capitate/trunk/lib/deployment/install-centos-rubyweb.rb
 
-You could copy this profile into config/deployment/ and add it to your Capfile:
+Load this in your Capfile:
 
-  load "config/deployment/centos-sick.rb"
+  load "lib/deployment/install-centos-rubyweb.rb"
+  
+and then:
 
+  cap HOSTS=x.x.x.x install
 
 
-h3. Use recipes
+h3. Use it
 
 "View recipes documentation":recipes/index.html
 
-For example, to script the install of a group of applications as root, use "recipes:run":recipes/recipes.html:
 
-Configure your Capfile to run it:
 
-<pre syntax="ruby">
-set :recipes_run, [ "ruby:centos:install", "memcached:centos:install" ]
-set :recipes_user, "root"
-</pre>
-
-Then run:
-
-  cap recipes:run
-
-This is just a basic example.
 
 h2. Forum
 
@@ -66,7 +56,7 @@ h2. How to submit patches
 
 Read the "8 steps for fixing other people's code":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/ and for section "8b: Submit patch to Google Groups":http://drnicwilliams.com/2007/06/01/8-steps-for-fixing-other-peoples-code/#8b-google-groups, use the Google Group above.
 
-The trunk repository is <code>http://svn.ducktyper.com/capitate/trunk</code> for anonymous access.
+The trunk repository is "http://svn.ducktyper.com/capitate/trunk":http://svn.ducktyper.com/capitate/trunk for anonymous access.
 
 h2. License
 

data/website/stylesheets/screen.css

@@ -45,7 +45,6 @@ blockquote {
 }
 .coda {
   text-align: right;
-  color: #77f;
   font-size: smaller;
 }
 
@@ -101,7 +100,7 @@ pre, code {
 .box {
   font-family: sans-serif;
   font-weight: normal;
-  background-color: #A7A37E;
+  background-color: #445878;
   color: #000;
   padding: 15px 20px 10px 20px;
   margin: 0 auto;
@@ -110,12 +109,25 @@ pre, code {
 }
 
 .landing h1 {
-  float: left;
+  
 }
 
 #recipes {
-  float: right;
-  margin-right: 10px;
+
+}
+
+.recipes pre,
+.recipes code {
+  margin: 0 30px;
+}
+
+.recipes code {
+  display:block;
+}
+
+.recipes h3 {
+  padding: 4px;
+  background-color: #E6E2AF;
 }
 
 #version {
@@ -134,16 +146,15 @@ pre, code {
 
 #version p {
   text-decoration: none;
-	color: #000;
-	background-color: #A7A37E;
+	color: #FFF;
+	background-color: #445878;
 	margin: 0;
 	padding: 0;
 }
 
-#version a,
-#recipes a {
-	color: #000;
-	background-color: #A7A37E;
+#version a {
+	color: #FFF;
+	background-color: #445878;
 }
 
 #version a {

data/website/template.rhtml

@@ -5,7 +5,7 @@
   <link rel="stylesheet" href="stylesheets/screen.css" type="text/css" media="screen" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>
-      <%= title %>
+      <%= title %>: Capistrano recipes, plugins and templates.
   </title>
   <script src="javascripts/rounded_corners_lite.inc.js" type="text/javascript"></script>
 <style>
@@ -23,7 +23,7 @@
           validTags: ["div"]
       };
       
-      curvy_ids = [ "version", "recipes" ];
+      curvy_ids = [ "version" ];
       for(id in curvy_ids) {        
         var box = new curvyCorners(settings, document.getElementById(curvy_ids[id]));
         box.applyCornersToAll();
@@ -41,17 +41,19 @@
       <a href="<%= download %>" class="numbers"><%= version %></a>
     </div>
     
-    <div id="recipes" class="box">
+    <div id="recipes">
+      <p>Documentation:
       <a href="recipes/index.html">Recipes</a> &#x2192;
       <a href="http://svn.ducktyper.com/capitate/trunk/lib/capitate/plugins/">Plugins</a> &#x2192;
       <a href="http://svn.ducktyper.com/capitate/trunk/lib/templates/">Templates</a>
+      </p>
     </div>
 
-    <div style="clear:both">
+    <div>
     <%= body %>
     </div>
     <p class="coda">
-      <a href="FIXME email">Gabriel Handford</a>, <%= modified.pretty %><br>
+      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/template_recipe.rhtml

@@ -5,16 +5,20 @@
   <link rel="stylesheet" href="../stylesheets/screen.css" type="text/css" media="screen" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>
-      <%= title %>
+      <% if title != "Recipes" %>
+      Capistrano recipes: <%= title %>
+      <% else %>
+      Capistrano recipes
+      <% end %>
   </title>
 </head>
 <body>
 <div id="main" class="recipes">
-
+    
     <h1><%= title %></h1>
     <%= body %>
     <p class="coda">
-      <a href="FIXME email">Gabriel Handford</a>, <%= modified.pretty %><br>
+      <a href="mailto:gabrielh@gmail.com">Gabriel Handford</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
-platform: ""
+  version: 0.2.1
+platform: ruby
 authors: 
 - Gabriel Handford
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-02-22 00:00:00 -05:00
+date: 2008-02-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,29 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
+- docs/recipes/centos.txt
+- docs/recipes/deploy-pending.txt
+- docs/recipes/deploy-web.txt
+- docs/recipes/deploy.txt
+- docs/recipes/docs.txt
+- docs/recipes/imagemagick-centos.txt
+- docs/recipes/imagemagick.txt
+- docs/recipes/index.txt
+- docs/recipes/memcached-centos.txt
+- docs/recipes/memcached.txt
+- docs/recipes/mongrel_cluster-centos.txt
+- docs/recipes/mongrel_cluster.txt
+- docs/recipes/monit-centos.txt
+- docs/recipes/monit.txt
+- docs/recipes/mysql-centos.txt
+- docs/recipes/mysql.txt
+- docs/recipes/nginx-centos.txt
+- docs/recipes/nginx.txt
+- docs/recipes/rails.txt
+- docs/recipes/ruby-centos.txt
+- docs/recipes/ruby.txt
+- docs/recipes/sphinx-centos.txt
+- docs/recipes/sphinx.txt
 - website/index.txt
 files: 
 - Capfile
@@ -44,25 +67,47 @@ files:
 - bin/capitate
 - config/hoe.rb
 - config/requirements.rb
+- docs/nginx.README
+- docs/recipes/centos.txt
+- docs/recipes/deploy-pending.txt
+- docs/recipes/deploy-web.txt
+- docs/recipes/deploy.txt
+- docs/recipes/docs.txt
+- docs/recipes/imagemagick-centos.txt
+- docs/recipes/imagemagick.txt
+- docs/recipes/index.txt
+- docs/recipes/memcached-centos.txt
+- docs/recipes/memcached.txt
+- docs/recipes/mongrel_cluster-centos.txt
+- docs/recipes/mongrel_cluster.txt
+- docs/recipes/monit-centos.txt
+- docs/recipes/monit.txt
+- docs/recipes/mysql-centos.txt
+- docs/recipes/mysql.txt
+- docs/recipes/nginx-centos.txt
+- docs/recipes/nginx.txt
+- docs/recipes/rails.txt
+- docs/recipes/ruby-centos.txt
+- docs/recipes/ruby.txt
+- docs/recipes/sphinx-centos.txt
+- docs/recipes/sphinx.txt
 - lib/capitate.rb
 - lib/capitate/cap_ext/connections.rb
 - lib/capitate/cap_ext/extension_proxy.rb
+- lib/capitate/cap_ext/run_via.rb
 - lib/capitate/cap_ext/variables.rb
 - lib/capitate/plugins/base.rb
 - lib/capitate/plugins/gem.rb
-- lib/capitate/plugins/package.rb
-- lib/capitate/plugins/profiles.rb
+- lib/capitate/plugins/prompt.rb
 - lib/capitate/plugins/script.rb
 - lib/capitate/plugins/templates.rb
 - lib/capitate/plugins/upload.rb
-- lib/capitate/plugins/wget.rb
 - lib/capitate/plugins/yum.rb
 - lib/capitate/recipes.rb
 - lib/capitate/task_node.rb
 - lib/capitate/version.rb
-- lib/profiles/centos-sick.rb
-- lib/recipes/README
-- lib/recipes/centos/README
+- lib/deployment/deploy.rb
+- lib/deployment/install-centos-rubyweb.rb
 - lib/recipes/centos/centos.rb
 - lib/recipes/centos/imagemagick.rb
 - lib/recipes/centos/memcached.rb
@@ -74,18 +119,13 @@ files:
 - lib/recipes/centos/sphinx.rb
 - lib/recipes/deploy.rb
 - lib/recipes/docs.rb
-- lib/recipes/gems.rb
 - lib/recipes/memcached.rb
 - lib/recipes/mongrel_cluster.rb
 - lib/recipes/mysql.rb
 - lib/recipes/nginx.rb
-- lib/recipes/packages.rb
 - lib/recipes/rails.rb
-- lib/recipes/recipes.rb
 - lib/recipes/sphinx.rb
 - lib/templates/capistrano/Capfile
-- lib/templates/centos/setup_for_web.sh
-- lib/templates/centos/sudoers
 - lib/templates/memcached/memcached.initd.centos.erb
 - lib/templates/memcached/memcached.monitrc.erb
 - lib/templates/mongrel/mongrel_cluster.initd.erb
@@ -147,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capitate
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Capistrano recipes, plugins and templates.

data/lib/capitate/plugins/package.rb

@@ -1,30 +0,0 @@
-# Package plugin.
-#
-# TODO: If type not set silently fails. NOT GOOD :(
-#
-module Capitate::Plugins::Package
-  
-  # Setup packager.
-  #
-  # ==== Options
-  # +packager_type+:: Packager type (:yum)
-  #
-  # ==== Examples (in capistrano task)
-  #   package.type = :yum
-  #   package.install [ "aspell", "foo" ]
-  #   package.remove [ "aspell", "foo" ]
-  #   package.update [ "aspell", "foo" ]
-  #   package.clean
-  #
-  def type=(packager_type)
-    case packager_type.to_sym
-    when :yum
-      include Capitate::Plugins::Yum
-    else
-      raise "Invalid packager type: #{packager_type}"
-    end    
-  end  
-    
-end
-
-Capistrano.plugin :package, Capitate::Plugins::Package

data/lib/capitate/plugins/profiles.rb

@@ -1,33 +0,0 @@
-# == Profiles
-# Useful for starting a profile, but your mileage may vary.
-#
-module Capitate::Plugins::Profiles
-  
-  ProfileDir = File.dirname(__FILE__) + "/../../profiles"
-  
-  # Load all profiles with prefix.
-  #
-  # ==== Options
-  # +prefix+:: Prefix to filter/search on
-  #  
-  def list(prefix = "")
-    Dir[ProfileDir + "/#{prefix}*.rb"].collect { |file| File.basename(file).gsub(File.extname(file), "") }
-  end
-  
-  # Choose a profile (via command line).
-  # 
-  # ==== Options
-  # +prefix+:: Prefix to filter/search on
-  #
-  def choose(prefix = "")
-    profile = HighLine.new.choose(*list(prefix)) do |menu|
-      menu.header = "Choose recipe profile"
-    end
-    
-    "#{ProfileDir}/#{profile}.rb"
-  end
-
-end
-    
-    
-Capistrano.plugin :profile, Capitate::Plugins::Profiles

data/lib/capitate/plugins/wget.rb

@@ -1,23 +0,0 @@
-require 'open-uri'
-
-module Capitate::Plugins::Wget
-  
-  # Download the uri, then upload it into the remote destination directory
-  # 
-  # ==== Options
-  # +uri+:: URI to get
-  # +remote_dest_dir+:: Remote destination directory, defaults to /tmp
-  #
-  def uri(uri, remote_dest_dir = "/tmp")
-    
-    uri = uri = URI.parse(uri)
-    name = uri.path.split("/").last
-    remote_dest_path = File.join(remote_dest_dir, name)
-    
-    logger.info "Downloading #{name} from #{uri}..."      
-    put open(uri).read, remote_dest_path    
-  end
-  
-end
-
-Capistrano.plugin :wget, Capitate::Plugins::Wget

data/lib/profiles/centos-sick.rb

@@ -1,116 +0,0 @@
-#
-# This is an EXAMPLE profile.
-#
-# Profile for sick rails app on centos 5.1
-#
-
-set :description, "Sick project deployment for centos 5.1 image"
-
-set :recipes_run, [ 
-  "centos:setup_for_web",
-  "packages:install",
-  "ruby:centos:install", 
-  "nginx:centos:install", 
-  "mysql:centos:install", 
-  "sphinx:centos:install", 
-  "monit:centos:install",
-  "imagemagick:centos:install", 
-  "memcached:centos:install", 
-  "nginx:install_monit",   
-  "mysql:install_monit",     
-  "memcached:install_monit", 
-  "gems:install", 
-  "centos:cleanup" 
-]
-
-#
-# Settings for recipes
-#
-
-# For packages:install
-set :packages_type, :yum
-set :packages_remove, [ "openoffice.org-*", "ImageMagick" ]
-set :packages_add, [
-  "gcc", "kernel-devel", "libevent-devel", "libxml2-devel", 
-  "openssl", "openssl-devel",
-  "aspell", "aspell-devel", "aspell-en", "aspell-es",
-  ]
-  
-# For gem:install
-set :gem_list, [ 
-  "rake", 
-  "mysql -- --with-mysql-include=/usr/include/mysql --with-mysql-lib=/usr/lib/mysql --with-mysql-config", 
-  "raspell", 
-  "rmagick", 
-  "mongrel", 
-  "mongrel_cluster",
-  "json"
-]
-
-# For monit:install
-set :monit_port, 2812 # Capistrano::CLI.ui.ask('Monit port: ')
-set :monit_password, Proc.new { Capistrano::CLI.ui.ask('Monit admin password (to set): ') }
-
-# For nginx:install
-set :nginx_bin_path, "/sbin/nginx"
-set :nginx_conf_path, "/etc/nginx/nginx.conf"
-set :nginx_pid_path, "/var/run/nginx.pid"
-set :nginx_prefix_path, "/var/nginx"
-
-# For mysql:install
-set :mysql_admin_password_set, Proc.new { Capistrano::CLI.ui.ask('Mysql admin password (to set): ') }
-set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"
-set :db_port, 3306 # Capistrano::CLI.ui.ask('Mysql port: ')
-
-# For sphinx:install
-set :sphinx_prefix, "/usr/local/sphinx"
-
-# For memcached:install
-set :memcached_pid_path, "/var/run/memcached.pid"
-set :memcached_memory, 64
-set :memcached_port, 11211
-
-
-#
-# Settings for project
-#
-
-set :application, "sick"
-set :user, "sick"
-set :deploy_to, "/var/www/apps/sick"
-set :web_host, "WEB_HOST"
-set :db_host, "DB_HOST"
-set :db_user, "sick"
-set :db_pass, "sick"
-set :db_name, "sick"
-# db_port set already
-set :sphinx_host, "SPHINX_HOST"
-set :sphinx_port, 3312
-set :repository, "REPOSITORY"
-set :mongrel_port, 12000
-set :mongrel_size, 3
-set :domain_name, "localhost"
-set :mysql_admin_password, Proc.new { Capistrano::CLI.ui.ask('Mysql admin password: ') }
-
-set :deploy_via, :copy
-set :copy_strategy, :export
-
-role :web, "WEB_URL"
-role :db, "DB_URL", :primary => true
-
-
-# Callbacks 
-before "deploy:setup", "centos:add_user_for_app"
-
-after "deploy:setup", "mysql:setup", "rails:setup", "mongrel_cluster:centos:setup",
-  "nginx:setup_mongrel", "sphinx:centos:setup"
-  
-after "sphinx:centos:setup", "sphinx:setup_monit"
-after "mongrel_cluster:centos:setup", "mongrel_cluster:setup_monit"
-
-after "nginx:setup_mongrels", "nginx:centos:restart"
-
-after "deploy:update_code", "rails:update_code", "sphinx:update_code"
-
-# Auto cleanup after deploy
-after "deploy", "deploy:cleanup"

data/lib/recipes/README

@@ -1,5 +0,0 @@
-= Recipes
-* Install tasks are one time tasks (per OS).
-* Setup tasks are one time tasks (per application).
-* Update code tasks are called after each deploy (per application).
-* Scripts and templates are in capitate/lib/templates.

data/lib/recipes/centos/README

@@ -1,3 +0,0 @@
-Recipes specific to Centos.
-
-Tested on Centos 5.1