axtro-rubber 1.2.3 → 1.5.7

data/CHANGELOG

@@ -1,3 +1,213 @@
+1.5.7
+-----
+
+allow access to calling generator so can determine stuff like fake_root <fa6354c> [Matt Conway]
+refactor create using refresh <12df4c4> [Matt Conway]
+save config in refresh <cdb8344> [Matt Conway]
+
+1.5.6
+-----
+
+Merge branch 'master' of github.com:wr0ngway/rubber <9d6ca8a> [Matt Conway]
+force unattended apt-get for some rare cases <94fa160> [Matt Conway]
+fixed typo <2382e8d> [Matt Conway]
+mongrel custom_install should be rvm agnostic <b620f71> [Matt Conway]
+setup_gem_sources should precede install_gems on rvm <52f9d48> [Matt Conway]
+Restore DynDNS update support <80f3c0e> [Matt Conway]
+update munin conf for new ubuntu package <672db55> [Matt Conway]
+exclude unneeded/large files during noscm deploy <286c8da> [Matt Conway]
+Merge branch 'master' of github.com:wr0ngway/rubber <3da29cb> [Matt Conway]
+use specific rvm version to stop rubber breaking everytime they change stuff <71cba60> [Matt Conway]
+Don't try to set up SSH access on Windows hosts. <e1df646> [Kevin Menard]
+increase ulimit for cassandra <e45bae1> [Matt Conway]
+
+1.5.5
+-----
+
+only existingg config files should be listed to fix non-existing env yml when doing a push_config <9fbb7ba> [Matt Conway]
+
+1.5.4
+-----
+
+add an environment specific rubber.yml file <8f8366e> [Matt Conway]
+set ruby ver to more stable 1.9.2 (rvm currently maps it to preview3, but will map it to actual 1.9.2 when released) <5fa8763> [Matt Conway]
+extra test <0ff8aba> [Matt Conway]
+fix some test failures <9ac276b> [Matt Conway]
+Merge branch 'master' into merge <6599fcb> [Matt Conway]
+add missing stuff from create to refresh to aid in sertting instance details for a partially failed create <a7ac958> [Matt Conway]
+clean string from instance arch to remove newlines <1b1052f> [Matt Conway]
+tell bundler to not install dev/test gems <a3a7d3b> [Matt Conway]
+use correct path for passenger ruby for newer rvm <dcff158> [Matt Conway]
+fix wget params for cassandra <d521eb1> [Matt Conway]
+set rvmrc before installing <df111ef> [Matt Conway]
+
+1.5.3
+-----
+
+Don't do a rake gems:install if bundler is in use. <511cac1> [Kevin Menard]
+Don't require rubber to be used as a plugin for Rails 2. <60165e3> [Kevin Menard]
+
+1.5.2
+-----
+
+New release. <fad9bbb> [Kevin Menard]
+Fixed issue with dependent modules in Rails 2 generator. <84a0259> [Kevin Menard]
+Fixed an issue with mysqldump and empty passwords. <708f053> [Kevin Menard]
+Removed unnecessary puts statement. <0e81cdc> [Kevin Menard]
+Fix for incomplete path. <b18743f> [Kevin Menard]
+Ubuntu changed the location of its service command, so we can't rely on any given path for it. <e82e7b1> [Kevin Menard]
+
+1.5.1
+-----
+
+Fixed a problem with installing gems listed in environment.rb. <aa2b516> [Kevin Menard]
+
+1.5.0
+-----
+
+Added a warning message about upgrading rubber and RVM. <0d30207> [Kevin Menard]
+New rubber version. <0d786b5> [Kevin Menard]
+Fixed issues in using rubber for non-Rails projects. <0f32f2c> [Kevin Menard]
+Support optional files in templates.yml for Rails 2 apps, too. <56cd5e2> [Kevin Menard]
+Fixed an issue with vulcanize on Rails 2. <0151382> [Kevin Menard]
+Added ability to diverge template behavior for Rails 2 & Rails 3. <682e40f> [Kevin Menard]
+Fixed a spacing bug. <7e56d16> [Kevin Menard]
+Added utility methods to clean things up a bit. <97f50cd> [Kevin Menard]
+Install gems for Rails 2. <ab3fa74> [Kevin Menard]
+Avoiding adding dependencies that screw up Rails 2 & Rails 3. <22c3008> [Kevin Menard]
+Updated vulcanize to work with both Rails 2 and Rails 3. <c2f3ceb> [Kevin Menard]
+Symlink generators directory for Rails 2.x support. <30a0b41> [Kevin Menard]
+Prevent conflict with Zerigo loading in ActiveSupport. <fe9438d> [Kevin Menard]
+fix resque roles <ed5491b> [Matt Conway]
+cleanup some monit patterns <66f1bb0> [Matt Conway]
+fix environment in resque web monit <45336ce> [Matt Conway]
+Updated gemspec <3638682> [Matt Conway]
+more rigorous stopping of stuff to prevent errors in create_staging <5c2425d> [Matt Conway]
+fix postgres backup <d92e1de> [Matt Conway]
+better directory aliases <0169b47> [Matt Conway]
+munin package doesn't seem to be creating directory <e2a9ca2> [Matt Conway]
+fix updating existing zerigo record <cb5bfdd> [Matt Conway]
+Merge branch 'cassandra' into rails3 <400e814> [Matt Conway]
+postgresql working for a single master configuration <269cb7a> [Matt Conway]
+extracted out helper method for prompting from non-capistrano code <27c77e0> [Matt Conway]
+calculate dependencies as a separate step <b304f9c> [Matt Conway]
+avoid multiple deploy:update_code <eec7c55> [Matt Conway]
+Merge branch 'rails3' into postgresql <2b8f728> [Matt Conway]
+replace init.d scripts with call to service <69a34a4> [Matt Conway]
+monit nowe needs mailserver set <61d3710> [Matt Conway]
+fix rvm environment issue that breaks initial rake fcall from rubber:config <e6bdec2> [Matt Conway]
+updated to lucid 10.04 <5238701> [Matt Conway]
+only add gem if rubber not a plugin <a09102a> [Matt Conway]
+set ssh connection timeout <39dbc45> [Matt Conway]
+only add rubber to gemfile in base template <d04f306> [Matt Conway]
+allow loading of initial schema <c431688> [Matt Conway]
+working cassandra <9402a7a> [Matt Conway]
+Merge branch 'rails3' into cassandra <4965a07> [Matt Conway]
+Don't rely on ":on_error => :continue" due to capistrano bug https://capistrano.lighthouseapp.com/projects/8716/tickets/110-using-on_error-continue-doesnt-work-when-chaining-callbacks <2d5415e> [Matt Conway]
+fix redis boostrap <3113246> [Matt Conway]
+some fixes to resque process management <68c43c5> [Matt Conway]
+refactor, make worker management smoother <c1c35e3> [Matt Conway]
+allow calling generator helpers <35a9f0e> [Matt Conway]
+set exe <b3c6c47> [Matt Conway]
+mv files for rails3 <68a5bb2> [Matt Conway]
+Merge remote branch 'origin/new_resque' into rails3 <151c3bf> [Matt Conway]
+Better handling of resque worker queues. <c288253> [Kevin Menard]
+Redis version bump. <74ed93a> [Kevin Menard]
+Merge branch 'master' into rails3 <13bf17a> [Matt Conway]
+initial incomplete cassandra support <b0beaf4> [Matt Conway]
+initial incomplete postgres support <4eff243> [Matt Conway]
+version bump <1f00825> [Matt Conway]
+fix railties dependency <b302bcd> [Matt Conway]
+Merge branch 'master' into rails3 <6c11203> [Matt Conway]
+Set rubber version to the one being installed by Gemfile <29a3fdf> [Matt Conway]
+make sure ec2 config directory exists <50878d5> [Matt Conway]
+Add rubber to gemfile when generating if needed <ef0a279> [Matt Conway]
+version bump <ad08522> [Matt Conway]
+ec2 tools need system ruby as they don't currently work with 1.9 <015dfaa> [Matt Conway]
+use RUBBER_ENV to select DB so task can be used with staging, etc <120bf11> [Matt Conway]
+new version <a013cce> [Matt Conway]
+new version <9ee1a64> [Matt Conway]
+regenerated gemspec <0c96963> [Matt Conway]
+make sure ec2-ami-tools is installed on canonical ami for rubber:bundle <ca1dc3d> [Matt Conway]
+get vulcanize helper script working in rails3 <a14f59e> [Matt Conway]
+copy file permissions too so executable files work <f579248> [Matt Conway]
+fix rvm environment for cron/munin <58fb2e6> [Matt Conway]
+handle prescence of config.ru, fix bundle install, minor other tweaks <8fbc50f> [Matt Conway]
+fix passenger/rvm activation <8739480> [Matt Conway]
+enable passenger support in rvm <e99e5c5> [Matt Conway]
+more rails3 support, using rvm to select ruby runtime, make run/sudo load profile to get rvm environment <ef1afa7> [Matt Conway]
+initial rails3 changes <9a30414> [Matt Conway]
+optional rakefile for non-rails projects <c45931a> [Matt Conway]
+mv new template since sam's changes <3f6689a> [Matt Conway]
+Merge branch 'sam-mcingvale/master' into rails3 <df7ecd7> [Matt Conway]
+Fixed template issues <8916817> [Sam McIngvale]
+Preliminary Rails 3 generator changes <412cfb4> [Sam McIngvale]
+
+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
 -----
 

data/VERSION

@@ -1 +1 @@
-1.2.3
+1.5.7

data/bin/vulcanize

@@ -1,41 +1,25 @@
 #!/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]
+if Rubber::Util::is_rails2?
+  ARGV.insert(0, 'vulcanize') unless ARGV[0] == 'vulcanize' # Need for Rails 2 generator.
+  require File.expand_path('../../lib/generators/vulcanize/vulcanize_generator', __FILE__)
+else
+  begin
+    gem 'railties'
+  rescue LoadError
+    puts "Missing the railties gem.  Install with `sudo gem install railties --version=3.0.0.beta3`."
+    exit(-1)
   end
 
-  require 'rails_generator'
-  require 'rails_generator/scripts/generate'
+  require File.expand_path('../../lib/generators/vulcanize/vulcanize_generator', __FILE__)
 
-  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/bin/env service apache2 start"
+  stop program = "/usr/bin/env 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,21 @@
+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
+
+RAILS_TASKS

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

@@ -6,6 +6,7 @@ on :load do
   set :application, rubber_env.app_name
   set :runner,      rubber_env.app_user
   set :deploy_to,   "/mnt/#{application}-#{RUBBER_ENV}"
+  set :copy_exclude, [".git/*", "log/*"]
 end
 
 # Use a simple directory tree copy here to make demo easier.

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 %>