rudy 0.8.3 → 0.8.4

data/CHANGES.txt

@@ -1,6 +1,16 @@
 RUDY, CHANGES
 
 
+#### 0.8.4 (2009-06-04) ###############################
+
+* FIXED: Fixed nil exception in fetch_machine_param
+* CHANGE: Disabled check for private key for shutdown routine. 
+  If the private key doesn't exist it prevents shutting down.
+* CHANGE: Re-enabled the check to make sure command config is parsed only one time
+* CHANGE: Some UI tweaks, some minor integration stuff with Rye
+* CHANGE: Caesars::Config verbose mode is now enabled at Rudy verbose level 2
+
+
 #### 0.8.3 (2009-06-03) ###############################
 
 * CHANGE: Now requires rye-0.7.3 (disable_safe_mode method)

data/Rudyfile

@@ -118,12 +118,12 @@ routines do
         after :rudy do               # Run remote SSH commands after startup
           mkdir :p, 'great'          # $ mkdir -p great
           touch 'great/scott'        # $ touch great/scott
-          ls :l, :a, '*'             # $ ls -l -a *
+          ls :l, :a                  # $ ls -l -a *
         end                          
       end                            
                                      
       shutdown do                    # $ rudy shutdown
-        script :root do              # Run remote SSH commands before shutdown
+        before :root do              # Run remote SSH commands before shutdown
           uptime               
         end                               
         disks do                     

data/lib/rudy.rb

@@ -38,7 +38,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 8.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/lib/rudy/cli/candy.rb

@@ -6,7 +6,7 @@ module Rudy
       def open
         rmach = Rudy::Machines.new
         machines = rmach.list
-        puts 1
+        
         if machines
           `open http://#{machines.first.dns_public}`
         else

data/lib/rudy/cli/machines.rb

@@ -86,6 +86,8 @@ module Rudy
         lt.each do |machine|
           machine.update  # make sure we have the latest DNS info
           
+          # mount -t ext3 /dev/sdr /rudy/disk1
+          
           # Print header
           if @@global.quiet
             print "You are #{ssh_opts[:user].to_s.bright}. " if !checked # only the 1st

data/lib/rudy/cli/routines.rb

@@ -12,7 +12,7 @@ module Rudy; module CLI;
       machines = @rr.execute || []
       puts $/, "The following machines are now available:" unless machines.empty?
       machines.each do |machine|
-        puts machine.to_s
+        puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
       end
     end
     
@@ -25,7 +25,7 @@ module Rudy; module CLI;
       machines = @rr.execute
       puts $/, "The following machines have been restarted:"
       machines.each do |machine|
-        puts machine.to_s
+        puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
       end
     end
     
@@ -53,7 +53,7 @@ module Rudy; module CLI;
       unless machines.empty?
         puts $/, "The following machines were processed:"
         machines.each do |machine|
-          puts @@global.verbose > 0 ? machine.inspect : machine.dump(@@global.format)
+          puts @@global.verbose > 2 ? machine.inspect : machine.dump(@@global.format)
         end
       end
       

data/lib/rudy/config/objects.rb

@@ -20,6 +20,9 @@ class Rudy::Config
   # important that new keywords do not conflict with existing
   # Rudy keywords. Strange things may happen!
   class Commands < Caesars
+    class AlreadyDefined < Rudy::Config::Error
+      def message; "The command '#{@obj}' has already been defined for this project"; end
+    end
     class PathNotString < Rudy::Config::Error
       def message; super << " (path must be a String)"; end
     end
@@ -30,7 +33,11 @@ class Rudy::Config
       def message; "Arguments for #{cmd} must be: Symbols, Strings only"; end
     end
       
-    @@processed = false
+    @@processed = false  
+    
+    ## Not used currently. May be revived. 
+    ##@@allowed = []        ## Commands which have been processed
+    
     forced_array :allow
     forced_array :deny
     chill :allow
@@ -53,6 +60,7 @@ class Rudy::Config
     def postprocess
       return false if @@processed
       @@processed = true  # Make sure this runs only once
+
       # Parses:
       # commands do
       #   allow :kill 
@@ -65,6 +73,10 @@ class Rudy::Config
       self.allow.each do |cmd|
         cmd, *args = *cmd
         
+        ## Currently disabled
+        ##raise AlreadyDefined.new(:commands, cmd) if @@allowed.member?(cmd)
+        ##@@allowed << cmd
+        
         # We can allow existing commands to be overridden but we
         # print a message to STDERR so the user knows what's up.
         STDERR.puts "Redefining #{cmd}" if Rye::Cmd.can?(cmd)

data/lib/rudy/huxtable.rb

@@ -40,7 +40,7 @@ module Rudy
     #def logger; @@logger; end
     
     def self.update_config(path=nil)
-      @@config.verbose = (@@global.verbose > 0)
+      @@config.verbose = (@@global.verbose > 1)
       # nil and bad paths sent to look_and_load are ignored
       @@config.look_and_load(path || @@global.config)
       @@global.apply_config(@@config)
@@ -332,7 +332,7 @@ module Rudy
       raise NoMachinesConfig if !@@config.machines
       raise NoGlobal unless @@global
       top_level = @@config.machines.find(parameter)
-      mc = fetch_machine_config
+      mc = fetch_machine_config || {}
       mc[parameter] || top_level || nil
     end
     

data/lib/rudy/routines.rb

@@ -140,7 +140,7 @@ module Rudy
           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) {
+              ret = Rudy::Utils.waiter(2, 30, STDOUT, msg, 0) {
                 Rudy::Utils.service_available?(machine.dns_public, 22)
               }
               is_available = ret
@@ -149,7 +149,7 @@ module Rudy
           
           if is_available
             # TODO: trap rbox errors. We could get an authentication error. 
-            opts = { :keys =>  root_keypairpath, :user => remote_user, :info => @@global.verbose > 0 }
+            opts = { :keys =>  root_keypairpath, :user => remote_user, :info => @@global.verbose > 3 }
             begin
               rbox = Rye::Box.new(machine.dns_public, opts)
               Rudy::Utils.waiter(2, 10, STDOUT, nil, 0) { rbox.connect }
@@ -337,7 +337,7 @@ module Rudy
         rescue => ex
           STDERR.puts "  Error: #{ex.message}".color(:red)
           STDERR.puts ex.backtrace if Rudy.debug?
-          choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+          choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ') || ''
            if choice.match(/\AS/i)
              return
            elsif choice.match(/\AR/i)

data/lib/rudy/routines/helper.rb

@@ -13,7 +13,7 @@ module Rudy
          print_response(ret)
        rescue IOError => ex
          STDERR.puts "  Connection Error (#{ex.message})".color(:red)
-         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ') || ''
           if choice.match(/\AS/i)
             return
           elsif choice.match(/\AR/i)
@@ -23,7 +23,7 @@ module Rudy
           end
        rescue Rye::CommandError => ex
          print_response(ex)
-         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ') || ''
           if choice.match(/\AS/i)
             return
           elsif choice.match(/\AR/i)
@@ -34,7 +34,7 @@ module Rudy
        rescue Rye::CommandNotFound => ex
          STDERR.puts "  CommandNotFound: #{ex.message}".color(:red)
          STDERR.puts ex.backtrace if Rudy.debug?
-         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+         choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ') || ''
           if choice.match(/\AS/i)
             return
           elsif choice.match(/\AR/i)

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

@@ -9,7 +9,7 @@ module Rudy; module Routines;
     extend self
 
     @@script_types = [:after, :before, :after_local, :before_local, :script, :script_local]
-    @@script_config_file_name = "rudy-config.yml"
+    
     
     # TODO: refactor using this_method
     
@@ -76,7 +76,7 @@ module Rudy; module Routines;
       return false unless hasconf
       unless routine[timing].kind_of?(Hash)
         STDERR.puts "No user supplied for #{timing} block".color(:red)
-        choice = Annoy.get_user_input('(S)kip (A)bort: ')
+        choice = Annoy.get_user_input('(S)kip (A)bort: ') || ''
          if choice.match(/\AS/i)
            return
          else
@@ -104,15 +104,6 @@ module Rudy; module Routines;
       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)
-      
-      if sconf && !sconf.empty?
-        tf = Tempfile.new(@@script_config_file_name)
-        Rudy::Utils.write_to_file(tf.path, sconf.to_hash.to_yaml, 'w')
-      end
-      
       # Do we need to run this again? It's called in generic_routine_runner
       ##if execute_command?(timing, routine) # i.e. before_local?
 
@@ -140,18 +131,6 @@ module Rudy; module Routines;
             next
           end
           
-          trap_rbox_errors {
-            # We need to create the config file for every script, 
-            # b/c the user may change and it would not be accessible.
-            # We turn off safe mode so we can write the config file via SSH. 
-            # This will need to use SCP eventually; it is unsafe and error prone.
-            # TODO: Replace with rbox.upload. Make it safe again!
-            conf_str = StringIO.new
-            conf_str.puts sconf.to_hash.to_yaml
-            rbox.upload(conf_str, script_config_remote_path)
-            rbox.chmod(600, script_config_remote_path)
-          }
-          
           begin
             # We define hooks so we can still print each command and its output
             # when running the command blocks. NOTE: We only print this in
@@ -176,7 +155,7 @@ module Rudy; module Routines;
             
           rescue Rye::CommandError => ex
             print_response(ex)
-            choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+            choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ') || ''
              if choice.match(/\AS/i)
                return
              elsif choice.match(/\AR/i)
@@ -187,7 +166,7 @@ module Rudy; module Routines;
           rescue Rye::CommandNotFound => ex
             STDERR.puts "  CommandNotFound: #{ex.message}".color(:red)
             STDERR.puts ex.backtrace if Rudy.debug?
-            choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ')
+            choice = Annoy.get_user_input('(S)kip  (R)etry  (A)bort: ') || ''
              if choice.match(/\AS/i)
                return
              elsif choice.match(/\AR/i)
@@ -202,7 +181,6 @@ module Rudy; module Routines;
           end
           
           rbox.cd # reset to home dir
-          rbox.rudy_tmp_rm(:f, script_config_remote_path)  # -f to ignore errors
         end
         
         # Return the borrowed rbox instance to the user it was provided with
@@ -212,7 +190,6 @@ module Rudy; module Routines;
       ##  puts "Nothing to do"
       ##end
       
-      tf.delete # delete local copy of script config
       
     end
   end

data/lib/rudy/routines/shutdown.rb

@@ -8,7 +8,7 @@ module Rudy; module Routines;
     end
     
     def execute
-      routine_separator(:shutdown)
+      routine_separator(:list)
       unless @routine
         STDERR.puts "[this is a generic shutdown routine]"
         @routine = {}
@@ -24,9 +24,11 @@ module Rudy; module Routines;
     def raise_early_exceptions
       rmach = Rudy::Machines.new
       raise MachineGroupNotRunning, current_machine_group unless rmach.running?
+      ## NOTE: This check is disabled for now. If the private key doesn't exist
+      ## it prevents shutting down.
       # Check private key after machine group, otherwise we could get an error
       # about there being no key which doesn't make sense if the group isn't running.
-      raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
+      ##raise Rudy::PrivateKeyNotFound, root_keypairpath unless has_keypair?(:root)
     end
     
   end

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.8.3"
+	s.version = "0.8.4"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -15,17 +15,26 @@
   s.rubygems_version = '1.1.1'
   
   s.add_dependency 'drydock', '>= 0.6.3'
-  s.add_dependency 'caesars', '>= 0.6.8'
-  s.add_dependency 'rye', '>= 0.7.3'
+  s.add_dependency 'caesars', '>= 0.7.0'
+  s.add_dependency 'rye', '>= 0.7.4'
   s.add_dependency 'sysinfo', '>= 0.5.1'
   s.add_dependency 'storable', '>= 0.5.2'
-  s.add_dependency 'annoy', '>= 0.5.1'
+  s.add_dependency 'annoy', '>= 0.5.2'
   
   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
   s.add_dependency 'highline', '>= 1.5.1'
 
+  # One of the other dependencies needs these gems but doesn't seem
+  # to specify them. Why I outta!
+  s.add_dependency 'archive-tar-minitar'
+  s.add_dependency 'nokogiri'
+  s.add_dependency 'racc'
+  s.add_dependency 'tenderlove-frex'
+  s.add_dependency 'hoe'
+  
+  # libxml2 libxml2-dev libxslt-dev
   
   # http://bit.ly/2WaAgV
   #s.add_runtime_dependency('xml-simple', '>= 1.0.11')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -04:00
+date: 2009-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.8
+        version: 0.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.3
+        version: 0.7.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
@@ -112,6 +112,56 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: archive-tar-minitar
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: racc
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: tenderlove-frex
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: "Rudy: Not your grandparents' EC2 deployment tool."
 email: delano@solutious.com
 executables: