capitate 0.1.7 → 0.1.8

data/website/index.txt

@@ -1,25 +1,23 @@
-h1. Capistrano plugins, recipes and templates
-
 h1. → 'capitate'
 
-
 h2. What
 
 Capistrano plugins, recipes and templates.
 
 h2. Installing
 
-<pre syntax="ruby">sudo gem install capitate</pre>
-
-Create a Capfile (in your project):
+<pre>sudo gem install capitate</pre>
 
-<pre syntax="ruby">capitate</pre>
 
-Create and set a profile in you Capfile:
+h2. Running
 
-<pre syntax="ruby"># load "config/deployment/centos-sick.rb"</pre>
+Add capitate to your Capfile. Copy this somewhere near the top:
 
-<em>See profiles section below for more info</em>
+<pre syntax="ruby">
+  set :project_root, File.dirname(__FILE__)
+  require 'capitate'  
+  require 'capitate/recipes'
+</pre>
 
 
 h2. The basics
@@ -32,39 +30,34 @@ Capitate has recipes for:
 * And more...
 
 
-h3. Profiles
-
-Profiles are capfiles which store lists of recipes to run for cap install and deploy and settings for those recipes.
-
-For an example profile, see "centos-sick.rb":http://svn.ducktyper.com/capitate/trunk/lib/profiles/centos-sick.rb
+h3. Beefing up your deploy
 
-TODO: More on profiles...
+For an example deploy, see "centos-sick.rb":http://svn.ducktyper.com/capitate/trunk/lib/profiles/centos-sick.rb
 
+You could copy this profile into config/deployment/ and add it to your Capfile:
 
-h3. Install recipes
+  load "config/deployment/centos-sick.rb"
 
-To install a group of applications based on a profile (see Profiles section below):
 
-  cap install
 
-<em>You may need to comment out "Defaults requiretty" in /etc/sudoders on the image before capistrano recipes will work.</em>
+h3. Use recipes
 
-  
-h3. Deploying (application)
+"View recipes documentation":recipes/index.html
 
-If this is the first time you've deployed you'll need to run:
+For example, to script the install of a group of applications as root, use "recipes:run":recipes/recipes.html:
 
-  cap deploy:setup
+Configure your Capfile to run it:
 
-Otherwise, your standard deploy options:
-  
-  cap deploy
+<pre syntax="ruby">
+set :recipes_run, [ "ruby:centos:install", "memcached:centos:install" ]
+set :recipes_user, "root"
+</pre>
 
-  cap deploy:migrations (deploys and does migration)
-  
-  cap deploy:migrate (only does migration on existing deployment)
+Then run:
 
+  cap recipes:run
 
+This is just a basic example.
 
 h2. Forum
 
@@ -74,7 +67,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/var/svn/capitate/trunk</code> for anonymous access.
+The trunk repository is <code>http://svn.ducktyper.com/capitate/trunk</code> for anonymous access.
 
 h2. License
 

data/website/stylesheets/screen.css

@@ -1,5 +1,5 @@
 body {
-  background-color: #E1D1F1;
+  background-color: #EFECCA;
   font-family: "Georgia", sans-serif;
   font-size: 16px;
   line-height: 1.6em;
@@ -23,8 +23,8 @@ li {
   list-style-type: square;
 }
 a {
-  color: #5E5AFF;
-	background-color: #DAC;
+  color: #046380;
+	background-color: #E6E2AF;
   font-weight: normal;
   text-decoration: underline;
 }
@@ -84,6 +84,7 @@ pre, code {
   color: #ff8;
   background-color: #111;
   padding: 2px 10px 2px 10px;
+  overflow: auto;
 }
 .comment { color: #aaa; font-style: italic; }
 .keyword { color: #eff; font-weight: bold; }
@@ -96,19 +97,33 @@ pre, code {
 .number { color: #F99; }
 .expr { color: #227; }
 
-#version {
-  float: right;
-  text-align: right;
+
+.box {
   font-family: sans-serif;
   font-weight: normal;
-  background-color: #B3ABFF;
-  color: #141331;
+  background-color: #A7A37E;
+  color: #000;
   padding: 15px 20px 10px 20px;
   margin: 0 auto;
 	margin-top: 15px;
   border: 3px solid #141331;
 }
 
+.landing h1 {
+  float: left;
+}
+
+#recipes {
+  float: right;
+  margin-right: 10px;
+}
+
+#version {
+  float: right;
+  text-align: right;
+  clear:right;
+}
+
 #version .numbers {
   display: block;
   font-size: 4em;
@@ -119,16 +134,20 @@ pre, code {
 
 #version p {
   text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
+	color: #000;
+	background-color: #A7A37E;
 	margin: 0;
 	padding: 0;
 }
 
+#version a,
+#recipes a {
+	color: #000;
+	background-color: #A7A37E;
+}
+
 #version a {
   text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
 }
 
 .clickable {

data/website/template.rhtml

@@ -21,21 +21,35 @@
           antiAlias: true,
           autoPad: true,
           validTags: ["div"]
-      }
-      var versionBox = new curvyCorners(settings, document.getElementById("version"));
-      versionBox.applyCornersToAll();
+      };
+      
+      curvy_ids = [ "version", "recipes" ];
+      for(id in curvy_ids) {        
+        var box = new curvyCorners(settings, document.getElementById(curvy_ids[id]));
+        box.applyCornersToAll();
+      }      
     }
   </script>
 </head>
 <body>
-<div id="main">
+<div id="main" class="landing">
 
     <h1><%= title %></h1>
-    <div id="version" class="clickable" onclick='document.location = "<%= download %>"; return false'>
+
+    <div id="version" class="clickable box" onclick='document.location = "<%= download %>"; return false'>
       <p>Get Version</p>
       <a href="<%= download %>" class="numbers"><%= version %></a>
     </div>
+    
+    <div id="recipes" class="box">
+      <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>
+    </div>
+
+    <div style="clear:both">
     <%= body %>
+    </div>
     <p class="coda">
       <a href="FIXME email">Gabriel Handford</a>, <%= modified.pretty %><br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>

data/website/template_recipe.rhtml

@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <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>
+</head>
+<body>
+<div id="main" class="recipes">
+
+    <h1><%= title %></h1>
+    <%= body %>
+    <p class="coda">
+      <a href="FIXME email">Gabriel Handford</a>, <%= modified.pretty %><br>
+      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
+    </p>
+</div>
+
+<!-- insert site tracking codes here, like Google Urchin -->
+
+</body>
+</html>

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: capitate
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
-platform: ruby
+  version: 0.1.8
+platform: ""
 authors: 
 - Gabriel Handford
 autorequire: 
@@ -11,9 +11,17 @@ cert_chain: []
 
 date: 2008-02-21 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
-description: Capistrano recipe library for all types of remote tasks.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: capistrano
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+    version: 
+description: Capistrano recipes, plugins and templates.
 email: 
 - gabrielh@gmail.com
 executables: 
@@ -40,7 +48,6 @@ files:
 - lib/capitate/cap_ext/connections.rb
 - lib/capitate/cap_ext/extension_proxy.rb
 - lib/capitate/cap_ext/variables.rb
-- lib/capitate/config.rb
 - lib/capitate/plugins/base.rb
 - lib/capitate/plugins/gem.rb
 - lib/capitate/plugins/package.rb
@@ -50,21 +57,8 @@ files:
 - lib/capitate/plugins/wget.rb
 - lib/capitate/plugins/yum.rb
 - lib/capitate/recipes.rb
+- lib/capitate/task_node.rb
 - lib/capitate/version.rb
-- lib/doc/centos/memcached.yml
-- lib/doc/centos/mongrel_cluster.yml
-- lib/doc/centos/monit.yml
-- lib/doc/centos/mysql.yml
-- lib/doc/centos/nginx.yml
-- lib/doc/centos/sphinx.yml
-- lib/doc/gems.yml
-- lib/doc/install.yml
-- lib/doc/memcached.yml
-- lib/doc/mongrel_cluster.yml
-- lib/doc/mysql.yml
-- lib/doc/nginx.yml
-- lib/doc/packages.yml
-- lib/doc/rails.yml
 - lib/profiles/centos-sick.rb
 - lib/recipes/README
 - lib/recipes/centos/README
@@ -78,14 +72,15 @@ files:
 - lib/recipes/centos/ruby.rb
 - lib/recipes/centos/sphinx.rb
 - lib/recipes/deploy.rb
+- lib/recipes/docs.rb
 - lib/recipes/gems.rb
-- lib/recipes/install.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
@@ -115,7 +110,6 @@ files:
 - script/generate
 - script/txt2html
 - setup.rb
-- tasks/capitate.rake
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/website.rake
@@ -127,6 +121,7 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
+- website/template_recipe.rhtml
 has_rdoc: true
 homepage: http://capitate.rubyforge.org
 post_install_message: 
@@ -150,10 +145,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capitate
-rubygems_version: 1.0.1
+rubygems_version: 0.9.5
 signing_key: 
 specification_version: 2
-summary: Capistrano recipe library for all types of remote tasks.
+summary: Capistrano recipes, plugins and templates.
 test_files: 
 - test/test_helper.rb
 - test/test_recipes.rb

data/lib/capitate/config.rb

@@ -1,106 +0,0 @@
-require 'yaml'
-require 'highline'
-
-# DEPRECATED, not in use.
-#
-# Application configuration for helping generate Capfile and deploy.rb.
-#
-class Capitate::Config
-  
-  attr_accessor :application, :user, :deploy_to, :web_host
-  attr_accessor :db_host, :db_user, :db_pass, :db_name, :db_port
-  attr_accessor :sphinx_port, :sphinx_host
-  attr_accessor :repository, :recipes
-  attr_accessor :mongrel_port, :mongrel_size
-  attr_accessor :domain_name
-  
-  def initialize
-  end
-
-  # Expose the binding.
-  def get_binding
-    binding
-  end
-  
-  # Ask for property.
-  # 
-  # ==== Options
-  # +message+:: Prompt
-  # +property+:: Property
-  # +options+:: Options
-  # - :default, Default value, defaults to nil
-  # - :answer_type, Highline answer type, defaults to String
-  # - :auto_apply, If true and property is set don't ask for it
-  #
-  # ==== Examples
-  #   ask("Database port: ", "db_port", { :default => 3306, :answer_type => Integer })
-  #
-  def ask(message, property, options = {}, &block)    
-    # Options
-    default = options[:default] || nil    
-    answer_type = options[:answer_type] || String
-    auto_apply = options[:auto_apply]
-    
-    # Default to existing or default if set
-    existing = send(property.to_sym)
-    default = existing || default
-    
-    unless auto_apply and !existing.blank?
-      result = HighLine.new.ask(message, answer_type) { |q| 
-        q.default = default unless default.blank?
-        yield q if block_given?
-      }
-  
-      send("#{property}=", result)
-    end
-  end
-  
-  # For property, set to value if blank.
-  def set_default(property, value)
-    v = send(property.to_sym)
-    send("#{property}=", value) if v.blank?
-  end
-
-  # Save to yaml.
-  def save(path)
-    File.open(path, "w") { |f| f.puts self.to_yaml }
-  end
-  
-  # Build config from asking.
-  # 
-  # ==== Options
-  # +auto_apply+:: For values, if set, then don't ask for it
-  #
-  def ask_all(auto_apply = false)
-    
-    options = { :auto_apply => auto_apply }
-    
-    ask("Application name: ", "application", options)
-    ask("User (to run application as): ", "user", options.merge({ :default => application }))
-    
-    ask("Deploy to: ", "deploy_to", options.merge({ :default => "/var/www/apps/#{application}" }))  
-    ask("Web host: ", "web_host", options)
-    
-    ask("Database host: ", "db_host", options.merge({ :default => web_host }))
-    ask("Database user: ", "db_user", options.merge({ :default => user }))
-    ask("Database password: ", "db_pass", options)
-    ask("Database name: ", "db_name", options.merge({ :default => application }))
-
-    ask("Database port: ", "db_port", options.merge({ :default => 3306, :answer_type => Integer }))
-    
-    ask("Sphinx host: ", "sphinx_host", options.merge({ :default => "127.0.0.1" }))
-    ask("Sphinx port: ", "sphinx_port", options.merge({ :default => 3312, :answer_type => Integer }))
-    
-    default_repos = YAML.load(`svn info`)["URL"] rescue nil
-    ask("Repository uri: ", "repository", options.merge({ :default => default_repos }))
-    
-    ask("Mongrel starting port: ", "mongrel_port", options.merge({ :answer_type => Integer }))
-    ask("Number of mongrels: ", "mongrel_size", options.merge({ :answer_type => Integer }))
-    
-    ask("Domain name (for nginx vhost; no www prefix): ", "domain_name", options)    
-    
-    # Load default recipes if not set
-    set_default("recipes", YAML.load_file(File.dirname(__FILE__) + "/recipes.yml"))    
-  end
-  
-end

data/lib/doc/centos/memcached.yml

@@ -1,18 +0,0 @@
-install:
-  memcached_memory: |
-    Memcached memory (in MB).
-  
-    set :memcached_memory, 64
-  
-  memcached_pid_path: |
-    Path to memcached pid file.
-    Defaults to /var/run/memcached.pid
-    
-    set :memcached_pid_path, "/var/run/memcached.pid"
-  
-  memcached_port: |
-    Memcached port.
-    Defaults to 11211.
-    
-    set :memcached_port, 11211
-  

data/lib/doc/centos/mongrel_cluster.yml

@@ -1,11 +0,0 @@
-setup:
-  mongrel_size: |
-    Number of mongrels.
-    
-    set :mongrel_size, 3
-    
-  mongrel_port: |
-    Starting port for mongrels.
-    If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002
-    
-    set :mongrel_port, 9000

data/lib/doc/centos/monit.yml

@@ -1,12 +0,0 @@
-install:
-  monit_port: |
-    Monit port.
-    Defaults to 2812.
-    
-    set :monit_port, 2812
-    
-  monit_password: |
-    Monit password.
-    Defaults to password prompt.
-    
-    set :monit_password, Proc.new { Capistrano::CLI.ui.ask('Monit admin password (to set): ') })

data/lib/doc/centos/mysql.yml

@@ -1,6 +0,0 @@
-install:
-  mysql_admin_password_set: |
-    Mysql admin password (to set).
-    Defaults to password prompt.
-    
-    set :mysql_admin_password_set, Proc.new { Capistrano::CLI.ui.ask('Mysql admin password (to set): ') }

data/lib/doc/centos/nginx.yml

@@ -1,25 +0,0 @@
-install:
-  nginx_bin_path: |
-    Nginx sbin path.
-    Defaults to /sbin/nginx
-    
-    set :nginx_bin_path, "/sbin/nginx"
-    
-  nginx_conf_path: |
-    Path to nginx conf.
-    Defaults to /etc/nginx/nginx.conf
-    
-    set :nginx_conf_path, "/etc/nginx/nginx.conf"
-    
-  nginx_pid_path: |
-    Path to nginx pid file.
-    Defaults to /var/run/nginx.pid
-    
-    set :nginx_pid_path, "/var/run/nginx.pid"
-    
-  nginx_prefix_path: |
-    Nginx install prefix.
-    Defaults to /var/nginx
-    
-    set :nginx_prefix_path, "/var/nginx"
-  

data/lib/doc/centos/sphinx.yml

@@ -1,14 +0,0 @@
-install:  
-  sphinx_prefix: |
-    Sphinx install prefix.
-    Defaults to "/usr/local/sphinx"
-    
-    set :sphinx_prefix, "/usr/local/sphinx"
-    
-setup:
-  sphinx_prefix: |
-    Sphinx install prefix.
-    Defaults to "/usr/local/sphinx"
-    
-    set :sphinx_prefix, "/usr/local/sphinx"
-    

data/lib/doc/gems.yml

@@ -1,7 +0,0 @@
-install:
-  gem_list: |
-    set :gem_list, [ 
-      "rake", 
-      "mysql -- --with-mysql-include=/usr/include/mysql --with-mysql-lib=/usr/lib/mysql --with-mysql-config",
-      "raspell"
-    ]

data/lib/doc/install.yml

@@ -1,11 +0,0 @@
-default:
-  recipes: |
-    Recipes to run as part of install.
-    
-    set :recipes, [ "centos:setup_for_web", "packages:install", "centos:ruby:install" ]
-    
-  install_user: |
-    The user to run as for install recipes.
-    Defaults to root.
-    
-    set :install_user, "root"

data/lib/doc/memcached.yml

@@ -1,13 +0,0 @@
-install_monit:  
-  memcached_pid_path: |
-    Path to memcached pid file.
-    Defaults to /var/run/memcached.pid
-    
-    set :memcached_pid_path, "/var/run/memcached.pid"
-  
-  memcached_port: |
-    Memcached port.
-    Defaults to 11211.
-    
-    set :memcached_port, 11211
-  

data/lib/doc/mongrel_cluster.yml

@@ -1,12 +0,0 @@
-setup_monit:
-  mongrel_size: |
-    Number of mongrels.
-    
-    set :mongrel_size, 3
-    
-  mongrel_port: |
-    Starting port for mongrels.
-    If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002
-    
-    set :mongrel_port, 9000
-  

data/lib/doc/mysql.yml

@@ -1,46 +0,0 @@
-setup:
-  db_name: |
-    Database name (application).
-    
-    set :db_name, "app_db_name"
-  
-  db_user: |
-    Database user (application).
-    
-    set :db_user, "app_db_user"
-    
-  db_pass: |
-    Database password (application).
-    
-    set :db_pass, "the_password"
-    
-  web_host: |
-    Web host to provide access privileges to (if recipe used in context of web app).
-    Defaults to nil
-    TODO: Support multiple web hosts
-    
-    set :web_host, 10.0.6.100
-    
-  db_host: |
-    Database host (to provide itself with access).
-    
-    set :db_host, 10.0.6.101
-    
-  mysql_admin_password: |
-    Mysql admin password (to use to connect).
-    Defaults to password prompt.
-
-    set :mysql_admin_password, Proc.new { Capistrano::CLI.ui.ask('Mysql admin password: ') })
-  
-setup_monit:
-  db_port: |
-    Mysql port.
-    Defaults to 3306.
-    
-    set :db_port, 3306
-    
-  mysql_pid_path: |
-    Path to mysql pid file.
-    Defaults to /var/run/mysqld/mysqld.pid
-    
-    set :mysql_pid_path, "/var/run/mysqld/mysqld.pid"

data/lib/doc/nginx.yml

@@ -1,23 +0,0 @@
-install_monit:
-  nginx_pid_path: |
-    Path to nginx pid file.
-    Defaults to /var/run/nginx.pid
-    
-    set :nginx_pid_path, "/var/run/nginx.pid"
-    
-setup_mongrel:
-  mongrel_size: |
-    Number of mongrels.
-    
-    set :mongrel_size, 3
-    
-  mongrel_port: |
-    Starting port for mongrels.
-    If there are 3 mongrels with port 9000, then instances will be at 9000, 9001, and 9002
-    
-    set :mongrel_port, 9000
-
-  domain_name: |
-    Domain name for nginx virtual host, (without www prefix).
-    
-    set :domain_name, "foo.com"