rudy 0.8.2 → 0.8.3

data/CHANGES.txt

@@ -1,6 +1,13 @@
 RUDY, CHANGES
 
 
+#### 0.8.3 (2009-06-03) ###############################
+
+* CHANGE: Now requires rye-0.7.3 (disable_safe_mode method)
+* CHANGE: Rye safe-mode is enabled after each routines script block to force disabling it
+  explicitly in every block it's needed. 
+* CHANGE: Removed grit dependency
+
 
 #### 0.8.2 (2009-06-01) ###############################
 

data/README.rdoc

@@ -52,9 +52,9 @@ The routines configuration describes repeatable processes that you can execute o
       end                       
                             
       after :rudy do      # Run remote SSH commands
-        mkdir :p, "great"       # $ mkdir -p great
-        touch "great/scott"     # $ touch great/scott
-        ls :l, :a               # $ ls -l -a
+        mkdir :p, "great"        # $ mkdir -p great
+        touch "great/scott"      # $ touch great/scott
+        ls :l, :a                # $ ls -l -a
       end                          
     end
 

data/lib/rudy.rb

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

data/lib/rudy/routines.rb

@@ -80,13 +80,13 @@ module Rudy
         }
         
         
-        lbox = Rye::Box.new('localhost', :info => false)
+        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, @option, @argv)
           end
@@ -96,7 +96,7 @@ 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, @option, @argv)
           end
@@ -186,28 +186,28 @@ module Rudy
 
             enjoy_every_sandwich {
               if Rudy::Routines::UserHelper.adduser?(routine)       # adduser
-                puts task_separator("ADD USER")
+                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")
+                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")
+                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")
+                task_separator("DISKS")
                 if rbox.ostype == "sunos"
                   puts "Sorry, Solaris disks are not supported yet!"
                 else
@@ -234,7 +234,7 @@ module Rudy
             # both be executed. 
             enjoy_every_sandwich {
               if Rudy::Routines::ScriptHelper.script?(routine)      # script
-                puts task_separator("REMOTE SHELL")
+                task_separator("REMOTE SHELL")
                 # Runs "after" scripts of routines config
                 Rudy::Routines::ScriptHelper.script(routine, sconf, machine, rbox, @option, @argv)
               end
@@ -242,7 +242,7 @@ module Rudy
           
             enjoy_every_sandwich {
               if Rudy::Routines::ScriptHelper.after?(routine)       # after
-                puts task_separator("REMOTE SHELL")
+                task_separator("REMOTE SHELL")
                 # Runs "after" scripts of routines config
                 Rudy::Routines::ScriptHelper.after(routine, sconf, machine, rbox, @option, @argv)
               end
@@ -254,7 +254,7 @@ module Rudy
 
         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, @option, @argv)
@@ -273,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)
@@ -316,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)
@@ -337,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
@@ -345,10 +352,6 @@ module Rudy
         ret
       end
       
-       def keep_going?
-         Annoy.pose_question("  Keep going?\a ", /yes|y|ya|sure|you bet!/i, STDOUT)
-       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
@@ -35,7 +56,7 @@ module Rudy
        cmd ||= ""
        cmd, user = cmd.to_s, user.to_s
        prompt = user == "root" ? "#" : "$"
-       ("%s%s@%s%s %s" % [$/, user, host, prompt, cmd.bright])
+       ("%s@%s%s %s" % [user, host, prompt, cmd.bright])
      end
      
   private 

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

@@ -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|
@@ -101,7 +106,7 @@ module Rudy; module Routines;
       
       # 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)
@@ -169,16 +174,31 @@ module Rudy; module Routines;
             ### EXECUTE THE COMMANDS BLOCK
             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

data/lib/rudy/routines/reboot.rb

@@ -48,7 +48,7 @@ module Rudy; module Routines;
         
       
         if Rudy::Routines::DiskHelper.disks?(@routine)         # disk
-          puts task_separator("DISKS")
+          task_separator("DISKS")
           if rbox.ostype == "sunos"
             puts "Sorry, Solaris is not supported yet!"
           else

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.8.2"
+	s.version = "0.8.3"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -16,12 +16,11 @@
   
   s.add_dependency 'drydock', '>= 0.6.3'
   s.add_dependency 'caesars', '>= 0.6.8'
-  s.add_dependency 'rye', '>= 0.7.2'
+  s.add_dependency 'rye', '>= 0.7.3'
   s.add_dependency 'sysinfo', '>= 0.5.1'
   s.add_dependency 'storable', '>= 0.5.2'
-  s.add_dependency 'annoy', '>= 0.5.0'
+  s.add_dependency 'annoy', '>= 0.5.1'
   
-  s.add_dependency 'grit'
   s.add_dependency 'echoe'
   s.add_dependency 'amazon-ec2', '>= 0.3.8'  # Region fix
   s.add_dependency 'aws-s3', '>= 0.6.1'      # Ruby 1.9.1 compatability

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -04:00
+date: 2009-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.2
+        version: 0.7.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -70,17 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: grit
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe