console-mode.rb in sup-0.12

- old
+ new

@@ -6,11 +6,11 @@
   def initialize mode
     @mode = mode
   end
 
   def query(query)
-    Enumerable::Enumerator.new(Index, :each_message, Index.parse_query(query))
+    Enumerator.new(Index.instance, :each_message, Index.parse_query(query))
   end
 
   def add_labels(query, *labels)
     query(query).each { |m| m.labels += labels; m.save Index }
   end
@@ -23,9 +23,12 @@
 
   def loglevel; Redwood::Logger.level; end
   def set_loglevel(level); Redwood::Logger.level = level; end
 
   def special_methods; methods - Object.methods end
+
+  def puts x; @mode << "#{x.to_s.rstrip}\n" end
+  def p x; puts x.inspect end
 
   ## files that won't cause problems when reloaded
   ## TODO expand this list / convert to blacklist
   RELOAD_WHITELIST = %w(sup/index.rb sup/modes/console-mode.rb)
 