Changeset 233

Timestamp:

06/13/05 06:47:51 (3 years ago)

Author:

ged

Message:

• Used pp instead of .inspect when YAML is disabled for more readable output.

Files:

• trunk/utils.rb (modified) (8 diffs)

trunk/utils.rb

@@ -3 +3 @@
 #   $Id: utils.rb,v 1.20 2003/11/23 04:37:57 stillflame Exp $
 #
-#   Copyright (c) 2001-2004, The FaerieMUD Consortium.
+#   Copyright (c) 2001-2005, The FaerieMUD Consortium.
 #
 #   This is free software. You may use, modify, and/or redistribute this
@@ -27 +27 @@
         $yaml = true
     rescue LoadError => e
-        $stderr.puts "No YAML; try() will use .inspect instead."
+        $stderr.puts "No YAML; try() will use PrettyPrint instead."
         $yaml = false
     end
@@ -34 +34 @@
 require 'rbconfig'
 include Config
+require 'pp'
 
 module UtilityFunctions
@@ -170 +171 @@
     ### specified <tt>msg</tt> instead.
     def replaceMessage( msg )
-        print ErasePreviousLine
+        $stderr.print ErasePreviousLine
         message( msg )
     end
@@ -176 +177 @@
     ### Output a divider made up of <tt>length</tt> hyphen characters.
     def divider( length=75 )
-        puts "\r" + ("-" * length )
+        $stderr.puts "\r" + ("-" * length )
     end
     alias :writeLine :divider
@@ -483 +484 @@
     def try( msg, bind=nil )
         result = nil
-        message "Trying #{msg}..."
+        message "Trying #{msg}...\n"
 
         begin
@@ -497 +498 @@
                 result = rval.to_yaml
             else
-                result = rval.inspect
+                result = ''
+                PP.pp( rval, result )
             end
         rescue Exception => err
@@ -505 +507 @@
             result = err.message + "\n\t" + nicetrace
         ensure
-            puts result
+            divider
+            message result + "\n"
+            divider
+            $deferr.puts
         end
     end