solutious-rudy 0.9.3 → 0.9.4

data/lib/rudy/routines/handlers/script.rb

@@ -59,8 +59,8 @@ module Rudy; module Routines; module Handlers;
             robj.switch_user user
             
           rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch => ex  
-            STDERR.puts "Error connecting: #{ex.message}".color(:red)
-            STDERR.puts "Skipping user #{user}".color(:red)
+            le "Error connecting: #{ex.message}".color(:red)
+            le "Skipping user #{user}".color(:red)
             next
           end
         end

data/lib/rudy/routines/passthrough.rb

@@ -3,14 +3,21 @@ module Rudy; module Routines;
   class Passthrough < Rudy::Routines::Base
     
     def init(*args)
-      @machines = Rudy::Machines.list || []
-      @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+      Rudy::Routines.rescue {
+        @machines = Rudy::Machines.list || []
+        @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+      }
     end
     
     def execute
-      li "Executing routine: #{@name}"
-      return @machines unless run?
       Rudy::Routines::Handlers::Depends.execute_all @before
+      li " Executing routine: #{@name} ".att(:reverse)
+      # Re-retreive the machine set to reflect dependency changes
+      Rudy::Routines.rescue {
+        @machines = Rudy::Machines.list || []
+        @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+      }
+      return @machines unless run?
       Rudy::Routines.runner(@routine, @@rset, @@lbox, @argv)
       Rudy::Routines::Handlers::Depends.execute_all @after
       @machines

data/lib/rudy/routines/reboot.rb

@@ -11,8 +11,10 @@ module Rudy; module Routines;
                          
     def init(*args)
       @routine ||= {}
-      @machines = Rudy::Machines.list
-      @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+      Rudy::Routines.rescue {
+        @machines = Rudy::Machines.list || []
+        @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+      }
     end
     
     # Startup routines run in the following order:
@@ -24,10 +26,19 @@ module Rudy; module Routines;
     # * all other actions
     # * after dependencies
     def execute
-      li "Executing routine: #{@name}"
-      ld "[this is a generic routine]" if @routine.empty?
       
       if run?
+        Rudy::Routines::Handlers::Depends.execute_all @before
+        
+        li " Executing routine: #{@name} ".att(:reverse)
+        ld "[this is a generic routine]" if @routine.empty?
+        
+        # Re-retreive the machine set to reflect dependency changes
+        Rudy::Routines.rescue {
+          @machines = Rudy::Machines.list || []
+          @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+        }
+        
         Rudy::Routines.rescue {
           Rudy::Routines::Handlers::Group.authorize rescue nil
         }
@@ -57,7 +68,7 @@ module Rudy; module Routines;
       li "Rebooting #{current_group_name}..."
       @machines.each { |m| m.restart } if run?
       
-      15.times { print '.'; Kernel.sleep 2 }; puts $/  # Wait for 30 seconds
+      15.times { print '.'; Kernel.sleep 2 }; li $/  # Wait for 30 seconds
       
       Rudy::Routines.rescue {
         if !Rudy::Routines::Handlers::Host.is_running? @@rset

data/lib/rudy/routines/shutdown.rb

@@ -9,9 +9,11 @@ module Rudy; module Routines;
                          :local, :remote, :after_local, :after]
                          
     def init(*args)
-      @machines = Rudy::Machines.list || []
-      @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
       @routine ||= {}
+      Rudy::Routines.rescue {
+        @machines = Rudy::Machines.list || []
+        @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+      }
     end
     
     # Startup routines run in the following order:
@@ -21,8 +23,6 @@ module Rudy; module Routines;
     # * after_local (if present)
     # * after dependencies
     def execute
-      li "Executing routine: #{@name}"
-      ld "[this is a generic routine]" if @routine.empty?
       
       # We need to remove after_local so the runner doesn't see it
       after_local = @routine.delete(:after_local)
@@ -33,7 +33,16 @@ module Rudy; module Routines;
         }
         
         Rudy::Routines::Handlers::Depends.execute_all @before
-      
+        
+        li " Executing routine: #{@name} ".att(:reverse)
+        ld "[this is a generic routine]" if @routine.empty?
+        
+        # Re-retreive the machine set to reflect dependency changes
+        Rudy::Routines.rescue {
+          @machines = Rudy::Machines.list || []
+          @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
+        }
+        
         # This is the meat of the sandwich
         Rudy::Routines.runner(@routine, @@rset, @@lbox, @argv)
         

data/lib/rudy/routines/startup.rb

@@ -20,13 +20,13 @@ module Rudy; module Routines;
     # * all other actions
     # * after dependencies
     def execute
-      li "Executing routine: #{@name}"
-      ld "[this is a generic routine]" if @routine.empty?
-      
       
       if run?
         Rudy::Routines::Handlers::Depends.execute_all @before
-      
+        
+        li " Executing routine: #{@name} ".att(:reverse)
+        ld "[this is a generic routine]" if @routine.empty?
+        
         if @routine.has_key? :before_local
           handler = Rudy::Routines.get_handler :local
           Rudy::Routines.rescue {
@@ -52,7 +52,7 @@ module Rudy; module Routines;
         
       end
       
-      ## puts Rudy::Routines.machine_separator(machine.name, machine.awsid)
+      ## li Rudy::Routines.machine_separator(machine.name, machine.awsid)
       
       # If this is a testrun we won't create new instances
       # we'll just grab the list of machines in this group. 
@@ -62,7 +62,6 @@ module Rudy; module Routines;
         @@rset = Rudy::Routines::Handlers::RyeTools.create_set @machines
       }
       
-      sleep 1  # SimpleDB eventual consistency 
       
       Rudy::Routines.rescue {
         if !Rudy::Routines::Handlers::Host.is_running? @@rset

data/lib/rudy/utils.rb

@@ -23,7 +23,7 @@ module Rudy
           break if ip && !ip.empty?
         end
       rescue SocketError, Errno::ETIMEDOUT => ex
-        STDERR.puts "Connection Error. Check your internets!"
+        Rudy::Huxtable.le "Connection Error. Check your internets!"
       end
       ip
     end
@@ -297,7 +297,7 @@ module Rudy::Utils::RSSReader
     begin
       xmlstr = Net::HTTP.get(URI.parse(uri))
     rescue SocketError, Errno::ETIMEDOUT
-      STDERR.puts "Connection Error. Check your internets!"
+      Rudy::Huxtable.le "Connection Error. Check your internets!"
     end
     
     xml = REXML::Document.new xmlstr

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.9.3"
+	s.version = "0.9.4"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: solutious-rudy
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -285,7 +285,6 @@ files:
 - tryouts/failer
 has_rdoc: true
 homepage: http://solutious.com/projects/rudy/
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -310,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rudy
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: "Rudy: Not your grandparents' EC2 deployment tool."