rudy 0.9.3 → 0.9.4

data/lib/rudy/metadata/machine.rb

@@ -126,6 +126,16 @@ module Rudy
       k.decrypt encrtypted_text
     end
     
+    def create_mock
+      refresh!
+      @dns_public = @dns_private = nil
+      inst = Rudy::AWS::EC2::Instances.list(:running).first
+      @instid = inst.awsid
+      self.save :replace
+      sleep 1
+      self
+    end
+    
     def create
       raise "#{name} is already running" if instance_running?
       
@@ -140,11 +150,7 @@ module Rudy
         :machine_data => self.generate_machine_data.to_yaml
       }
       
-      Rudy::Huxtable.ld "OPTS: #{opts.inspect}"
-      
-      #@dns_public = @dns_private = nil
-      #inst = Rudy::AWS::EC2::Instances.list(:running).first
-      #@instid = inst.awsid
+      ld "OPTS: #{opts.inspect}"
       
       Rudy::AWS::EC2::Instances.create(opts) do |inst|
         @instid = inst.awsid
@@ -157,19 +163,22 @@ module Rudy
           if @address
             # Make sure the address is associated to the current account
             if Rudy::AWS::EC2::Addresses.exists?(@address)
-              puts "Associating #{@address} to #{@instid}"
+              li "Associating #{@address} to #{@instid}"
               Rudy::AWS::EC2::Addresses.associate(@address, @instid)
             else
-              STDERR.puts "Unknown address: #{@address}"
+              le "Unknown address: #{@address}"
             end
           end
         rescue => ex
-          STDERR.puts "Error: #{ex.message}"
-          STDERR.puts ex.backtrace if Rudy.debug?
+          le "Error: #{ex.message}"
+          le ex.backtrace if Rudy.debug?
         end
       end
       
       self.save
+      
+      sleep 1 # Eventual consistency in SimpleDB
+      
       self
     end
     

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

@@ -8,10 +8,10 @@ module Rudy; module Routines; module Handlers;
      begin
        ret = command.call if command
        return unless ret.is_a?(Rye::Rap)
-       puts '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?
+       li '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?
        print_response(ret)
      rescue IOError => ex
-       STDERR.puts "  Connection Error (#{ex.message})".color(:red)
+       le "  Connection Error (#{ex.message})".color(:red)
        choice = Annoy.get_user_input('(S)kip  (R)etry  (F)orce  (A)bort: ', nil, 3600) || ''
         if choice.match(/\AS/i)
           return
@@ -38,11 +38,11 @@ module Rudy; module Routines; module Handlers;
       colour = rap.exit_code != 0 ? :red : :normal
       [:stderr].each do |sumpin|
         next if rap.send(sumpin).empty?
-        STDERR.puts
-        STDERR.puts(("  #{sumpin.to_s.upcase}  " << '-'*38).color(colour).bright)
-        STDERR.puts "  " << rap.send(sumpin).join("#{$/}  ").color(colour)
+        le
+        le(("  #{sumpin.to_s.upcase}  " << '-'*38).color(colour).bright)
+        le "  " << rap.send(sumpin).join("#{$/}  ").color(colour)
       end
-      STDERR.puts "  Exit code: #{rap.exit_code}".color(colour) if rap.exit_code != 0
+      le "  Exit code: #{rap.exit_code}".color(colour) if rap.exit_code != 0
     end
   
   end

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

@@ -82,7 +82,7 @@ module Rudy::Routines::Handlers;
     
     def create(rbox, disk, index)
       if disk.exists?
-        puts "Disk found: #{disk.name}"
+        li "Disk found: #{disk.name}"
         disk.refresh!          
       end
       
@@ -179,7 +179,7 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::AlreadyMounted, disk.name if disk.mounted?
       end
       
-      puts "Mounting at #{disk.path}... "
+      li "Mounting at #{disk.path}... "
       
       
       rbox.mkdir(:p, disk.path)
@@ -201,7 +201,7 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::NotMounted, disk.name if !disk.mounted?
       end
       
-      puts "Unmounting #{disk.path}... "
+      li "Unmounting #{disk.path}... "
       
       unless rbox.nil? || rbox.stash.windows?
         rbox.umount(disk.path)
@@ -232,11 +232,11 @@ module Rudy::Routines::Handlers;
       
       print "Creating #{disk.fstype} filesystem for #{disk.path}... "
       if rbox.stash.windows?
-        puts "(index: #{index})"
+        li "(index: #{index})"
         windows_diskpart_partition rbox, disk, index
         disk.mounted = true
       else
-        puts $/
+        li $/
         rbox.rudy_mkfs(:t, disk.fstype, :F, disk.device)
       end
       
@@ -257,7 +257,7 @@ module Rudy::Routines::Handlers;
         raise Rudy::Disks::InUse, disk.name if disk.volume_attached?
       end
       
-      puts "Destroying #{disk.name}"
+      li "Destroying #{disk.name}"
       disk.destroy
     end
     
@@ -268,13 +268,13 @@ module Rudy::Routines::Handlers;
       raise Rudy::Disks::NotAttached, disk.name if !disk.volume_attached?
       
       back = disk.archive
-      puts "Created backup: #{back.name}"
+      li "Created backup: #{back.name}"
     end
     
     def restore(rbox, disk, index)
 
       if disk.exists?
-        puts "Disk found: #{disk.name}"
+        li "Disk found: #{disk.name}"
         disk.refresh!       
       end
       
@@ -290,7 +290,7 @@ module Rudy::Routines::Handlers;
       
       disk.size, disk.fstype = latest_backup.size, latest_backup.fstype
       
-      puts "Backup found: #{latest_backup.name}"
+      li "Backup found: #{latest_backup.name}"
       
       unless disk.volume_exists?
         msg = "Creating volume... "

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

@@ -70,7 +70,7 @@ module Rudy; module Routines; module Handlers;
       end
       
       ports.each do |port|
-        #li "Authorizing port #{port} access for: #{addresses.join(', ')}"
+        li "#{action} port #{port} access for: #{addresses.join(', ')}"
         Rudy::AWS::EC2::Groups.send(action, name, addresses, [[port, port]]) rescue nil
       end
     end

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

@@ -13,7 +13,7 @@ module Rudy::Routines::Handlers;
      def create_box(hostname, opts={})
        ld [:hostname, hostname, opts, caller[0]]
        opts = {
-         :info => (@@global.verbose >= 3),  # rudy -vvv
+         :info => (@@global.verbose >= 2),  # rudy -vv
          :debug => false,
          :user => current_machine_user, 
          :ostype => current_machine_os || :unix,
@@ -35,14 +35,14 @@ module Rudy::Routines::Handlers;
        # We define hooks so we can still print each command and its output
        # when running the command blocks. NOTE: We only print this in
        # verbosity mode. 
-       if @@global.verbose > 0 && !@@global.parallel
+       if !@@global.parallel && !@@global.quiet
          # This block gets called for every command method call.
          box.pre_command_hook do |cmd, user, host, nickname|
            print_command user, nickname, cmd
          end
        end
 
-       if @@global.verbose > 1
+       if @@global.verbose > 0 && !@@global.quiet
          # And this one gets called after each command method call.
          box.post_command_hook do |ret|
            print_response ret
@@ -68,7 +68,9 @@ module Rudy::Routines::Handlers;
      # NOTE: Windows machines are skipped and not added to the set. 
      def create_set(hostnames, opts={})
        hostnames ||= []
-
+       
+       ld "Creating set from:", hostnames.inspect
+       
        opts = {
          :user => (current_machine_user).to_s,
          :parallel => @@global.parallel
@@ -164,7 +166,7 @@ module Rudy::Routines::Handlers;
      else
        le prefix << "#{ex.class}: #{ex.message}".color(:red)
      end
-     le *ex.backtrace if @@global.verbose > 2
+     le ex.backtrace if @@global.verbose > 1
    end
 
 

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/routines.rb

@@ -87,7 +87,7 @@ module Rudy
     def self.runner(routine, rset, lbox, argv=nil)
       routine.each_pair do |name,definition| 
         handler = Rudy::Routines.get_handler name
-        Rudy::Huxtable.ld "  executing handler: #{name}"
+        Rudy::Huxtable.li "  #{name}:".bright
         self.rescue {
           handler.execute(name, definition, rset, lbox, argv)
         }
@@ -99,8 +99,8 @@ module Rudy
       begin
         ret = bloc_party.call
       rescue NameError, ArgumentError, RuntimeError, Errno::ECONNREFUSED => ex
-        STDERR.puts "  #{ex.class}: #{ex.message}".color(:red)
-        STDERR.puts ex.backtrace if Rudy.debug?
+        Rudy::Huxtable.le "#{ex.class}: #{ex.message}".color(:red)
+        Rudy::Huxtable.le ex.backtrace if Rudy.debug?
         unless Rudy::Huxtable.global.parallel
           choice = Annoy.get_user_input('(S)kip  (A)bort: ', nil, 3600) || ''
           if choice.match(/\AS/i)
@@ -110,7 +110,7 @@ module Rudy
           end
          end
       rescue Interrupt
-        puts "Aborting..."
+        li "Aborting..."
         exit 12
       end
       ret

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/lib/rudy.rb

@@ -42,7 +42,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 9.freeze
-      TINY  = 3.freeze
+      TINY  = 4.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end

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: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-26 00:00:00 -04:00
+date: 2009-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency