rudy 0.8.5 → 0.9.0

data/lib/rudy/cli/aws/ec2/zones.rb

@@ -7,11 +7,10 @@ module AWS; module EC2;
     
     
     def zones
-      rzone = Rudy::AWS::EC2::Zones.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      rzone.list_as_hash(@argv.name).each_value do |zon|
+      Rudy::AWS::EC2::Zones.list_as_hash(@argv.name).each_value do |zon|
         puts zon.dump(@@global.format)
       end
-      puts "No zones" unless rzone.any?
+      puts "No zones" unless Rudy::AWS::EC2::Zones.any?
     end
     
     

data/lib/rudy/cli/aws/sdb/domains.rb

@@ -4,32 +4,31 @@ module Rudy; module CLI;
 module AWS; module SDB;
   
   class Domains < Rudy::CLI::CommandBase
-    
-    
+        
     def domains
-      sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
-      domains = sdb.list_domains
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      domains = @sdb.list_domains
       puts domains
       puts "No domains" if domains.nil? || domains.empty?
     end
     
     def domains_create_valid?
-      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       raise "No name specified" unless @argv.name
       true
     end
     def domains_create
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       @sdb.create_domain @argv.name
       execute_check(:low)
       domains
     end
     
     def domains_destroy_valid?
-      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       raise "No name specified" unless @argv.name
       true
     end
     def domains_destroy
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
       execute_check(:medium)
       @sdb.destroy_domain @argv.name
       domains

data/lib/rudy/cli/aws/sdb/objects.rb

@@ -0,0 +1,33 @@
+
+
+module Rudy; module CLI; 
+module AWS; module SDB;
+  
+  class Objects < Rudy::CLI::CommandBase
+    
+    
+    def objects_valid?
+      raise "Must supply domain" if @argv.empty?
+      true
+    end
+    def objects
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      
+      if @argv.key.nil?
+        query = "select * from #{@argv.name}"
+        items = @sdb.select query
+      else
+        items = [@sdb.get( @argv.name, @argv.key)]
+      end
+      
+      exit unless items
+      
+      items.each do |i|
+        p i
+      end
+    end
+    
+  end
+  
+end; end
+end; end

data/lib/rudy/cli/aws/sdb/select.rb

@@ -0,0 +1,23 @@
+
+module Rudy; module CLI; 
+module AWS; module SDB;
+  
+  class Select < Rudy::CLI::CommandBase
+    
+    def query_valid?
+      raise "No select query supplied" if @argv.empty?
+      true
+    end
+    
+    def query
+      @sdb = Rudy::AWS::SDB.new(@@global.accesskey, @@global.secretkey, @@global.region)
+      results = @sdb.select @argv.query 
+      return if results.nil?
+      results.each do |r|
+        p r
+      end
+    end
+  end
+  
+end; end
+end; end

data/lib/rudy/cli/backups.rb

@@ -0,0 +1,38 @@
+
+
+module Rudy
+  module CLI
+    class Backups < Rudy::CLI::CommandBase
+
+      
+      def backups
+        more, less = {}, []
+        less = [:environment, :role] if @option.all
+        # We first get the disk metadata
+        b_list = Rudy::Backups.list(more, less) || []
+        b_list.each do |back|
+          puts @global.verbose > 0 ? "#{back.name}: #{back.inspect}" : back.name
+        end
+      end
+      
+      def backups_wash
+        dirt = (Rudy::Backups.list || []).select { |b| !b.snapshot_exists? }
+        if dirt.empty?
+          puts "Nothing to wash in #{current_machine_group}"
+          return
+        end
+        
+        puts "The following backup metadata will be deleted:"
+        puts dirt.collect {|b| b.name }
+        
+        execute_check(:medium)
+
+        dirt.each do |b|
+          b.destroy(:force)
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/rudy/cli/base.rb

@@ -0,0 +1,104 @@
+
+
+module Rudy::CLI
+  
+  class CommandBase < Drydock::Command
+    include Rudy::Huxtable
+
+    attr_reader :config
+
+  protected
+    def init
+
+      if Drydock.debug?
+        #Caesars.enable_debug
+        Rudy.enable_debug
+      end
+
+      # The CLI wants output!
+      Rudy::Huxtable.update_logger STDOUT
+
+      # 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
+      
+      @@global.nocolor ? String.disable_color : String.enable_color
+      @@global.auto ? Annoy.enable_skip : Annoy.disable_skip
+      
+      # ANSI codes look like garbage in DOS
+      if Rudy.sysinfo.os.to_s == 'win32'
+        String.disable_color 
+        raise Rudy::Error, 'Ruby 1.9 is not supported (yet)' if Rudy.sysinfo.ruby == [1,9,1]
+      end
+      
+      unless @@global.accesskey && @@global.secretkey
+        STDERR.puts "No AWS credentials. Check your configs!"
+        STDERR.puts "Try: rudy init"
+        exit 1
+      end
+
+      if @@global.environment =~ /^prod/ && Rudy.debug?
+        puts Rudy::Utils.banner("PRODUCTION ACCESS IS DISABLED IN DEBUG MODE")
+        exit 1
+      end
+
+      if @@global.verbose >= 4    # -vvvv
+        format = @@global.format == :json ? :json : :yaml
+        gcopy = @@global.dup
+        gcopy.secretkey = "[HIDDEN]"
+        puts "# GLOBALS: ", gcopy.dump(format)
+      end
+      
+      Rudy::Metadata.connect @@global.accesskey, @@global.secretkey, @@global.region
+      Rudy::AWS::EC2.connect @@global.accesskey, @@global.secretkey, @@global.region
+    end
+
+    def execute_action(emsg="Failed", &action)
+      begin
+        ret = action.call
+        raise emsg unless ret
+        ret
+      rescue Rudy::AWS::EC2::NoAMI => ex
+        raise Drydock::OptError.new('-a', @alias)
+      end
+    end
+
+    def execute_check(level=:medium)
+      ret = Annoy.are_you_sure?(level)
+      exit 0 unless ret
+      ret
+    end
+
+    # Print a default header to the screen for every command.
+    #
+    def print_header
+
+      # Send The Huxtables the global values again because they could be
+      # updated after initialization but before the command was executed
+      Rudy::Huxtable.update_global @global
+
+      puts Rudy::CLI.generate_header(@@global, @@config) if @@global.print_header
+
+      unless @@global.quiet
+        if @@global.environment == "prod"
+          msg = "YOU ARE PLAYING WITH PRODUCTION"
+          puts Rudy::Utils.banner(msg, :normal), $/
+        end
+      end
+    end
+
+    def machine_separator(name, awsid)
+      ('%s %-50s awsid: %s ' % [$/, name, awsid]).att(:reverse)
+    end
+
+  end
+end

data/lib/rudy/cli/candy.rb

@@ -4,8 +4,7 @@ module Rudy
     class Candy < Rudy::CLI::CommandBase
       
       def open
-        rmach = Rudy::Machines.new
-        machines = rmach.list
+        machines = Rudy::Machines.list
         
         if machines
           `open http://#{machines.first.dns_public}`

data/lib/rudy/cli/config.rb

@@ -21,17 +21,20 @@ module Rudy
       #
       # It will return the most specific configuration available. If the 
       # attribute isn'e found it will check each parent for the same attribute. 
-      # i.e. if [prod][app][ami] is not available, it will check [prod][ami]
+      # e.g. if [prod][app][ami] is not available, it will check [prod][ami]
       # and then [ami]. 
       #
-      #     # Display the value for a specific machine.
-      #     $ rudy -e prod -r db config param-name
-      #
       #     # Display all configuration
       #     $ rudy config --all
       #
+      #     # Display just machines
+      #     $ rudy config --defaults
+      #
       def config
-        # if Rudy.in_situ? # TODO: do something intelligent when running on EC2
+        
+        # TODO: Re-enable:
+        #     # Display the value for a specific machine.
+        #     $ rudy -e prod -r db config param-name
         
         if @@config.nil? || @@config.empty?
           return if @@global.quiet
@@ -58,7 +61,11 @@ module Rudy
           types.each do |conftype|
             puts "# #{conftype.to_s.upcase}"
             next unless @@config[conftype]  # Nothing to output
-            @@config[conftype][:aws][:secretkey] = '[hidden]' if conftype == :accounts
+            if conftype == :accounts
+              skey = @@config[conftype][:aws][:secretkey]
+              @@config[conftype][:aws][:secretkey] = hide_secret_key(skey)
+            end
+            
             puts @@config[conftype].to_hash.send(outform)
           end
         end
@@ -73,10 +80,16 @@ module Rudy
         end
         gtmp = @@global.clone
         gtmp.format = "yaml" if gtmp.format == :s || gtmp.format == :string
-        gtmp.accesskey = gtmp.secretkey = "[not displayed]"
+        gtmp.secretkey = hide_secret_key(gtmp.secretkey)
         puts gtmp.dump(gtmp.format)
       end
       
+      private
+      def hide_secret_key(skey)
+        skey = skey.to_s
+        "%s%s%s" % [skey[0], '.'*18, skey[-1]]
+      end
+      
     end
   end
 end

data/lib/rudy/cli/disks.rb

@@ -6,16 +6,14 @@ module Rudy
 
       
       def disks
-        rdisk = Rudy::Disks.new
-        rback = Rudy::Backups.new
-        more, less = [], []
+        more, less = {}, []
         less = [:environment, :role] if @option.all
         # We first get the disk metadata
-        disk_list = rdisk.list(more, less) || []
+        disk_list = Rudy::Disks.list(more, less) || []
         # If there are no disks currently, there could be backups
         # so we grab those to create a list of disks. 
         if @option.backups
-          backups = rback.list(more, less) || []
+          backups = Rudy::Backups.list(more, less) || []
           backups.each_with_index do |b, index|
             disk_list << b.disk
           end
@@ -27,7 +25,7 @@ module Rudy
           seen << d.name
           puts @@global.verbose > 0 ? d.inspect : d.dump(@@global.format)
           if @option.backups
-            d.list_backups.each_with_index do |b, index|
+            d.backups.each_with_index do |b, index|
               puts '  %s' % b.name
               ##break if @option.all.nil? && index >= 2 # display only 3, unless all
             end
@@ -36,15 +34,15 @@ module Rudy
       end
       
       def disks_wash
-        rdisk = Rudy::Disks.new
-        dirt = (rdisk.list || [])#.select { |d| d.available? }
+        dirt = (Rudy::Disks.list || []).select { |d| !d.volume_exists? }
         if dirt.empty?
-          puts "Nothing to wash in #{rdisk.current_machine_group}"
+          puts "Nothing to wash in #{current_machine_group}"
           return
         end
         
         puts "The following disk metadata will be deleted:"
         puts dirt.collect {|d| d.name }
+        
         execute_check(:medium)
 
         dirt.each do |d|

data/lib/rudy/cli/execbase.rb

@@ -0,0 +1,56 @@
+
+
+module Rudy::CLI
+  
+  # A base for all Drydock executables (bin/rudy etc...). 
+  class Base
+    extend Drydock
+    
+    debug :off
+    
+    before do |obj|
+      # Don't print Rudy header unless requested to
+      obj.global.print_header = false  if (obj.global.verbose == 0)
+      @start = Time.now
+    end
+
+    after do |obj|  
+      if obj.global.verbose > 0
+        puts
+        @elapsed = Time.now - @start
+        puts "Elapsed: %.2f seconds" % @elapsed.to_f if @elapsed > 0.1
+      end
+    end
+    
+    # These globals are used by all bin/ executables
+    global :A, :accesskey, String, "AWS Access Key"
+    global :S, :secretkey, String, "AWS Secret Access Key"
+    global :R, :region, String, "Amazon service region (e.g. #{Rudy::DEFAULT_REGION})"
+    global :z, :zone, String, "Amazon Availability zone (e.g. #{Rudy::DEFAULT_ZONE})"
+    global :u, :user, String, "Provide a username (ie: #{Rudy.sysinfo.user})"
+    global :l, :localhost, String, "Provide a localhost (e.g. #{Rudy.sysinfo.hostname})"
+    global :i, :identity, String, "Path to SSH identity (private key) for RSA or DSA authentication"
+    global :k, :pkey, String, "AWS Private Encryption Key (pk-****.pem)"
+    global :c, :cert, String, "AWS Private Certificate (cert-****.pem)"
+    global :f, :format, String, "Output format"
+    global :n, :nocolor, "Disable output colors"
+    global :Y, :auto, "Skip interactive confirmation"
+    global :q, :quiet, "Run with less output"
+    global :O, :offline, "Be cool about the internet being down"
+    global :C, :config, String, "Specify another configuration file to read (e.g. #{Rudy::CONFIG_FILE})" do |val|
+      @configs ||= []
+      @configs << val
+    end
+    global :v, :verbose, "Increase verbosity of output (e.g. -v or -vv or -vvv)" do
+      @verbose ||= 0
+      @verbose += 1
+    end
+    global :V, :version, "Display version number" do
+      puts "Rudy version: #{Rudy::VERSION}"
+      exit 0
+    end
+    
+    
+  end
+
+end

data/lib/rudy/cli/machines.rb

@@ -11,29 +11,22 @@ module Rudy
         # When all is specified we want to find machines in every
         # environment and role to we remove these attributes from
         # the select. 
-        more, less = nil, nil
-        less = [:environment, :role] if @option.all
+        fields, less = {}, []
+        less = Rudy::Metadata::COMMON_FIELDS if @option.all
         
-        rmach = Rudy::Machines.new
-        mlist = rmach.list(more, less) || []
+        mlist = Rudy::Machines.list(fields, less) || []
         if mlist.empty?
-          if @option.all
-            puts "No machines running"
-          else
-            puts "No machines running in #{current_machine_group}" 
-            puts "Try: rudy machines --all"
-          end
+          raise( NoMachines, @option.all ? nil : current_group_name)
         end
         mlist.each do |m|
-          puts @@global.verbose > 0 ? m.inspect : m.dump(@@global.format)
+          puts @@global.verbose > 0 ? m.to_yaml : "#{m.name}: #{m.dns_public}" 
         end
       end
       
       def machines_wash
-        rmach = Rudy::Machines.new
-        dirt = (rmach.list || []).select { |m| !m.running? }
+        dirt = (Rudy::Machines.list || []).select { |m| !m.instance_running? }
         if dirt.empty?
-          puts "Nothing to wash in #{rmach.current_machine_group}"
+          puts "Nothing to wash in #{current_machine_group}"
           return
         end
         
@@ -47,70 +40,274 @@ module Rudy
         
       end
       
+      def associate_machines_valid?
+        @mlist = Rudy::Machines.list || []
+        @alist = Rudy::AWS::EC2::Addresses.list || []
+        @alist_used    = @alist.select { |a|  a.associated? }
+        @alist_unused  = @alist.select { |a| !a.associated? }
+        @alist_unused.collect! { |a| a.ipaddress }
+        @alist_instids = @alist_used.collect { |a| a.instid }
+        @mlist_static  = @mlist.select do |m| 
+          @alist_instids.member?(m.instid)
+        end
+        
+        unless @@global.force
+          unless @mlist_static.empty?
+            msg = "Some machines already have static IP addresses: #{$/}"
+            msg << @mlist_static.collect { |m| "#{m.name}: #{m.dns_public}" }.join($/)
+            raise Rudy::Error, msg 
+          end
+        
+          if !@argv.empty? && @mlist.size > @argv.size
+            msg = "You supplied #{@argv.size} addresses for #{@mlist.size} "
+            msg << "machines. Try: rudy --force machines -S #{@argv.join(' ')}"
+            raise Rudy::Error, msg
+          end
+        
+          if @alist_unused.size > 0 && @alist_unused.size < @mlist.size
+            msg = "There are only #{@alist_unused.size} available addresses for "
+            msg << "#{@mlist.size} machines. Try: rudy --force machines -S #{@argv.join(' ')}"
+            raise Rudy::Error, msg
+          end
+        end
+        
+        @argv.each do |address|
+          unless Rudy::AWS::EC2::Addresses.exists?(address)
+            raise "#{address} is not allocated to you" 
+          end
+          if Rudy::AWS::EC2::Addresses.associated?(address)
+            raise "#{address} is already associated!"
+          end
+        end
+        
+        @alist_unused = @argv unless @argv.empty? 
+        
+        true
+      end
+      
+      def associate_machines 
+        
+        puts "Assigning static IP addresses for:"
+        puts @mlist.collect { |m| m.name }
+        
+        execute_check(:medium)
+        
+        @mlist.each do |m|
+          next if @mlist_static.member?(m)
+          address = @alist_unused.shift
+          address ||= Rudy::AWS::EC2::Addresses.create.ipaddress
+          puts "Associating #{address} to #{m.name} (#{m.instid})"
+          Rudy::AWS::EC2::Addresses.associate(address, m.instid)
+          sleep 2
+          m.refresh!
+        end
+        
+        @alist = Rudy::AWS::EC2::Addresses.list || []
+        @alist_used    = @alist.select { |a|  a.associated? }
+        @alist_instids = @alist_used.collect { |a| a.instid }
+        @mlist_static  = @mlist.select do |m| 
+          @alist_instids.member?(m.instid)
+        end
+        
+        unless @mlist_static.empty?
+          @mlist_static.each do |m|
+            puts "%s: %s" % [m.name, m.dns_public]
+          end
+        end
+      end
+      
+      
+      def disassociate_machines_valid?
+        @mlist = Rudy::Machines.list || []
+        @alist = Rudy::AWS::EC2::Addresses.list || []
+        @alist_used    = @alist.select { |a|  a.associated? }
+        @alist_instids = @alist_used.collect { |a| a.instid }
+        @mlist_static  = @mlist.select do |m| 
+          @alist_instids.member?(m.instid)
+        end
+        raise NoMachines, current_group_name if @mlist.empty?
+        true
+      end
+      
+      
+      def disassociate_machines
+        if @mlist_static.empty?
+          puts "No machines in #{current_group_name} have static IP addresses"
+        else
+          puts "The following machines will be updated:"
+          puts @mlist_static.collect { |m| m.name }
+          puts "NOTE: Unassigned IP addresses are not removed from your account"
+          execute_check(:medium)
+          @mlist_static.each do |m|
+            address = Resolv.getaddress m.dns_public
+            puts "Disassociating #{address} from #{m.name} (#{m.instid})"
+            Rudy::AWS::EC2::Addresses.disassociate(address)
+          end
+        end
+      end
+      
+      def update_machines
+        fields, less = {}, []
+        less = Rudy::Metadata::COMMON_FIELDS if @option.all
+        mlist = Rudy::Machines.list(fields, less) || []
+        rset = Rye::Set.new(current_group_name, :parallel => @@global.parallel, :user => 'root')
+        os = current_machine_os
+        mlist.each do |m|
+          m.refresh!
+          rbox = Rye::Box.new(m.dns_public, :user => 'root')
+          rbox.add_key user_keypairpath('root')
+          rbox.nickname = m.name
+          rbox.stash = m
+          rset.add_boxes rbox
+          puts "Updating metadata"
+          if m.os.to_s != os.to_s
+            puts "os: #{os}"
+            m.os = os
+          end
+          m.save :replace
+        end
+        
+        unless os.to_s == 'win32'
+          puts "Updating hostnames for #{current_group_name}"
+          Rudy::Routines::Handlers::Host.set_hostname rset
+          puts rset.hostname.flatten
+        end
+        
+      end
+      
+      def available_machines
+        fields, less = {}, []
+        less = Rudy::Metadata::COMMON_FIELDS if @option.all
+        mlist = Rudy::Machines.list(fields, less) || []
+        mlist.each do |m|
+          print "#{m.name}: "
+          m.refresh!
+          Rudy::Utils.waiter(2, 60, STDOUT, nil, 0) {
+            Rudy::Utils.service_available?(m.dns_public, 22)
+          }
+          available = Rudy::Utils.service_available?(m.dns_public, 22)
+          puts available ? 'up' : 'down'
+        end
+        
+      end
+      
       
       def ssh
-        # TODO: Give this methos a good look over
-        pkey = user_keypairpath(@@global.user)
+        # TODO: Give this method a good look over
+        pkey = current_user_keypairpath
         unless pkey
-          puts "No private key configured for #{@@global.user} in #{current_machine_group}"
+          puts "No private key configured for #{current_machine_user} in #{current_machine_group}"
         end
         
-        # Options to be sent to Net::SSH
-        ssh_opts = { :user => @@global.user || Rudy.sysinfo.user, :debug => nil }
+        # Options to be sent to Rye::Box
+        rye_opts = { :user => current_machine_user, :debug => nil }
         if pkey 
           raise "Cannot find file #{pkey}" unless File.exists?(pkey)
-          raise InsecureKeyPermissions, @pkey unless File.stat(pkey).mode == 33152
-          ssh_opts[:keys] = pkey 
+          if Rudy.sysinfo.os != :win32 && File.stat(pkey).mode != 33152
+            raise InsecureKeyPermissions, pkey 
+          end
+          rye_opts[:keys] = pkey 
         end
-
-
+        
         # The user specified a command to run. We won't create an interactive
         # session so we need to prepare the command and its arguments
         if @argv.first
           command, command_args = @argv.shift, @argv || []
-          puts "#{command} #{command_args.join(' ')}" if @@global.verbose > 1
+          Rudy::Huxtable.ld "COMMAND: #{command} #{command_args.join(' ')}" if @@global.verbose > 1
 
         # otherwise, we'll open an ssh session or print command
         else
           command, command_args = :interactive_ssh, @option.print.nil?
         end
-
-
+        
+        if command == :interactive_ssh && @global.parallel
+          raise "Cannot run interactive sessions in parallel"
+        end
+        
         checked = false
-        rudy = Rudy::Machines.new
-        lt = rudy.list 
+        lt = Rudy::Machines.list 
         unless lt
-          puts "No machines running in #{rudy.current_machine_group}"
-          exit
+          puts "No machines running in #{current_machine_group}"
+          return
         end
+        
+        rset = Rye::Set.new(current_machine_group, :parallel => @global.parallel)
         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
+          machine.refresh!  # make sure we have the latest DNS info
+          rbox = Rye::Box.new(machine.dns_public, rye_opts)
+          rbox.nickname = machine.name
+          if command == :interactive_ssh
+            # Print header
+            if @@global.quiet
+              print "You are #{rye_opts[:user].to_s.bright}. " if !checked # only the 1st
+            else
+              puts machine_separator(machine.name, machine.instid)
+              puts "Connecting #{rye_opts[:user].to_s.bright}@#{machine.dns_public} "
+              puts
+            end
           else
-            puts machine_separator(machine.name, machine.awsid)
-            puts "Connecting #{ssh_opts[:user].to_s.bright}@#{machine.dns_public} "
-            puts
+            unless @global.parallel
+              rbox.pre_command_hook do |cmd,user,host,nickname|
+                print_command user, nickname, cmd
+              end
+            end
+            rbox.post_command_hook do |ret|
+              print_response ret
+            end
           end
 
           # Make sure we want to run this command on all instances
           if !checked && command != :interactive_ssh 
-            execute_check(:low) if ssh_opts[:user] == "root"
+            execute_check(:low) if rye_opts[:user] == "root"
             checked = true
           end
           
-          # Open the connection and run the command
-          rbox = Rye::Box.new(machine.dns_public, ssh_opts)
-          ret = rbox.send(command, command_args)
-          puts ret unless command == :interactive_ssh
+          # Open the connection and run the command          
+          if command == :interactive_ssh
+            rbox.send(command, command_args) 
+          else
+            rset.add_box rbox
+          end
         end
+        
+        rset.send(command, command_args) unless command == :interactive_ssh
+        
       end
 
+      
+      private 
+      # Returns a formatted string for printing command info
+      def print_command(user, host, cmd)
+        #return if @@global.parallel
+        cmd ||= ""
+        cmd, user = cmd.to_s, user.to_s
+        prompt = user == "root" ? "#" : "$"
+        li ("%s@%s%s %s" % [user, host, prompt, cmd.bright])
+      end
+      
+      
+      def print_response(rap)
+        # Non zero exit codes raise exceptions so  
+        # the erorrs have already been handled. 
+        return if rap.exit_code != 0
 
+        if @@global.parallel
+          cmd, user = cmd.to_s, user.to_s
+          prompt = user == "root" ? "#" : "$"
+          li "%s@%s%s %s%s%s" % [rap.box.user, rap.box.nickname, prompt, rap.cmd.bright, $/, rap.stdout.inspect]
+          unless rap.stderr.empty?
+            le "#{rap.box.nickname}: " << rap.stderr.join("#{rap.box.nickname}: ")
+          end
+        else
+          li '  ' << rap.stdout.join("#{$/}  ") if !rap.stdout.empty?
+          colour = rap.exit_code != 0 ? :red : :normal
+          unless rap.stderr.empty?
+            le ("  STDERR  " << '-'*38).color(colour).bright
+            le "  " << rap.stderr.join("#{$/}    ").color(colour)
+          end
+        end
+      end
+      
     end
   end
 end