solutious-rudy 0.8.2 → 0.8.3

data/lib/rudy/routines.rb

@@ -8,8 +8,11 @@ module Rudy
     
     class Base
       include Rudy::Huxtable
-    
-      def initialize(*args)
+      
+      # * +cmdname+ The name of the command specified on the command line
+      # * +option+ An OpenStruct of named command line options
+      # * +argv+ An Array of command line argument
+      def initialize(cmdname, option, argv, *args)
         a, s, r = @@global.accesskey, @@global.secretkey, @@global.region
         @sdb = Rudy::AWS::SDB.new(a, s, r)
         @rinst = Rudy::AWS::EC2::Instances.new(a, s, r)
@@ -17,11 +20,12 @@ module Rudy
         @rkey = Rudy::AWS::EC2::KeyPairs.new(a, s, r)
         @rvol = Rudy::AWS::EC2::Volumes.new(a, s, r)
         @rsnap = Rudy::AWS::EC2::Snapshots.new(a, s, r)
+        @cmdname, @option, @argv = cmdname, option, argv
+        @option ||= OpenStruct.new
         init(*args)
       end
       
-      def init
-      end
+      def init; raise "Must override init"; end 
       
       def execute
         raise "Override execute method"
@@ -39,6 +43,8 @@ module Rudy
       #   machine between the disk routine and after blocks. The block receives
       #   two argument: an instance of Rudy::Machine and one of Rye::Box.
       def generic_machine_runner(machine_action, routine=nil, skip_check=false, skip_header=false, &routine_action)
+        is_available= false
+        
         if @@global.offline
           rmach = Rudy::Machines::Offline.new
           skip_check = true
@@ -74,15 +80,15 @@ module Rudy
         }
         
         
-        lbox = Rye::Box.new('localhost')
+        lbox = Rye::Box.new('localhost', :info => (@@global.verbose > 3), :debug => false)
         sconf = fetch_script_config
         
         enjoy_every_sandwich {
           if Rudy::Routines::ScriptHelper.before_local?(routine)  # before_local
             # Runs "before_local" scripts of routines config. 
-            puts task_separator("LOCAL SHELL")
+            task_separator("LOCAL SHELL")
             lbox.cd Dir.pwd # Run local command block from current working directory
-            Rudy::Routines::ScriptHelper.before_local(routine, sconf, lbox)
+            Rudy::Routines::ScriptHelper.before_local(routine, sconf, lbox, @option, @argv)
           end
         }
         
@@ -90,9 +96,9 @@ module Rudy
           if Rudy::Routines::ScriptHelper.script_local?(routine)  # script_local
             # Runs "script_local" scripts of routines config. 
             # NOTE: This is synonymous with before_local
-            puts task_separator("LOCAL SHELL")
+            task_separator("LOCAL SHELL")
             lbox.cd Dir.pwd # Run local command block from current working directory
-            Rudy::Routines::ScriptHelper.script_local(routine, sconf, lbox)
+            Rudy::Routines::ScriptHelper.script_local(routine, sconf, lbox, @option, @argv)
           end
         }
         
@@ -131,80 +137,86 @@ module Rudy
             next  # The short circuit
           end
             
-          unless skip_check
-            msg = preliminary_separator("Waiting for SSH daemon...")
-            Rudy::Utils.waiter(2, 60, STDOUT, msg, 0) {
-              Rudy::Utils.service_available?(machine.dns_public, 22)
+          if !skip_check && has_remote_task?(routine)
+            enjoy_every_sandwich {
+              msg = preliminary_separator("Waiting for SSH daemon...")
+              ret = Rudy::Utils.waiter(2, 1, STDOUT, msg, 0) {
+                Rudy::Utils.service_available?(machine.dns_public, 22)
+              }
+              is_available = ret
             }
           end
           
-          # TODO: trap rbox errors. We could get an authentication error. 
-          opts = { :keys =>  root_keypairpath, :user => remote_user, :info => @@global.verbose > 0 }
-          begin
-            rbox = Rye::Box.new(machine.dns_public, opts)
-            rbox.connect
-          rescue Rye::NoHost => ex
-            STDERR.puts "No host: #{ex.message}"
-            exit 65
-          end
+          if is_available
+            # TODO: trap rbox errors. We could get an authentication error. 
+            opts = { :keys =>  root_keypairpath, :user => remote_user, :info => @@global.verbose > 0 }
+            begin
+              rbox = Rye::Box.new(machine.dns_public, opts)
+              Rudy::Utils.waiter(2, 10, STDOUT, nil, 0) { rbox.connect }
+            rescue Rye::NoHost => ex
+              STDERR.puts "No host: #{ex.message}"
+              exit 65
+            end
           
-          unless skip_check
-            # Set the hostname if specified in the machines config. 
-            # :rudy -> change to Rudy's machine name
-            # :default -> leave the hostname as it is
-            # Anything else other than nil -> change to that value
-            # NOTE: This will set hostname every time a routine is
-            # run so we may want to make this an explicit action. 
+            unless skip_check
+              # Set the hostname if specified in the machines config. 
+              # :rudy -> change to Rudy's machine name
+              # :default -> leave the hostname as it is
+              # Anything else other than nil -> change to that value
+              # NOTE: This will set hostname every time a routine is
+              # run so we may want to make this an explicit action. 
+              enjoy_every_sandwich {
+                hn = current_machine_hostname || :rudy
+                if hn != :default
+                  hn = machine.name if hn == :rudy
+                  print preliminary_separator("Setting hostname to #{hn}... ")
+                  rbox.hostname(hn) 
+                  puts "done"
+                end
+              }
+            end
+          
+          
+            ## NOTE: This prevents shutdown from doing its thing and prob
+            ## isn't necessary. 
+            ##unless has_remote_task?(routine) 
+            ##  puts "[no remote tasks]"
+            ##  next
+            ##end
+
             enjoy_every_sandwich {
-              hn = current_machine_hostname || :rudy
-              if hn != :default
-                hn = machine.name if hn == :rudy
-                print preliminary_separator("Setting hostame to #{hn}... ")
-                rbox.hostname(hn) 
-                puts "done"
+              if Rudy::Routines::UserHelper.adduser?(routine)       # adduser
+                task_separator("ADD USER")
+                Rudy::Routines::UserHelper.adduser(routine, machine, rbox)
               end
             }
-          end
           
-          ## NOTE: This prevents shutdown from doing its thing and prob
-          ## isn't necessary. 
-          ##unless has_remote_task?(routine) 
-          ##  puts "[no remote tasks]"
-          ##  next
-          ##end
-
-          enjoy_every_sandwich {
-            if Rudy::Routines::UserHelper.adduser?(routine)       # adduser
-              puts task_separator("ADD USER")
-              Rudy::Routines::UserHelper.adduser(routine, machine, rbox)
-            end
-          }
-          
-          enjoy_every_sandwich {
-            if Rudy::Routines::UserHelper.authorize?(routine)     # authorize
-              puts task_separator("AUTHORIZE USER")
-              Rudy::Routines::UserHelper.authorize(routine, machine, rbox)
-            end
-          }
+            enjoy_every_sandwich {
+              if Rudy::Routines::UserHelper.authorize?(routine)     # authorize
+                task_separator("AUTHORIZE USER")
+                Rudy::Routines::UserHelper.authorize(routine, machine, rbox)
+              end
+            }
           
-          enjoy_every_sandwich {
-            if Rudy::Routines::ScriptHelper.before?(routine)      # before
-              puts task_separator("REMOTE SHELL")
-              Rudy::Routines::ScriptHelper.before(routine, sconf, machine, rbox)
-            end
-          }
+            enjoy_every_sandwich {
+              if Rudy::Routines::ScriptHelper.before?(routine)      # before
+                task_separator("REMOTE SHELL")
+                Rudy::Routines::ScriptHelper.before(routine, sconf, machine, rbox, @option, @argv)
+              end
+            }
           
-          enjoy_every_sandwich {
-            if Rudy::Routines::DiskHelper.disks?(routine)         # disk
-              puts task_separator("DISKS")
-              if rbox.ostype == "sunos"
-                puts "Sorry, Solaris disks are not supported yet!"
-              else
-                Rudy::Routines::DiskHelper.execute(routine, machine, rbox)
-              end    
-            end
-          }
+            enjoy_every_sandwich {
+              if Rudy::Routines::DiskHelper.disks?(routine)         # disk
+                task_separator("DISKS")
+                if rbox.ostype == "sunos"
+                  puts "Sorry, Solaris disks are not supported yet!"
+                else
+                  Rudy::Routines::DiskHelper.execute(routine, machine, rbox)
+                end    
+              end
+            }
           
+          end
           
           enjoy_every_sandwich {
             # Startup, shutdown, release, deploy, etc...
@@ -212,38 +224,40 @@ module Rudy
           }
           
           
-          # The "after" blocks are synonymous with "script" blocks. 
-          # For some routines, like startup, it makes sense to an 
-          # "after" block b/c "script" is ambiguous. In generic
-          # routines, there is no concept of before or after. The
-          # definition is the entire routine so we use "script".
-          # NOTE: If both after and script are supplied they will 
-          # both be executed. 
-          enjoy_every_sandwich {
-            if Rudy::Routines::ScriptHelper.script?(routine)      # script
-              puts task_separator("REMOTE SHELL")
-              # Runs "after" scripts of routines config
-              Rudy::Routines::ScriptHelper.script(routine, sconf, machine, rbox)
-            end
-          }
+          if is_available
+            # The "after" blocks are synonymous with "script" blocks. 
+            # For some routines, like startup, it makes sense to an 
+            # "after" block b/c "script" is ambiguous. In generic
+            # routines, there is no concept of before or after. The
+            # definition is the entire routine so we use "script".
+            # NOTE: If both after and script are supplied they will 
+            # both be executed. 
+            enjoy_every_sandwich {
+              if Rudy::Routines::ScriptHelper.script?(routine)      # script
+                task_separator("REMOTE SHELL")
+                # Runs "after" scripts of routines config
+                Rudy::Routines::ScriptHelper.script(routine, sconf, machine, rbox, @option, @argv)
+              end
+            }
           
-          enjoy_every_sandwich {
-            if Rudy::Routines::ScriptHelper.after?(routine)       # after
-              puts task_separator("REMOTE SHELL")
-              # Runs "after" scripts of routines config
-              Rudy::Routines::ScriptHelper.after(routine, sconf, machine, rbox)
-            end
-          }
+            enjoy_every_sandwich {
+              if Rudy::Routines::ScriptHelper.after?(routine)       # after
+                task_separator("REMOTE SHELL")
+                # Runs "after" scripts of routines config
+                Rudy::Routines::ScriptHelper.after(routine, sconf, machine, rbox, @option, @argv)
+              end
+            }
           
-          rbox.disconnect
+            rbox.disconnect
+          end
         end
-        
+
         enjoy_every_sandwich {
           if Rudy::Routines::ScriptHelper.after_local?(routine)   # after_local
-            puts task_separator("LOCAL SHELL")
+            task_separator("LOCAL SHELL")
             lbox.cd Dir.pwd # Run local command block from current working directory
             # Runs "after_local" scripts of routines config
-            Rudy::Routines::ScriptHelper.after_local(routine, sconf, lbox)
+            Rudy::Routines::ScriptHelper.after_local(routine, sconf, lbox, @option, @argv)
           end
         }
         
@@ -259,7 +273,7 @@ module Rudy
         return unless depends
         unless depends.empty?
           depends.each_with_index do |d, index|
-            puts task_separator("DEPENDENCY: #{d}")  
+            task_separator("DEPENDENCY: #{d}")  
             routine_dependency = fetch_routine_config(d)
             unless routine_dependency
               STDERR.puts "  Unknown routine: #{d}".color(:red)
@@ -302,7 +316,7 @@ module Rudy
       def task_separator(title)
         dashes = 59 - title.size 
         dashes = 0 if dashes < 1
-        ("%s---  %s  %s" % [$/, title, '-'*dashes])
+        puts ("%s---  %s  %s" % [$/, title, '-'*dashes]) if @@global.verbose > 2
       end
       
       def machine_separator(name, awsid)
@@ -323,7 +337,14 @@ module Rudy
         rescue => ex
           STDERR.puts "  Error: #{ex.message}".color(:red)
           STDERR.puts ex.backtrace if Rudy.debug?
-          exit 12 unless keep_going?
+          choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+           if choice.match(/\AS/i)
+             return
+           elsif choice.match(/\AR/i)
+             retry
+           else
+             exit 12
+           end
         rescue Interrupt
           puts "Aborting..."
           exit 12
@@ -331,10 +352,6 @@ module Rudy
         ret
       end
       
-       def keep_going?
-         Annoy.pose_question("  Keep going?\a ", /yes|y|ya|sure|you bet!/i, STDERR)
-       end
-      
     end
   end
 end

data/lib/rudy/routines/helper.rb

@@ -13,14 +13,35 @@ module Rudy
          print_response(ret)
        rescue IOError => ex
          STDERR.puts "  Connection Error (#{ex.message})".color(:red)
-         exit 12 unless keep_going?
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+          if choice.match(/\AS/i)
+            return
+          elsif choice.match(/\AR/i)
+            retry
+          else
+            exit 12
+          end
        rescue Rye::CommandError => ex
          print_response(ex)
-         exit 12 unless keep_going?
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+          if choice.match(/\AS/i)
+            return
+          elsif choice.match(/\AR/i)
+            retry
+          else
+            exit 12
+          end
        rescue Rye::CommandNotFound => ex
          STDERR.puts "  CommandNotFound: #{ex.message}".color(:red)
          STDERR.puts ex.backtrace if Rudy.debug?
-         exit 12 unless keep_going?
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+          if choice.match(/\AS/i)
+            return
+          elsif choice.match(/\AR/i)
+            retry
+          else
+            exit 12
+          end
        end
        
        ret
@@ -31,11 +52,11 @@ module Rudy
      end
      
      # Returns a formatted string for printing command info
-     def command_separator(cmd, user)
+     def command_separator(cmd, user, host)
        cmd ||= ""
        cmd, user = cmd.to_s, user.to_s
        prompt = user == "root" ? "#" : "$"
-       ("%s%s%s %s" % [$/, user, prompt, cmd.bright])
+       ("%s@%s%s %s" % [user, host, prompt, cmd.bright])
      end
      
   private 

data/lib/rudy/routines/helpers/scripthelper.rb

@@ -13,8 +13,8 @@ module Rudy; module Routines;
     
     # TODO: refactor using this_method
     
-    def before_local(routine, sconf, rbox)
-      execute_command(:before_local, routine, sconf, 'localhost', rbox)
+    def before_local(routine, sconf, rbox, option=nil, argv=nil)
+      execute_command(:before_local, routine, sconf, 'localhost', rbox, option, argv)
     end
     def before_local?(routine)
       # before_local generally doesn't take a user name like the remote
@@ -24,8 +24,8 @@ module Rudy; module Routines;
       } if routine[:before_local].is_a?(Proc)
       execute_command?(:before_local, routine)
     end
-    def script_local(routine, sconf, rbox)
-      execute_command(:script_local, routine, sconf, 'localhost', rbox)
+    def script_local(routine, sconf, rbox, option=nil, argv=nil)
+      execute_command(:script_local, routine, sconf, 'localhost', rbox, option, argv)
     end
     def script_local?(routine)
       # before_local generally doesn't take a user name like the remote
@@ -36,8 +36,8 @@ module Rudy; module Routines;
       execute_command?(:script_local, routine)
     end
     
-    def after_local(routine, sconf, rbox)
-      execute_command(:after_local, routine, sconf, 'localhost', rbox)
+    def after_local(routine, sconf, rbox, option=nil, argv=nil)
+      execute_command(:after_local, routine, sconf, 'localhost', rbox, option, argv)
     end
     def after_local?(routine)
       routine[:after_local] = {                 # See before_local note
@@ -46,21 +46,21 @@ module Rudy; module Routines;
       execute_command?(:after_local, routine)
     end
     
-    def before(routine, sconf, machine, rbox)
+    def before(routine, sconf, machine, rbox, option=nil, argv=nil)
       raise "ScriptHelper: Not a Rudy::Machine" unless machine.is_a?(Rudy::Machine)
-      execute_command(:before, routine, sconf, machine.name, rbox)
+      execute_command(:before, routine, sconf, machine.name, rbox, option, argv)
     end
     def before?(routine); execute_command?(:before, routine); end
     
-    def after(routine, sconf, machine, rbox)
+    def after(routine, sconf, machine, rbox, option=nil, argv=nil)
       raise "ScriptHelper: Not a Rudy::Machine" unless machine.is_a?(Rudy::Machine)
-      execute_command(:after, routine, sconf, machine.name, rbox)
+      execute_command(:after, routine, sconf, machine.name, rbox, option, argv)
     end
     def after?(routine); execute_command?(:after, routine); end
     
-    def script(routine, sconf, machine, rbox)
+    def script(routine, sconf, machine, rbox, option=nil, argv=nil)
       raise "ScriptHelper: Not a Rudy::Machine" unless machine.is_a?(Rudy::Machine)
-      execute_command(:script, routine, sconf, machine.name, rbox)
+      execute_command(:script, routine, sconf, machine.name, rbox, option, argv)
     end
     def script?(routine); execute_command?(:script, routine); end
 
@@ -76,7 +76,12 @@ module Rudy; module Routines;
       return false unless hasconf
       unless routine[timing].kind_of?(Hash)
         STDERR.puts "No user supplied for #{timing} block".color(:red)
-        exit 12 unless keep_going?
+        choice = Annoy.get_user_input('(S)kip (A)bort: ')
+         if choice.match(/\AS/i)
+           return
+         else
+           exit 12
+         end
         return false
       end
       routine[timing].each_pair do |user,proc|
@@ -95,13 +100,13 @@ module Rudy; module Routines;
     # * +sconf+ is a config hash from machines config (ignored if nil)
     # * +hostname+ machine hostname that we're working on
     # * +rbox+ a Rye::Box instance for the machine we're working on
-    def execute_command(timing, routine, sconf, hostname, rbox)
+    def execute_command(timing, routine, sconf, hostname, rbox, option=nil, argv=nil)
       raise "ScriptHelper: Not a Rye::Box" unless rbox.is_a?(Rye::Box)
       raise "ScriptHelper: #{timing}?" unless @@script_types.member?(timing)
       
       # The config file that gets created on each remote machine
       # will be created in the user's home directory. 
-      script_config_remote_path = File.join(rbox.getenv['HOME'], @@script_config_file_name)
+      script_config_remote_path = File.join(rbox.getenv['HOME'] || '', @@script_config_file_name)
       
       if sconf && !sconf.empty?
         tf = Tempfile.new(@@script_config_file_name)
@@ -148,32 +153,52 @@ module Rudy; module Routines;
           }
           
           begin
-            # We define hooks so we can call the script block as a batch. 
-            # We intentionally set and unset the hooks so the other commands
-            # (config file copy) don't get printed.
-            #
-            # This block gets called for every command method call.
-            rbox.pre_command_hook do |cmd, args, user|
-              puts command_separator(rbox.preview_command(cmd, args), user)
+            # 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. We intentionally set and unset the hooks 
+            # so the other commands (config file copy) don't get printed.
+            if @@global.verbose > 0
+              # This block gets called for every command method call.
+              rbox.pre_command_hook do |cmd, args, user, host|
+                puts command_separator(rbox.preview_command(cmd, args), user, host)
+              end
             end
-            # And this one gets called after each command method call.
-            rbox.post_command_hook do |ret|
-              puts '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?
-              print_response(ret)
+            if @@global.verbose > 1
+              # And this one gets called after each command method call.
+              rbox.post_command_hook do |ret|
+                puts '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?
+                print_response(ret)
+              end
             end
             
             ### EXECUTE THE COMMANDS BLOCK
-            rbox.batch(&proc)
+            rbox.batch(option, argv, &proc)
             
-            rbox.pre_command_hook = nil
-            rbox.post_command_hook = nil
           rescue Rye::CommandError => ex
             print_response(ex)
-            exit 12 unless keep_going?
+            choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+             if choice.match(/\AS/i)
+               return
+             elsif choice.match(/\AR/i)
+               retry
+             else
+               exit 12
+             end
           rescue Rye::CommandNotFound => ex
             STDERR.puts "  CommandNotFound: #{ex.message}".color(:red)
             STDERR.puts ex.backtrace if Rudy.debug?
-            exit 12 unless keep_going?
+            choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+             if choice.match(/\AS/i)
+               return
+             elsif choice.match(/\AR/i)
+               retry
+             else
+               exit 12
+             end
+          ensure
+            rbox.pre_command_hook = nil
+            rbox.post_command_hook = nil
+            rbox.enable_safe_mode  # In case it was disabled
           end
           
           rbox.cd # reset to home dir