nirvdrum-rubber 1.1.7 → 2.0.0.rails3.beta6

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

@@ -4,8 +4,9 @@ namespace :rubber do
     Bootstraps instances by setting timezone, installing packages and gems
   DESC
   task :bootstrap do
-    set_timezone
     link_bash
+    set_timezone
+    enable_multiverse
     upgrade_packages
     install_packages
     setup_volumes
@@ -14,6 +15,33 @@ namespace :rubber do
     deploy.setup
   end
 
+  # Sets up instance to allow root access (e.g. recent canonical AMIs)
+  def enable_root_ssh(ip, initial_ssh_user)
+    old_user = user
+    begin
+      set :user, initial_ssh_user
+
+      task :_allow_root_ssh, :hosts => ip do
+        rsudo "cp /home/#{initial_ssh_user}/.ssh/authorized_keys /root/.ssh/"
+      end
+
+      begin
+        _allow_root_ssh
+      rescue ConnectionError => e
+        if e.message =~ /Net::SSH::AuthenticationFailed/
+          logger.info "Can't connect as user #{initial_ssh_user} to #{ip}, assuming root allowed"
+        else
+          sleep 2
+          logger.info "Failed to connect to #{ip}, retrying"
+          retry
+        end
+      end
+    ensure
+      set :user, old_user
+    end
+
+  end
+
   desc <<-DESC
     Sets up aliases for instance hostnames based on contents of instance.yml.
     Generates /etc/hosts for local/remote machines and sets hostname on
@@ -164,7 +192,9 @@ namespace :rubber do
       put filtered, hosts_file
 
       # Setup hostname on instance so shell, etcs have nice display
-      sudo "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
+      rsudo "mkdir -p /etc/ec2-init && echo compat=0 > /etc/ec2-init/is-compat-env"
     end
 
     # TODO
@@ -219,11 +249,11 @@ namespace :rubber do
   end
 
   desc <<-DESC
-    Install ruby gems defined in the rails environment.rb
+    Install ruby gems defined in Gemfile
   DESC
-  after "rubber:config", "rubber:install_rails_gems" if Rubber::Util.is_rails?
-  task :install_rails_gems do
-    sudo "sh -c 'cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake gems:install'"
+  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
@@ -245,46 +275,43 @@ namespace :rubber do
 
     logger.info "Installing gems:#{expanded_gem_list}"
     open("/tmp/gem_helper", "w") {|f| f.write(gem_helper_script)}
-    system "sh /tmp/gem_helper install #{expanded_gem_list}"
+    system "ruby /tmp/gem_helper install #{expanded_gem_list}"
   end
 
+  set :gem_sources_helper_script, <<-'ENDSCRIPT'
+    sources = ARGV
+
+    installed = []
+    `gem sources -l`.each_line do |line|
+      line = line.strip
+      installed << line if line.size > 0 && line =~ /^[^*]/
+    end
+
+    to_install = sources - installed
+    to_remove = installed - sources
+
+    if to_install.size > 0
+      to_install.each do |source|
+        system "gem sources -a #{source}"
+        fail "Unable to add gem sources" if $?.exitstatus > 0
+      end
+    end
+    if to_remove.size > 0
+      to_remove.each do |source|
+        system "gem sources -r #{source}"
+        fail "Unable to remove gem sources" if $?.exitstatus > 0
+      end
+    end
+  ENDSCRIPT
+  
   desc <<-DESC
     Setup ruby gems sources. Set 'gemsources' in rubber.yml to \
     be an array of URI strings.
   DESC
   task :setup_gem_sources do
     if rubber_env.gemsources
-      script = prepare_script 'gem_sources_helper', <<-'ENDSCRIPT'
-        ruby - $@ <<-'EOF'
-
-        sources = ARGV
-
-        installed = []
-        `gem sources -l`.grep(/^[^*]/) do |line|
-            line = line.strip
-            installed << line if line.size > 0
-        end
-
-        to_install = sources - installed
-        to_remove = installed - sources
-
-        if to_install.size > 0
-          to_install.each do |source|
-            system "gem sources -a #{source}"
-            fail "Unable to add gem sources" if $?.exitstatus > 0
-          end
-        end
-        if to_remove.size > 0
-          to_remove.each do |source|
-            system "gem sources -r #{source}"
-            fail "Unable to remove gem sources" if $?.exitstatus > 0
-          end
-        end
-
-        'EOF'
-      ENDSCRIPT
-
-      sudo "sh #{script} #{rubber_env.gemsources.join(' ')}"
+      script = prepare_script 'gem_sources_helper', gem_sources_helper_script, nil
+      rsudo "ruby #{script} #{rubber_env.gemsources.join(' ')}"
     end
   end
 
@@ -293,7 +320,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
@@ -307,10 +334,28 @@ namespace :rubber do
   DESC
   task :set_timezone do
     opts = get_host_options('timezone')
-    sudo "bash -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 "/etc/init.d/sysklogd restart"
+    sudo_script 'restart_syslog', <<-ENDSCRIPT
+      if [[ -x /etc/init.d/sysklogd ]]; then
+        /etc/init.d/sysklogd restart
+      elif [[ -x /etc/init.d/rsyslog ]]; then
+        service rsyslog restart
+     fi
+    ENDSCRIPT
+  end
+  
+  desc <<-DESC
+    Enable the ubuntu multiverse source for getting packages like
+    ec2-ami-tools used for bundling images
+  DESC
+  task :enable_multiverse do
+    sudo_script 'enable_multiverse', <<-ENDSCRIPT
+      if ! grep -qc multiverse /etc/apt/sources.list /etc/apt/sources.list.d/* &> /dev/null; then
+        cat /etc/apt/sources.list | sed 's/main universe/multiverse/' > /etc/apt/sources.list.d/rubber-multiverse-source.list
+      fi
+    ENDSCRIPT
   end
   
   def update_dyndns(instance_item)
@@ -342,16 +387,16 @@ 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
 
   def custom_package(url_base, name, ver, install_test)
-    rubber.run_script "install_#{name}", <<-ENDSCRIPT
+    rubber.sudo_script "install_#{name}", <<-ENDSCRIPT
       if [[ #{install_test} ]]; then
         arch=`uname -m`
         if [ "$arch" = "x86_64" ]; then
@@ -360,7 +405,7 @@ namespace :rubber do
           src="#{url_base}/#{name}_#{ver}_i386.deb"
         fi
         src_file="${src##*/}"
-        wget -qP /tmp ${src}
+        wget -qNP /tmp ${src}
         dpkg -i /tmp/${src_file}
       fi
     ENDSCRIPT
@@ -386,8 +431,6 @@ namespace :rubber do
   # calls to rubygems
   #
   set :gem_helper_script, <<-'ENDSCRIPT'
-    ruby - $@ <<-'EOF'
-
     gem_cmd = ARGV[0]
     gems = ARGV[1..-1]
     cmd = "gem #{gem_cmd} --no-rdoc --no-ri"
@@ -405,7 +448,7 @@ namespace :rubber do
     end
 
     installed = {}
-    `gem list --local`.each do |line|
+    `gem list --local`.each_line do |line|
         parts = line.scan(/(.*) \((.*)\)/).first
         next unless parts && parts.size == 2
         installed[parts[0]] = parts[1].split(",")
@@ -426,8 +469,6 @@ namespace :rubber do
       system "#{cmd} #{gem_list}"
       fail "Unable to install gems" if $?.exitstatus > 0
     end
-
-    'EOF'
   ENDSCRIPT
 
   # Helper for installing gems,allows one to respond to prompts
@@ -447,11 +488,11 @@ namespace :rubber do
     end
     
     if opts.size > 0
-      script = prepare_script('gem_helper', gem_helper_script)
-      sudo "sh #{script} #{cmd} $CAPISTRANO:VAR$", opts do |ch, str, data|
+      script = prepare_script('gem_helper', gem_helper_script, nil)
+      rsudo "ruby #{script} #{cmd} $CAPISTRANO:VAR$", opts do |ch, str, data|
         handle_gem_prompt(ch, data, str)
       end
     end
   end
 
-end
+end

data/lib/rubber/recipes/rubber/spot_requests.rb

@@ -14,4 +14,10 @@ namespace :rubber do
     end
   end
 
+  desc "Cancel the spot instances request for the given id"
+  required_task :cancel_spot_instances_request do
+    request_id = get_env('SPOT_INSTANCE_REQUEST_ID', 'The id of the spot instances request to cancel', true)
+    cloud.destroy_spot_instance_request(request_id)
+  end
+
 end

data/lib/rubber/recipes/rubber/static_ips.rb

@@ -80,6 +80,89 @@ namespace :rubber do
     destroy_static_ip(ip)
   end
 
+  desc 'Move a static IP address from DONOR machine to RECEIVER machine.'
+  task :move_static_ip do
+    donor_alias = get_env 'DONOR', 'Instance alias to get the IP from (e.g., web01)', true
+    receiver_alias = get_env 'RECEIVER', 'Instance alias to assign the IP to (e.g., web02)', true
+
+    # Sanity checks
+    donor = rubber_instances[donor_alias]
+    fatal "Instance does not exist: #{donor_alias}" unless donor
+
+    static_ip = donor.static_ip
+    fatal 'No static IP address to move exists' unless static_ip && static_ip != ''
+
+    receiver = rubber_instances[receiver_alias]
+    fatal "Instance does not exist: #{receiver_alias}" unless receiver
+
+    # Temporary removal of the instances.
+    old_donor = rubber_instances.remove(donor_alias)
+    old_receiver = rubber_instances.remove(receiver_alias)
+
+    rubber_instances.save
+
+    # Getting rid of alias->IP mappings and SSH's known_hosts records.
+    load_roles
+    setup_aliases
+    cleanup_known_hosts(old_donor)
+    cleanup_known_hosts(old_receiver)
+
+    # Detachment of EIPA.
+    success = cloud.detach_static_ip(static_ip)
+    fatal "Failed to detach static IP address #{static_ip}" unless success
+    rubber_instances.artifacts['static_ips'].delete(old_donor.name)
+
+    rubber_instances.save
+
+    # Attachment of EIPA.
+    success = cloud.attach_static_ip(static_ip, old_receiver.instance_id)
+    fatal "Failed to associate static IP address #{static_ip}" unless success
+
+    print "Waiting for #{receiver_alias} to get the address"
+    while true do
+      print '.'
+      sleep 3
+      instance = cloud.describe_instances(old_receiver.instance_id).first
+      break if instance[:external_ip] == static_ip
+    end
+
+    # Partial cleanup of static IP records.
+    rubber_instances.artifacts['static_ips'][old_receiver.name] = static_ip
+
+    rubber_instances.save
+
+    # First half of the sync.
+    new_receiver = Rubber::Configuration::InstanceItem.new(old_receiver.name,
+      old_receiver.domain, old_receiver.roles, old_receiver.instance_id,
+      old_receiver.security_groups)
+    new_receiver.static_ip = static_ip
+    rubber_instances.add(new_receiver)
+
+    rubber_instances.save
+
+    refresh_instance(receiver_alias)
+
+    print "Waiting for #{donor_alias} to get a new address"
+    while true do
+      print '.'
+      sleep 3
+      instance = cloud.describe_instances(old_donor.instance_id).first
+      break if instance[:external_ip] && instance[:external_ip] != ''
+    end
+
+    # Second half of the sync.
+    new_donor = Rubber::Configuration::InstanceItem.new(old_donor.name,
+      old_donor.domain, old_donor.roles, old_donor.instance_id,
+      old_donor.security_groups)
+    rubber_instances.add(new_donor)
+
+    rubber_instances.save
+
+    refresh_instance(donor_alias)
+
+    logger.info "Run 'cap rubber:describe_static_ips' to check the allocated ones"
+  end
+
   def allocate_static_ip()
     ip = cloud.create_static_ip()
     fatal "Failed to allocate static ip" if ip.nil?

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
@@ -147,22 +150,30 @@ namespace :rubber do
     return local_alias
   end
 
-  def prepare_script(name, contents)
+  def prepare_script(name, contents, stop_on_error_cmd=rubber_env.stop_on_error_cmd)
     script = "/tmp/#{name}"
     # this lets us abort a script if a command in the middle of it errors out
-    contents = "#{rubber_env.stop_on_error_cmd}\n#{contents}" if rubber_env.stop_on_error_cmd
+    contents = "#{stop_on_error_cmd}\n#{contents}" if stop_on_error_cmd
     put(contents, script)
     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/recipes/rubber/volumes.rb

@@ -104,7 +104,7 @@ namespace :rubber do
       if vol_spec['mount'] && vol_spec['filesystem']
         # then format/mount/etc if we don't have an entry in hosts file
         task :_setup_volume, :hosts => ic.external_ip do
-          rubber.run_script 'setup_volume', <<-ENDSCRIPT
+          rubber.sudo_script 'setup_volume', <<-ENDSCRIPT
             if ! grep -q '#{vol_spec['mount']}' /etc/fstab; then
               if mount | grep -q '#{vol_spec['mount']}'; then
                 umount '#{vol_spec['mount']}'
@@ -135,7 +135,7 @@ namespace :rubber do
     if ! ic.partitions.include?(part_id)
       # then format/mount/etc if we don't have an entry in hosts file
       task :_setup_partition, :hosts => ic.external_ip do
-        rubber.run_script 'setup_partition', <<-ENDSCRIPT
+        rubber.sudo_script 'setup_partition', <<-ENDSCRIPT
           if ! fdisk -l 2>&1 | grep -q '#{partition_spec['partition_device']}'; then
             if grep -q '#{partition_spec['disk_device']}\\b' /etc/fstab; then
               umount #{partition_spec['disk_device']}
@@ -175,7 +175,7 @@ namespace :rubber do
       end
       # then format/mount/etc if we don't have an entry in hosts file
       task :_zero_partitions, :hosts => ic.external_ip do
-        rubber.run_script 'zero_partitions', <<-ENDSCRIPT
+        rubber.sudo_script 'zero_partitions', <<-ENDSCRIPT
           # zero out parition for performance (see amazon DevGuide)
           echo "Zeroing out raid partitions to improve performance, this way take a while"
           #{zero_script}
@@ -200,7 +200,7 @@ namespace :rubber do
     end
 
     task :_setup_raid_volume, :hosts => ic.external_ip do
-      rubber.run_script 'setup_raid_volume', <<-ENDSCRIPT
+      rubber.sudo_script 'setup_raid_volume', <<-ENDSCRIPT
         if ! grep -q '#{raid_spec['device']}' /etc/fstab; then
           if mount | grep -q '#{raid_spec['mount']}'; then
             umount '#{raid_spec['mount']}'

data/lib/rubber/recipes/rubber.rb

@@ -10,7 +10,13 @@ require 'rubber'
 
 namespace :rubber do
 
-  # advise capistrano's task method so that tasks for non-existant roles don't
+  # Disable connecting to any Windows instance.
+  alias :original_task :task
+  def task(name, options={}, &block)
+    original_task(name, options.merge(:except => { :platform => 'windows' }), &block)
+  end
+
+  # advise capistrano's task method so that tasks for non-existent roles don't
   # fail when roles isn't defined due to using a FILTER for load_roles
   # If you have a task you need to execute even when there are no
   # roles, you have to use required_task instead of task - see rubber:create
@@ -19,7 +25,8 @@ namespace :rubber do
     class << ns
       alias :required_task :task
       def task(name, options={}, &block)
-        required_task(name, options) do
+        # Disable connecting to any Windows instance.
+        required_task(name, options.merge(:except => { :platform => 'windows' })) do
           # define empty roles for the case when a task has a role that we don't define anywhere
           [*options[:roles]].each do |r|
             roles[r] ||= []
@@ -39,16 +46,15 @@ namespace :rubber do
   on :load, "rubber:init"
     
   required_task :init do
-    # Require cap 2.4 since we depend on bugs that have been fixed
-    require 'capistrano/version'
-    if Capistrano::Version::MAJOR < 2 || Capistrano::Version::MINOR < 4
-      fatal "rubber requires capistrano 2.4.0 or greater"
-    end
-    
     set :rubber_cfg, Rubber::Configuration.get_configuration(RUBBER_ENV)
     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
@@ -56,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
 
 
@@ -73,7 +80,7 @@ namespace :rubber do
     # define capistrano host => role mapping for all instances
     rubber_instances.filtered.each do |ic|
       ic.roles.each do |role|
-        opts = Rubber::Util::symbolize_keys(role.options)
+        opts = Rubber::Util::symbolize_keys(role.options).merge(:platform => ic.platform)
         msg = "Auto role: #{role.name.to_sym} => #{ic.full_name}"
         msg << ", #{opts.inspect}" if opts.inspect.size > 0
         logger.info msg

data/lib/rubber/util.rb

@@ -30,8 +30,35 @@ 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_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/lib/rubber.rb

@@ -2,11 +2,13 @@ $:.unshift(File.dirname(__FILE__))
 
 module Rubber
 
-  VERSION = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).chomp
+  @@version  = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).chomp
 
   def self.initialize(project_root, project_env)
     return if defined?(RUBBER_ROOT) && defined?(RUBBER_ENV)
 
+    @@root = project_root
+    @@env = project_env
     Object.const_set('RUBBER_ENV', project_env)
     Object.const_set('RUBBER_ROOT', File.expand_path(project_root))
 
@@ -15,17 +17,49 @@ module Rubber
     # complicates bootstrap (i.e. can't run config to create db because full
     # rails env needs db to exist as some plugin accesses model or something)
     rails_boot_file = File.join(RUBBER_ROOT, 'config', 'boot.rb')
-    require(rails_boot_file) if File.exists? rails_boot_file
 
-    if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER
-      Object.const_set('LOGGER', RAILS_DEFAULT_LOGGER)
+    if File.exists? rails_boot_file
+      ARGV.insert(0, 'vulcanize') unless ARGV[0] == 'vulcanize' # Need for Rails 2 generator.
+      require(rails_boot_file)
+    end
+
+    if defined?(Rails.logger) && Rails.logger
+      @@logger = Rails.logger
     else
-      Object.const_set('LOGGER', Logger.new($stdout))
-      LOGGER.level = Logger::INFO
-      LOGGER.formatter = lambda {|severity, time, progname, msg| "Rubber[%s]: %s\n" % [severity, msg.to_s.lstrip]}
+      @@logger = Logger.new($stdout)
+      @@logger.level = Logger::INFO
+      @@logger.formatter = lambda {|severity, time, progname, msg| "Rubber[%s]: %s\n" % [severity, msg.to_s.lstrip]}
     end
+
+    # conveniences for backwards compatibility with old names
+    Object.const_set('RUBBER_CONFIG', self.config)
+    Object.const_set('RUBBER_INSTANCES', self.instances)
+
+  end
+
+  def self.root
+    @@root
+  end
+
+  def self.env
+    @@env
+  end
+
+  def self.version
+    @@version
+  end
+
+  def self.logger
+    @@logger
+  end
+
+  def self.config
+    Rubber::Configuration.rubber_env
   end
 
+  def self.instances
+    Rubber::Configuration.rubber_instances
+  end
 end
 
 
@@ -36,3 +70,9 @@ require 'rubber/instance'
 require 'rubber/util'
 require 'rubber/cloud'
 require 'rubber/dns'
+
+if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  module Rubber
+    require 'rubber/railtie'
+  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)

data/test/environment_test.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+gem 'test-unit'
+
 require 'test/unit'
 require 'tempfile'
 require 'test_helper'