nirvdrum-rubber 1.1.7 → 2.0.0.rails3.beta6

data/CHANGELOG

@@ -1,3 +1,85 @@
+1.3.2
+-----
+
+fix to mkdir command which failed on rubber:create_staging <6a0d513> [Matt Conway]
+fix for ruby1.9 <6e08329> [Matt Conway]
+fix for ruby1.9 <4e92c69> [Matt Conway]
+
+1.3.1
+-----
+
+make sure ec2 config dir exists before writing to it <39f51d1> [Matt Conway]
+make sure ec2-ami-tools is installed on canonical ami for rubber:bundle <62cb4ba> [Matt Conway]
+make passenger not unload app by default <d580cd9> [Matt Conway]
+ensure wget overwrites when rerunning after failed get <69102dc> [Matt Conway]
+remove uneeded dependency <97b68ac> [Matt Conway]
+
+1.3.0
+-----
+
+fix release process <4e1243b> [Matt Conway]
+more tests <6a70bb5> [Matt Conway]
+Merge branch 'master' into zerigo_api_1_1 <9d5fb10> [Matt Conway]
+Merge branch 'master' into canonical_ami <b40f95a> [Matt Conway]
+preserver backwards compatbility with sysklog in older ubuntu images <daf3283> [Matt Conway]
+Bump rubygems version. <60509fb> [Kevin Menard]
+Redis version bump. <89ca8ee> [Kevin Menard]
+Merge branch 'master' into canonical_ami <fc62f2e> [Matt Conway]
+ruby 1.9 fix for to_a (thanks to rlewis) <19fa3c1> [Matt Conway]
+Fixed compatibility issues with Ruby 1.9.x <d037136> [Matt Conway]
+Merge branch 'jrhicks/master' <b28fa6a> [Matt Conway]
+disable debian.cnf copy <fdbbf8c> [Matt Conway]
+prevent backups when generating apparmor config file <2cc50b6> [Matt Conway]
+cleanup remote ruby script execution <86da61e> [Matt Conway]
+fix force flag, add backup flag for disabling backups (e.g. in /etc/*.d directories) <9e749fd> [Matt Conway]
+prevent ubuntu 9.10 ec2-init script from changing hostname <739a495> [Matt Conway]
+fix monit config for new version in ubuntu 9.10 <6df5a33> [Matt Conway]
+move mysql reconfigure to common mysql bootstrap <4ce6255> [Matt Conway]
+fix mysql deploy for new ubuntu <7ef0ae7> [Matt Conway]
+Ubuntu using rsyslog now <904f225> [Matt Conway]
+update to latest rubygems <7722ba6> [Matt Conway]
+use sudo everywhere in case users don't want to run as root <8b19367> [Matt Conway]
+allow root login to canonical amis <d04b7f1> [Matt Conway]
+Switch to canonical AMIs <4cd540e> [Matt Conway]
+fix 404, use zone.id <2219de4> [Matt Conway]
+Merge branch 'zerigo_api_1_1' of github.com:wr0ngway/rubber into zerigo_api_1_1 <23f7b70> [Matt Conway]
+no need for customer id in new zerigo api <e91589a> [Matt Conway]
+using zerigo api v1.1 <1aecee3> [Matt Conway]
+no need for customer id in new zerigo api <45c4258> [Matt Conway]
+using zerigo api v1.1 <8784286> [Matt Conway]
+Only proxy app roles since mongrel may be used by non-app roles. <3dd218d> [Kevin Menard]
+Only proxy app roles since passenger may be used for non-app roles, too. <13a7f49> [Kevin Menard]
+Add capistrano task to move data from deploy client to production server.  cap rubber:mysql:local_to_ec2 <628920d> [Jeffrey Hicks]
+Added mysql cap commands rubber:mysql:backup and rubber:mysql:restore_s3 <2f3c535> [Jeffrey Hicks]
+Added mysql client headers to mysql package to allow compilation of mysql <89c5a38> [Jeffrey Hicks]
+Passenger bump. <d09934e> [Kevin Menard]
+Use full path to ruby in case munin's path doesn't work due to non-login shell. <c9ec151> [Kevin Menard]
+
+1.2.1
+-----
+
+Jeweler will release to gemcutter. <5ab598f> [Kevin Menard]
+Work around issue with capistrano 2.5.16. <ce9617b> [Kevin Menard]
+Bumped to the latest version of redis. <e32f072> [Kevin Menard]
+Bumped to latest version of passenger. <251f2ee> [Kevin Menard]
+
+1.2.0
+-----
+
+Added Windows support. <e3c883e> [Kevin Menard]
+The libmysql-ruby package seems to not work with the latest Ruby enterprise edition, so re-install the gem to be safe. <931b19d> [Kevin Menard]
+Bumped to the latest ruby enterprise edition. <0ab3557> [Kevin Menard]
+Added example spot instance request configuration. <239b2f4> [Kevin Menard]
+Updated to the latest version of redis. <9723864> [Kevin Menard]
+Updated to the latest version of passenger. <5f152fc> [Kevin Menard]
+Fixed rake failing due to Test::Unit 2.0 being installed. <a579dc2> [Kevin Menard]
+Jeweler is available on gemcutter. <b5539b5> [Kevin Menard]
+Merge branch 'master' of github.com:wr0ngway/rubber <5efd21d> [Kevin Menard]
+Added support for spot instances. <a995d14> [Kevin Menard]
+Task to move around static IP addresses. <9612eb9> [Matt Conway]
+Merge branch 'master' of github.com:wr0ngway/rubber <3d66204> [Kevin Menard]
+Make it easier to override jetty options. <96d566e> [Kevin Menard]
+
 1.1.7
 -----
 

data/VERSION

@@ -1 +1 @@
-1.1.7
+2.0.0.rails3.beta6

data/bin/vulcanize

@@ -1,41 +1,18 @@
 #!/usr/bin/env ruby
 
-env = ENV['RUBBER_ENV'] || ENV['RAILS_ENV'] || 'development'
-root = '.'
-
-# if in a rails project, then use standard generate, otherwise
-# we need a minimal rails environment for generators to run
- #
-if File.exist?(File.join(root, 'config', 'environment.rb'))
-  ARGV.insert(0, 'vulcanize')
-  require File.join(root, 'config', 'boot')
-  require 'commands/generate'
-else
-  RAILS_ENV = ENV['RAILS_ENV'] = env
-  RAILS_ROOT = ENV['RAILS_ROOT'] = root
+require 'rubygems'
 
-  require 'rubygems'
-  gem 'rails'
-  module Rails
-    class << self
-      def vendor_rails?
-        false
-      end
-    end
-  end
+env = ENV['RUBBER_ENV'] ||= 'development'
+root = '.'
 
-  require 'initializer'
-  class Rails::Initializer
-    def load_environment; end
-  end
+require 'rubber'
+Rubber::initialize(root, env)
 
-  Rails::Initializer.run do |config|
-    config.frameworks -= [:active_record, :action_controller]
-  end
+require File.expand_path('../../lib/generators/vulcanize/vulcanize_generator', __FILE__)
 
-  require 'rails_generator'
-  require 'rails_generator/scripts/generate'
+if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  gem 'railties'
+  require 'rails/generators'
 
-  ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-  Rails::Generator::Scripts::Generate.new.run(['vulcanize'] + ARGV)
+  VulcanizeGenerator.start
 end

data/generators/vulcanize/templates/apache/config/rubber/deploy-apache.rb

@@ -8,17 +8,17 @@ namespace :rubber do
     after "rubber:install_packages", "rubber:apache:custom_install"
 
     task :custom_install, :roles => :apache do
-      sudo "a2dissite default"
+      rsudo "a2dissite default"
     end
 
     # serial_task can only be called after roles defined - not normally a problem, but
     # rubber auto-roles don't get defined till after all tasks are defined
     on :load do
       rubber.serial_task self, :serial_restart, :roles => :apache do
-        run "/etc/init.d/apache2 restart"
+        rsudo "service apache2 restart"
       end
       rubber.serial_task self, :serial_reload, :roles => :apache do
-        run "if ! ps ax | grep -v grep | grep -c apache2 &> /dev/null; then /etc/init.d/apache2 start; else /etc/init.d/apache2 reload; fi"
+        rsudo "if ! ps ax | grep -v grep | grep -c apache2 &> /dev/null; then service apache2 start; else service apache2 reload; fi"
       end
     end
     
@@ -27,13 +27,13 @@ namespace :rubber do
     after "deploy:restart", "rubber:apache:reload"
     
     desc "Stops the apache web server"
-    task :stop, :roles => :apache, :on_error => :continue do
-      run "/etc/init.d/apache2 stop"
+    task :stop, :roles => :apache do
+      rsudo "service apache2 stop; exit 0"
     end
     
     desc "Starts the apache web server"
     task :start, :roles => :apache do
-      run "/etc/init.d/apache2 start"
+      rsudo "service apache2 start"
     end
     
     desc "Restarts the apache web server"

data/generators/vulcanize/templates/apache/config/rubber/role/apache/monit-apache.conf

@@ -4,5 +4,5 @@
 <% PIDFILE = "/var/run/apache2.pid" %>
 check process apache with pidfile <%= PIDFILE %>
   group apache-<%= RUBBER_ENV %>
-  start program = "/etc/init.d/apache2 start"
-  stop program = "/etc/init.d/apache2 stop"
+  start program = "/usr/sbin/service apache2 start"
+  stop program = "/usr/sbin/service apache2 stop"

data/generators/vulcanize/templates/apache/config/rubber/role/apache/ports.conf

@@ -1,5 +1,8 @@
 <%
   @path = '/etc/apache2/ports.conf'
+  # need to stop here so that apache will release port 80 before other
+  # services start and need to bind to it (e.g. haproxy)
+  @post = 'service apache2 stop'
 %>
 # empty ports file since other modules contribute which ports to open (vhosts)
 

data/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf

@@ -38,29 +38,42 @@ Listen <%= rubber_env.web_tools_ssl_port %>
   SetOutputFilter  proxy-html
 
   <% rubber_instances.for_role('haproxy').each do |ic| %>
-    ProxyPass       /haproxy_<%= ic.name %>/  http://<%= ic.full_name %>:<%= rubber_env.haproxy_admin_port %>/haproxy/
-    ProxyPassReverse /haproxy_<%= ic.name %>/ http://<%= ic.full_name %>:<%= rubber_env.haproxy_admin_port %>/haproxy/
-    ProxyHTMLURLMap http://<%= ic.full_name %>:<%= rubber_env.haproxy_admin_port %>/ /haproxy_<%= ic.name %>/
-    ProxyHTMLURLMap /haproxy/ /haproxy_<%= ic.name %>/
-    ProxyHTMLURLMap /haproxy /haproxy_<%= ic.name %>/
+    ProxyPass /haproxy_<%= ic.name %>/  http://<%= ic.full_name %>:<%= rubber_env.haproxy_admin_port %>/haproxy/
+    <Location /haproxy_<%= ic.name %>/>
+      ProxyPassReverse /
+      ProxyHTMLURLMap http://<%= ic.full_name %>:<%= rubber_env.haproxy_admin_port %>/ /haproxy_<%= ic.name %>/
+      ProxyHTMLURLMap /haproxy/ /haproxy_<%= ic.name %>/
+      ProxyHTMLURLMap /haproxy /haproxy_<%= ic.name %>/
+    </Location>
   <% end %>
 
   <% if cruise_host = rubber_instances.for_role('cruise').first %>
-    ProxyPass       /cruise/  http://<%= cruise_host.full_name %>:<%= rubber_env.cruise_port %>/
-    ProxyPassReverse /cruise/  http://<%= cruise_host.full_name %>:<%= rubber_env.cruise_port %>/
-    ProxyHTMLURLMap http://<%= cruise_host.full_name %>:<%= rubber_env.cruise_port %>/ /cruise/
-    ProxyHTMLURLMap / /cruise/
+    ProxyPass /cruise/  http://<%= cruise_host.full_name %>:<%= rubber_env.cruise_port %>/
+    <Location /cruise/>
+      ProxyPassReverse /
+      ProxyHTMLURLMap http://<%= cruise_host.full_name %>:<%= rubber_env.cruise_port %>/ /cruise/
+      ProxyHTMLURLMap / /cruise/
+    </Location>
   <% end %>
 
   <% rubber_instances.each do |ic| %>
-    ProxyPass        /monit_<%= ic.name %>/ http://<%= ic.full_name %>:<%= rubber_env.monit_admin_port %>/
-    ProxyPassReverse /monit_<%= ic.name %>/ http://<%= ic.full_name %>:<%= rubber_env.monit_admin_port %>/
-    ProxyHTMLURLMap http://<%= ic.full_name %>:<%= rubber_env.monit_admin_port %>/ /monit_<%= ic.name %>/
-    ProxyHTMLURLMap / /monit_<%= ic.name %>/
+    ProxyPass /monit_<%= ic.name %>/ http://<%= ic.full_name %>:<%= rubber_env.monit_admin_port %>/
+    <Location /monit_<%= ic.name %>/>
+      ProxyPassReverse /
+      ProxyHTMLURLMap http://<%= ic.full_name %>:<%= rubber_env.monit_admin_port %>/ /monit_<%= ic.name %>/
+      ProxyHTMLURLMap / /monit_<%= ic.name %>/
+    </Location>
   <% end %>
-  
-  <% if resque_host = rubber_instances.for_role('resque').first %>
-    RackBaseURI /resque
+
+  <% if resque_host = rubber_instances.for_role('resque_web').first %>
+    ProxyPass /resque/  http://<%= resque_host.full_name %>:<%= rubber_env.resque_web_port %>/
+    # special case, sinatra is using X-Forwarded-Host header to set redirects (Location header) to our external address, so we have to rewrite that to the right path
+    ProxyPassReverse /resque/ http://<%= rubber_env.full_host %>:<%= rubber_env.web_tools_ssl_port %>/
+    <Location /resque/>
+      ProxyPassReverse /
+      ProxyHTMLURLMap http://<%= resque_host.full_name %>:<%= rubber_env.resque_web_port %>/ /resque/
+      ProxyHTMLURLMap / /resque/
+    </Location>
   <% end %>
   
 </VirtualHost>

data/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-index.html

@@ -25,7 +25,7 @@
           <li><a href="/monit_<%= ic.name %>/">Monit <%= ic.name %></a></li>
       <% end %>
       
-      <% if resque_host = rubber_instances.for_role('resque').first %>
+      <% if resque_host = rubber_instances.for_role('resque_web').first %>
           <li><a href="/resque/">Resque</a></li>
       <% end %>
 

data/generators/vulcanize/templates/base/Rakefile

@@ -0,0 +1,19 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
+RAILS_ENV = ENV['RAILS_ENV'] = env
+root = File.dirname(__FILE__)
+
+require 'rubber'
+
+Rubber::initialize(root, env)
+
+require 'rubber/tasks/rubber'
+
+task :console do
+  ARGV.clear
+  require "irb"
+  IRB.start
+end

data/generators/vulcanize/templates/base/config/rubber/common/crontab

@@ -3,7 +3,12 @@
   @write_cmd = 'crontab -'
 %>
 
-PATH=/sbin:/usr/sbin:/usr/local/sbin:<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:/usr/bin:/bin
+# cron clears out enviroment variables, so we need to add these in
+# to make sure we are running the correct ruby (rvm env vars, plus paths)
+<%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i }.each do |k, v| -%>
+<%= k %>=<%= v %>
+<%- end -%>
+
 MAILTO=<%= rubber_env.admin_email %>
 # don't need to set RUBBER_ENV for each script since we set it for all cron here
 RUBBER_ENV=<%= RUBBER_ENV %>

data/generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf

@@ -3,6 +3,6 @@
 %>
 
 check process postfix with pidfile /var/spool/postfix/pid/master.pid
-  start program  "/etc/init.d/postfix start"
-  stop program  "/etc/init.d/postfix stop"
+  start program  "/usr/sbin/service postfix start"
+  stop program  "/usr/sbin/service postfix stop"
   if 5 restarts within 5 cycles then timeout

data/generators/vulcanize/templates/base/config/rubber/common/rubber.profile

@@ -1,14 +1,13 @@
 <%
   @path = "/etc/profile.d/rubber.sh"
+  current_path = "/mnt/#{rubber_env.app_name}-#{RUBBER_ENV}/current" 
 %>
 
 # convenience to simply running rails console, etc with correct env
 export RUBBER_ENV=<%= RUBBER_ENV %>
 export RAILS_ENV=<%= RUBBER_ENV %>
-alias current="cd <%= RUBBER_ROOT %>"
-
-# make sure we use the right ruby since REE installs into /usr/local
-export PATH=<%= rubber_env.ruby_prefix %>/bin:$PATH
+alias current="cd <%= current_path %>"
+alias release="cd <%= RUBBER_ROOT %>"
 
 # Always use rubygems
 export RUBYOPT="rubygems"

data/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb

@@ -3,63 +3,42 @@ namespace :rubber do
   
     rubber.allow_optional_tasks(self)
 
+    before "rubber:install_gems", "rubber:base:install_rvm"
+    task :install_rvm do
+      rubber.sudo_script "install_rvm", <<-ENDSCRIPT
+        if [[ `rvm --version 2> /dev/null` == "" ]]; then
+          wget -qNP /tmp http://rvm.beginrescueend.com/releases/rvm-install-head
+          bash /tmp/rvm-install-head
+          echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
+          echo "rvm_prefix=/usr/local" > /etc/rvmrc
+        fi
+      ENDSCRIPT
+    end
 
-    before "rubber:install_packages", "rubber:base:pre_install_ruby"
-    task :pre_install_ruby do
-
-      # figure out which hosts we have specified enterprise ruby for
-      sys_ruby_hosts = []
-      ent_ruby_hosts = []
-      rubber_instances.filtered.each do |ic|
-        env = rubber_cfg.environment.bind(ic.role_names, ic.name)
-        if env.use_enterprise_ruby
-          ent_ruby_hosts << ic.full_name
-        end
-      end
-
-      if ent_ruby_hosts.size > 0
-        task :_install_enterprise_ruby, :hosts => ent_ruby_hosts do
-          ver = "1.8.7-2009.10"
-          rubber.run_script "install_ruby-enterprise", <<-ENDSCRIPT
-            if [[ ! `ruby --version 2> /dev/null` =~ "Ruby Enterprise Edition 2009.10" ]]; then
-              arch=`uname -m`
-              if [ "$arch" = "x86_64" ]; then
-                src="http://rubyforge.org/frs/download.php/66163/ruby-enterprise_#{ver}_amd64.deb"
-              else
-                src="http://rubyforge.org/frs/download.php/66164/ruby-enterprise_#{ver}_i386.deb"
-              fi
-              src_file="${src##*/}"
-              wget -qP /tmp ${src}
-              dpkg -i /tmp/${src_file}
-            fi
-          ENDSCRIPT
-        end
-
-        _install_enterprise_ruby
-      end
-
+    # ensure that the rvm profile script gets sourced by reconnecting
+    after "rubber:base:install_rvm" do
+      teardown_connections_to(sessions.keys)
     end
 
