rubber 1.3.2 → 1.5.0

data/lib/rubber/cloud/aws.rb

@@ -224,7 +224,9 @@ module Rubber
         arch = case arch when /i\d86/ then "i386" else arch end
 
         capistrano.sudo_script "create_bundle", <<-CMD
+          rvm use system
           export RUBYLIB=/usr/lib/site_ruby/
+          unset RUBYOPT
           nohup ec2-bundle-vol --batch -d /mnt -k #{ec2_pk_dest} -c #{ec2_cert_dest} -u #{@aws_env.account} -p #{image_name} -r #{arch}  &> /tmp/ec2-bundle-vol.log &
           echo "Creating image from instance volume..."
           while true; do
@@ -235,7 +237,9 @@ module Rubber
         CMD
 
         capistrano.sudo_script "register_bundle", <<-CMD
+          rvm use system
           export RUBYLIB=/usr/lib/site_ruby/
+          unset RUBYOPT
           echo "Uploading image to S3..."
           ec2-upload-bundle --batch -b #{@aws_env.image_bucket} -m /mnt/#{image_name}.manifest.xml -a #{@aws_env.access_key} -s #{@aws_env.secret_access_key}
         CMD

data/lib/rubber/dns/zerigo.rb

@@ -1,5 +1,11 @@
 require 'rubygems'
-require 'zerigo_dns'
+
+begin
+  require 'zerigo_dns'
+rescue LoadError
+  puts "Missing the zerigo_dns gem.  Install with `sudo gem install zerigo_dns`."
+  exit(-1)
+end
 
 module Rubber
   module Dns
@@ -92,14 +98,14 @@ module Rubber
 
       def update_host_record(old_opts={}, new_opts={})
         old_opts = setup_opts(old_opts, [:host, :domain])
-        new_opts = setup_opts(new_opts.merge(:no_defaults =>true), [])
+        new_opts = setup_opts(new_opts, [:host, :domain, :type, :data])
         zone = ::Zerigo::DNS::Zone.find_or_create(old_opts[:domain])
 
         find_hosts(old_opts).each do |h|
           opts_to_host(new_opts).each do |k, v|
             h.send("#{k}=", v)
           end
-          h.save || raise("Failed to update host #{h.hostname}")
+          h.save || raise("Failed to update host #{h.hostname}, #{h.errors.full_messages.join(', ')}")
         end
       end
 

data/lib/rubber/environment.rb

@@ -22,7 +22,7 @@ module Rubber
       end
       
       def read_config(file)
-        LOGGER.debug{"Reading rubber configuration from #{file}"}
+        Rubber.logger.debug{"Reading rubber configuration from #{file}"}
         if File.exist?(file)
           @items = Environment.combine(@items, YAML.load_file(file) || {})
         end

data/lib/rubber/generator.rb

@@ -33,13 +33,13 @@ module Rubber
           Dir[dir].sort.each do |f|
             next if f =~ /\/(CVS|\.svn)\//
             if File.file?(f) && (! pat || pat.match(f))
-              LOGGER.info{"Transforming #{f}"}
+              Rubber.logger.info{"Transforming #{f}"}
               begin
                 transform(IO.read(f), @options)
               rescue Exception => e
                 lines = e.backtrace.grep(/^\(erb\):([0-9]+)/) {|b| Regexp.last_match(1) }
-                LOGGER.error{"Transformation failed for #{f}#{':' + lines.first if lines.first}"}
-                LOGGER.error e.message
+                Rubber.logger.error{"Transformation failed for #{f}#{':' + lines.first if lines.first}"}
+                Rubber.logger.error e.message
                 exit 1
               end
             end
@@ -131,22 +131,22 @@ module Rubber
           # Run post transform command if needed
           if config.post
             if fake_root
-              LOGGER.info("Not running post command as a fake root was given: #{config.post}")
+              Rubber.logger.info("Not running post command as a fake root was given: #{config.post}")
             elsif no_post
-              LOGGER.info("Not running post command as no post specified")
+              Rubber.logger.info("Not running post command as no post specified")
             else
               if orig != result || force
                 # this lets us abort a script if a command in the middle of it errors out
                 # stop_on_error_cmd = "function error_exit { exit 99; }; trap error_exit ERR"
                 config.post = "#{stop_on_error_cmd}\n#{config.post}" if stop_on_error_cmd
 
-                LOGGER.info{"Transformation executing post config command: #{config.post}"}
-                LOGGER.info `#{config.post}`
+                Rubber.logger.info{"Transformation executing post config command: #{config.post}"}
+                Rubber.logger.info `#{config.post}`
                 if $?.exitstatus != 0
                   raise "Post command failed execution:  #{config.post}"
                 end
               else
-                LOGGER.info("Nothing to do, not running post command")
+                Rubber.logger.info("Nothing to do, not running post command")
               end
             end
           end

data/lib/rubber/instance.rb

@@ -10,7 +10,7 @@ module Rubber
       include Enumerable
 
       def initialize(file)
-        LOGGER.debug{"Reading rubber instances from #{file}"}
+        Rubber.logger.debug{"Reading rubber instances from #{file}"}
         @file = file
         @items = {}
         @artifacts = {'volumes' => {}, 'static_ips' => {}}

data/lib/rubber/railtie.rb

@@ -0,0 +1,14 @@
+require 'rubber'
+require 'rails'
+
+module Rubber
+
+  class Railtie < Rails::Railtie
+
+    initializer "rubber.configure_rails_initialization" do
+      Rubber::initialize(Rails.root, Rails.env)
+    end
+
+  end
+
+end

data/lib/rubber/recipes/rubber.rb

@@ -50,6 +50,11 @@ namespace :rubber do
     set :rubber_env, rubber_cfg.environment.bind()
     set :rubber_instances, rubber_cfg.instance
 
+    # Disable connecting to any Windows instance.
+    # pass -l to bash in :shell to that run also gets full env
+    # use a pty so we don't get "stdin: is not a tty" error output
+    set :default_run_options, :pty => true, :shell => "/bin/bash -l", :except => { :platform => 'windows' }
+
     set :cloud, Rubber::Cloud::get_provider(rubber_env.cloud_provider || "aws", rubber_env, self)
 
     load_roles() unless rubber_env.disable_auto_roles
@@ -57,6 +62,7 @@ namespace :rubber do
     # the private key in the same folder, the public key should have the
     # extension ".pub".
     ssh_options[:keys] = rubber_env.cloud_providers[rubber_env.cloud_provider].key_file
+    ssh_options[:timeout] = fetch(:ssh_timeout, 5)
   end
 
 

data/lib/rubber/recipes/rubber/deploy.rb

@@ -59,8 +59,8 @@ namespace :rubber do
     Sets permissions of files in application directory to be owned by app_user.
   DESC
   task :setup_app_permissions do
-    sudo "sh -c 'find #{shared_path} -name cached-copy -prune -o -print | xargs chown #{rubber_env.app_user}:#{rubber_env.app_user}'"
-    sudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/tmp"
+    rsudo "find #{shared_path} -name cached-copy -prune -o -print | xargs chown #{rubber_env.app_user}:#{rubber_env.app_user}"
+    rsudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/tmp"
   end
 
   def run_config(options={})
@@ -84,7 +84,7 @@ namespace :rubber do
       put(File.read(secret), File.join(path, base, File.basename(secret)), :mode => "+r")
     end
 
-    sudo "sh -c 'cd #{path} && #{extra_env} rake rubber:config'"
+    rsudo "cd #{path} && #{extra_env} rake rubber:config"
   end
 
 end

data/lib/rubber/recipes/rubber/setup.rb

@@ -1,8 +1,5 @@
 namespace :rubber do
 
-  # Disable connecting to any Windows instance.
-  set :default_run_options, :except => { :platform => 'windows' }
-
   desc <<-DESC
     Bootstraps instances by setting timezone, installing packages and gems
   DESC
@@ -25,7 +22,7 @@ namespace :rubber do
       set :user, initial_ssh_user
 
       task :_allow_root_ssh, :hosts => ip do
-        sudo "cp /home/#{initial_ssh_user}/.ssh/authorized_keys /root/.ssh/"
+        rsudo "cp /home/#{initial_ssh_user}/.ssh/authorized_keys /root/.ssh/"
       end
 
       begin
@@ -195,9 +192,9 @@ namespace :rubber do
       put filtered, hosts_file
 
       # Setup hostname on instance so shell, etcs have nice display
-      sudo "sh -c 'echo $CAPISTRANO:HOST$ > /etc/hostname && hostname $CAPISTRANO:HOST$'"
+      rsudo "echo $CAPISTRANO:HOST$ > /etc/hostname && hostname $CAPISTRANO:HOST$"
       # Newer ubuntus ec2-init script always resets hostname, so prevent it
-      sudo "sh -c 'mkdir -p /etc/ec2-init && echo compat=0 > /etc/ec2-init/is-compat-env'"
+      rsudo "mkdir -p /etc/ec2-init && echo compat=0 > /etc/ec2-init/is-compat-env"
     end
 
     # TODO
@@ -251,12 +248,20 @@ namespace :rubber do
     gem_helper(false)
   end
 
+  desc <<-DESC
+    Install ruby gems defined in Gemfile
+  DESC
+  after "deploy:update_code", "rubber:install_bundler_gems" if Rubber::Util.is_bundler?
+  task :install_bundler_gems do
+    rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} bundle install"
+  end
+
   desc <<-DESC
     Install ruby gems defined in the rails environment.rb
   DESC
-  after "rubber:config", "rubber:install_rails_gems" if Rubber::Util.is_rails?
+  after "rubber:config", "rubber:install_rails_gems" if Rubber::Util::is_rails2?
   task :install_rails_gems do
-    sudo "sh -c 'cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake gems:install'"
+    sudo "sh -c 'cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} rake gems:install'"
   end
 
   desc <<-DESC
@@ -314,7 +319,7 @@ namespace :rubber do
   task :setup_gem_sources do
     if rubber_env.gemsources
       script = prepare_script 'gem_sources_helper', gem_sources_helper_script, nil
-      sudo "ruby #{script} #{rubber_env.gemsources.join(' ')}"
+      rsudo "ruby #{script} #{rubber_env.gemsources.join(' ')}"
     end
   end
 
@@ -323,7 +328,7 @@ namespace :rubber do
     You can override this task if you don't want this to happen
   DESC
   task :link_bash do
-    sudo "ln -sf /bin/bash /bin/sh"
+    rsudo "ln -sf /bin/bash /bin/sh"
   end
 
   desc <<-DESC
@@ -337,14 +342,14 @@ namespace :rubber do
   DESC
   task :set_timezone do
     opts = get_host_options('timezone')
-    sudo "sh -c 'echo $CAPISTRANO:VAR$ > /etc/timezone'", opts
-    sudo "cp /usr/share/zoneinfo/$CAPISTRANO:VAR$ /etc/localtime", opts
+    rsudo "echo $CAPISTRANO:VAR$ > /etc/timezone", opts
+    rsudo "cp /usr/share/zoneinfo/$CAPISTRANO:VAR$ /etc/localtime", opts
     # restart syslog so that times match timezone
     sudo_script 'restart_syslog', <<-ENDSCRIPT
       if [[ -x /etc/init.d/sysklogd ]]; then
         /etc/init.d/sysklogd restart
       elif [[ -x /etc/init.d/rsyslog ]]; then
-        /etc/init.d/rsyslog restart
+        service rsyslog restart
      fi
     ENDSCRIPT
   end
@@ -390,11 +395,11 @@ namespace :rubber do
       expanded_pkg_list.join(' ')
     end
 
-    sudo "apt-get -q update"
+    rsudo "apt-get -q update"
     if upgrade
-      sudo "/bin/sh -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -q -y --force-yes dist-upgrade'"
+      rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -y --force-yes dist-upgrade"
     else
-      sudo "/bin/sh -c 'export DEBIAN_FRONTEND=noninteractive; apt-get -q -y --force-yes install $CAPISTRANO:VAR$'", opts
+      rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -y --force-yes install $CAPISTRANO:VAR$", opts
     end
   end
 
@@ -492,7 +497,7 @@ namespace :rubber do
     
     if opts.size > 0
       script = prepare_script('gem_helper', gem_helper_script, nil)
-      sudo "ruby #{script} #{cmd} $CAPISTRANO:VAR$", opts do |ch, str, data|
+      rsudo "ruby #{script} #{cmd} $CAPISTRANO:VAR$", opts do |ch, str, data|
         handle_gem_prompt(ch, data, str)
       end
     end

data/lib/rubber/recipes/rubber/utils.rb

@@ -16,23 +16,26 @@ namespace :rubber do
     default_roles = rubber_env.staging_roles || "*"
     roles = ENV['ROLES'] = rubber.get_env("ROLES", "Roles to use for staging instance", true, default_roles)
 
-    # some bootstraps update code (bootstrap_db) but if you don't have that role, need to do it here
-    # Since release directory variable gets reused by cap, we have to just do the symlink here - doing
-    # a update again will fail
-    set :rubber_code_was_updated, false
-    after "deploy:update_code" do
-      set :rubber_code_was_updated, true
-    end
-
     if rubber_instances[instance_alias]
       logger.info "Instance already exists, skipping to bootstrap"
     else
       rubber.create
     end
+
+    # stop everything before so monit doesn't start stuff during bootstrapping
+    # if its already installed due to a bundled instance
+    deploy.stop rescue nil
+
     rubber.bootstrap
-    # stop everything in case we have a bundled instance with monit, etc starting at boot
+    
+    # stop everything after in case package upgrades during bootstrap start up
+    # services - we should be able to safely do a deploy:start below
     deploy.stop rescue nil
-    if ! rubber_code_was_updated
+
+    # some bootstraps update code (bootstrap_db) but if you don't have that role, need to do it here
+    # Since release directory variable gets reused by cap, we have to just do the symlink here - doing
+    # a update again will fail
+    if ! fetch(:rubber_code_was_updated, false)
       deploy.update_code
     end
     deploy.symlink
@@ -155,14 +158,22 @@ namespace :rubber do
     return script
   end
 
-  def run_script(name, contents)
+  def run_script(name, contents, opts = {})
+    args = opts.delete(:script_args)
     script = prepare_script(name, contents)
-    run "sh #{script}"
+    run "bash #{script} #{args}", opts
   end
 
-  def sudo_script(name, contents)
+  def sudo_script(name, contents, opts = {})
+    args = opts.delete(:script_args)
     script = prepare_script(name, contents)
-    sudo "sh #{script}"
+    run "#{sudo} bash -l #{script} #{args}", opts
+  end
+
+  def top.rsudo(command, opts = {}, &block)
+    user = opts.delete(:as)
+    args = "-H -u #{user}" if user
+    run "#{sudo opts} #{args} bash -l -c '#{command}'", opts, &block
   end
 
   def get_env(name, desc, required=false, default=nil)
@@ -200,4 +211,16 @@ namespace :rubber do
     return opts
   end
 
+  # some bootstraps update code (bootstrap_db), so keep track so we don't do it multiple times  
+  after "deploy:update_code" do
+    set :rubber_code_was_updated, true
+  end
+  
+  def update_code_for_bootstrap
+    unless (fetch(:rubber_code_was_updated, false))
+      deploy.setup
+      deploy.update_code
+    end
+  end
+  
 end

data/lib/rubber/util.rb

@@ -30,8 +30,43 @@ module Rubber
     end
 
     def self.is_rails?
-      File.exist?(File.join(RUBBER_ROOT, 'config', 'environment.rb'))
+      File.exist?(File.join(RUBBER_ROOT, 'config', 'boot.rb'))
     end
 
+    def self.is_rails2?
+      defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 2
+    end
+
+    def self.is_rails3?
+      defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::MAJOR == 3
+    end
+
+    def self.is_bundler?
+      File.exist?(File.join(RUBBER_ROOT, 'Gemfile'))
+    end
+
+    def self.rubber_as_plugin?
+      File.exist?(File.join(RUBBER_ROOT, 'vendor/plugins/rubber'))
+    end
+
+    def self.prompt(name, desc, required=false, default=nil)
+      value = ENV.delete(name)
+      msg = "#{desc}"
+      msg << " [#{default}]" if default
+      msg << ": "
+      unless value
+        print msg
+        value = gets
+      end
+      value = value.size == 0 ? default : value
+      self.fatal "#{name} is required, pass using environment or enter at prompt" if required && ! value
+      return value
+    end
+
+    def self.fatal(msg, code=1)
+      puts msg
+      exit code
+    end
+    
   end
 end

data/rails/init.rb

@@ -3,7 +3,4 @@
 #
 
 require "rubber"
-Rubber::initialize(RAILS_ROOT, RAILS_ENV)
-
-::RUBBER_CONFIG = Rubber::Configuration.rubber_env
-::RUBBER_INSTANCES = Rubber::Configuration.rubber_instances
+Rubber::initialize(Rails.root, Rails.env)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-05-21 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 4
@@ -35,9 +38,11 @@ dependencies:
   name: amazon-ec2
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 9
@@ -49,9 +54,11 @@ dependencies:
   name: aws-s3
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,39 +68,17 @@ dependencies:
   name: nettica
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: zerigo_dns
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
-description: The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to Amazon's Elastic Compute Cloud (EC2).  Like capistrano, rubber is role based, so you can define a set of configuration files for a role and then assign that role to as many concrete instances as needed. One can also assign multiple roles to a single instance. This lets one start out with a single ec2 instance (belonging to all roles), and add new instances into the mix as needed to scale specific facets of your deployment, e.g. adding in instances that serve only as an 'app' role to handle increased app server load.
+description: "      The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to\n      Amazon's Elastic Compute Cloud (EC2).  Like capistrano, rubber is role based, so you can define a set\n      of configuration files for a role and then assign that role to as many concrete instances as needed. One\n      can also assign multiple roles to a single instance. This lets one start out with a single ec2 instance\n      (belonging to all roles), and add new instances into the mix as needed to scale specific facets of your\n      deployment, e.g. adding in instances that serve only as an 'app' role to handle increased app server load.\n"
 email: matt@conwaysplace.com
 executables: 
 - vulcanize
@@ -123,25 +108,39 @@ files:
 - generators/vulcanize/templates/apache/config/rubber/rubber-apache.yml
 - generators/vulcanize/templates/apache/templates.yml
 - generators/vulcanize/templates/base/Capfile
+- generators/vulcanize/templates/base/Rakefile
 - generators/vulcanize/templates/base/config/deploy.rb
 - generators/vulcanize/templates/base/config/rubber/common/crontab
 - generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf
 - generators/vulcanize/templates/base/config/rubber/common/rubber.profile
 - generators/vulcanize/templates/base/config/rubber/deploy-setup.rb
+- generators/vulcanize/templates/base/config/rubber/deploy-util.rb
 - generators/vulcanize/templates/base/config/rubber/rubber-dns.yml
+- generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml
 - generators/vulcanize/templates/base/config/rubber/rubber.yml
 - generators/vulcanize/templates/base/lib/tasks/rubber.rake
 - generators/vulcanize/templates/base/script/cron-rake
 - generators/vulcanize/templates/base/script/cron-runner
 - generators/vulcanize/templates/base/script/cron-sh
+- generators/vulcanize/templates/base/templates.rb
 - generators/vulcanize/templates/base/templates.yml
+- generators/vulcanize/templates/cassandra/config/rubber/deploy-cassandra.rb
+- generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.in.sh
+- generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.yaml
+- generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/log4j-server.properties
+- generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/monit-cassandra.conf
+- generators/vulcanize/templates/cassandra/config/rubber/rubber-cassandra.yml
+- generators/vulcanize/templates/cassandra/templates.yml
 - generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/haproxy/haproxy-mongrel.conf
 - generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/nginx/nginx-mongrel.conf
 - generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/rubber-complete.yml
 - generators/vulcanize/templates/complete_mongrel_mysql/templates.yml
-- generators/vulcanize/templates/complete_passenger_mysql/config/rubber/role/haproxy/haproxy-passenger.conf
-- generators/vulcanize/templates/complete_passenger_mysql/config/rubber/rubber-complete.yml
+- generators/vulcanize/templates/complete_passenger/config/rubber/role/haproxy/haproxy-passenger.conf
+- generators/vulcanize/templates/complete_passenger/config/rubber/rubber-complete.yml
+- generators/vulcanize/templates/complete_passenger/templates.rb
+- generators/vulcanize/templates/complete_passenger/templates.yml
 - generators/vulcanize/templates/complete_passenger_mysql/templates.yml
+- generators/vulcanize/templates/complete_passenger_postgresql/templates.yml
 - generators/vulcanize/templates/cruise/config/rubber/deploy-cruise.rb
 - generators/vulcanize/templates/cruise/config/rubber/role/cruise/cruise
 - generators/vulcanize/templates/cruise/config/rubber/role/cruise/my.cnf
@@ -237,16 +236,29 @@ files:
 - generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf
 - generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml
 - generators/vulcanize/templates/passenger/templates.yml
+- generators/vulcanize/templates/postgresql/config/rubber/common/database.yml
+- generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb
+- generators/vulcanize/templates/postgresql/config/rubber/role/db/crontab
+- generators/vulcanize/templates/postgresql/config/rubber/role/db/monit-postgresql.conf
+- generators/vulcanize/templates/postgresql/config/rubber/role/db/pg_hba.conf
+- generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql-sysctl.conf
+- generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql.conf
+- generators/vulcanize/templates/postgresql/config/rubber/rubber-postgresql.yml
+- generators/vulcanize/templates/postgresql/templates.yml
 - generators/vulcanize/templates/redis/config/rubber/deploy-redis.rb
 - generators/vulcanize/templates/redis/config/rubber/role/redis/crontab
 - generators/vulcanize/templates/redis/config/rubber/role/redis/monit-redis.conf
 - generators/vulcanize/templates/redis/config/rubber/role/redis/redis.conf
 - generators/vulcanize/templates/redis/config/rubber/rubber-redis.yml
 - generators/vulcanize/templates/redis/templates.yml
-- generators/vulcanize/templates/resque/config/rubber/deploy-resque-worker-default.rb
+- generators/vulcanize/templates/resque/config/initializers/resque.rb
+- generators/vulcanize/templates/resque/config/rubber/common/resque.yml
 - generators/vulcanize/templates/resque/config/rubber/deploy-resque.rb
-- generators/vulcanize/templates/resque/config/rubber/role/resque_worker_default/monit-resque_worker_default.conf
+- generators/vulcanize/templates/resque/config/rubber/role/resque_web/monit-resque_web.conf
+- generators/vulcanize/templates/resque/config/rubber/role/resque_worker/monit-resque_worker.conf
 - generators/vulcanize/templates/resque/config/rubber/rubber-resque.yml
+- generators/vulcanize/templates/resque/script/resque_worker_management.rb
+- generators/vulcanize/templates/resque/templates.rb
 - generators/vulcanize/templates/resque/templates.yml
 - generators/vulcanize/templates/sphinx/config/rubber/common/sphinx.yml
 - generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb
@@ -256,6 +268,179 @@ files:
 - generators/vulcanize/templates/sphinx/templates.yml
 - generators/vulcanize/vulcanize_generator.rb
 - lib/capistrano/hostcmd.rb
+- lib/generators/vulcanize/USAGE
+- lib/generators/vulcanize/templates/apache/config/rubber/deploy-apache.rb
+- lib/generators/vulcanize/templates/apache/config/rubber/role/apache/deflate.conf
+- lib/generators/vulcanize/templates/apache/config/rubber/role/apache/expires.conf
+- lib/generators/vulcanize/templates/apache/config/rubber/role/apache/headers.conf
+- lib/generators/vulcanize/templates/apache/config/rubber/role/apache/monit-apache.conf
+- lib/generators/vulcanize/templates/apache/config/rubber/role/apache/ports.conf
+- lib/generators/vulcanize/templates/apache/config/rubber/role/apache/setenvif.conf
+- lib/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf
+- lib/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache.auth
+- lib/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-index.html
+- lib/generators/vulcanize/templates/apache/config/rubber/rubber-apache.yml
+- lib/generators/vulcanize/templates/apache/templates.yml
+- lib/generators/vulcanize/templates/base/Capfile
+- lib/generators/vulcanize/templates/base/Rakefile
+- lib/generators/vulcanize/templates/base/config/deploy.rb
+- lib/generators/vulcanize/templates/base/config/rubber/common/crontab
+- lib/generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf
+- lib/generators/vulcanize/templates/base/config/rubber/common/rubber.profile
+- lib/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb
+- lib/generators/vulcanize/templates/base/config/rubber/deploy-util.rb
+- lib/generators/vulcanize/templates/base/config/rubber/rubber-dns.yml
+- lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml
+- lib/generators/vulcanize/templates/base/config/rubber/rubber.yml
+- lib/generators/vulcanize/templates/base/lib/tasks/rubber.rake
+- lib/generators/vulcanize/templates/base/script/cron-rake
+- lib/generators/vulcanize/templates/base/script/cron-runner
+- lib/generators/vulcanize/templates/base/script/cron-sh
+- lib/generators/vulcanize/templates/base/templates.rb
+- lib/generators/vulcanize/templates/base/templates.yml
+- lib/generators/vulcanize/templates/cassandra/config/rubber/deploy-cassandra.rb
+- lib/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.in.sh
+- lib/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.yaml
+- lib/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/log4j-server.properties
+- lib/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/monit-cassandra.conf
+- lib/generators/vulcanize/templates/cassandra/config/rubber/rubber-cassandra.yml
+- lib/generators/vulcanize/templates/cassandra/templates.yml
+- lib/generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/haproxy/haproxy-mongrel.conf
+- lib/generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/nginx/nginx-mongrel.conf
+- lib/generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/rubber-complete.yml
+- lib/generators/vulcanize/templates/complete_mongrel_mysql/templates.yml
+- lib/generators/vulcanize/templates/complete_passenger/config/rubber/role/haproxy/haproxy-passenger.conf
+- lib/generators/vulcanize/templates/complete_passenger/config/rubber/rubber-complete.yml
+- lib/generators/vulcanize/templates/complete_passenger/templates.rb
+- lib/generators/vulcanize/templates/complete_passenger/templates.yml
+- lib/generators/vulcanize/templates/complete_passenger_mysql/templates.yml
+- lib/generators/vulcanize/templates/complete_passenger_postgresql/templates.yml
+- lib/generators/vulcanize/templates/cruise/config/rubber/deploy-cruise.rb
+- lib/generators/vulcanize/templates/cruise/config/rubber/role/cruise/cruise
+- lib/generators/vulcanize/templates/cruise/config/rubber/role/cruise/my.cnf
+- lib/generators/vulcanize/templates/cruise/config/rubber/role/cruise/production.rb
+- lib/generators/vulcanize/templates/cruise/config/rubber/role/cruise/site_config.rb
+- lib/generators/vulcanize/templates/cruise/config/rubber/role/web_tools/cruise-nginx.conf
+- lib/generators/vulcanize/templates/cruise/config/rubber/rubber-cruise.yml
+- lib/generators/vulcanize/templates/cruise/templates.yml
+- lib/generators/vulcanize/templates/haproxy/config/rubber/deploy-haproxy.rb
+- lib/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/haproxy-base.conf
+- lib/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/haproxy-default.conf
+- lib/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/monit-haproxy.conf
+- lib/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/syslog-haproxy.conf
+- lib/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/syslogd-default.conf
+- lib/generators/vulcanize/templates/haproxy/config/rubber/role/web_tools/haproxy-nginx.conf
+- lib/generators/vulcanize/templates/haproxy/config/rubber/rubber-haproxy.yml
+- lib/generators/vulcanize/templates/haproxy/templates.yml
+- lib/generators/vulcanize/templates/jetty/config/rubber/deploy-jetty.rb
+- lib/generators/vulcanize/templates/jetty/config/rubber/role/jetty/jetty.sh
+- lib/generators/vulcanize/templates/jetty/config/rubber/role/jetty/jetty.xml
+- lib/generators/vulcanize/templates/jetty/config/rubber/role/jetty/monit-jetty.conf
+- lib/generators/vulcanize/templates/jetty/config/rubber/rubber-jetty.yml
+- lib/generators/vulcanize/templates/jetty/templates.yml
+- lib/generators/vulcanize/templates/memcached/config/memcached.yml
+- lib/generators/vulcanize/templates/memcached/config/rubber/common/memcached.yml
+- lib/generators/vulcanize/templates/memcached/config/rubber/role/memcached/memcached.conf
+- lib/generators/vulcanize/templates/memcached/config/rubber/role/memcached/memcached_munin_plugin
+- lib/generators/vulcanize/templates/memcached/config/rubber/rubber-memcached.yml
+- lib/generators/vulcanize/templates/memcached/templates.yml
+- lib/generators/vulcanize/templates/minimal_mysql/templates.yml
+- lib/generators/vulcanize/templates/minimal_nodb/templates.yml
+- lib/generators/vulcanize/templates/mongrel/config/rubber/deploy-mongrel.rb
+- lib/generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/mongrel_cluster.yml
+- lib/generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/monit-mongrel.conf
+- lib/generators/vulcanize/templates/mongrel/config/rubber/rubber-mongrel.yml
+- lib/generators/vulcanize/templates/mongrel/templates.yml
+- lib/generators/vulcanize/templates/monit/config/rubber/common/monit-default.conf
+- lib/generators/vulcanize/templates/monit/config/rubber/common/monit.conf
+- lib/generators/vulcanize/templates/monit/config/rubber/deploy-monit.rb
+- lib/generators/vulcanize/templates/monit/config/rubber/role/web_tools/monit-admin-nginx.conf
+- lib/generators/vulcanize/templates/monit/config/rubber/rubber-monit.yml
+- lib/generators/vulcanize/templates/monit/templates.yml
+- lib/generators/vulcanize/templates/munin/config/rubber/common/monit-munin.conf
+- lib/generators/vulcanize/templates/munin/config/rubber/common/munin-node.conf
+- lib/generators/vulcanize/templates/munin/config/rubber/common/munin-plugins.conf
+- lib/generators/vulcanize/templates/munin/config/rubber/deploy-munin.rb
+- lib/generators/vulcanize/templates/munin/config/rubber/role/web_tools/munin-nginx.conf
+- lib/generators/vulcanize/templates/munin/config/rubber/role/web_tools/munin-plugins.conf
+- lib/generators/vulcanize/templates/munin/config/rubber/role/web_tools/munin.conf
+- lib/generators/vulcanize/templates/munin/config/rubber/rubber-munin.yml
+- lib/generators/vulcanize/templates/munin/script/munin/example_mysql_query.rb
+- lib/generators/vulcanize/templates/munin/script/munin/example_simple.rb
+- lib/generators/vulcanize/templates/munin/templates.yml
+- lib/generators/vulcanize/templates/mysql/config/rubber/common/database.yml
+- lib/generators/vulcanize/templates/mysql/config/rubber/deploy-mysql.rb
+- lib/generators/vulcanize/templates/mysql/config/rubber/role/db/apparmor-mysql.conf
+- lib/generators/vulcanize/templates/mysql/config/rubber/role/db/crontab
+- lib/generators/vulcanize/templates/mysql/config/rubber/role/db/monit-mysql.cnf
+- lib/generators/vulcanize/templates/mysql/config/rubber/role/db/my.cnf
+- lib/generators/vulcanize/templates/mysql/config/rubber/role/mysql_slave/mysql_slave_munin_plugin
+- lib/generators/vulcanize/templates/mysql/config/rubber/rubber-mysql.yml
+- lib/generators/vulcanize/templates/mysql/templates.yml
+- lib/generators/vulcanize/templates/mysql_cluster/config/rubber/common/mysql_cluster_migrations.rb
+- lib/generators/vulcanize/templates/mysql_cluster/config/rubber/deploy-mysql_cluster.rb
+- lib/generators/vulcanize/templates/mysql_cluster/config/rubber/role/mysql_data/my.cnf
+- lib/generators/vulcanize/templates/mysql_cluster/config/rubber/role/mysql_mgm/ndb_mgmd.cnf
+- lib/generators/vulcanize/templates/mysql_cluster/config/rubber/role/mysql_sql/monit-mysql_cluster_sql.cnf
+- lib/generators/vulcanize/templates/mysql_cluster/config/rubber/role/mysql_sql/my.cnf
+- lib/generators/vulcanize/templates/mysql_cluster/config/rubber/rubber-mysql_cluster.yml
+- lib/generators/vulcanize/templates/mysql_cluster/templates.yml
+- lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/database.yml
+- lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/monit-mysql_proxy.cnf
+- lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/mysql-proxy
+- lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/mysql-proxy.conf
+- lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/mysql-proxy.lua
+- lib/generators/vulcanize/templates/mysql_proxy/config/rubber/deploy-mysql_proxy.rb
+- lib/generators/vulcanize/templates/mysql_proxy/config/rubber/rubber-mysql_proxy.yml
+- lib/generators/vulcanize/templates/mysql_proxy/templates.yml
+- lib/generators/vulcanize/templates/nginx/config/rubber/deploy-nginx.rb
+- lib/generators/vulcanize/templates/nginx/config/rubber/role/nginx/crontab
+- lib/generators/vulcanize/templates/nginx/config/rubber/role/nginx/monit-nginx.conf
+- lib/generators/vulcanize/templates/nginx/config/rubber/role/nginx/nginx.conf
+- lib/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/nginx-tools.conf
+- lib/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-index.html
+- lib/generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-nginx.auth
+- lib/generators/vulcanize/templates/nginx/config/rubber/rubber-nginx.yml
+- lib/generators/vulcanize/templates/nginx/templates.yml
+- lib/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb
+- lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf
+- lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf
+- lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf
+- lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf
+- lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf
+- lib/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml
+- lib/generators/vulcanize/templates/passenger/templates.yml
+- lib/generators/vulcanize/templates/postgresql/config/rubber/common/database.yml
+- lib/generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb
+- lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/crontab
+- lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/monit-postgresql.conf
+- lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/pg_hba.conf
+- lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql-sysctl.conf
+- lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql.conf
+- lib/generators/vulcanize/templates/postgresql/config/rubber/rubber-postgresql.yml
+- lib/generators/vulcanize/templates/postgresql/templates.yml
+- lib/generators/vulcanize/templates/redis/config/rubber/deploy-redis.rb
+- lib/generators/vulcanize/templates/redis/config/rubber/role/redis/crontab
+- lib/generators/vulcanize/templates/redis/config/rubber/role/redis/monit-redis.conf
+- lib/generators/vulcanize/templates/redis/config/rubber/role/redis/redis.conf
+- lib/generators/vulcanize/templates/redis/config/rubber/rubber-redis.yml
+- lib/generators/vulcanize/templates/redis/templates.yml
+- lib/generators/vulcanize/templates/resque/config/initializers/resque.rb
+- lib/generators/vulcanize/templates/resque/config/rubber/common/resque.yml
+- lib/generators/vulcanize/templates/resque/config/rubber/deploy-resque.rb
+- lib/generators/vulcanize/templates/resque/config/rubber/role/resque_web/monit-resque_web.conf
+- lib/generators/vulcanize/templates/resque/config/rubber/role/resque_worker/monit-resque_worker.conf
+- lib/generators/vulcanize/templates/resque/config/rubber/rubber-resque.yml
+- lib/generators/vulcanize/templates/resque/script/resque_worker_management.rb
+- lib/generators/vulcanize/templates/resque/templates.rb
+- lib/generators/vulcanize/templates/resque/templates.yml
+- lib/generators/vulcanize/templates/sphinx/config/rubber/common/sphinx.yml
+- lib/generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb
+- lib/generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/crontab
+- lib/generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/monit-sphinx.conf
+- lib/generators/vulcanize/templates/sphinx/config/rubber/rubber-sphinx.yml
+- lib/generators/vulcanize/templates/sphinx/templates.yml
+- lib/generators/vulcanize/vulcanize_generator.rb
 - lib/rubber.rb
 - lib/rubber/capistrano.rb
 - lib/rubber/cloud.rb
@@ -270,6 +455,7 @@ files:
 - lib/rubber/environment.rb
 - lib/rubber/generator.rb
 - lib/rubber/instance.rb
+- lib/rubber/railtie.rb
 - lib/rubber/recipes/rubber.rb
 - lib/rubber/recipes/rubber/bundles.rb
 - lib/rubber/recipes/rubber/deploy.rb
@@ -284,33 +470,56 @@ files:
 - lib/rubber/tasks/rubber.rb
 - lib/rubber/util.rb
 - rails/init.rb
+- test/environment_test.rb
+- test/generator_test.rb
+- test/instance_test.rb
+- test/test_helper.rb
+- test/util_test.rb
+- test/zerigo_test.rb
 has_rdoc: true
 homepage: http://github.com/wr0ngway/rubber
 licenses: []
 
-post_install_message: 
+post_install_message: |+
+  
+  ********************************************************************************
+  
+  Thank you for installing rubber.  Please note that this is a major upgrade
+  and we've moved towards using RVM for Ruby configuration on your EC2 instances.
+  
+  If you're upgrading rubber, please make sure to read the upgrade notes and
+  make the necessary configuration changes:
+  
+  http://wiki.github.com/wr0ngway/rubber/upgrading
+  
+  ********************************************************************************
+  
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rubber
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)