capigen 0.1.3 → 0.1.4

data/Capfile

@@ -17,8 +17,8 @@ set :user, Proc.new { Capistrano::CLI.ui.ask('Bootstrap user: ') }
 # Roles
 role :base, Capistrano::CLI.ui.ask('Server: ')
 
-# Profile
-set :profile, Proc.new { load choose_profile }
+# Choose a profile
+set :profile, Proc.new { load profile.choose }
 
 # Reset the password var
 reset_password

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.4 2008-02-07
+
+* Using capistrano's plugin architecture instead of hacking around
+
 == 0.1.3 2008-02-06
 
 * Fixing local recipes

data/Manifest.txt

@@ -7,20 +7,19 @@ Rakefile
 config/hoe.rb
 config/requirements.rb
 lib/capigen.rb
-lib/capigen/cap_ext/configuration.rb
 lib/capigen/cap_ext/connections.rb
-lib/capigen/cap_ext/namespace.rb
+lib/capigen/cap_ext/extension_proxy.rb
 lib/capigen/config.rb
-lib/capigen/helper.rb
-lib/capigen/helpers/gem_helper.rb
-lib/capigen/helpers/package_helper.rb
-lib/capigen/helpers/script_helper.rb
-lib/capigen/helpers/wget_helper.rb
-lib/capigen/packagers/yum.rb
-lib/capigen/profiles.rb
+lib/capigen/plugins/base.rb
+lib/capigen/plugins/gem.rb
+lib/capigen/plugins/package.rb
+lib/capigen/plugins/profiles.rb
+lib/capigen/plugins/script.rb
+lib/capigen/plugins/templates.rb
+lib/capigen/plugins/wget.rb
+lib/capigen/plugins/yum.rb
 lib/capigen/recipes.rb
 lib/capigen/recipes.yml
-lib/capigen/templates.rb
 lib/capigen/version.rb
 lib/profiles/centos-sick.rb
 lib/recipes/README

data/lib/capigen/cap_ext/extension_proxy.rb

@@ -0,0 +1,10 @@
+module Capistrano
+  class ExtensionProxy #:nodoc:
+    
+    # Allow include modules in plugins
+    def include(mod)
+      self.class.send(:include, mod)
+    end
+    
+  end
+end

data/lib/capigen/{helper.rb → plugins/base.rb}

@@ -6,16 +6,8 @@ require 'yaml'
 # * Loads the configuration 
 # * Generates files from templates
 #
-module Capigen::Helper
+module Capigen::Plugins::Base
   
-  include Capigen::Templates
-  include Capigen::Profiles
-  
-  include Capigen::Helpers::PackageHelper
-  include Capigen::Helpers::WgetHelper
-  include Capigen::Helpers::ScriptHelper
-  include Capigen::Helpers::GemHelper
-    
   # Project root (for rails)
   def root
     if respond_to?(:fetch)
@@ -49,3 +41,4 @@ module Capigen::Helper
     
 end
 
+Capistrano.plugin :capigen, Capigen::Plugins::Base

data/lib/capigen/plugins/gem.rb

@@ -0,0 +1,25 @@
+module Capigen::Plugins::Gem
+  
+  # Installl a gem.
+  #
+  # ==== Options
+  # +gems+:: List of gem names, or a single gem
+  #
+  # ==== Examples
+  #   install("raspell") 
+  #   install([ "raspell", "foo" ])
+  #
+  def install(gems)
+    # If a single object, wrap in array
+    gems = [ gems ] unless gems.is_a?(Array)
+    
+    # Install one at a time because we may need to pass install args (e.g. mysql)
+    # TODO: Fix this
+    gems.each do |gem|
+      sudo "gem install --no-rdoc --no-ri --no-verbose #{gem}"
+    end
+  end
+  
+end
+
+Capistrano.plugin :gemc, Capigen::Plugins::Gem

data/lib/capigen/plugins/package.rb

@@ -0,0 +1,19 @@
+module Capigen::Plugins::Package
+  
+  # Setup packager
+  #
+  # ==== Options
+  # +packager+:: Packager type (:yum)
+  #
+  def type=(packager_type)
+    case packager_type.to_sym
+    when :yum
+      include Capigen::Plugins::Yum
+    else
+      raise "Invalid packager type: #{packager_type}"
+    end    
+  end
+    
+end
+
+Capistrano.plugin :package, Capigen::Plugins::Package

data/lib/capigen/plugins/profiles.rb

@@ -0,0 +1,35 @@
+module Capigen::Plugins::Profiles
+  
+  ProfileDir = File.dirname(__FILE__) + "/../../profiles"
+  
+  def recipes(prefix = "")
+    Dir[ProfileDir + "/#{prefix}*.rb"].collect { |file| File.basename(file).gsub(File.extname(file), "") }
+  end
+  
+  def choose(prefix = "")
+    profile = HighLine.new.choose(*recipes(prefix)) do |menu|
+      menu.header = "Choose recipe profile"
+    end
+    
+    "#{ProfileDir}/#{profile}.rb"
+  end
+  
+  # More helpful fetch
+  def get(var)
+    begin
+      result = fetch(var.to_sym)
+    rescue
+      puts <<-EOS
+      
+      Please set :#{var} variable in your Capfile or profile.
+      
+      EOS
+      raise "Please set :#{var} in your Capfile or profile."
+    end
+    result
+  end
+  
+end
+    
+    
+Capistrano.plugin :profile, Capigen::Plugins::Profiles

data/lib/capigen/plugins/script.rb

@@ -0,0 +1,39 @@
+module Capigen::Plugins::Script
+  
+  # Install (sh) script
+  #
+  # ==== Options
+  # +script+:: Name of file (relative to templates dir) 
+  # +files_to_put+:: List of files to upload [ { :file => "foo/bar.txt", :dest "/tmp/bar.txt" }, ... ]
+  #
+  def install(script, files_to_put = [], override_binding = nil)
+    
+    files_to_put = [ files_to_put ] if files_to_put.is_a?(Hash)
+    
+    files_to_put.each do |file_info|
+      data = template.load(file_info[:file], override_binding || binding)
+      put data, file_info[:dest]
+    end
+    
+    if File.extname(script) == ".erb"
+      name = script[0...script.length-4]
+      dest = "/tmp/#{name}"
+      run "mkdir -p #{File.dirname(dest)}"
+      put template.load(script, override_binding || binding), dest
+    else
+      name = script
+      dest = "/tmp/#{name}"
+      run "mkdir -p #{File.dirname(dest)}"
+      put template.load(script), dest
+    end
+    
+    # If want verbose, -v
+    sudo "sh #{dest}"
+    
+    # Cleanup
+    sudo "rm -rf #{File.dirname(dest)}"    
+  end
+  
+end
+
+Capistrano.plugin :script, Capigen::Plugins::Script

data/lib/capigen/plugins/templates.rb

@@ -0,0 +1,70 @@
+module Capigen::Plugins::Templates
+  
+  # Root of templates path
+  def gem_templates_root
+    File.expand_path(File.dirname(__FILE__) + "/../../templates")
+  end
+  
+  # Get full template path
+  def gem_template_path(template_path)
+    File.join(gem_templates_root, template_path)
+  end
+  
+  # Load template. If extension is erb will be evaluated with binding.
+  # 
+  # ==== Options
+  # +path+:: If starts with '/', absolute path, otherwise relative path to templates dir
+  # +binding+:: Binding
+  #
+  def load(path, override_binding = nil)
+    template_paths = [ path, gem_template_path(path) ]
+    
+    template_paths = template_paths.select { |file| File.exist?(file) }
+    
+    if template_paths.empty?
+      raise <<-EOS 
+      
+      Template not found: #{template_paths.join("\n\t")}
+      
+      EOS
+    end
+    
+    # Use first
+    template_path = template_paths.first
+    
+    data = IO.read(template_path)
+    
+    if File.extname(template_path) == ".erb"    
+      template = ERB.new(data)
+      data = template.result(override_binding || binding)
+    end
+    data
+  end
+  
+  # Load template from project
+  def project(path, override_binding = nil)
+    load(project_root + "/" + path, override_binding || binding)
+  end
+    
+  # Write template at (relative path) with binding to LOCAL destination path.
+  #
+  # ==== Options
+  # +template_path+:: Path to template relative to templates path
+  #
+  def write(template_path, binding, dest_path, overwrite = false, verbose = true)    
+    # This is gnarly!
+    relative_dest_path = Pathname.new(File.expand_path(dest_path)).relative_path_from(Pathname.new(File.expand_path(".")))  
+    
+    if !overwrite && File.exist?(dest_path) 
+      puts "%10s %-40s (skipped)" % [ "create", relative_dest_path ] if verbose
+      return
+    end
+    
+    puts "%10s %-40s" % [ "create", relative_dest_path ] if verbose
+        
+    File.open(dest_path, "w") { |file| file.puts(load(template_path, binding)) }
+  end
+    
+end
+
+Capistrano.plugin :template, Capigen::Plugins::Templates

data/lib/capigen/{helpers/wget_helper.rb → plugins/wget.rb}

@@ -1,10 +1,14 @@
 require 'open-uri'
 
-# Wget capistrano helper
-module Capigen::Helpers::WgetHelper
+module Capigen::Plugins::Wget
   
   # Download the uri, then upload it into the remote destination directory
-  def wget(uri, remote_dest_dir = "/tmp")
+  # 
+  # ==== Options
+  # +uri+:: URI to get
+  # +remote_dest_dir+:: Remote destination directory
+  #
+  def uri(uri, remote_dest_dir = "/tmp")
     
     uri = uri = URI.parse(uri)
     name = uri.path.split("/").last
@@ -14,4 +18,6 @@ module Capigen::Helpers::WgetHelper
     put open(uri).read, remote_dest_path    
   end
   
-end
+end
+
+Capistrano.plugin :wget, Capigen::Plugins::Wget

data/lib/capigen/{packagers → plugins}/yum.rb

@@ -1,18 +1,14 @@
 # Packages must respond to update, remove, install and clean
-class Capigen::Packagers::Yum
-  
-  def initialize(cap)
-    @cap = cap
-  end
+module Capigen::Plugins::Yum
   
   # Update all installed packages
   def update(packages = [])
-    @cap.sudo "yum -y update #{packages.join(" ")}"
+    sudo "yum -y update #{packages.join(" ")}"
   end
     
   # Remove via yum.
   def remove(packages)
-    @cap.sudo "yum -y remove #{packages.join(" ")}"    
+    sudo "yum -y remove #{packages.join(" ")}"    
   end
   
   # Install via yum.
@@ -26,21 +22,23 @@ class Capigen::Packagers::Yum
       
       installed_packages = []
       
-      @cap.sudo "yum -d 0 list installed #{packages.join(" ")}" do |channel, stream, data|
+      sudo "yum -d 0 list installed #{packages.join(" ")}" do |channel, stream, data|
         installed_packages += data.split("\n")[1..-1].collect { |line| line.split(".").first }
       end      
     
       packages -= installed_packages
     
-      @cap.sudo "yum -y update #{installed_packages.join(" ")}" unless installed_packages.blank?
+      sudo "yum -y update #{installed_packages.join(" ")}" unless installed_packages.blank?
     end
     
-    @cap.sudo "yum -y install #{packages.join(" ")}" unless packages.blank?
+    sudo "yum -y install #{packages.join(" ")}" unless packages.blank?
   end
   
   # Clean yum
   def clean
-    @cap.sudo "yum -y clean all"
+    sudo "yum -y clean all"
   end
   
-end
+end
+
+Capistrano.plugin :yum, Capigen::Plugins::Yum

data/lib/capigen/version.rb

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

data/lib/capigen.rb

@@ -7,28 +7,23 @@ HighLine.track_eof = false
 $:.unshift File.dirname(__FILE__)
 
 module Capigen
- module Helpers
+ module Plugins
  end  
- 
- module Packagers
- end
 end
 
-require "capigen/packagers/yum"
-
-require "capigen/helpers/package_helper"
-require "capigen/helpers/wget_helper"
-require "capigen/helpers/script_helper"
-require "capigen/helpers/gem_helper"
-require "capigen/templates"
-require "capigen/profiles"
-require "capigen/helper"
+require 'capigen/plugins/base'
+require 'capigen/plugins/gem'
+require 'capigen/plugins/package'
+require 'capigen/plugins/profiles'
+require 'capigen/plugins/script'
+require 'capigen/plugins/templates'
+require 'capigen/plugins/wget'
+require 'capigen/plugins/yum'
 
 require "capigen/config"
 
-require "capigen/cap_ext/configuration"
-require "capigen/cap_ext/namespace"
 require "capigen/cap_ext/connections"
+require "capigen/cap_ext/extension_proxy"
         
 
 

data/lib/profiles/centos-sick.rb

@@ -1,8 +1,31 @@
 set :namespace, "centos"
 set :description, "Install based on default centos 5.1 image"
-set :packager_type, "yum" 
-set :packages_to_remove, [ "openoffice.org-*", "ImageMagick" ]
-set :packages_to_add, [ 
+
+set :recipes, [ 
+  # "centos:setup",
+  # "packages:install",
+  # "ruby:install", 
+  # "nginx:install", 
+  # "nginx:install_monit", 
+  # "mysql:install", 
+  # "mysql:install_monit", 
+  # "sphinx:install", 
+  # "monit:install",
+  # "imagemagick:install", 
+  # "memcached:install", 
+  # "memcached:install_monit", 
+  # "gems:install", 
+  "centos:cleanup" 
+]
+
+#
+# Settings for recipes
+#
+
+set :packages, { 
+  :type => "yum",
+  :remove => [ "openoffice.org-*", "ImageMagick" ],
+  :add => [ 
   "gcc", "kernel-devel", "libevent-devel", "libxml2-devel", 
   "openssl", "openssl-devel",
   "aspell", "aspell-devel", "aspell-en", "aspell-es",
@@ -13,34 +36,22 @@ set :packages_to_add, [
   "flex", "byacc", 
   "libjpeg-devel", "libpng-devel", "glib2-devel", "fontconfig-devel", "libwmf-devel", "freetype-devel",
     "libtiff-devel"
-]
+  ]
+}
   
-set :install_tasks, [ 
-  "centos:setup",
-  "packages:install",
-  "ruby:install", 
-  "nginx:install", 
-  "nginx:install_monit", 
-  "mysql:install", 
-  "mysql:install_monit", 
-  "sphinx:install", 
-  "monit:install",
-  "imagemagick:install", 
-  "memcached:install", 
-  "memcached:install_monit", 
-  "gems:install", 
-  "centos:cleanup" 
-]
-
 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" 
+  "raspell", 
+  "rmagick", 
+  "mongrel", 
+  "mongrel_cluster",
+  "json"
 ]
 
 # Monit
 set :monit_port, 2812 # Capistrano::CLI.ui.ask('Monit port: ')
-set :monit_password, Capistrano::CLI.ui.ask('Monit admin password (to set): ') 
+set :monit_password, Proc.new { Capistrano::CLI.ui.ask('Monit admin password (to set): ') }
 
 # For nginx
 set :nginx_bin_path, "/sbin/nginx"
@@ -49,7 +60,7 @@ set :nginx_pid_path, "/var/run/nginx.pid"
 set :nginx_prefix_path, "/var/nginx"
 
 # Mysql
-set :mysql_admin_password, Capistrano::CLI.ui.ask('Mysql admin password (to set): ')
+set :mysql_admin_password, 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: ')
 

data/lib/recipes/centos.rb

@@ -3,14 +3,12 @@ namespace :centos do
     
   desc "Setup centos"
   task :setup do
-    put load_file("centos/sudoers"), "/tmp/sudoers"
-    script_install("centos/setup.sh")    
-  end
-  
+    script.install("centos/setup.sh", :file => "centos/sudoers", :dest => "/tmp/sudoers")
+  end  
     
   desc "Cleanup"
   task :cleanup do
-    package_clean
+    yum.clean
   end
   
   # Add user for an application

data/lib/recipes/gems.rb

@@ -1,8 +1,10 @@
 namespace :gems do
   
   desc "Install gems"
-  task :install do
-    gem_install(gem_list) if gem_list
+  task :install do    
+    gem_list = profile.get(:gem_list)
+    
+    gemc.install(gem_list)
   end
   
 end

data/lib/recipes/imagemagick.rb

@@ -3,7 +3,8 @@ namespace :imagemagick do
   task :install do
     # Dependencies: "libjpeg-devel", "libpng-devel", "glib2-devel", "fontconfig-devel", "zlib-devel", 
     # "libwmf-devel", "freetype-devel", "libtiff-devel"
-    script_install("imagemagick/install.sh")
+    
+    script.install("imagemagick/install.sh")
   end
   
 end

data/lib/recipes/install.rb

@@ -5,7 +5,7 @@ namespace :install do
     fetch(:profile)
         
     # These run after install task and install all the apps
-    install_tasks.each do |task_name|
+    recipes.each do |task_name|
       after "install", task_name
     end
   end

data/lib/recipes/memcached.rb

@@ -2,14 +2,13 @@ namespace :memcached do
   
   desc "Install memcached"
   task :install do
-    put load_template("memcached/memcached.initd.centos.erb", binding), "/tmp/memcached.initd"    
-    script_install("memcached/install.sh")   
+    script.install("memcached/install.sh", :file => "memcached/memcached.initd.centos.erb", :dest => "/tmp/memcached.initd")   
   end
 
   desc "Install memcached monit hooks"
   task :install_monit do
-    put load_template("memcached/memcached.monitrc.erb", binding), "/tmp/memcached.monitrc"    
-    script_install("memcached/install_monit.sh")    
+    put template.load("memcached/memcached.monitrc.erb", binding), "/tmp/memcached.monitrc"    
+    sudo "install -o root /tmp/memcached.monitrc /etc/monit/memcached.monitrc"
   end
   
 end

data/lib/recipes/mongrel_cluster.rb

@@ -13,8 +13,8 @@ namespace :mongrel_cluster do
     
     pid_path = "#{shared_path}/pids"
     
-    put load_template("mongrel/mongrel_cluster.initd.erb", binding), "/tmp/mongrel_cluster_#{application}.initd"    
-    put load_template("mongrel/mongrel_cluster.yml.erb", binding), "#{mongrel_config_path}/mongrel_cluster.yml"
+    put template.load("mongrel/mongrel_cluster.initd.erb", binding), "/tmp/mongrel_cluster_#{application}.initd"    
+    put template.load("mongrel/mongrel_cluster.yml.erb", binding), "#{mongrel_config_path}/mongrel_cluster.yml"
     
     # Setup the mongrel_cluster init script
     sudo "install -o root /tmp/mongrel_cluster_#{application}.initd /etc/init.d/mongrel_cluster_#{application}"
@@ -41,7 +41,7 @@ namespace :mongrel_cluster do
       processes << { :port => port, :start_options => start_options, :stop_options => stop_options, :name => "/usr/bin/mongrel_rails", :pid_path => pid_path }
     end
     
-    put load_template("mongrel/mongrel_cluster.monitrc.erb", binding), "/tmp/mongrel_cluster_#{application}.monitrc"
+    put template.load("mongrel/mongrel_cluster.monitrc.erb", binding), "/tmp/mongrel_cluster_#{application}.monitrc"
     
     sudo "install -o root /tmp/mongrel_cluster_#{application}.monitrc /etc/monit/mongrel_cluster_#{application}.monitrc"
   end

data/lib/recipes/monit.rb

@@ -4,13 +4,16 @@ namespace :monit do
   task :install do
     # Dependencies: "flex", "byacc"
     
-    put load_template("monit/monit.initd.centos.erb", binding), "/tmp/monit.initd"
-    put load_template("monit/monitrc.erb", binding), "/tmp/monitrc"
-    put load_file("monit/monit.cnf"), "/tmp/monit.cnf"
+    install_files = [ 
+      { :file => "monit/monit.initd.centos.erb", :dest => "/tmp/monit.initd" },
+      { :file => "monit/monitrc.erb", :dest => "/tmp/monitrc" } 
+    ]
     
-    script_install("monit/install.sh")      
-    script_install("monit/patch_inittab.sh")
-    script_install("monit/cert.sh")
+    script.install("monit/install.sh", install_files)  
+        
+    script.install("monit/patch_inittab.sh")
+    
+    script.install("monit/cert.sh", :file => "monit/monit.cnf", :dest => "/tmp/monit.cnf")
   end
       
 end

data/lib/recipes/mysql.rb

@@ -3,13 +3,13 @@ namespace :mysql do
   
   desc "Install mysql"
   task :install do    
-    script_install("mysql/install.sh.erb")
+    script.install("mysql/install.sh.erb")
   end
   
   desc "Install mysql monit hooks"
   task :install_monit do
-    put load_template("mysql/mysql.monitrc.erb", binding), "/tmp/mysql.monitrc"        
-    script_install("mysql/install_monit.sh")
+    put template.load("mysql/mysql.monitrc.erb", binding), "/tmp/mysql.monitrc"    
+    sudo "install -o root /tmp/mysql.monitrc /etc/monit/mysql.monitrc"
   end
   
   desc "Create database user, and database with appropriate permissions"
@@ -17,7 +17,7 @@ namespace :mysql do
     # Add localhost to grant locations
     locations_for_grant = [ "localhost", web_host ]
     
-    put load_template("mysql/install_db.sql.erb", binding), "/tmp/install_db_#{application}.sql"    
+    put template.load("mysql/install_db.sql.erb", binding), "/tmp/install_db_#{application}.sql"    
     run "mysql -u root -p#{mysql_admin_password} < /tmp/install_db_#{application}.sql"
   end
   

data/lib/recipes/nginx.rb

@@ -8,19 +8,20 @@ namespace :nginx do
   task :install do
     # Dependencies: "pcre-devel", "openssl", "openssl-devel"
 
-    put(load_template("nginx/nginx.initd.erb", binding), "/tmp/nginx.initd")
-    put(load_template("nginx/nginx.conf.erb", binding), "/tmp/nginx.conf")
+    files = [ 
+      { :file => "nginx/nginx.initd.erb", :dest => "/tmp/nginx.initd" },
+      { :file => "nginx/nginx.conf.erb", :dest => "/tmp/nginx.conf" }
+    ]
     
-    script_install("nginx/install.sh.erb")          
+    script.install("nginx/install.sh.erb", files, binding)
   end
   
   desc "Install nginx monit hooks"
   task :install_monit do
-    put load_template("nginx/nginx.monitrc.erb", binding), "/tmp/nginx.monitrc"
-    script_install("nginx/install_monit.sh")
+    put template.load("nginx/nginx.monitrc.erb", binding), "/tmp/nginx.monitrc"    
+    sudo "install -o root /tmp/nginx.monitrc /etc/monit/nginx.monitrc"
   end
-  
-  
+    
   desc "Create and update the nginx vhost include"
   task :setup do 
     
@@ -28,7 +29,7 @@ namespace :nginx do
     public_path = current_path + "/public"
     
     run "mkdir -p #{shared_path}/config"
-    put load_template("nginx/nginx_vhost.conf.erb", binding), "/tmp/nginx_#{application}.conf"    
+    put template.load("nginx/nginx_vhost.conf.erb", binding), "/tmp/nginx_#{application}.conf"    
     
     sudo "install -o root /tmp/nginx_#{application}.conf /etc/nginx/vhosts/#{application}.conf"        
   end

data/lib/recipes/packages.rb

@@ -2,18 +2,23 @@ namespace :packages do
   
   task :install do
     
-    # Setup packager
-    setup_packager(packager_type)
+    # Settings
+    packages = profile.get(:packages)
+    
+    packages_to_remove = packages[:remove]
+    packages_to_add = packages[:add]
+    
+    # Set package type
+    package.type = packages[:type]
     
     # Remove packages          
-    package_remove(packages_to_remove)
+    package.remove(packages_to_remove) unless packages_to_remove.blank?
     
     # Update all existing packages
-    package_update
+    package.update
     
     # Install packages
-    package_install(packages_to_add)
-    
+    package.install(packages_to_add) unless packages_to_add.blank?
   end
   
 end

data/lib/recipes/rails.rb

@@ -4,7 +4,7 @@ namespace :rails do
   desc "Create database yaml in shared path" 
   task :setup do    
     run "mkdir -p #{shared_path}/config"
-    put load_template("rails/database.yml.erb", binding), "#{shared_path}/config/database.yml"
+    put template.load("rails/database.yml.erb", binding), "#{shared_path}/config/database.yml"
   end
 
   desc "Make symlink for database yaml" 

data/lib/recipes/ruby.rb

@@ -5,10 +5,10 @@ namespace :ruby do
     # Dependencies: zlib, zlib-devel
     
     # Install ruby 1.8.6
-    script_install("ruby/ruby_install.sh")
+    script.install("ruby/ruby_install.sh")
     
     # Install rubygems
-    script_install("ruby/rubygems_install.sh")
+    script.install("ruby/rubygems_install.sh")
   end
   
 end

data/lib/recipes/sphinx.rb

@@ -6,7 +6,7 @@ namespace :sphinx do
   desc "Install sphinx"
   task :install do 
     # Dependencies: gcc-c++
-    script_install("sphinx/install.sh.erb")
+    script.install("sphinx/install.sh.erb")
   end
   
   desc "Setup sphinx for application"
@@ -16,7 +16,7 @@ namespace :sphinx do
     sphinx_conf_path = "#{shared_path}/config/sphinx.conf"
     sphinx_pid_path = "#{shared_path}/pids/searchd.pid"
     
-    put load_template("sphinx/sphinx_app.initd.centos.erb", binding), "/tmp/sphinx.initd"
+    put template.load("sphinx/sphinx_app.initd.centos.erb"), "/tmp/sphinx.initd"
 
     sudo "install -o root /tmp/sphinx.initd /etc/init.d/sphinx_#{application}"
     
@@ -28,7 +28,7 @@ namespace :sphinx do
   desc "Create monit configuration for sphinx"
   task :setup_monit do    
     sphinx_pid_path = "#{shared_path}/pids/searchd.pid"
-    put load_template("sphinx/sphinx.monitrc.erb", binding), "/tmp/sphinx_#{application}.monitrc"        
+    put template.load("sphinx/sphinx.monitrc.erb"), "/tmp/sphinx_#{application}.monitrc"        
     
     sudo "install -o root /tmp/sphinx_#{application}.monitrc /etc/monit/sphinx_#{application}.monitrc"
   end
@@ -36,12 +36,12 @@ namespace :sphinx do
   desc "Update sphinx for application" 
   task :update_code do
     
-    rails_root = current_path
-    index_root = "#{shared_path}/var/index";
-    log_root = "#{shared_path}/log"
-    pid_root = "#{shared_path}/pids"
+    set :rails_root, current_path
+    set :index_root, "#{shared_path}/var/index";
+    set :log_root, "#{shared_path}/log"
+    set :pid_root, "#{shared_path}/pids"
     
-    put load_project_template("config/templates/sphinx.conf.erb", binding), "#{shared_path}/config/sphinx.conf"
+    put template.project("config/templates/sphinx.conf.erb"), "#{shared_path}/config/sphinx.conf"
   end
   
   desc "Rotate sphinx index for application"

data/lib/templates/ruby/ruby_install.sh

@@ -4,7 +4,8 @@ set -e
 trap ERROR ERR
 
 cd /usr/src
-#wget -nv ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p110.tar.gz
+wget -nv http://capigen.s3.amazonaws.com/ruby-1.8.6-p110.tar.gz
+# ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p110.tar.gz
 tar xzf ruby-1.8.6-p110.tar.gz
 cd ruby-1.8.6-p110
 echo "Configuring ruby..."

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>capigen</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/capigen"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/capigen" class="numbers">0.1.3</a>
+      <a href="http://rubyforge.org/projects/capigen" class="numbers">0.1.4</a>
     </div>
     <h1>&#x2192; &#8216;capigen&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capigen
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ""
 authors: 
 - Gabriel Handford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-06 00:00:00 -05:00
+date: 2008-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -36,20 +36,19 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - lib/capigen.rb
-- lib/capigen/cap_ext/configuration.rb
 - lib/capigen/cap_ext/connections.rb
-- lib/capigen/cap_ext/namespace.rb
+- lib/capigen/cap_ext/extension_proxy.rb
 - lib/capigen/config.rb
-- lib/capigen/helper.rb
-- lib/capigen/helpers/gem_helper.rb
-- lib/capigen/helpers/package_helper.rb
-- lib/capigen/helpers/script_helper.rb
-- lib/capigen/helpers/wget_helper.rb
-- lib/capigen/packagers/yum.rb
-- lib/capigen/profiles.rb
+- lib/capigen/plugins/base.rb
+- lib/capigen/plugins/gem.rb
+- lib/capigen/plugins/package.rb
+- lib/capigen/plugins/profiles.rb
+- lib/capigen/plugins/script.rb
+- lib/capigen/plugins/templates.rb
+- lib/capigen/plugins/wget.rb
+- lib/capigen/plugins/yum.rb
 - lib/capigen/recipes.rb
 - lib/capigen/recipes.yml
-- lib/capigen/templates.rb
 - lib/capigen/version.rb
 - lib/profiles/centos-sick.rb
 - lib/recipes/README

data/lib/capigen/cap_ext/configuration.rb

@@ -1,5 +0,0 @@
-class Capistrano::Configuration
-  # Load config helper for use within Capfile
-  include Capigen::Helper
-  
-end

data/lib/capigen/cap_ext/namespace.rb

@@ -1,6 +0,0 @@
-class Capistrano::Configuration::Namespaces::Namespace
-  
-  # Load config helper for use within recipes
-  include Capigen::Helper
-      
-end

data/lib/capigen/helpers/gem_helper.rb

@@ -1,15 +0,0 @@
-# Gem capistrano helpers
-module Capigen::Helpers::GemHelper
-  
-  # gem_install("raspell") or gem_install([ "raspell", "foo" ])
-  def gem_install(gems)
-    # If a single object, wrap in array
-    gems = [ gems ] unless gems.is_a?(Array)
-    
-    # Install one at a time because we may need to pass install args (e.g. mysql)
-    gems.each do |gem|
-      sudo "gem install --no-rdoc --no-ri --no-verbose #{gem}"
-    end
-  end
-  
-end

data/lib/capigen/helpers/package_helper.rb

@@ -1,40 +0,0 @@
-# Package, Yum capistrano helpers
-module Capigen::Helpers::PackageHelper
-  
-  def setup_packager(packager)
-    @packager = case packager.to_sym
-    when :yum then Capigen::Packagers::Yum.new(self)
-    end      
-  end
-  
-  def ensure_packager    
-    unless @packager
-      logger.important "No packager defined, defaulting to yum." 
-    
-      # Currently only have 1 packager, so 
-      setup_packager(:yum)
-    end
-  end
-  
-  def package_install(packages)
-    ensure_packager
-    @packager.install(packages)
-  end
-  
-  def package_update(packages = [])
-    ensure_packager
-    @packager.update(packages)
-  end
-  
-  def package_clean
-    ensure_packager
-    @packager.clean
-  end
-  
-  def package_remove(packages)
-    ensure_packager
-    @packager.remove(packages)
-  end
-  
-  
-end

data/lib/capigen/helpers/script_helper.rb

@@ -1,30 +0,0 @@
-# Installer capistrano helper
-module Capigen::Helpers::ScriptHelper
-  
-  def script_install(script, files_to_put = {})
-    
-    files_to_put.each do |file, dest|
-      put load_file(file), dest
-    end
-
-    if File.extname(script) == ".erb"
-      name = script[0...script.length-4]
-      dest = "/tmp/#{name}"
-      run "mkdir -p #{File.dirname(dest)}"
-      put load_template(script, binding), dest   
-      
-    else
-      name = script
-      dest = "/tmp/#{name}"
-      run "mkdir -p #{File.dirname(dest)}"
-      put load_file(name), dest
-    end
-    
-    # If want verbose, -v
-    sudo "sh #{dest}"
-    
-    # Cleanup
-    sudo "rm -rf #{File.dirname(dest)}"    
-  end
-  
-end

data/lib/capigen/profiles.rb

@@ -1,19 +0,0 @@
-module Capigen::Profiles
-  
-  ProfileDir = File.dirname(__FILE__) + "/../profiles"
-  
-  def recipe_profiles(prefix = "")
-    Dir[ProfileDir + "/#{prefix}*.rb"].collect { |file| File.basename(file)[0...-3] }  
-  end
-  
-  def choose_profile(prefix = "")
-    profile = HighLine.new.choose(*recipe_profiles(prefix)) do |menu|
-      menu.header = "Choose recipe profile"
-    end
-    
-    "#{ProfileDir}/#{profile}.rb"
-  end
-  
-end
-    
-    

data/lib/capigen/templates.rb

@@ -1,65 +0,0 @@
-module Capigen::Templates
-  
-  # Root of templates path
-  def template_root
-    @template_root ||= File.expand_path(File.dirname(__FILE__) + "/../templates")
-  end
-  
-  # Get full template path
-  def full_template_path(template_path)
-    File.join(template_root, template_path)
-  end
-  
-  # Load template at (full) path with binding.
-  # If options[:project] is true will load template relative to project root.
-  def load_template(path, binding, options = {})
-    template_path = options[:project] ? "#{root}/#{path}" : full_template_path(path)
-    
-    unless File.exist?(template_path)
-      raise <<-EOS 
-      
-      Template not found: #{template_path}
-      
-      EOS
-    end
-    
-    template = ERB.new(IO.read(template_path))
-    template.result(binding)
-  end
-  
-  def load_project_template(path, binding)
-    load_template(path, binding, { :project => true })
-  end
-  
-  def load_file(path)
-    template_path = full_template_path(path)
-    IO.read(template_path)
-  end
-  
-  # Write template at (relative path) with binding to destination path.
-  #
-  # template_path is relative <tt>"capistrano/deploy.rb.erb"</tt>
-  def write_template(template_path, binding, dest_path, overwrite = false, verbose = true)    
-    # This is gnarly!
-    relative_dest_path = Pathname.new(File.expand_path(dest_path)).relative_path_from(Pathname.new(File.expand_path(".")))  
-    
-    if !overwrite && File.exist?(dest_path) 
-      puts "%10s %-40s (skipped)" % [ "create", relative_dest_path ] if verbose
-      return
-    end
-    
-    puts "%10s %-40s" % [ "create", relative_dest_path ] if verbose
-        
-    File.open(dest_path, "w") { |file| file.puts(load_template(template_path, binding)) }
-  end
-  
-  # Remove files from root
-  def clean(files, verbose = true)    
-    rm_files = files.collect { |f| File.join(root, f) }
-    rm_files.each do |rm_file|
-      puts "%10s %-40s" % [ "delete", rm_file ] if verbose
-      FileUtils.rm_rf(rm_file)
-    end
-  end
-  
-end