-    #  The ubuntu rubygem package is woefully out of date, so install it manually
-    after "rubber:install_packages", "rubber:base:install_rubygems"
-    task :install_rubygems do
-      ver = "1.3.5"
-      src_url = "http://rubyforge.org/frs/download.php/60718/rubygems-#{ver}.tgz"
-      rubber.sudo_script 'install_rubygems', <<-ENDSCRIPT
-        if [[ `gem --version 2>&1` != "#{ver}" ]]; then
-          wget -qNP /tmp #{src_url}
-          tar -C /tmp -xzf /tmp/rubygems-#{ver}.tgz
-          ruby -C /tmp/rubygems-#{ver} setup.rb
-          ln -sf /usr/bin/gem1.8 /usr/bin/gem
-          rm -rf /tmp/rubygems*
-          gem source -l > /dev/null
+    after "rubber:base:install_rvm", "rubber:base:install_rvm_ruby"
+    task :install_rvm_ruby do
+      opts = get_host_options('rvm_ruby')
+      install_rvm_ruby_script = <<-ENDSCRIPT
+        rvm_ver=$1
+        if [[ ! `rvm list default 2> /dev/null` =~ "$rvm_ver" ]]; then
+          rvm install $rvm_ver
+          # need to set default after using once or something in env is broken
+          rvm use $rvm_ver &> /dev/null
+          rvm use $rvm_ver --default
         fi
       ENDSCRIPT
+      opts[:script_args] = '$CAPISTRANO:VAR$'
+      rubber.sudo_script "install_rvm_ruby", install_rvm_ruby_script, opts
     end
-    
+
     after "rubber:install_packages", "rubber:base:configure_git" if scm == "git"
     task :configure_git do
-      rubber.run_script 'configure_git', <<-ENDSCRIPT
+      rubber.sudo_script 'configure_git', <<-ENDSCRIPT
         if [[ "#{repository}" =~ "@" ]]; then
           # Get host key for src machine to prevent ssh from failing
           rm -f ~/.ssh/known_hosts

data/generators/vulcanize/templates/base/config/rubber/deploy-util.rb

@@ -0,0 +1,97 @@
+namespace :rubber do
+  namespace :util do
+  
+    rubber.allow_optional_tasks(self)
+   
+    desc <<-DESC
+      Backup database using rake task rubber:backup_db
+    DESC
+    task :backup do
+      master_instances = rubber_instances.for_role('db', :primary => true)
+      slaves = rubber_instances.for_role('db', {})
+
+      # Select only one instance for backup.  Favor slave database.
+      selected_db_instance = (slaves+master_instances).first
+            
+      task_name = "_backup_db_#{selected_db_instance.full_name}".to_sym()
+      task task_name, :hosts => selected_db_instance.full_name do
+        rsudo "cd #{current_path} && RUBBER_ENV=#{RUBBER_ENV} BACKUP_DIR=/mnt/db_backups DBUSER=#{rubber_env.db_user} DBPASS=#{rubber_env.db_pass} DBNAME=#{rubber_env.db_name} DBHOST=#{selected_db_instance.full_name} rake rubber:backup_db"
+      end
+      send task_name
+    end
+    
+    desc <<-DESC
+      Restore database from s3 using rake task rubber:restore_db_s3
+    DESC
+    task :restore_s3 do
+      master_instances = rubber_instances.for_role('db', :primary => true)
+      slaves = rubber_instances.for_role('db', {})
+
+      for instance in master_instances+slaves
+        task_name = "_restore_db_s3_#{instance.full_name}".to_sym()
+        task task_name, :hosts => instance.full_name do
+          rsudo "cd #{current_path} && RUBBER_ENV=#{RUBBER_ENV} BACKUP_DIR=/mnt/db_backups DBUSER=#{rubber_env.db_user} DBPASS=#{rubber_env.db_pass} DBNAME=#{rubber_env.db_name} DBHOST=#{instance.full_name} rake rubber:restore_db_s3"
+        end
+        send task_name
+      end
+    end    
+    
+    desc <<-DESC
+      Overwrite ec2 production database with export from local production database.
+    DESC
+    task :local_to_ec2 do
+      require 'yaml'      
+      master_instances = rubber_instances.for_role('db', :primary => true)
+      slaves = rubber_instances.for_role('db', {})
+
+      # Select only one instance for backup.  Favor slave database.
+      selected_db_instance = (slaves+master_instances).first
+            
+      task_name = "_load_local_to_#{selected_db_instance.full_name}".to_sym()
+      task task_name, :hosts => selected_db_instance.full_name do
+
+        # Dump Local to tmp folder
+        filename = "#{application}.local.#{Time.now.to_i}.sql.gz" 
+        backup_file = "/tmp/#{filename}" 
+        on_rollback { delete file }
+        FileUtils.mkdir_p(File.dirname(backup_file))
+
+        # Use database.yml to get connection params
+        db = YAML::load(ERB.new(IO.read(File.join(File.dirname(__FILE__), '..','database.yml'))).result)[RUBBER_ENV]
+        user = db['username']
+        pass = db['passsword']
+        pass = nil if pass and pass.strip.size == 0
+        host = db['host']
+        name = db['database']
+        
+        raise "No db_backup_cmd defined in rubber.yml, cannot backup!" unless rubber_env.db_backup_cmd
+        db_backup_cmd = rubber_env.db_backup_cmd.gsub(/%([^%]+)%/, '#{\1}')
+        db_backup_cmd = eval('%Q{' + db_backup_cmd + '}')
+
+        # dbdump (or backup app) needs to be in your path
+        puts "Backing up database with command:"
+        system(db_backup_cmd)
+        puts "Created backup: #{backup_file}"
+
+        # Upload Local to S3
+        cloud_provider = rubber_env.cloud_providers[rubber_env.cloud_provider]
+        s3_prefix = "db/"
+        backup_bucket = cloud_provider.backup_bucket
+        if backup_bucket
+          AWS::S3::Base.establish_connection!(:access_key_id => cloud_provider.access_key, :secret_access_key => cloud_provider.secret_access_key)
+          unless AWS::S3::Bucket.list.find { |b| b.name == backup_bucket }
+            AWS::S3::Bucket.create(backup_bucket)
+          end
+          dest = "#{s3_prefix}#{File.basename(backup_file)}"
+          puts "Saving db dump to S3: #{backup_bucket}:#{dest}"
+          AWS::S3::S3Object.store(dest, open(backup_file), backup_bucket)
+        end
+        
+        send :restore_s3
+
+      end
+      send task_name
+    end    
+
+  end
+end

data/generators/vulcanize/templates/base/config/rubber/rubber-dns.yml

@@ -11,7 +11,6 @@ dns_providers:
     type: A
     ttl: 300
   zerigo:
-    customer_id: 1234
     email: foo@bar.com
     token: hexxy
     type: A

data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -0,0 +1,25 @@
+
+# rvm needs some extra packages to compile/install ruby runtimes
+# curl is required.
+# patch is required (for ree, some ruby head's).
+# For JRuby (if you wish to use it) you will need:
+#   aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
+# For MRI & ree (if you wish to use it) you will need:
+#   aptitude install curl bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev git-core
+# For IronRuby (if you wish to use it) you will need:
+#   aptitude install curl mono-2.0-devel
+
+packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
+
+# REQUIRED: Set to the rvm version string for the ruby version you wish to use
+# Run "rvm list known" to see the list of possible options
+rvm_ruby: 1.9.2-head
+
+# When rvm is installed as root, and you set the default, it symlinks ruby executables
+# into /usr/local
+ruby_prefix: /usr/local
+
+rvm_prefix: /usr/local/rvm
+  
+# lets us setup global envoronment to use rvm (also needed when running sudo)
+rvm_prepare: "source #{rvm_prefix}/scripts/rvm"

data/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -75,13 +75,26 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 9.04 Jaunty	base install	32-bit	2.6.21.7-2.fc8xen	ami-ccf615a5
-    # Ubuntu 9.04 Jaunty	base install	64-bit	2.6.21.7-2.fc8xen	ami-eef61587
+    # Ubuntu 10.04 Lucid	base install	32-bit	ami-2d4aa444
+    # Ubuntu 10.04 Lucid	base install	64-bit	ami-fd4aa494
     #
-    image_id: ami-ccf615a5
+    image_id: ami-2d4aa444
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
 
+    # OPTIONAL: EC2 spot instance request support.
+    #
+    # Enables the creation of spot instance requests.  Rubber will wait synchronously until the request is fulfilled,
+    # at which point it will begin initializing the instance, unless spot_instance_request_timeout is set.
+    # spot_instance: true
+    #
+    # The maximum price you would like to pay for your spot instance.
+    # spot_price: "0.085"
+    #
+    # If a spot instance request can't be fulfilled in 3 minutes, fallback to on-demand instance creation.  If not set,
+    # the default is infinite.
+    # spot_instance_request_timeout: 180
+
 # REQUIRED the cloud provider to use
 #
 cloud_provider: aws
@@ -117,25 +130,20 @@ auto_security_groups: true
 # account, or even multiple apps
 isolate_security_groups: true
 
-# OPTIONAL: Set if you want to use Ruby Enterprise Edition instead of the standard ubuntu one
-use_enterprise_ruby: false
-
-# REE installs into /usr/local, so this lets us setup environment to use it globally
-# instead of system ruby
-ruby_prefix: "#{use_enterprise_ruby ? '/usr/local' : '/usr'}"
-
 # OPTIONAL: The packages to install on all instances
 # You can install a specific version of a package by using a sub-array of pkg, version
 # For example, packages: [[rake, 0.7.1], irb]
-packages: [postfix, build-essential, ruby-full, ruby1.8-dev, rake, irb, git-core]
+packages: [postfix, build-essential, git-core, ec2-ami-tools]
 
 # OPTIONAL: gem sources to setup for rubygems
-gemsources: ["http://gemcutter.org", "http://gems.rubyforge.org/", "http://gems.github.com"]
+# gemsources: ["http://rubygems.org", "http://gems.github.com"]
 
 # OPTIONAL: The gems to install on all instances
 # You can install a specific version of a gem by using a sub-array of gem, version
 # For example, gem: [[rails, 2.2.2], open4, aws-s3]
-gems: [rubber, rails, open4, aws-s3]
+# gems: [rubber, rails, open4, aws-s3]
+# The above is the correct line once rails3 has been released
+gems: [open4, aws-s3, tzinfo, builder, i18n, memcache-client, rack, rake, rack-test, erubis, mail, text-format, thor, bundler, [rack-mount, 0.4], [rails, 3.0.0.beta3], [rubber, "#{Rubber.version}"]]
 
 # OPTIONAL: A string prepended to shell command strings that cause multi
 # statement shell commands to fail fast.  You may need to comment this out

data/generators/vulcanize/templates/base/script/cron-runner

@@ -14,5 +14,5 @@ rescue
 end
 
 Dir.chdir(RAILS_ROOT)
-args = %W{-e -l #{log} -- script/runner} + ARGV
+args = %W{-e -l #{log} -- rails runner} + ARGV
 system "script/cron-sh", *args

data/generators/vulcanize/templates/base/templates.rb

@@ -0,0 +1 @@
+gem "rubber", Rubber.version if Rubber::Util::is_bundler? && ! Rubber::Util::rubber_as_plugin?

data/generators/vulcanize/templates/base/templates.yml

@@ -1 +1,6 @@
 description: The core configuration needed by all others
+
+# only include Rakefile when generating for non-rails apps, as we use rails
+# rake loading mechanism for including rakefile in rails apps
+optional:
+  Rakefile: "!rails?"