rutty 2.1.3 → 2.2.0

data/Gemfile

@@ -1,10 +1,13 @@
 source :gemcutter
 
 gem "commander", '~> 4.0.3'
+gem "terminal-table", '~> 1.4.2'
 gem "net-ssh", '~> 2.0.23'
 gem "net-scp", '~> 1.0.4'
+gem "builder", '~> 2.1.2'
 
 group :development do
   gem "jeweler", '~> 1.4.0'
   gem "thoughtbot-shoulda"
+  gem "xml-simple", '~> 1.0.12'
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    builder (2.1.2)
     commander (4.0.3)
       highline (>= 1.5.0)
     gemcutter (0.5.0)
@@ -17,14 +18,19 @@ GEM
     net-ssh (2.0.23)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
+    terminal-table (1.4.2)
     thoughtbot-shoulda (2.11.1)
+    xml-simple (1.0.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  builder (~> 2.1.2)
   commander (~> 4.0.3)
   jeweler (~> 1.4.0)
   net-scp (~> 1.0.4)
   net-ssh (~> 2.0.23)
+  terminal-table (~> 1.4.2)
   thoughtbot-shoulda
+  xml-simple (~> 1.0.12)

data/README.md

@@ -80,10 +80,7 @@ TODO
 
 * Cleanup dsh action code
 * Expand the tag searching semantics to allow for AND and/or OR queries
-* Add a special printout for > 0 exit codes on dsh action
 * Implement delete_node command
-* Make better printouts
-* Documentation
 
 Copyright
 ---------

data/Rakefile

@@ -17,9 +17,12 @@ begin
     gem.add_development_dependency "bundler", ">= 1.0.0"
     gem.add_development_dependency "jeweler", ">= 1.4.0"
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "xml-simple", ">= 1.0.12"
     gem.add_dependency "commander", ">= 4.0.3"
+    gem.add_dependency "terminal-table", ">= 1.4.2"
     gem.add_dependency "net-ssh", ">= 2.0.23"
     gem.add_dependency "net-scp", ">= 1.0.4"
+    gem.add_dependency "builder", ">= 2.1.2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.2.0

data/bin/rutty

@@ -9,10 +9,16 @@ $r = Rutty::Runner.new
 
 # Helpers
 add_filter_options = lambda { |c| 
-  c.option('--keypath PATH', String, 'Path to a private key')
-  c.option('--user NAME', String, 'User login')
-  c.option('--port NUMBER', Integer, 'SSH port number')
-  c.option('--tags TAG1[,TAG2,...]', Array, 'Comma-separated list of tags')
+  c.option('-k', '--keypath PATH', String, 'Path to a private key')
+  c.option('-u', '--user NAME', String, 'User login')
+  c.option('-p', '--port NUMBER', Integer, 'SSH port number')
+  c.option('-t', '--tags TAG1[,TAG2,...]', Array, 'Comma-separated list of tags')
+}
+
+add_remote_options = lambda { |c|
+  c.option('-t', '--tags TAG1[,TAG2,...]', Array, 'Comma-separated list of tags to run the command on')
+  c.option('-a', 'Run the command on ALL nodes')
+  c.option('-d', '--debug', 'Enable debug output')
 }
 
 # Commander config
@@ -23,10 +29,14 @@ program :help_formatter, Commander::HelpFormatter::TerminalCompact
 
 default_command :dsh
 
-global_option '-c', '--config DIR', 'Directory to load configs from, defaults to ~/.rutty' do |dir|
+global_option '-c', '--config DIR', "Directory to load configs from, defaults to #{Rutty::Consts::CONF_DIR}" do |dir|
   $r.config_dir = dir
 end
 
+global_option '-o', '--output FORMAT', "Format to output into, defaults to #{Rutty::Consts::DEFAULT_OUTPUT_FORMAT}" do |format|
+  $r.output_format = format
+end
+
 # Commander commands
 command :init do |c|
   c.syntax = "rutty init [DIR]"
@@ -79,9 +89,7 @@ command :dsh do |c|
   c.example "Get a list of all users logged in to all your web and app nodes", "rutty --tags web,app w"
   c.example "See all your nodes' current memory footprint", "rutty -a \"free -m\""
   
-  c.option('--tags TAG1[,TAG2,...]', Array, 'Comma-separated list of tags to run the command on')
-  c.option('-a', 'Run the command on ALL nodes')
-  c.option('-d', '--debug', 'Enable debug output')
+  add_remote_options.call(c)
   
   c.when_called do |args, options|
     $r.dsh args, options
@@ -93,9 +101,7 @@ command :scp do |c|
   c.summary = "Uploads a file to the nodes according to [options]."
   c.description = "#{c.summary} Unlike the actual scp command, this action is one-way: upload only."
   
-  c.option('--tags TAG1[,TAG2,...]', Array, 'Comma-separated list of tags to run the command on')
-  c.option('-a', 'Run the command on ALL nodes')
-  c.option('-d', '--debug', 'Enable debug output')
+  add_remote_options.call(c)
   
   c.when_called do |args, options|
     $r.dsh args, options

data/lib/rutty.rb

@@ -22,6 +22,9 @@ module Rutty
   # @since 2.0.0 
   class Runner
     attr_writer :config_dir
+    attr :config
+    attr :nodes
+    attr :output_format
   
     include Rutty::Consts
     include Rutty::Helpers
@@ -39,7 +42,7 @@ module Rutty
     # Lazy-load the {Rutty::Config} object for this instance, based on the config_dir param
     # passed to {#initialize}.
     #
-    # @return [Rutty::Config]
+    # @return [Rutty::Config] The loaded and parsed config object
     def config
       @config ||= Rutty::Config.load_config self.config_dir
     end
@@ -48,18 +51,43 @@ module Rutty
     # Lazy-load the {Rutty::Nodes} object containing the user-defined nodes' connection info.
     # Loads from the config_dir param passed to {#initialize}
     #
-    # @return [Rutty::Nodes]
+    # @return [Rutty::Nodes] The Nodes loaded from the config
     def nodes
       @nodes ||= Rutty::Nodes.load_config self.config_dir
     end
     
     ##
-    # If @config_dir is nil, returns {Rutty::Consts::CONF_DIR}. Otherwise return @config_dir.
+    # The user-specified config directory, falling back to the default on nil.
+    # Used by {Rutty::Nodes.load_config} and {Rutty::Config.load_config} to determine
+    # where to look for config files.
     #
     # @see Rutty::Consts::CONF_DIR
-    # @return [String] The user-specified config directory, falling back to the default on nil
+    # @return [String] The user-specified config directory, falling back to the default on nil.
     def config_dir
       (@config_dir.nil? && Rutty::Consts::CONF_DIR) || @config_dir
     end
+    
+    ##
+    # The tool's output format, passed by the user via the rutty bin's flag. 
+    # Must be one of the elements of {Rutty::Consts::OUTPUT_FORMATS}.
+    # Defaults to {Rutty::Consts::DEFAULT_OUTPUT_FORMAT}
+    #
+    # @see Rutty::Consts::OUTPUT_FORMATS
+    # @see Rutty::Consts::DEFAULT_OUTPUT_FORMAT
+    # @return [String] The configured output format
+    def output_format
+      (@output_format.nil? && Rutty::Consts::DEFAULT_OUTPUT_FORMAT) || @output_format
+    end
+    
+    ##
+    # Sets @output_format, or raises an exception if the value is not included in {Rutty::Consts::OUTPUT_FORMATS}.
+    #
+    # @see Rutty::Consts::OUTPUT_FORMATS
+    # @raise [Rutty::InvalidOutputFormat] On a disallowed output format string
+    def output_format= format
+      raise Rutty::InvalidOutputFormat.new "Invalid output format: #{format}" unless Rutty::Consts::OUTPUT_FORMATS.include? format
+      
+      @output_format = format
+    end
   end
 end

data/lib/rutty/actions.rb

@@ -22,16 +22,16 @@ module Rutty
       nodes_file = File.join(dir, Rutty::Consts::NODES_CONF_FILE)
       
       if File.exists? dir
-        log "exists", dir
+        log "\t<%= color('exists', :cyan) %>", dir
       else
-        log "create", dir
+        log "\t<%= color('create', :green) %>", dir
         Dir.mkdir dir
       end
 
       if File.exists? general_file
-        log "exists", general_file
+        log "\t<%= color('exists', :cyan) %>", general_file
       else
-        log "create", general_file
+        log "\t<%= color('create', :green) %>", general_file
 
         defaults_hash = { 
           :user => 'root', 
@@ -45,9 +45,9 @@ module Rutty
       end
 
       if File.exists? nodes_file
-        log "exists", nodes_file
+        log "\t<%= color('exists', :cyan) %>", nodes_file
       else
-        log "create", nodes_file
+        log "\t<%= color('create', :green) %>", nodes_file
 
         File.open(nodes_file, 'w') do |f|
           YAML.dump([], f)
@@ -73,6 +73,8 @@ module Rutty
       
       self.nodes << Rutty::Node.new(hash, self.config.to_hash)
       self.nodes.write_config self.config_dir
+      
+      say "<%= color('Added #{hash[:host]}', :green) %>"
     end
 
     ##
@@ -81,9 +83,51 @@ module Rutty
     # @see (see #add_node)
     # @param (see #add_node)
     def list_nodes args, options
-      require 'pp'
-
-      pp self.nodes.filter(options)
+      check_installed!
+      
+      if self.nodes.empty?
+        say "<%= color('No nodes defined', :yellow) %>"
+      else
+        output = case self.output_format
+          when 'human-readable'
+            require 'terminal-table/import'
+      
+            table do |t|
+              t.headings = 'Host', 'Key', 'User', 'Port', 'Tags'
+              self.nodes.each do |node|
+                tags = node.tags.nil? ? [] : node.tags
+                t << [node.host, node.keypath, node.user, node.port, tags.join(', ')]
+              end
+            end
+          
+          when 'json'
+           require 'json'
+           JSON.dump self.nodes.collect { |node| node.to_hash }
+           
+          when 'xml'
+            require 'builder'
+            xml = Builder::XmlMarkup.new(:indent => 2)
+           
+             xml.instruct!
+             xml.nodes do
+               self.nodes.each do |node|
+                 xml.node do
+                   xml.host node.host
+                   xml.user node.user
+                   xml.port node.port
+                   xml.keypath node.keypath
+                   xml.tags do
+                     node.tags.each do |tag|
+                       xml.tag tag
+                     end
+                   end
+                 end
+               end
+             end
+        end
+        
+        puts output
+      end
     end
 
     ##
@@ -93,19 +137,23 @@ module Rutty
     # @see (see #add_node)
     # @param (see #add_node)
     def dsh args, options
-      # TODO: Clean this up, it's pretty hard to read and follow
-
       check_installed!
       raise Rutty::BadUsage.new "Must supply a command to run. See `rutty help dsh' for usage" if args.empty?
       raise Rutty::BadUsage.new "One of -a or --tags must be passed" if options.a.nil? and options.tags.nil?
       raise Rutty::BadUsage.new "Use either -a or --tags, not both" if !options.a.nil? and !options.tags.nil?
       raise Rutty::BadUsage.new "Multi-word commands must be enclosed in quotes (ex. rutty -a \"ps -ef | grep httpd\")" if args.length > 1
 
+      if self.nodes.empty?
+        say "<%= color('No nodes defined', :yellow) %>"
+        exit
+      end
+      
+      HighLine.color_scheme = HighLine::SampleColorScheme.new
+
       com_str = args.pop
 
       require 'logger'
       require 'net/ssh'
-      require 'pp'
 
       @returns = {}
       connections = []
@@ -142,18 +190,21 @@ module Rutty
       }
 
       self.nodes.filter(options).each do |node|
-        @returns[node.host] = { :out => '' }
+        @returns[node.host] = { :exit => 0, :out => '' }
         begin
           connections << Net::SSH.start(node.host, node.user, :port => node.port, :paranoid => false, 
-          :user_known_hosts_file => '/dev/null', :keys => [node.keypath], 
+          :user_known_hosts_file => '/dev/null', :keys => [node.keypath], :timeout => 5,
           :logger => Logger.new(options.debug.nil? ? $stderr : $stdout),
           :verbose => (options.debug.nil? ? Logger::FATAL : Logger::DEBUG))
         rescue Errno::ECONNREFUSED
-          $stderr.puts "ERROR: Connection refused on #{node.host}"
-          @returns.delete node.host
+          @returns[node.host][:out] = "ERROR: Connection refused"
+          @returns[node.host][:exit] = 10000
         rescue SocketError
-          $stderr.puts "ERROR: nodename nor servname provided, or not known for #{node[:host]}"
-          @returns.delete node.host
+          @returns[node.host][:out] = "ERROR: no nodename nor servname provided, or not known"
+          @returns[node.host][:exit] = 20000
+        rescue Timeout::Error
+          @returns[node.host][:out] = "ERROR: Connection timeout"
+          @returns[node.host][:exit] = 30000
         end
       end
 
@@ -163,11 +214,57 @@ module Rutty
         connections.delete_if { |ssh| !ssh.process(0.1) { |s| s.busy? } }
         break if connections.empty?
       end
-
-      # TODO: Print this out in a better way
-      # TODO: Print a special alert for exit codes > 0
-
-      pp @returns
+      
+      output = case self.output_format
+        when 'human-readable'
+          min_width = 0
+          @returns.each do |host, hash|
+            min_width = host.length if host.length > min_width
+          end
+      
+          buffer = ''
+          @returns.each do |host, hash|
+            padded_host = host.dup
+      
+            if hash[:exit] >= 10000
+              padded_host = "<%= color('#{padded_host}', :critical) %>"
+              hash[:out] = "<%= color('#{hash[:out]}', :red) %>"
+            elsif hash[:exit] > 0
+              padded_host = "<%= color('#{padded_host}', :error) %>"
+            else
+              padded_host = "<%= color('#{padded_host}', :green) %>"
+            end
+        
+            padded_host << (" " * (min_width - host.length)) if host.length < min_width
+            buffer << padded_host << "\t\t"
+        
+            buffer << hash[:out].lstrip
+          end
+          
+          buffer
+          
+        when 'json'
+          require 'json'
+          JSON.dump @returns
+          
+        when 'xml'
+          require 'builder'
+          
+          xml = Builder::XmlMarkup.new(:indent => 2)
+          
+          xml.instruct!
+          xml.nodes do
+            @returns.each do |host, hash|
+              xml.node do
+                xml.host host
+                xml.exit hash[:exit]
+                xml.out hash[:out].strip
+              end
+            end
+          end
+      end
+      
+      say output
     end
 
     ##

data/lib/rutty/consts.rb

@@ -5,6 +5,11 @@ module Rutty
   # @author Josh Lindsey
   # @since 2.0.0
   module Consts
+    ## List of possible output formats
+    OUTPUT_FORMATS = %w(human-readable json xml)
+    ## Default output format
+    DEFAULT_OUTPUT_FORMAT = 'human-readable'
+    
     ## Name of the general (defaults) config file
     GENERAL_CONF_FILE = 'defaults.yaml'
     ## Name of the datastore file for user-defined nodes

data/lib/rutty/errors.rb

@@ -12,4 +12,11 @@ module Rutty
   # @author Josh Lindsey
   # @since 2.0.0
   class BadUsage < StandardError; end
+  
+  ##
+  # Raised by {Rutty::Runner} if a bad output format is passed.
+  #
+  # @author Josh Lindsey
+  # @since 2.1.4
+  class InvalidOutputFormat < StandardError; end
 end

data/lib/rutty/version.rb

@@ -8,8 +8,8 @@ module Rutty
   # @see http://semver.org
   module Version
     MAJOR = 2
-    MINOR = 1
-    PATCH = 3
+    MINOR = 2
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/rutty.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rutty}
-  s.version = "2.1.3"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Lindsey"]
-  s.date = %q{2010-11-12}
+  s.date = %q{2010-11-13}
   s.default_executable = %q{rutty}
   s.description = %q{
       RuTTY is a DSH (distributed / dancer's shell) written in Ruby. It's used to run commands 
@@ -43,7 +43,9 @@ Gem::Specification.new do |s|
      "rutty.gemspec",
      "test/helper.rb",
      "test/test_action_add_node.rb",
+     "test/test_action_dsh.rb",
      "test/test_action_init.rb",
+     "test/test_action_list_nodes.rb",
      "test/test_actions.rb",
      "test/test_config.rb",
      "test/test_consts.rb",
@@ -60,7 +62,9 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
      "test/test_action_add_node.rb",
+     "test/test_action_dsh.rb",
      "test/test_action_init.rb",
+     "test/test_action_list_nodes.rb",
      "test/test_actions.rb",
      "test/test_config.rb",
      "test/test_consts.rb",
@@ -78,24 +82,33 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<xml-simple>, [">= 1.0.12"])
       s.add_runtime_dependency(%q<commander>, [">= 4.0.3"])
+      s.add_runtime_dependency(%q<terminal-table>, [">= 1.4.2"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.23"])
       s.add_runtime_dependency(%q<net-scp>, [">= 1.0.4"])
+      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
     else
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.4.0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
       s.add_dependency(%q<commander>, [">= 4.0.3"])
+      s.add_dependency(%q<terminal-table>, [">= 1.4.2"])
       s.add_dependency(%q<net-ssh>, [">= 2.0.23"])
       s.add_dependency(%q<net-scp>, [">= 1.0.4"])
+      s.add_dependency(%q<builder>, [">= 2.1.2"])
     end
   else
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.4.0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<xml-simple>, [">= 1.0.12"])
     s.add_dependency(%q<commander>, [">= 4.0.3"])
+    s.add_dependency(%q<terminal-table>, [">= 1.4.2"])
     s.add_dependency(%q<net-ssh>, [">= 2.0.23"])
     s.add_dependency(%q<net-scp>, [">= 1.0.4"])
+    s.add_dependency(%q<builder>, [">= 2.1.2"])
   end
 end
 

data/test/helper.rb

@@ -24,7 +24,13 @@ class Test::Unit::TestCase
   end
   
   def seed_nodes
-    %x(#{RUTTY_BIN} add_node localhost -c #{TEST_CONF_DIR} -k ~/.ssh/id_rsa.pem -u root --tags localhost,test -p 22)
+    out = %x(#{RUTTY_BIN} add_node localhost -c #{TEST_CONF_DIR} -k ~/.ssh/id_rsa -u #{ENV['USER']} --tags localhost,test -p 22)
+    assert_match /Added localhost/, out
+  end
+  
+  def seed_bad_node
+    out = %x(#{RUTTY_BIN} add_node example.com -c #{TEST_CONF_DIR} --tags example,test,broken)
+    assert_match /Added example\.com/, out
   end
   
   def ensure_fresh_config!

data/test/test_action_add_node.rb

@@ -8,7 +8,12 @@ class TestActionAddNode < Test::Unit::TestCase
     should "properly create a new node entry when called" do
       require 'yaml'
       
-      %x(#{RUTTY_BIN} add_node -c #{TEST_CONF_DIR} example.com -k /home/user/.ssh/id_rsa -u root -p 22333 --tags example,testing)
+      output = %x(#{RUTTY_BIN} add_node -c #{TEST_CONF_DIR} example.com -k /home/user/.ssh/id_rsa -u root -p 22333 --tags example,testing)
+      
+      green = '\\e\[32m'
+      clear = '\\e\[0m'
+      
+      assert_match /#{green}Added example\.com#{clear}/, output
       
       nodes = YAML.load(File.open(TEST_NODES_CONF).read)
       

data/test/test_action_dsh.rb

@@ -0,0 +1,53 @@
+require 'helper'
+
+class TestActionDSH < Test::Unit::TestCase
+  context "The `rutty dsh' action" do
+    setup { ensure_fresh_config! }
+    teardown { clean_test_config! }
+    
+    should "report no defined nodes when no nodes defined" do
+      output = %x(#{RUTTY_BIN} -c #{TEST_CONF_DIR} -a uptime)
+      
+      yellow = '\\e\[33m'
+      clear = '\\e\[0m'
+      
+      assert_match /^#{yellow}No nodes defined#{clear}$/, output.rstrip
+    end
+    
+    should "display a critical error state when unable to connect" do
+      seed_bad_node
+      
+      output = %x(#{RUTTY_BIN} -c #{TEST_CONF_DIR} -a uptime)
+      
+      red_bg = '\\e\[41m'
+      yellow = '\\e\[33m'
+      red = '\\e\[31m'
+      clear = '\\e\[0m'
+      
+      assert_match /^#{yellow}#{red_bg}example\.com#{clear}\s+#{red}ERROR: Connection timeout#{clear}$/, output.rstrip
+    end
+    
+    should "display a general error state when an exite code > 0 is returned" do
+      seed_nodes
+      
+      output = %x(#{RUTTY_BIN} -c #{TEST_CONF_DIR} -a foobar)
+      
+      bold = '\\e\[1m'
+      red = '\\e\[31m'
+      clear = '\\e\[0m'
+      
+      assert_match /^#{bold}#{red}localhost#{clear}\s+.*command not found$/, output.rstrip
+    end
+    
+    should "display the proper output on success" do
+      seed_nodes
+      
+      output = %x(#{RUTTY_BIN} -c #{TEST_CONF_DIR} -a whoami)
+      
+      green = '\\e\[32m'
+      clear = '\\e\[0m'
+      
+      assert_match /^#{green}localhost#{clear}\s+#{ENV['USER']}$/, output.rstrip
+    end
+  end
+end

data/test/test_action_init.rb

@@ -18,17 +18,25 @@ class TestActionInit < Test::Unit::TestCase
       
       out = %x(#{RUTTY_BIN} init #{TEST_CONF_DIR})
       
-      assert_match /^\s+exists\s+#{TEST_CONF_DIR}$/, out
-      assert_match /^\s+exists\s+#{TEST_GENERAL_CONF}$/, out
-      assert_match /^\s+exists\s+#{TEST_NODES_CONF}$/, out
+      cyan = '\\e\[36m'
+      clear = '\\e\[0m'
+      exists = "#{cyan}exists#{clear}"
+      
+      assert_match /^\s+#{exists}\s+#{TEST_CONF_DIR}$/o, out
+      assert_match /^\s+#{exists}\s+#{TEST_GENERAL_CONF}$/o, out
+      assert_match /^\s+#{exists}\s+#{TEST_NODES_CONF}$/o, out
     end
     
     should "report that it has created the file structure if it doesn't exist" do
       out = %x(#{RUTTY_BIN} init #{TEST_CONF_DIR})
       
-      assert_match /^\s+create\s+#{TEST_CONF_DIR}$/, out
-      assert_match /^\s+create\s+#{TEST_GENERAL_CONF}$/, out
-      assert_match /^\s+create\s+#{TEST_NODES_CONF}$/, out
+      green = '\\e\[32m'
+      clear = '\\e\[0m'
+      create = "#{green}create#{clear}"
+      
+      assert_match /^\s+#{create}\s+#{TEST_CONF_DIR}$/o, out
+      assert_match /^\s+#{create}\s+#{TEST_GENERAL_CONF}$/o, out
+      assert_match /^\s+#{create}\s+#{TEST_NODES_CONF}$/o, out
     end
   end
 end

data/test/test_action_list_nodes.rb

@@ -0,0 +1,78 @@
+require 'helper'
+
+class TestActionListNodes < Test::Unit::TestCase
+  context "The `rutty list_nodes' action" do
+    setup { ensure_fresh_config! }
+    teardown { clean_test_config! }
+    
+    should "report no defined nodes when no nodes are defined" do
+      output = %x(#{RUTTY_BIN} list_nodes -c #{TEST_CONF_DIR} 2>&1)
+      
+      yellow = '\\e\[33m'
+      clear = '\\e\[0m'
+      
+      assert_match /#{yellow}No nodes defined#{clear}/, output
+    end
+    
+    should "properly list defined nodes in ASCII table format" do
+      3.times { seed_nodes }
+      output = %x(#{RUTTY_BIN} list_nodes -c #{TEST_CONF_DIR} 2>&1)
+      output = output.split("\n")
+      
+      separator = /^(?:\+{1}\-+)+\+$/
+      
+      assert_match separator, output.shift
+      assert_match /^\|\sHost\s+\|\sKey\s+\|\sUser\s+\|\sPort\s+\|\sTags\s+\|$/, output.shift
+      assert_match separator, output.shift
+      
+      3.times do
+        assert_match /^\|\slocalhost\s+\|\s#{ENV['HOME']}\/\.ssh\/id_rsa\s+\|\s#{ENV['USER']}\s+\|\s22\s+\|\slocalhost,\stest\s+\|$/o, output.shift
+      end
+      
+      assert_match separator, output.shift
+    end
+    
+    should "properly list defined nodes in JSON format" do
+      3.times { seed_nodes }
+      output = %x(#{RUTTY_BIN} list_nodes -o json -c #{TEST_CONF_DIR} 2>&1)
+      
+      require 'json'
+      require 'yaml'
+      
+      json_nodes = ''
+      assert_nothing_raised { json_nodes = JSON.parse(output) }
+      loaded_nodes = YAML.load(File.read(TEST_NODES_CONF))
+      
+      assert_equal loaded_nodes.length, json_nodes.length
+      
+      (0..(loaded_nodes.length - 1)).to_a.each do |i|
+        assert_equal loaded_nodes[i]['host'], json_nodes[i]['host']
+        assert_equal loaded_nodes[i]['keypath'], json_nodes[i]['keypath']
+        assert_equal loaded_nodes[i]['user'], json_nodes[i]['user']
+        assert_equal loaded_nodes[i]['port'], json_nodes[i]['port']
+        assert_equal loaded_nodes[i]['tags'], json_nodes[i]['tags']
+      end
+    end
+    
+    should "properly list defined nodes in XML format" do
+      3.times { seed_nodes }
+      output = %x(#{RUTTY_BIN} list_nodes -o xml -c #{TEST_CONF_DIR} 2>&1)
+      
+      require 'xmlsimple'
+      
+      xml_nodes = ''
+      assert_nothing_raised { xml_nodes = XmlSimple.xml_in(output, { 'ForceArray' => false })['node'] }
+      loaded_nodes = YAML.load(File.read(TEST_NODES_CONF))
+      
+      assert_equal loaded_nodes.length, xml_nodes.length
+      
+      (0..(loaded_nodes.length - 1)).to_a.each do |i|
+        assert_equal loaded_nodes[i]['host'], xml_nodes[i]['host']
+        assert_equal loaded_nodes[i]['keypath'], xml_nodes[i]['keypath']
+        assert_equal loaded_nodes[i]['user'], xml_nodes[i]['user']
+        assert_equal loaded_nodes[i]['port'], xml_nodes[i]['port'].to_i
+        assert_equal loaded_nodes[i]['tags'], xml_nodes[i]['tags']['tag']
+      end
+    end
+  end
+end

data/test/test_nodes.rb

@@ -20,9 +20,9 @@ class TestNodes < Test::Unit::TestCase
       
       node = @nodes.pop
       
-      assert_equal 'root', node.user
+      assert_equal ENV['USER'], node.user
       assert_equal 22, node.port
-      assert_equal "#{ENV['HOME']}/.ssh/id_rsa.pem", node.keypath
+      assert_equal "#{ENV['HOME']}/.ssh/id_rsa", node.keypath
       assert_equal %w(localhost test), node.tags
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rutty
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 3
-  version: 2.1.3
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Josh Lindsey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -05:00
+date: 2010-11-13 00:00:00 -05:00
 default_executable: rutty
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,9 +65,25 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: commander
+  name: xml-simple
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        - 12
+        version: 1.0.12
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: commander
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +95,27 @@ dependencies:
         - 3
         version: 4.0.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: terminal-table
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: net-ssh
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,11 +127,11 @@ dependencies:
         - 23
         version: 2.0.23
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: net-scp
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,7 +143,23 @@ dependencies:
         - 4
         version: 1.0.4
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  version_requirements: *id009
 description: "\n      RuTTY is a DSH (distributed / dancer's shell) written in Ruby. It's used to run commands \n      on multiple remote servers at once, based on a tagging system. Also allows for multiple\n      SCP-style uploads.\n    "
 email: josh@cloudspace.com
 executables: 
@@ -142,7 +190,9 @@ files:
 - rutty.gemspec
 - test/helper.rb
 - test/test_action_add_node.rb
+- test/test_action_dsh.rb
 - test/test_action_init.rb
+- test/test_action_list_nodes.rb
 - test/test_actions.rb
 - test/test_config.rb
 - test/test_consts.rb
@@ -187,7 +237,9 @@ summary: A DSH implementation in Ruby
 test_files: 
 - test/helper.rb
 - test/test_action_add_node.rb
+- test/test_action_dsh.rb
 - test/test_action_init.rb
+- test/test_action_list_nodes.rb
 - test/test_actions.rb
 - test/test_config.rb
 - test/test_consts.rb