capigen 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.2 2008-02-06
+
+* Loading recipes from gem
+
 == 0.1.1 2008-02-06
 
 * Initial import

data/Manifest.txt

@@ -6,8 +6,10 @@ README.txt
 Rakefile
 config/hoe.rb
 config/requirements.rb
-init.rb
 lib/capigen.rb
+lib/capigen/cap_ext/configuration.rb
+lib/capigen/cap_ext/connections.rb
+lib/capigen/cap_ext/namespace.rb
 lib/capigen/config.rb
 lib/capigen/helper.rb
 lib/capigen/helpers/gem_helper.rb
@@ -16,25 +18,59 @@ lib/capigen/helpers/script_helper.rb
 lib/capigen/helpers/wget_helper.rb
 lib/capigen/packagers/yum.rb
 lib/capigen/profiles.rb
+lib/capigen/recipes.rb
 lib/capigen/recipes.yml
 lib/capigen/templates.rb
 lib/capigen/version.rb
-recipes/README
-recipes/bootstrap/patch.rb
-recipes/centos.rb
-recipes/deploy.rb
-recipes/gems.rb
-recipes/imagemagick.rb
-recipes/install.rb
-recipes/memcached.rb
-recipes/mongrel_cluster.rb
-recipes/monit.rb
-recipes/mysql.rb
-recipes/nginx.rb
-recipes/profiles/centos-sick.rb
-recipes/rails.rb
-recipes/ruby.rb
-recipes/sphinx.rb
+lib/profiles/centos-sick.rb
+lib/recipes/README
+lib/recipes/centos.rb
+lib/recipes/deploy.rb
+lib/recipes/gems.rb
+lib/recipes/imagemagick.rb
+lib/recipes/install.rb
+lib/recipes/memcached.rb
+lib/recipes/mongrel_cluster.rb
+lib/recipes/monit.rb
+lib/recipes/mysql.rb
+lib/recipes/nginx.rb
+lib/recipes/packages.rb
+lib/recipes/rails.rb
+lib/recipes/ruby.rb
+lib/recipes/sphinx.rb
+lib/templates/capistrano/Capfile
+lib/templates/capistrano/deploy.rb.erb
+lib/templates/centos/setup.sh
+lib/templates/centos/sudoers
+lib/templates/imagemagick/install.sh
+lib/templates/memcached/install.sh
+lib/templates/memcached/memcached.initd.centos.erb
+lib/templates/memcached/memcached.monitrc.erb
+lib/templates/mongrel/mongrel_cluster.initd.erb
+lib/templates/mongrel/mongrel_cluster.monitrc.erb
+lib/templates/mongrel/mongrel_cluster.yml.erb
+lib/templates/monit/cert.sh
+lib/templates/monit/install.sh
+lib/templates/monit/monit.cnf
+lib/templates/monit/monit.initd.centos.erb
+lib/templates/monit/monitrc.erb
+lib/templates/monit/patch_inittab.sh
+lib/templates/mysql/install.sh.erb
+lib/templates/mysql/install_db.sql.erb
+lib/templates/mysql/mysql.monitrc.erb
+lib/templates/nginx/install.sh.erb
+lib/templates/nginx/nginx.conf.erb
+lib/templates/nginx/nginx.initd.erb
+lib/templates/nginx/nginx.monitrc.erb
+lib/templates/nginx/nginx_vhost.conf.erb
+lib/templates/rails/database.yml.erb
+lib/templates/ruby/ruby_install.sh
+lib/templates/ruby/rubygems_install.sh
+lib/templates/sphinx/install.sh.erb
+lib/templates/sphinx/sphinx.conf.erb
+lib/templates/sphinx/sphinx.monitrc.erb
+lib/templates/sphinx/sphinx_app.initd.centos.erb
+lib/templates/sphinx/sphinx_app.initd.erb
 script/destroy
 script/generate
 script/txt2html
@@ -43,39 +79,6 @@ tasks/capigen.rake
 tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake
-templates/capistrano/Capfile
-templates/capistrano/deploy.rb.erb
-templates/centos/setup.sh
-templates/centos/sudoers
-templates/imagemagick/install.sh
-templates/memcached/install.sh
-templates/memcached/memcached.initd.centos.erb
-templates/memcached/memcached.monitrc.erb
-templates/mongrel/mongrel_cluster.initd.erb
-templates/mongrel/mongrel_cluster.monitrc.erb
-templates/mongrel/mongrel_cluster.yml.erb
-templates/monit/cert.sh
-templates/monit/install.sh
-templates/monit/monit.cnf
-templates/monit/monit.initd.centos.erb
-templates/monit/monitrc.erb
-templates/monit/patch_inittab.sh
-templates/mysql/install.sh.erb
-templates/mysql/install_db.sql.erb
-templates/mysql/mysql.monitrc.erb
-templates/nginx/install.sh.erb
-templates/nginx/nginx.conf.erb
-templates/nginx/nginx.initd.erb
-templates/nginx/nginx.monitrc.erb
-templates/nginx/nginx_vhost.conf.erb
-templates/rails/database.yml.erb
-templates/ruby/ruby_install.sh
-templates/ruby/rubygems_install.sh
-templates/sphinx/install.sh.erb
-templates/sphinx/sphinx.conf.erb
-templates/sphinx/sphinx.monitrc.erb
-templates/sphinx/sphinx_app.initd.centos.erb
-templates/sphinx/sphinx_app.initd.erb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/lib/capigen/cap_ext/configuration.rb

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

