rubber 1.5.6 → 1.5.7

data/CHANGELOG

@@ -1,3 +1,19 @@
+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
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

data/lib/rubber/generator.rb

@@ -51,6 +51,7 @@ module Rubber
       # dest_file (if not nil) before returning it
       def transform(src_data, options={})
         config = ConfigDescriptor.new
+        config.generator = self
 
         # for development/test, if we have a fake root, echo any
         # calls to system
@@ -183,6 +184,9 @@ module Rubber
       # options passed in through code
       attr_accessor :options
 
+      # allow access to calling generator so can determine stuff like fake_root
+      attr_accessor :generator
+
       def initialize
         @backup = true
       end

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

@@ -216,62 +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()
-
-        # 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
-
-        # 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
 
@@ -283,19 +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'
+      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
@@ -317,6 +266,8 @@ namespace :rubber do
         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,
@@ -333,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
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 6
-  version: 1.5.6
+  - 7
+  version: 1.5.7
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
+date: 2010-07-07 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency