axtro-rubber 1.2.3 → 1.5.7

data/lib/rubber/instance.rb

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

data/lib/rubber/railtie.rb

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

data/lib/rubber/recipes/rubber.rb

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

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

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

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

@@ -35,9 +35,7 @@ namespace :rubber do
     # Add in roles that the given set of roles depends on
     ir = Rubber::Configuration::RoleItem.expand_role_dependencies(ir, get_role_dependencies)
 
-    user_data = env.cloud_providers[env.cloud_provider]["user_data"]
-
-    create_instance(instance_alias, ir, create_spot_instance, user_data)
+    create_instance(instance_alias, ir, create_spot_instance)
   end
 
   desc <<-DESC
@@ -158,7 +156,7 @@ namespace :rubber do
 
   # Creates a new ec2 instance with the given alias and roles
   # Configures aliases (/etc/hosts) on local and remote machines
-  def create_instance(instance_alias, instance_roles, create_spot_instance=false, user_data = nil)
+  def create_instance(instance_alias, instance_roles, create_spot_instance=false)
     fatal "Instance already exists: #{instance_alias}" if rubber_instances[instance_alias]
 
     role_names = instance_roles.collect{|x| x.name}
@@ -203,7 +201,7 @@ namespace :rubber do
 
     if !create_spot_instance || (create_spot_instance && max_wait_time < 0)
       logger.info "Creating instance #{ami}/#{ami_type}/#{security_groups.join(',') rescue 'Default'}/#{availability_zone || 'Default'}"
-      instance_id = cloud.create_instance(ami, ami_type, security_groups, availability_zone, user_data)
+      instance_id = cloud.create_instance(ami, ami_type, security_groups, availability_zone)
     end
 
     logger.info "Instance #{instance_id} created"
@@ -218,59 +216,9 @@ namespace :rubber do
     while true do
       print "."
       sleep 2
-      instance = cloud.describe_instances(instance_id).first
-
-      if instance[:state] == "running"
-        print "\n"
-        logger.info "Instance running, fetching hostname/ip data"
-        instance_item.external_host = instance[:external_host]
-        instance_item.external_ip = instance[:external_ip]
-        instance_item.internal_host = instance[:internal_host]
-        instance_item.zone = instance[:zone]
-        instance_item.platform = instance[:platform]
-        rubber_instances.save()
-
-        # setup amazon elastic ips if configured to do so
-        setup_static_ips
-
-        # Need to setup aliases so ssh doesn't give us errors when we
-        # later try? to connect to same ip but using alias
-        setup_local_aliases
-
-        # re-load the roles since we may have just defined new ones
-        load_roles() unless env.disable_auto_roles
-
-        # Connect to newly created instance and grab its internal ip
-        # so that we can update all aliases
-
-        task :_get_ip, :hosts => instance_item.external_ip do
-          # There's no good way to get the internal IP for a Windows host, so just set it to the external
-          # and let the router handle mapping to the internal network.
-          if instance_item.windows?
-            instance_item.internal_ip = instance_item.external_ip
-          else
-            instance_item.internal_ip = capture(print_ip_command).strip
-          end
-
-          rubber_instances.save()
-        end
 
-        # even though instance is running, sometimes ssh hasn't started yet,
-        # so retry on connect failure
-        begin
-          _get_ip
-        rescue ConnectionError
-          sleep 2
-          logger.info "Failed to connect to #{instance_alias} (#{instance_item.external_ip}), retrying"
-          retry
-        end
-
-        # Add the aliases for this instance to all other hosts
-        setup_remote_aliases
-        setup_dns_aliases
+      break if refresh_instance(instance_alias)
 
-        break
-      end
     end
   end
 
@@ -282,15 +230,21 @@ namespace :rubber do
     fatal "Instance does not exist: #{instance_alias}" if ! instance_item
 
     env = rubber_cfg.environment.bind(instance_item.role_names, instance_alias)
-    
-    instance = cloud.describe_instances(instance_item.instance_id).first
+
+    instance = cloud.describe_instances(instance_item.instance_id).first rescue {}
 
     if instance[:state] == "running"
-      logger.info "\nInstance running, fetching hostname/ip data"
+      print "\n"
+      logger.info "Instance running, fetching hostname/ip data"
       instance_item.external_host = instance[:external_host]
       instance_item.external_ip = instance[:external_ip]
       instance_item.internal_host = instance[:internal_host]
       instance_item.zone = instance[:zone]
+      instance_item.platform = instance[:platform]
+      rubber_instances.save()
+
+      # 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' && ! instance_item.windows?)
 
       # setup amazon elastic ips if configured to do so
       setup_static_ips
@@ -305,7 +259,14 @@ namespace :rubber do
       # Connect to newly created instance and grab its internal ip
       # so that we can update all aliases
       task :_get_ip, :hosts => instance_item.external_ip do
-        instance_item.internal_ip = capture(print_ip_command).strip
+        # There's no good way to get the internal IP for a Windows host, so just set it to the external
+        # and let the router handle mapping to the internal network.
+        if instance_item.windows?
+          instance_item.internal_ip = instance_item.external_ip
+        else
+          instance_item.internal_ip = capture(print_ip_command).strip
+        end
+
         rubber_instances.save()
       end
 
@@ -323,7 +284,10 @@ namespace :rubber do
       # Add the aliases for this instance to all other hosts
       setup_remote_aliases
       setup_dns_aliases
+
+      return true
     end
+    return false
   end
 
 
@@ -337,10 +301,10 @@ namespace :rubber do
     value = Capistrano::CLI.ui.ask("About to DESTROY #{instance_alias} (#{instance_item.instance_id}) in mode #{RUBBER_ENV}.  Are you SURE [yes/NO]?: ")
     fatal("Exiting", 0) if value != "yes"
 
-#    if instance_item.static_ip
-#      value = Capistrano::CLI.ui.ask("Instance has a static ip, do you want to release it? [y/N]?: ")
-#      destroy_static_ip(instance_item.static_ip) if value =~ /^y/
-#    end
+    if instance_item.static_ip
+      value = Capistrano::CLI.ui.ask("Instance has a static ip, do you want to release it? [y/N]?: ")
+      destroy_static_ip(instance_item.static_ip) if value =~ /^y/
+    end
 
     if instance_item.volumes
       value = Capistrano::CLI.ui.ask("Instance has persistent volumes, do you want to destroy them? [y/N]?: ")

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

@@ -1,14 +1,12 @@
 namespace :rubber do
 
-  # Disable connecting to any Windows instance.
-  set :default_run_options, :except => { :platform => 'windows' }
-
   desc <<-DESC
     Bootstraps instances by setting timezone, installing packages and gems
   DESC
   task :bootstrap do
-    set_timezone
     link_bash
+    set_timezone
+    enable_multiverse
     upgrade_packages
     install_packages
     setup_volumes
@@ -17,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
@@ -167,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
@@ -221,12 +248,20 @@ namespace :rubber do
     gem_helper(false)
   end
 
+  desc <<-DESC
+    Install ruby gems defined in Gemfile
+  DESC
+  after "deploy:update_code", "rubber:install_bundler_gems" if Rubber::Util.is_bundler?
+  task :install_bundler_gems do
+    rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} bundle install --without development test"
+  end
+
   desc <<-DESC
     Install ruby gems defined in the rails environment.rb
   DESC
-  after "rubber:config", "rubber:install_rails_gems" if Rubber::Util.is_rails?
+  after "rubber:config", "rubber:install_rails_gems" if (Rubber::Util::is_rails2? && !Rubber::Util.is_bundler?)
   task :install_rails_gems do
-    sudo "sh -c 'cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake gems:install'"
+    rsudo "cd #{current_release} && RAILS_ENV=#{RUBBER_ENV} rake gems:install"
   end
 
   desc <<-DESC
@@ -248,46 +283,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
 
@@ -296,7 +328,7 @@ namespace :rubber do
     You can override this task if you don't want this to happen
   DESC
   task :link_bash do
-    sudo("ln -sf /bin/bash /bin/sh")
+    rsudo "ln -sf /bin/bash /bin/sh"
   end
 
   desc <<-DESC
@@ -310,10 +342,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)
@@ -345,16 +395,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 -o Dpkg::Options::=--force-confold -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 -o Dpkg::Options::=--force-confold -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
@@ -363,7 +413,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
@@ -389,8 +439,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"
@@ -408,7 +456,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(",")
@@ -429,8 +477,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
@@ -450,11 +496,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