data/{recipes/bootstrap/patch.rb → lib/capigen/cap_ext/connections.rb}

@@ -1,23 +1,3 @@
-#
-# Patches
-#
-
-class Capistrano::Configuration::Namespaces::Namespace
-  
-  # Load config helper for use within recipes
-  require File.dirname(__FILE__) + "/../../init"
-  include Capigen::Helper
-      
-end
-
-class Capistrano::Configuration
-  # Load config helper for use within Capfile
-  require File.dirname(__FILE__) + "/../../init"
-  include Capigen::Helper
-  
-end
-
-
 # Patch to add ability to clear sessions
 module Capistrano::Configuration::Connections
   
@@ -67,11 +47,9 @@ module Capistrano::Configuration::Connections
       Capistrano::CLI.password_prompt("Password (for #{user}): ")
     }
   end
-  
+    
 end
 
-reset_password
-
 # Debug connections
 # class Capistrano::SSH
 #   

data/lib/capigen/cap_ext/namespace.rb

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

data/lib/capigen/profiles.rb

@@ -1,6 +1,6 @@
 module Capigen::Profiles
   
-  ProfileDir = File.dirname(__FILE__) + "/../../recipes/profiles"
+  ProfileDir = File.dirname(__FILE__) + "/../../profiles"
   
   def recipe_profiles(prefix = "")
     Dir[ProfileDir + "/#{prefix}*.rb"].collect { |file| File.basename(file)[0...-3] }  

data/lib/capigen/recipes.rb

@@ -0,0 +1,8 @@
+# Load recipes
+recipes = Dir[File.dirname(__FILE__) + "/../recipes/**/*.rb"].collect { |recipe| File.expand_path(recipe) }
+recipes.each do |recipe|
+  Capistrano::Configuration.instance.load recipe
+end
+
+# Reset the password var
+Capistrano::Configuration.instance.load(:string => "reset_password")

data/lib/capigen/version.rb

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

data/lib/capigen.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'highline'
+require 'capistrano'
 
 HighLine.track_eof = false
 
@@ -24,3 +25,10 @@ require "capigen/profiles"
 require "capigen/helper"
 
 require "capigen/config"
+
+require "capigen/cap_ext/configuration"
+require "capigen/cap_ext/namespace"
+require "capigen/cap_ext/connections"
+        
+
+

data/lib/recipes/packages.rb

@@ -0,0 +1,19 @@
+namespace :packages do
+  
+  task :install do
+    
+    # Setup packager
+    setup_packager(packager_type)
+    
+    # Remove packages          
+    package_remove(packages_to_remove)
+    
+    # Update all existing packages
+    package_update
+    
+    # Install packages
+    package_install(packages_to_add)
+    
+  end
+  
+end

data/{templates → lib/templates}/capistrano/Capfile

@@ -1,13 +1,14 @@
 #
-# This file is auto-generated from Capgen
+# This file is auto-generated from Capigen
 #
+require 'capigen'
 
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 
 set :project_root, File.dirname(__FILE__)
 
-# Load bootstrapped patch.rb
-Dir['vendor/plugins/*/recipes/bootstrap/patch.rb'].each { |patch| load(patch)}
+# Require capigen recipes
+require 'capigen/recipes'
 
 # Load recipes from plugins
 Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }

data/{templates → lib/templates}/capistrano/deploy.rb.erb

@@ -1,5 +1,5 @@
 #
-# This file is auto-generated from Capgen
+# This file is auto-generated from Capigen
 #
 
 set :application, "<%= application %>"

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.1</a>
+      <a href="http://rubyforge.org/projects/capigen" class="numbers">0.1.2</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.1
+  version: 0.1.2
 platform: ""
 authors: 
 - Gabriel Handford
@@ -35,8 +35,10 @@ files:
 - Rakefile
 - config/hoe.rb
 - config/requirements.rb
-- init.rb
 - lib/capigen.rb
+- lib/capigen/cap_ext/configuration.rb
+- lib/capigen/cap_ext/connections.rb
+- lib/capigen/cap_ext/namespace.rb
 - lib/capigen/config.rb
 - lib/capigen/helper.rb
 - lib/capigen/helpers/gem_helper.rb
@@ -45,25 +47,59 @@ files:
 - lib/capigen/helpers/wget_helper.rb
 - lib/capigen/packagers/yum.rb
 - lib/capigen/profiles.rb
+- lib/capigen/recipes.rb
 - lib/capigen/recipes.yml
 - lib/capigen/templates.rb
 - lib/capigen/version.rb
-- recipes/README
-- recipes/bootstrap/patch.rb
-- recipes/centos.rb
-- recipes/deploy.rb
-- recipes/gems.rb
-- recipes/imagemagick.rb
-- recipes/install.rb
-- recipes/memcached.rb
-- recipes/mongrel_cluster.rb
-- recipes/monit.rb
-- recipes/mysql.rb
-- recipes/nginx.rb
-- recipes/profiles/centos-sick.rb
-- recipes/rails.rb
-- recipes/ruby.rb
-- recipes/sphinx.rb
+- lib/profiles/centos-sick.rb
+- lib/recipes/README
+- lib/recipes/centos.rb
+- lib/recipes/deploy.rb
+- lib/recipes/gems.rb
+- lib/recipes/imagemagick.rb
+- lib/recipes/install.rb
+- lib/recipes/memcached.rb
+- lib/recipes/mongrel_cluster.rb
+- lib/recipes/monit.rb
+- lib/recipes/mysql.rb
+- lib/recipes/nginx.rb
+- lib/recipes/packages.rb
+- lib/recipes/rails.rb
+- lib/recipes/ruby.rb
+- lib/recipes/sphinx.rb
+- lib/templates/capistrano/Capfile
+- lib/templates/capistrano/deploy.rb.erb
+- lib/templates/centos/setup.sh
+- lib/templates/centos/sudoers
+- lib/templates/imagemagick/install.sh
+- lib/templates/memcached/install.sh
+- lib/templates/memcached/memcached.initd.centos.erb
+- lib/templates/memcached/memcached.monitrc.erb
+- lib/templates/mongrel/mongrel_cluster.initd.erb
+- lib/templates/mongrel/mongrel_cluster.monitrc.erb
+- lib/templates/mongrel/mongrel_cluster.yml.erb
+- lib/templates/monit/cert.sh
+- lib/templates/monit/install.sh
+- lib/templates/monit/monit.cnf
+- lib/templates/monit/monit.initd.centos.erb
+- lib/templates/monit/monitrc.erb
+- lib/templates/monit/patch_inittab.sh
+- lib/templates/mysql/install.sh.erb
+- lib/templates/mysql/install_db.sql.erb
+- lib/templates/mysql/mysql.monitrc.erb
+- lib/templates/nginx/install.sh.erb
+- lib/templates/nginx/nginx.conf.erb
+- lib/templates/nginx/nginx.initd.erb
+- lib/templates/nginx/nginx.monitrc.erb
+- lib/templates/nginx/nginx_vhost.conf.erb
+- lib/templates/rails/database.yml.erb
+- lib/templates/ruby/ruby_install.sh
+- lib/templates/ruby/rubygems_install.sh
+- lib/templates/sphinx/install.sh.erb
+- lib/templates/sphinx/sphinx.conf.erb
+- lib/templates/sphinx/sphinx.monitrc.erb
+- lib/templates/sphinx/sphinx_app.initd.centos.erb
+- lib/templates/sphinx/sphinx_app.initd.erb
 - script/destroy
 - script/generate
 - script/txt2html
@@ -72,39 +108,6 @@ files:
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/website.rake
-- templates/capistrano/Capfile
-- templates/capistrano/deploy.rb.erb
-- templates/centos/setup.sh
-- templates/centos/sudoers
-- templates/imagemagick/install.sh
-- templates/memcached/install.sh
-- templates/memcached/memcached.initd.centos.erb
-- templates/memcached/memcached.monitrc.erb
-- templates/mongrel/mongrel_cluster.initd.erb
-- templates/mongrel/mongrel_cluster.monitrc.erb
-- templates/mongrel/mongrel_cluster.yml.erb
-- templates/monit/cert.sh
-- templates/monit/install.sh
-- templates/monit/monit.cnf
-- templates/monit/monit.initd.centos.erb
-- templates/monit/monitrc.erb
-- templates/monit/patch_inittab.sh
-- templates/mysql/install.sh.erb
-- templates/mysql/install_db.sql.erb
-- templates/mysql/mysql.monitrc.erb
-- templates/nginx/install.sh.erb
-- templates/nginx/nginx.conf.erb
-- templates/nginx/nginx.initd.erb
-- templates/nginx/nginx.monitrc.erb
-- templates/nginx/nginx_vhost.conf.erb
-- templates/rails/database.yml.erb
-- templates/ruby/ruby_install.sh
-- templates/ruby/rubygems_install.sh
-- templates/sphinx/install.sh.erb
-- templates/sphinx/sphinx.conf.erb
-- templates/sphinx/sphinx.monitrc.erb
-- templates/sphinx/sphinx_app.initd.centos.erb
-- templates/sphinx/sphinx_app.initd.erb
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js

data/init.rb

@@ -1,3 +0,0 @@
-require File.dirname(__FILE__) + '/lib/capigen'
-
-#load File.dirname(__FILE__) + "/tasks/capigen.rake'