rudy 0.7.0 → 0.7.1

data/CHANGES.txt

@@ -8,7 +8,22 @@ RUDY, CHANGES
 * TODO: Tests for AWS HTTPS
 
 
-#### 0.7.0 (2009-04-??) ###############################
+#### 0.7.1 (2009-04-04) ###############################
+
+* FIXED: rudy wasn't honouring -C option for specifying a config file
+* FIXED: Was disabling, but not enabling colour
+* FIXED: Symbol errors in 1.8 
+* FIXED: Command blocks for root user are always run first now in Routines config.
+* ADDED: "script" keyword to routines config. 
+* CHANGE: routines before, after, and script blocks are now processed by Rye::Box.batch as Procs. 
+* CHANGE: deny was removed from commands config (it will come back later). 
+* ADDED: examples/
+* CHANGE: Rudy now checks the current working directory for machines, commands, etc... configs
+* ADDED: script_local
+* ADDED: Routine now checks whether there are any remote tasks. If not, it doesn't loop through machines. 
+
+
+#### 0.7.0 (2009-04-02) ###############################
 
 * CHANGE: Upgrade to Drydock 0.6, Caesars 0.6, and Rye 0.6
 * CHANGE: Updated Routines configuration syntax for specifying shell commands 

data/README.rdoc

@@ -29,7 +29,7 @@ All configuration is organized into the zones, environments, and roles that you
 * Powerful command-line tools
   * <tt>$ rudy -u root ssh</tt>
   * <tt>$ rudy -e testing -r database startup</tt>
-* Use _any_ Amazon machine image (AMI)
+* Use _any Linux_ Amazon machine image (AMI) (partial Solaris support)
 * Complete command-line interface for EC2. See <tt>bin/rudy-ec2</tt>.
 
 == Installation
@@ -40,8 +40,8 @@ Via Rubygems, one of:
     $ sudo gem install solutious-rudy --source http://gems.github.com/
 
 or via download:
-* rudy-latest.tar.gz[http://github.com/solutious/rudy/tarball/rudy-latest]
-* rudy-latest.zip[http://github.com/solutious/rudy/zipball/rudy-latest]
+* rudy-latest.tar.gz[http://github.com/solutious/rudy/tarball/latest]
+* rudy-latest.zip[http://github.com/solutious/rudy/zipball/latest]
 
 NOTE: <em>If you are not installing via RubyGems, you need to make sure the dependencies are in your LOAD_PATH (<tt>$:</tt>). Ryan Tomayko wrote a gist[http://gist.github.com/54177] about it.</em>
 

data/Rakefile

@@ -11,6 +11,8 @@ include FileUtils
  
 task :default => :test
  
+
+
 # TESTS ===============================================================
  
 Rake::TestTask.new(:test_old) do |t|

data/Rudyfile

@@ -81,13 +81,20 @@ end
 
 
 # ----------------------------------------------------------- COMMANDS --------
-# The commands block defines shell commands to be allowed or denied from the 
-# default list defined by Rye::Cmd (Rudy executes all SSH commands via Rye).
-# Commands can have any name except for keywords already used by Rudy. 
+# The commands block defines shell commands that can be used in routines. The
+# ones defined here are added to the default list defined by Rye::Cmd (Rudy 
+# executes all SSH commands via Rye). 
+#
+# Usage: 
+#
+# allow COMMAND-NAME
+# allow COMMAND-NAME, '/path/2/COMMAND'
+# allow COMMAND-NAME, '/path/2/COMMAND', 'default argument', 'another arg'
+#
 commands do
+  allow :make
   allow :gem_install, "/usr/bin/gem", "install", :V, "--no-rdoc", "--no-ri"
   allow :apt_get, "/usr/bin/apt-get", :y, :q
-  deny :kill
 end
 
 

data/bin/rudy

@@ -23,7 +23,7 @@ require 'rudy/cli'
 # Command-line interface for /bin/rudy
 class RudyCLI < Rudy::CLI::Base
   
-  debug :on
+  debug :off
   default :machines
   trawler :passthrough
   
@@ -86,6 +86,10 @@ class RudyCLI < Rudy::CLI::Base
   usage "rudy shutdown"
   command :shutdown => Rudy::CLI::Routines
   
+  #about "Restart a machine group"
+  #usage "rudy restart"
+  #command :restart => Rudy::CLI::Routines
+  
   about "Create a release"
   usage "rudy release"
   command :release => Rudy::CLI::Routines

data/lib/rudy.rb

@@ -45,7 +45,7 @@ module Rudy
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 0.freeze
+      TINY  = 1.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.rb

@@ -26,8 +26,7 @@ module Rudy
     protected
       def init
         
-        
-        Rudy::Huxtable.update_config
+        #Caesars.enable_debug
         
         # The CLI wants output!
         Rudy::Huxtable.update_logger STDOUT
@@ -35,6 +34,16 @@ module Rudy
         # Send The Huxtables the global values from the command-line
         Rudy::Huxtable.update_global @global
         
+        # Reload configuration. This must come after update_global 
+        # so it will catch the @@global.config path (if supplied).
+        begin
+          Rudy::Huxtable.update_config
+        rescue Caesars::SyntaxError => ex
+          STDERR.puts ex.message
+          STDERR.puts ex.backtrace if @@global.verbose > 0
+          exit 81
+        end
+      
         unless @@global.accesskey && @@global.secretkey
           STDERR.puts "No AWS credentials. Check your configs!"
           STDERR.puts "Try: rudy init"

data/lib/rudy/cli/routines.rb

@@ -9,21 +9,25 @@ module Rudy; module CLI;
       true
     end
     def startup
-
-      @rr.execute
-      
+      machines = @rr.execute
       puts $/, "The following machines are now available:"
-      rmach = Rudy::Machines.new
-      rmach.list do |machine|
+      machines.each do |machine|
         puts machine.to_s
       end
-      
-      if @@global.environment == @@config.defaults.environment && 
-         @@global.role == @@config.defaults.role
-         #puts
-         #puts "Login with: rudy -u root ssh"
-      end
-      
+    end
+    
+    def restart_valid?
+      @rr = Rudy::Routines::Restart.new
+      @rr.raise_early_exceptions
+      true
+    end
+    def restart
+      #machines = @rr.execute
+      #puts $/, "The following machines have been restarted:"
+      #machines.each do |machine|
+      #  puts machine.to_s
+      #end
+      #puts "Restart is disabled"
     end
     
     def release_valid?

data/lib/rudy/config.rb

@@ -61,10 +61,13 @@ module Rudy
         break
       end
       
+      typelist = self.keys.collect { |g| "#{g}.rb" }.join(',')
+      
       # Rudy then looks for the rest of the config in these locations
       @paths += Dir.glob(File.join(cwd, 'Rudyfile')) || []
       @paths += Dir.glob(File.join(cwd, 'config', 'rudy', '*.rb')) || []
       @paths += Dir.glob(File.join(cwd, '.rudy', '*.rb')) || []
+      @paths += Dir.glob(File.join(cwd, "{#{typelist}}")) || []
       @paths += Dir.glob(File.join('/etc', 'rudy', '*.rb')) || []
       @paths &&= @paths.uniq
       

data/lib/rudy/config/objects.rb

@@ -91,21 +91,16 @@ class Rudy::Config
           arg.is_a?(Symbol) ? ":#{arg}" : "'#{arg}'"
         end
         hard_args = args.empty? ? "*args" : "#{args.join(', ')}, *args"
-        
-        # Command keywords must be parsed with forced_array. See ScriptHelper.
-        Rudy::Config::Routines.forced_array cmd
+
+        # TODO: Use define_method 
         Rye::Cmd.module_eval %Q{
           def #{cmd}(*args); cmd(:'#{path}', #{hard_args}); end
         }
+        
       end
-      # We deny commands by telling routines to not parse the given keywords
-      self.deny.each do |cmd|
-        Rudy::Config::Routines.forced_ignore cmd.first # cmd is a forced array
-        # We don't remove the method from Rye:Cmd because we 
-        # may need elsewhere in Rudy. Forced ignore ensures
-        # the config is not stored anyhow.
-      end
-      raise Caesars::Config::ForceRefresh.new(:routines)
+      ## NOTE: We now process command blocks as Procs rather than individual commands.
+      # There's currently no need to ForceRefresh here
+      ##raise Caesars::Config::ForceRefresh.new(:routines)
     end
   end
   
@@ -124,31 +119,26 @@ class Rudy::Config
     forced_hash :restore
     forced_hash :mount
     
-    # Remote scripts
-    forced_hash :before
-    forced_hash :before_local
-    forced_hash :after
-    forced_hash :after_local
+    # Script blocks
+    forced_hash :before        
+    forced_hash :after         
+    forced_hash :script_local
+    forced_hash :before_local  
+    forced_hash :after_local     # We force hash the script keywords 
+    forced_hash :script          # b/c we want them to store the usernames
+    chill :before                # as hash keys. 
+    chill :after                 # We also chill them b/c we want to execute
+    chill :before_local          # the command blocks with an instance_eval
+    chill :after_local           # inside a Rye::Box object.
+    chill :script
+    chill :script_local
     
     # Version control systems
     forced_hash :git
     forced_hash :svn
     
-    def init
-      
-    end
-    
-    # Add remote shell commands to the DSL as forced Arrays. 
-    # Example:
-    #     ls :a, :l, "/tmp"  # => :ls => [[:a, :l, "/tmp"]]
-    #     ls :o              # => :ls => [[:a, :l, "/tmp"], [:o]]
-    # NOTE: Beware of namespace conflicts in other areas of the DSL,
-    # specifically shell commands that have the same name as a keyword
-    # we want to use in the DSL. This includes commands that were added
-    # to Rye::Cmd before Rudy is 'require'd. 
-    Rye::Cmd.instance_methods.sort.each do |cmd|
-      forced_array cmd
+    def init      
     end
-    
+
   end
 end

data/lib/rudy/disks.rb

@@ -4,6 +4,7 @@ module Rudy
 class Disk < Storable
   include Rudy::MetaData::ObjectBase
   
+  
   field :rtype
   field :awsid
   field :status
@@ -20,6 +21,11 @@ class Disk < Storable
   field :size
   #field :backups => Array
   
+  # Is the associated volume formatted? One of: true, false, [empty]. 
+  # [empty] means we don't know and it's the default. 
+  field :raw
+  
+  field :fstype
   field :mounted
   
   def init(path=nil, size=nil, device=nil, position=nil)
@@ -46,7 +52,6 @@ class Disk < Storable
   
   def to_s(with_titles=true)
     update
-    puts "FUCK" if @mounted
     mtd = @mounted == true ? "mounted" : @status
     "%s; %3sGB; %s; %s" % [liner_note, @size, @device, mtd]
   end
@@ -75,6 +80,7 @@ class Disk < Storable
     raise "#{name} is already running" if exists?
     vol = @rvol.create(@size, @zone, snapshot) 
     @awsid = vol.awsid
+    @raw = true
     self.save
     self
   end

data/lib/rudy/global.rb

@@ -42,7 +42,7 @@ module Rudy
       postprocess
       # These attributes MUST have values. 
       @verbose ||= 0
-      @nocolor = true unless @nocolor == "false" || @nocolor.is_a?(FalseClass)
+      @nocolor = true unless @nocolor == "false" || @nocolor == false
       @quiet ||= false
       @format ||= :string # as in, to_s
       @print_header = true if @print_header == nil
@@ -97,9 +97,9 @@ module Rudy
       @position &&= @position.to_s.rjust(2, '0')  
       @format &&= @format.to_sym rescue nil
       
-      String.disable_color if @nocolor
-      Rudy.enable_quiet if @quiet
-      Annoy.enable_skip if @yes
+      @nocolor ? String.disable_color : String.enable_color
+      @quiet ? Rudy.enable_quiet : Rudy.disable_quiet
+      @yes ? Annoy.enable_skip : Annoy.disable_skip
     end
     
     def apply_environment_variables

data/lib/rudy/huxtable.rb

@@ -38,8 +38,9 @@ module Rudy
     #def logger; @@logger; end
     
     def self.update_config(path=nil)
-      # nil or otherwise bad paths send to look_and_load are ignored
-      @@config.look_and_load(path || nil)
+      @@config.verbose = (@@global.verbose > 0)
+      # nil and bad paths sent to look_and_load are ignored
+      @@config.look_and_load(path || @@global.config)
       @@global.apply_config(@@config)
     end
     

data/lib/rudy/machines.rb

@@ -144,6 +144,9 @@ module Rudy
       super
     end
     
+    def restart
+      @ec2inst.restart(@awsid) if running?
+    end
     
     def Machine.generate_machine_data
       data = {      # Give the machine an identity
@@ -223,6 +226,19 @@ module Rudy
       end
     end
     
+    
+    def restart(&each_mach)
+      raise MachineGroupNotDefined, current_machine_group unless known_machine_group?
+      raise MachineGroupNotRunning, current_machine_group unless running?
+      machines = list
+      machines.each do |mach|
+        each_mach.call(mach) if each_mach
+        puts "Restarting #{mach.name}"
+        mach.restart
+      end
+      machines
+    end
+    
     def list(more=[], less=[], &each_mach)
       machines = list_as_hash(more, less, &each_mach)
       machines &&= machines.values

data/lib/rudy/routines.rb

@@ -50,12 +50,23 @@ module Rudy
         
         if Rudy::Routines::ScriptHelper.before_local?(@routine)  # before_local
           # Runs "before_local" scripts of routines config. 
-          # NOTE: Does not run "before" scripts b/c there are no remote machines
           puts task_separator("LOCAL SHELL")
           Rudy::Routines::ScriptHelper.before_local(@routine, sconf, lbox)
         end
         
-        # Execute the action (create, list, destroy) & apply the block to each
+        if Rudy::Routines::ScriptHelper.script_local?(@routine)  # before_local
+          # Runs "script_local" scripts of routines config. 
+          # NOTE: This is synonymous with before_local
+          puts task_separator("LOCAL SHELL")
+          Rudy::Routines::ScriptHelper.script_local(@routine, sconf, lbox)
+        end
+        
+        unless has_remote_task?(@routine)
+          puts "[no remote tasks]"
+          return
+        end
+        
+        # Execute the action (create, list, destroy, restart) & apply the block to each
         rmach.send(machine_action) do |machine|
           puts machine_separator(machine.name, machine.awsid)
           
@@ -131,7 +142,21 @@ module Rudy
 
           # Startup, shutdown, release, deploy, etc...
           routine_action.call(machine, rbox) if routine_action
-
+          
+          # 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. 
+          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 Rudy::Routines::ScriptHelper.after?(@routine)       # after
             puts task_separator("REMOTE SHELL")
             # Runs "after" scripts of routines config
@@ -156,6 +181,19 @@ module Rudy
 
       end
       
+      # Does the given +routine+ define any remote tasks?
+      def has_remote_task?(routine)
+        any = [Rudy::Routines::DiskHelper.disks?(routine),
+               Rudy::Routines::ScriptHelper.before?(routine),
+               Rudy::Routines::ScriptHelper.after?(routine),
+               Rudy::Routines::ScriptHelper.script?(routine),
+               Rudy::Routines::UserHelper.authorize?(routine),
+               Rudy::Routines::UserHelper.adduser?(routine)]
+        # Throw away all false answers (and nil answers)
+        any = any.compact.select { |success| success }
+        !any.empty?   # Returns true if any element contains true
+      end
+      
       def preliminary_separator(msg)
         # TODO: Count number messages printed 1/3. ie:
         # m-us-east-1b-stage-app-01                   

data/lib/rudy/routines/helper.rb

@@ -7,9 +7,13 @@ module Rudy
      
      def execute_rbox_command(ret=nil, &command)
        begin
-         ret = command.call
+         ret = command.call if command
+         return unless ret.is_a?(Rye::Rap)
          puts '  ' << ret.stdout.join("#{$/}  ") if !ret.stdout.empty?
          print_response(ret)
+       rescue IOError => ex
+         STDERR.puts "  Connection Error (#{ex.message})".color(:red)
+         exit 12 unless keep_going?
        rescue Rye::CommandError => ex
          print_response(ex)
          exit 12 unless keep_going?
@@ -39,7 +43,8 @@ module Rudy
       colour = rap.exit_code != 0 ? :red : :normal
       [:stderr].each do |sumpin|
         next if rap.send(sumpin).empty?
-        STDERR.puts ("  #{sumpin.upcase.to_s}  " << '-'*38).color(colour).bright
+        STDERR.puts
+        STDERR.puts(("  #{sumpin.to_s.upcase}  " << '-'*38).color(colour).bright)
         STDERR.puts "  " << rap.send(sumpin).join("#{$/}  ").color(colour)
       end
       STDERR.puts "  Exit code: #{rap.exit_code}".color(colour) if rap.exit_code != 0

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

@@ -7,7 +7,7 @@ module Rudy; module Routines;
     
     def disks?(routine)
       (routine.is_a?(Caesars::Hash) && routine.disks && 
-      routine.disks.is_a?(Caesars::Hash) && !routine.disks.empty?)
+      routine.disks.is_a?(Caesars::Hash) && !routine.disks.empty?) ? true : false
     end
     
     def paths(routine)
@@ -25,18 +25,24 @@ module Rudy; module Routines;
       
       # We need to add mkfs since it's not enabled by default. 
       # We add it only to this instance we're using. 
-      def @rbox.mkfs(*args); cmd('mkfs', args); end
+      # We give it a funny name so we can delete it. 
+      def @rbox.rudy_mkfs(*args); cmd('mkfs', args); end
       
-      return unless disks?(routine)
       
+      return unless disks?(routine)
+
+      modified = []
       routine.disks.each_pair do |action, disks|
         unless DiskHelper.respond_to?(action)  
           STDERR.puts %Q(DiskHelper: unknown action "#{action}")
           next
         end
         send(action, disks) # create, copy, destroy, ...
+        modified << disks
       end
       
+      # TODO: remove rudy_mkfs method
+      
     end
     
     def create(disks)
@@ -46,17 +52,26 @@ module Rudy; module Routines;
         disk = Rudy::Disk.new(path, props[:size], props[:device], @machine.position)
         olddisk = rdisk.get(disk.name)
         if olddisk && olddisk.exists?
-          puts "Disk exists: #{olddisk.name}".color(:red)
-          return
+          olddisk.update
+          puts "Disk found: #{olddisk.name}"
+          if olddisk.attached?
+            puts "In use. Skipping...".color(:red)
+            return
+          else
+            disk = olddisk
+          end
+        else
+          puts "Creating #{disk.name} "
+          disk.fstype = props[:fstype] || 'ext3'
         end
         
-        puts "Creating #{disk.name} "
-        
-        msg = "Creating volume... "
-        disk.create
-        Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
-          disk.available?
-        }
+        unless disk.exists? # Checks the EBS volume
+          msg = "Creating volume... "
+          disk.create
+          Rudy::Utils.waiter(2, 60, STDOUT, msg) { 
+            disk.available?
+          }
+        end
         
         msg = "Attaching #{disk.awsid} to #{@machine.awsid}... "
         disk.attach(@machine.awsid)
@@ -71,30 +86,40 @@ module Rudy; module Routines;
         
         # TODO: Cleanup. See ScriptHelper
         begin
-          print "Creating ext3 filesystem for #{disk.device}... "
-          execute_rbox_command { 
-            
-            @rbox.mkfs(:t, "ext3", :F, disk.device)
-            @rbox.mkdir(:p, disk.path)
+          if disk.raw == true
+            print "Creating #{disk.fstype} filesystem for #{disk.device}... "
+            @rbox.rudy_mkfs(:t, disk.fstype, :F, disk.device)
+            disk.raw = false
+            disk.save
             puts "done"
-        
-            print "Mounting at #{disk.path}... "
-        
-            @rbox.mount(:t, 'ext3', disk.device, disk.path)
-          }
+          end
+          
+          @rbox.mkdir(:p, disk.path)
+          
+          print "Mounting at #{disk.path}... "
+      
+          ret = @rbox.mount(:t, disk.fstype, disk.device, disk.path) 
+          print_response ret
+          if ret.exit_code > 0
+            STDERR.puts "Error creating disk".color(:red)
+            return
+          else
+            puts "done"
+          end
           disk.mounted = true
           disk.save
+          
         rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch => ex  
           STDERR.puts "Error creating disk".color(:red)
           STDERR.puts ex.message.color(:red)
          rescue Rye::CommandNotFound => ex
           puts "  CommandNotFound: #{ex.message}".color(:red)
+          
         rescue
           STDERR.puts "Error creating disk" .color(:red)
           Rudy::Utils.bug
         end
-        puts "done"
-        
+ 
       end
     end
       
@@ -127,7 +152,7 @@ module Rudy; module Routines;
           sleep 0.5
         end
         
-        puts "Destroying metadata... "
+        puts "Destroying volume and metadata... "
         disk.destroy
         
       end

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

@@ -8,28 +8,43 @@ module Rudy; module Routines;
     include Rudy::Routines::HelperBase  # TODO: use execute_rbox_command
     extend self
 
-    @@script_types = [:after, :before, :after_local, :before_local]
+    @@script_types = [:after, :before, :after_local, :before_local, :script, :script_local]
     @@script_config_file = "rudy-config.yml"
     
+    # TODO: refactor using this_method
+    
     def before_local(routine, sconf, rbox)
-      
+      execute_command(:before_local, routine, sconf, 'localhost', rbox)
+    end
+    def before_local?(routine)
       # before_local generally doesn't take a user name like the remote
       # before block so we add it here (unless the user did specify it)
       routine[:before_local] = { 
-        rbox.user.to_sym => routine.delete(:before_local) 
-      } unless routine.has_key?(rbox.user.to_sym) # use routine[timing].deepest_point ?
-      execute_command(:before_local, routine, sconf, 'localhost', rbox)
+        Rudy.sysinfo.user.to_sym => routine.delete(:before_local) 
+      } if routine[:before_local].is_a?(Proc)
+      execute_command?(:before_local, routine)
     end
-    def before_local?(routine); execute_command?(:before_local, routine); end
-      
+    def script_local(routine, sconf, rbox)
+      execute_command(:script_local, routine, sconf, 'localhost', rbox)
+    end
+    def script_local?(routine)
+      # before_local generally doesn't take a user name like the remote
+      # before block so we add it here (unless the user did specify it)
+      routine[:script_local] = { 
+        Rudy.sysinfo.user.to_sym => routine.delete(:script_local) 
+      } if routine[:script_local].is_a?(Proc)
+      execute_command?(:script_local, routine)
+    end
+    
     def after_local(routine, sconf, rbox)
-      routine[:after_local] = {                 # See before_local note
-        rbox.user.to_sym => routine.delete(:after_local) 
-      } unless routine.has_key?(rbox.user.to_sym)
       execute_command(:after_local, routine, sconf, 'localhost', rbox)
     end
-    def after_local?(routine); execute_command?(:after_local, routine); end
-      
+    def after_local?(routine)
+      routine[:after_local] = {                 # See before_local note
+        Rudy.sysinfo.user.to_sym => routine.delete(:after_local) 
+      } if routine[:after_local].is_a?(Proc)
+      execute_command?(:after_local, routine)
+    end
     
     def before(routine, sconf, machine, rbox)
       raise "ScriptHelper: Not a Rudy::Machine" unless machine.is_a?(Rudy::Machine)
@@ -43,6 +58,12 @@ module Rudy; module Routines;
     end
     def after?(routine); execute_command?(:after, routine); end
     
+    def script(routine, sconf, machine, rbox)
+      raise "ScriptHelper: Not a Rudy::Machine" unless machine.is_a?(Rudy::Machine)
+      execute_command(:script, routine, sconf, machine.name, rbox)
+    end
+    def script?(routine); execute_command?(:script, routine); end
+
   
   private  
     
@@ -53,8 +74,9 @@ module Rudy; module Routines;
     def execute_command?(timing, routine)
       hasconf = (routine.is_a?(Caesars::Hash) && routine.has_key?(timing))
       return false unless hasconf
-      routine[timing].each_pair do |user,conf|
-        if conf.empty? 
+      routine[timing].each_pair do |user,proc|
+        #p [timing, user, proc].join(', ')
+        if proc.nil? || !proc.is_a?(Proc)
           STDERR.puts "Empty #{timing} config for #{user}"
         else
           return true
@@ -77,16 +99,22 @@ module Rudy; module Routines;
         Rudy::Utils.write_to_file(tf.path, sconf.to_hash.to_yaml, 'w')
       end
       
-      # We need to explicitly add the rm command for rbox so we
-      # can delete the script config file when we're done. This
-      # add the method on for the instance of rbox we are using. 
-      def rbox.rm(*args); cmd('rm', args); end
-      
       if execute_command?(timing, routine) # i.e. before_local?
+
+        # We need to explicitly add the rm command for rbox so we
+        # can delete the script config file when we're done. This
+        # adds the method to this instance of rbox only.
+        # We give it a funny so we can delete it knowing we're not
+        # deleting a method added somewhere else. 
+        def rbox.rudy_tmp_rm(*args); cmd('rm', args); end
         
         original_user = rbox.user
-        users = routine[timing] || {}
-        users.each_pair do |user, commands|
+        user_blocks = routine[timing] || {}
+        users = user_blocks.keys
+        # Root stuff is always run first. 
+        users.unshift(users.delete(:root)) if users.member?(:root)
+        users.each do |user|
+          proc = user_blocks[user]
           
           begin
             rbox.switch_user user # does nothing if it's the same user
@@ -108,32 +136,45 @@ module Rudy; module Routines;
             rbox.upload(conf_str, @@script_config_file)
             rbox.chmod(600, @@script_config_file)
           }
-        
-          commands.each_pair do |command, calls|
-            # If a command is only referred to once and it has no arguments
-            # defined, we force it through by making an array with one element.
-            calls = [[]] if calls.empty?
-            
-            # Force a CommandNotFound exception early
-            unless rbox.can?(command)
-              execute_rbox_command { rbox.send(command) }
-              next
+          
+          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)
             end
-            
-            # Execute the command for every set of arguments
-            calls.each do |args|
-              puts command_separator(rbox.preview_command(command, args), user)
-              execute_rbox_command { ret = rbox.send(command, args) }
+            # 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
+            
+            ### EXECUTE THE COMMANDS BLOCK
+            rbox.batch(&proc)
+            
+            rbox.pre_command_hook = nil
+            rbox.post_command_hook = nil
+          rescue Rye::CommandError => ex
+            print_response(ex)
+            exit 12 unless keep_going?
+          rescue Rye::CommandNotFound => ex
+            STDERR.puts "  CommandNotFound: #{ex.message}".color(:red)
+            STDERR.puts ex.backtrace if Rudy.debug?
+            exit 12 unless keep_going?
           end
           
           # I was gettings errors about script_config_file not existing. There
           # might be a race condition when the rm command is called too quickly. 
           # It's also quite possible I'm off my rocker!
-          sleep 0.1
+          ## NOTE: I believe this was an issue with Rye. I fixed it when I was
+          ## noticing the same error in another place. It hasn't repeated. 
+          ## sleep 0.1
           
           rbox.cd # reset to home dir
-          #rbox.rm(@@script_config_file)
+          rbox.rudy_tmp_rm(@@script_config_file)
         end
         
         # Return the borrowed rbox instance to the user it was provided with

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

@@ -5,7 +5,7 @@ module Rudy; module Routines;
     extend self 
     
     def adduser?(routine)
-      (!routine.adduser.nil? && !routine.adduser.empty?)
+      (!routine.adduser.nil? && !routine.adduser.to_s.empty?)
     end
     def adduser(routine, machine, rbox)
       
@@ -13,7 +13,7 @@ module Rudy; module Routines;
       # explicitly so we do it for linux too for fun. 
       homedir = rbox.guess_user_home(routine.adduser.to_s)
       args = [:m, :d, homedir, :s, '/bin/bash', routine.adduser.to_s]
-      puts command_separator(rbox.preview_command(:useradd, args), routine.adduser.to_s)
+      puts command_separator(rbox.preview_command(:useradd, args), rbox.user)
       
       # NOTE: We'll may to use platform specific code here. 
       # Linux has adduser and useradd commands:
@@ -24,10 +24,10 @@ module Rudy; module Routines;
     end
     
     def authorize?(routine)
-      (!routine.authorize.nil? && !routine.authorize.empty?)
+      (!routine.authorize.nil? && !routine.authorize.to_s.empty?)
     end
     def authorize(routine, machine, rbox)
-      puts command_separator(:authorize_keys_remote, routine.authorize)
+      puts command_separator(:authorize_keys_remote, rbox.user)
       execute_rbox_command { rbox.authorize_keys_remote(routine.authorize) }
     end
     

data/lib/rudy/routines/passthrough.rb

@@ -14,7 +14,7 @@ module Rudy; module Routines;
     def execute(&each_mach)
       routine_separator(@routine_name)
       machines = []
-      generic_machine_runner(:list) do |machine|
+      generic_machine_runner(:list) do |machine,rbox|
         puts $/ #, "[routine: #{@routine_name}]"
         machines << machine
       end

data/lib/rudy/routines/shutdown.rb

@@ -15,7 +15,7 @@ module Rudy; module Routines;
       end
       machines = []
       generic_machine_runner(:destroy) do |machine,rbox|
-        #puts task_separator("SHUTDOWN")
+        puts $/, "Shutting down...", $/
         machines << machine
       end
       machines

data/lib/rudy/routines/startup.rb

@@ -16,8 +16,12 @@ module Rudy; module Routines;
         STDERR.puts "[this is a generic startup routine]"
         @routine = {}
       end
+      machines = []
       generic_machine_runner(:create) do |machine,rbox|
+        puts $/, "Starting up...", $/
+        machines << machine
       end
+      machines
     end
 
     # Called by generic_machine_runner

data/lib/rudy/scm/git.rb

@@ -17,6 +17,7 @@ module Rudy
       attr_reader :rtag
       attr_reader :user
       attr_reader :pkey
+      attr_reader :commit
       
       # * +args+ a hash of params from the git block in the routines config
       # 
@@ -26,10 +27,11 @@ module Rudy
           :remote => :origin,
           :branch => :master,
           :user => :root,
+          :commit => :enforce,
           :path => nil
         }.merge(args)
         @remote, @branch, @path = args[:remote], args[:branch], args[:path]
-        @user, @pkey = args[:user], args[:privatekey]
+        @user, @pkey, @commit = args[:user], args[:privatekey], args[:commit]
         @repo = Repo.new(Dir.pwd) if GIT.working_copy?
       end
       
@@ -196,7 +198,7 @@ module Rudy
       
       def raise_early_exceptions
         raise NotAWorkingCopy, :git unless working_copy?
-        #raise DirtyWorkingCopy, :git unless clean_working_copy?
+        raise DirtyWorkingCopy, :git unless @commit.to_s == 'ignore' || clean_working_copy?
         raise NoRemoteURI, "remote.#{@remote}.url not set" if get_remote_uri.nil?
         raise NoRemotePath, :git if @path.nil?
         raise PrivateKeyNotFound, @pkey if @pkey && !File.exists?(@pkey)

data/rudy.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "rudy"
   s.rubyforge_project = 'rudy'
-	s.version = "0.7.0"
+	s.version = "0.7.1"
 	s.summary = "Rudy: Not your grandparents' EC2 deployment tool."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"
@@ -14,9 +14,9 @@
   s.require_paths = %w[lib]
   s.rubygems_version = '1.1.1'
   
-  s.add_dependency 'drydock', '>= 0.6.0'
-  s.add_dependency 'caesars', '>= 0.6.1'
-  s.add_dependency 'rye', '>= 0.6.3'
+  s.add_dependency 'drydock', '>= 0.6.1'
+  s.add_dependency 'caesars', '>= 0.6.3'
+  s.add_dependency 'rye', '>= 0.6.4'
   
   s.add_dependency 'grit'
   s.add_dependency 'echoe'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rudy
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-02 00:00:00 -04:00
+date: 2009-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: caesars
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.1
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rye
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.6.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: grit