rubber 1.12.1 → 1.12.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+1.12.2
+-----
+
+improve commit filter for changelog <6298227> [Matt Conway]
+don't delete security groups when answer is negative <fbba5de> [Matt Conway]
+fix enabling root user for create/refresh with multiple instances <db5a227> [Matt Conway]
+latest stable ami <84da0eb> [Matt Conway]
+
 1.12.1
 -----
 

data/VERSION

@@ -1 +1 @@
-1.12.1
+1.12.2

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

@@ -75,12 +75,12 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 10.04 Lucid	base install	32-bit	ami-6407f20d
-    # Ubuntu 10.04 Lucid	base install	64-bit	ami-ac07f2c5
+    # Ubuntu 10.04 Lucid	base install	32-bit	ami-7000f019
+    # Ubuntu 10.04 Lucid	base install	64-bit	ami-fa01f193
     #
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
-    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-6407f20d' : 'ami-ac07f2c5' }"
+    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-7000f019' : 'ami-fa01f193' }"
 
     # OPTIONAL: EC2 spot instance request support.
     #

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

@@ -75,12 +75,12 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 10.04 Lucid	base install	32-bit	ami-6407f20d
-    # Ubuntu 10.04 Lucid	base install	64-bit	ami-ac07f2c5
+    # Ubuntu 10.04 Lucid	base install	32-bit	ami-7000f019
+    # Ubuntu 10.04 Lucid	base install	64-bit	ami-fa01f193
     #
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
-    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-6407f20d' : 'ami-ac07f2c5' }"
+    image_id: "#{ %w{m1.small c1.medium}.include?(image_type) ? 'ami-7000f019' : 'ami-fa01f193' }"
 
     # OPTIONAL: EC2 spot instance request support.
     #

data/lib/rubber/recipes/rubber/security_groups.rb

@@ -141,14 +141,16 @@ namespace :rubber do
             else
               logger.info(msg)
             end
-            
-            rule_map = Rubber::Util::symbolize_keys(rule_map)
-            if rule_map[:source_group_name]
-              cloud.remove_security_group_rule(group_name, nil, nil, nil, {:name => rule_map[:source_group_name], :account => rule_map[:source_group_account]})
-            else
-              rule_map[:source_ips].each do |source_ip|
-                cloud.remove_security_group_rule(group_name, rule_map[:protocol], rule_map[:from_port], rule_map[:to_port], source_ip)
-              end if rule_map[:source_ips] && answer =~ /^y/
+
+            if answer =~ /^y/
+              rule_map = Rubber::Util::symbolize_keys(rule_map)
+              if rule_map[:source_group_name]
+                cloud.remove_security_group_rule(group_name, nil, nil, nil, {:name => rule_map[:source_group_name], :account => rule_map[:source_group_account]})
+              else
+                rule_map[:source_ips].each do |source_ip|
+                  cloud.remove_security_group_rule(group_name, rule_map[:protocol], rule_map[:from_port], rule_map[:to_port], source_ip)
+                end if rule_map[:source_ips]
+              end
             end
           end
         end

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

@@ -17,29 +17,22 @@ namespace :rubber do
 
   # 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
+    task :_allow_root_ssh, :hosts => "#{initial_ssh_user}@#{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
+    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
-    ensure
-      set :user, old_user
     end
-
   end
 
   # Forces a direct connection

metadata

@@ -2,7 +2,7 @@
 name: rubber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors: 
 - Matt Conway
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -04:00
+date: 2011-03-31 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency