rubber 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01136934cc0415f1d68de69f207b2dc72057a479
-  data.tar.gz: fb2c1e5bdceeb4eba634ac1f830e00a32fdf61c5
+  metadata.gz: 01552c1465c4b0aa4ed066f0125ce367b0a00407
+  data.tar.gz: a7a618e9599de68a09172bad4500a822443b042e
 SHA512:
-  metadata.gz: eb9e38fbddc9004084a45c60fe6808cf42a7b1765e60c3d3fc7a80824dec3dceae80ae280b5cb83a48643fe5767016707683749eada51f0be2986ca82abc1570
-  data.tar.gz: 30107f3ae148391d6639684dfd3c80435e9aed1ae7d7eec430ae7555b9e39a164412c324602eeecdc7e8a5c836bf9d4553abcbd643a6932028e815db7d210cd0
+  metadata.gz: 24595ac3976eb6a51785b00e11a3f360223275f83fc8ab4b83aef4b35635af0800070f15a4b95490a144882956bb844ceb3daf95e3de9f7cd3b0ac1df4746be2
+  data.tar.gz: 4f8d3265b289f7c7a5bcc6aabd3b5a9aadd669788113cffa244219dff6dd087a64d6c3ee7cfed8a2c2538baf105bd2a5734175dd555f0b9c2d581f68a9a8e020

data/CHANGELOG

@@ -1,3 +1,20 @@
+2.5.3 (07/11/2013)
+
+Improvements:
+============
+
+[base] Upgraded to ruby-build 20130628 and Ruby 1.9.3-p448. <caa9e06>
+[base] Updated Digitial Ocean default zone info and image_id. <11502d2>
+[base, core] Re-install the VirtualBox add-ons when upgrading the kernel in a Vagrant instance so you can package VMs properly.
+[core] Ensure the SSH public key is installed for the user account if one is set. <75e7f20>
+
+Bug Fixes:
+=========
+
+[core] Allow the Vagrant plugin to interact with the local ruby installation when RVM is used. <98a061a>
+[core] Make sure we note the vagrant provider was used in the instance file. <d1573fe>
+
+
 2.5.2 (06/13/2013)
 
 Bug Fixes:
@@ -6,7 +23,6 @@ Bug Fixes:
 [core] Do not use the embedded Vagrant ruby installation by default.
 
 
-
 2.5.1 (06/09/2013)
 -----------------
 

data/lib/rubber/cloud/vagrant.rb

@@ -28,6 +28,7 @@ module Rubber
           Generic.instances.each do |instance|
             if instance[:id] == instance_id
               instance[:state] = state
+              instance[:provider] = 'vagrant'
             end
           end
 
@@ -38,6 +39,7 @@ module Rubber
           instance[:state] = state
           instance[:external_ip] = capistrano.rubber.get_env('EXTERNAL_IP', "External IP address for host '#{instance_id}'", true)
           instance[:internal_ip] = capistrano.rubber.get_env('INTERNAL_IP', "Internal IP address for host '#{instance_id}'", true, instance[:external_ip])
+          instance[:provider] = 'vagrant'
 
           [instance]
         end

data/lib/rubber/recipes/rubber.rb

@@ -85,7 +85,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).merge(:platform => ic.platform)
+        opts = Rubber::Util::symbolize_keys(role.options).merge(:platform => ic.platform, :provider => ic.provider)
         msg = "Auto role: #{role.name.to_sym} => #{ic.full_name}"
         msg << ", #{opts.inspect}" if opts.inspect.size > 0
         logger.info msg

data/lib/rubber/recipes/rubber/instances.rb

@@ -375,6 +375,7 @@ namespace :rubber do
 
             # turn back on root ssh access if we are using root as the capistrano user for connecting
             enable_root_ssh(instance_item.external_ip, fetch(:initial_ssh_user, 'ubuntu')) if user == 'root'
+
             # force a connection so if above isn't enabled we still timeout if initial connection hangs
             direct_connection(instance_item.external_ip) do
               run "echo"

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

@@ -9,8 +9,8 @@ namespace :rubber do
     link_bash
     set_timezone
     enable_multiverse
-    upgrade_packages
     install_core_packages
+    upgrade_packages
     install_packages
     setup_volumes
     setup_gem_sources
@@ -23,16 +23,35 @@ namespace :rubber do
     # Capistrano uses the :password variable for sudo commands.  Since this setting is generally used for the deploy user,
     # but we need it this one time for the initial SSH user, we need to swap out and restore the password.
     #
-    # We special-case the 'ubuntu' user since Amazon doesn't since the Canonical AMIs on EC2 don't set the password for
+    # We special-case the 'ubuntu' user since the Canonical AMIs on EC2 don't set the password for
     # this account, making any password prompt potentially confusing.
     orig_password = fetch(:password)
     set(:password, initial_ssh_user == 'ubuntu' || ENV.has_key?('RUN_FROM_VAGRANT') ? nil : Capistrano::CLI.password_prompt("Password for #{initial_ssh_user} @ #{ip}: "))
 
+    task :_ensure_key_file_present, :hosts => "#{initial_ssh_user}@#{ip}" do
+      public_key_filename = "#{cloud.env.key_file}.pub"
+
+      if File.exists?(public_key_filename)
+        public_key = File.read(public_key_filename).chomp
+
+        rubber.sudo_script 'ensure_key_file_present', <<-ENDSCRIPT
+          mkdir -p ~/.ssh
+          touch ~/.ssh/authorized_keys
+          chmod 600 ~/.ssh/authorized_keys
+
+          if ! grep -q '#{public_key}' .ssh/authorized_keys; then
+            echo '#{public_key}' >> .ssh/authorized_keys
+          fi
+        ENDSCRIPT
+      end
+    end
+
     task :_allow_root_ssh, :hosts => "#{initial_ssh_user}@#{ip}" do
       rsudo "mkdir -p /root/.ssh && cp /home/#{initial_ssh_user}/.ssh/authorized_keys /root/.ssh/"
     end
 
     begin
+      _ensure_key_file_present
       _allow_root_ssh
     rescue ConnectionError => e
       if e.message =~ /Net::SSH::AuthenticationFailed/
@@ -89,7 +108,7 @@ namespace :rubber do
       # don't add unqualified hostname in local hosts file since user may be
       # managing multiple domains with same aliases
       hosts_data = [ic.full_name, ic.external_host, ic.internal_host]
-      
+
       # add the ip aliases for web tools hosts so we can map internal tools
       # to their own vhost to make proxying easier (rewriting url paths for
       # proxy is a real pain, e.g. '/graphite/' externally to '/' on the
@@ -99,7 +118,7 @@ namespace :rubber do
           hosts_data << "#{name}-#{ic.full_name}"
         end
       end
-      
+
       local_hosts << ic.external_ip << ' ' << hosts_data.join(' ') << "\n"
     end
     local_hosts << delim << "\n"
@@ -124,10 +143,10 @@ namespace :rubber do
     # Generate /etc/hosts contents for the remote instance from instance config
     delim = "## rubber config #{Rubber.env}"
     remote_hosts = []
-    
+
     rubber_instances.each do |ic|
       hosts_data = [ic.internal_ip, ic.full_name, ic.name, ic.external_host, ic.internal_host]
-      
+
       # add the ip aliases for web tools hosts so we can map internal tools
       # to their own vhost to make proxying easier (rewriting url paths for
       # proxy is a real pain, e.g. '/graphite/' externally to '/' on the
@@ -137,21 +156,21 @@ namespace :rubber do
           hosts_data << "#{name}-#{ic.full_name}"
         end
       end
-      
+
       remote_hosts << hosts_data.join(' ')
     end
-    
+
     if rubber_instances.size > 0
-      
+
       replace="#{delim}\\n#{remote_hosts.join("\\n")}\\n#{delim}"
-      
+
       rubber.sudo_script 'setup_remote_aliases', <<-ENDSCRIPT
         sed -i.bak '/#{delim}/,/#{delim}/c #{replace}' /etc/hosts
         if ! grep -q "#{delim}" /etc/hosts; then
           echo -e "#{replace}" >> /etc/hosts
         fi
       ENDSCRIPT
-      
+
       # Setup hostname on instance so shell, etcs have nice display
       rsudo "echo $CAPISTRANO:HOST$ > /etc/hostname && hostname $CAPISTRANO:HOST$"
       # Newer ubuntus ec2-init script always resets hostname, so prevent it
@@ -162,7 +181,7 @@ namespace :rubber do
     # /etc/resolv.conf to add search domain
     # ~/.ssh/options to setup user/host/key aliases
   end
-  
+
   desc <<-DESC
     Sets up aliases in dynamic dns provider for instance hostnames based on contents of instance.yml.
   DESC
@@ -175,7 +194,7 @@ namespace :rubber do
   def record_key(record)
     "#{record[:host]}.#{record[:domain]} #{record[:type]}"
   end
-  
+
   def convert_to_new_dns_format(records)
     record = {}
     records.each do |r|
@@ -200,10 +219,10 @@ namespace :rubber do
   required_task :setup_dns_records do
     records = rubber_env.dns_records
     if records && rubber_env.dns_provider
-      
+
       provider_name = rubber_env.dns_provider
       provider = Rubber::Dns::get_provider(provider_name, rubber_env)
-      
+
       # records in rubber_env.dns_records can either have a value which
       # is an array, or multiple equivalent (same host+type)items with
       # value being a string, so try and normalize them
@@ -222,7 +241,7 @@ namespace :rubber do
       precords = domains.collect {|d| provider.find_host_records(:host => '*', :type => '*', :domain => d) }.flatten
       precords.each do |record|
         key = record_key(record)
-        raise "unmerged provider records" if provider_records[key] 
+        raise "unmerged provider records" if provider_records[key]
         provider_records[key] = record
       end
 
@@ -255,16 +274,16 @@ namespace :rubber do
 
     end
   end
-  
+
   desc <<-DESC
     Exports dns records from your provider into the format readable by rubber in rubber-dns.yml
   DESC
   required_task :export_dns_records do
     if rubber_env.dns_provider
-      
+
       provider_name = rubber_env.dns_provider
       provider = Rubber::Dns::get_provider(provider_name, rubber_env)
-      
+
       provider_records = provider.find_host_records(:host => '*', :type => '*', :domain => rubber_env.domain)
       puts({'dns_records' => provider_records.collect {|r| Rubber::Util.stringify_keys(r)}}.to_yaml)
     end
@@ -306,9 +325,12 @@ namespace :rubber do
   DESC
   task :install_core_packages do
     core_packages = [
-                      'python-software-properties', # Needed for add-apt-repository, which we use for adding PPAs.
-                       'bc'                         # Needed for comparing version numbers in bash, which we do for various setup functions.
-                    ]
+        'python-software-properties', # Needed for add-apt-repository, which we use for adding PPAs.
+        'bc',                         # Needed for comparing version numbers in bash, which we do for various setup functions.
+        'update-notifier-common'      # Needed for notifying us when a package upgrade requires a reboot.
+    ]
+
+    rsudo "apt-get -q update"
     rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install #{core_packages.join(' ')}"
   end
 
@@ -383,7 +405,7 @@ namespace :rubber do
       end
     end
   ENDSCRIPT
-  
+
   desc <<-DESC
     Setup ruby gems sources. Set 'gemsources' in rubber.yml to \
     be an array of URI strings.
@@ -425,7 +447,7 @@ namespace :rubber do
      fi
     ENDSCRIPT
   end
-  
+
   desc <<-DESC
     Enable the ubuntu multiverse source for getting packages like
     ec2-ami-tools used for bundling images
@@ -439,13 +461,13 @@ namespace :rubber do
       fi
     ENDSCRIPT
   end
-  
+
   def update_dyndns(instance_item)
     env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
     if env.dns_provider
       provider = Rubber::Dns::get_provider(env.dns_provider, env)
       provider.update(instance_item.name, instance_item.external_ip)
-      
+
       # add the ip aliases for web tools hosts so we can map internal tools
       # to their own vhost to make proxying easier (rewriting url paths for
       # proxy is a real pain, e.g. '/graphite/' externally to '/' on the
@@ -463,7 +485,7 @@ namespace :rubber do
     if env.dns_provider
       provider = Rubber::Dns::get_provider(env.dns_provider, env)
       provider.destroy(instance_item.name)
-      
+
       # add the ip aliases for web tools hosts so we can map internal tools
       # to their own vhost to make proxying easier (rewriting url paths for
       # proxy is a real pain, e.g. '/graphite/' externally to '/' on the
@@ -496,10 +518,10 @@ namespace :rubber do
     else
       rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install $CAPISTRANO:VAR$", opts
     end
-    
+
     maybe_reboot
   end
-  
+
   def multi_capture(cmd, opts={})
     mutex = Mutex.new
     host_data = {}
@@ -512,9 +534,9 @@ namespace :rubber do
         end
       end
     end
-    return host_data    
+    return host_data
   end
-  
+
   def maybe_reboot
     reboot_needed = multi_capture("echo $(ls /var/run/reboot-required 2> /dev/null)")
     reboot_hosts = reboot_needed.collect {|k, v| v.strip.size > 0 ? k : nil}.compact.sort
@@ -532,10 +554,10 @@ namespace :rubber do
         ENV['REBOOT'] = 'y'
         logger.info "Updates require a reboot on hosts #{reboot_hosts.inspect}"
       end
-      
+
       reboot = get_env('REBOOT', "Updates require a reboot on hosts #{reboot_hosts.inspect}, reboot [y/N]?", false)
       reboot = (reboot =~ /^y/)
-      
+
       if reboot
 
         logger.info "Rebooting ..."
@@ -547,7 +569,7 @@ namespace :rubber do
           # swallow exception since there is a chance
           # net:ssh throws an Exception
         end
-        
+
         sleep 30
 
         reboot_hosts.each do |host|
@@ -556,16 +578,16 @@ namespace :rubber do
           end
           logger.info "#{host} completed reboot"
         end
-        
+
       end
-      
+
       # could take a while to reboot (or get answer from prompt), so
       # we need to rebuild all capistrano connections in case they timed out
       teardown_connections_to(sessions.keys)
-      
+
     end
   end
-        
+
   def custom_package(url_base, name, ver, install_test)
     rubber.sudo_script "install_#{name}", <<-ENDSCRIPT
       if [[ #{install_test} ]]; then
@@ -657,7 +679,7 @@ namespace :rubber do
       end
       expanded_gem_list.join(' ')
     end
-    
+
     if opts.size > 0
       script = prepare_script('gem_helper', gem_helper_script, nil)
       rsudo "ruby #{script} #{cmd} $CAPISTRANO:VAR$", opts do |ch, str, data|

data/lib/rubber/vagrant/config.rb

@@ -1,17 +1,19 @@
 module VagrantPlugins
   module Rubber
     class Config < Vagrant.plugin("2", :config)
-      attr_accessor :roles, :rubber_env, :use_vagrant_ruby
+      attr_accessor :roles, :rubber_env, :use_vagrant_ruby, :rvm_ruby_version
 
       def initialize
         @roles = UNSET_VALUE
         @rubber_env = UNSET_VALUE
         @use_vagrant_ruby = UNSET_VALUE
+        @rvm_ruby_version = UNSET_VALUE
       end
 
       def finalize!
         @rubber_env = 'vagrant' if @rubber_env == UNSET_VALUE
         @use_vagrant_ruby = false if @use_vagrant_ruby == UNSET_VALUE
+        @rvm_ruby_version = nil if @rvm_ruby_version == UNSET_VALUE
 
         ::Rubber::initialize(Dir.pwd, @rubber_env)
 

data/lib/rubber/vagrant/provisioner.rb

@@ -32,12 +32,10 @@ module VagrantPlugins
           script = <<-ENDSCRIPT
             unset GEM_HOME;
             unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} bash -c 'bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} bash -c '#{rvm_prefix} bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
           ENDSCRIPT
         end
 
-        puts script
-
         system(script)
       end
 
@@ -48,7 +46,7 @@ module VagrantPlugins
           script = <<-ENDSCRIPT
             unset GEM_HOME;
             unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} bash -c 'bundle exec cap rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}'
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} bash -c '#{rvm_prefix} bundle exec cap rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}'
           ENDSCRIPT
         end
 
@@ -62,7 +60,7 @@ module VagrantPlugins
           script = <<-ENDSCRIPT
             unset GEM_HOME;
             unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap rubber:bootstrap'
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap rubber:bootstrap'
           ENDSCRIPT
         end
 
@@ -76,7 +74,7 @@ module VagrantPlugins
           script = <<-ENDSCRIPT
             unset GEM_HOME;
             unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap deploy:migrations'
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap deploy:migrations'
           ENDSCRIPT
         end
 
@@ -86,6 +84,10 @@ module VagrantPlugins
       def internal_cap_command
         "ruby -e \"require 'capistrano/cli'; Capistrano::CLI.execute\""
       end
+
+      def rvm_prefix
+        config.rvm_ruby_version ? "rvm #{config.rvm_ruby_version} do" : ''
+      end
     end
   end
 end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.5.2"
+  VERSION = "2.5.3"
 end

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

@@ -95,5 +95,9 @@ namespace :rubber do
       ENDSCRIPT
     end
 
+    after "rubber:bootstrap", "rubber:base:reinstall_virtualbox_additions"
+    task :reinstall_virtualbox_additions, :only => { :provider => 'vagrant' } do
+      rsudo "service vboxadd setup"
+    end
   end
 end

data/templates/base/config/rubber/rubber-ruby.yml

@@ -11,11 +11,11 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline6-dev, libxml2-dev, libyaml-dev]
 
 # REQUIRED: The version of ruby-build to use for building ruby.
-ruby_build_version: 20130501
+ruby_build_version: 20130628
 
 # REQUIRED: Set to the version string for the ruby version you wish to use
 # Run "ruby-build --definitions" to see the list of possible options
-ruby_version: 1.9.3-p392
+ruby_version: 1.9.3-p448
 
 # REQUIRED: Installation path for ruby.
 ruby_path: "/usr/local/rubies/#{ruby_version}"

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

@@ -104,12 +104,13 @@ cloud_providers:
     #
     # Options include
     # New York 1
-    # Amsterdam 1
+    # San Francisco 1
     #
+    # These change often.  Check https://www.digitalocean.com/droplets/new for the most up to date options.
     region: New York 1
 
     # REQUIRED: The image name and type for creating instances.
-    image_id: Ubuntu 12.04 x64 Server
+    image_id: Ubuntu 12.04 x64
     image_type: 512MB
 
   # Use an alternate cloud provider supported by fog.  This doesn't fully work

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano