delano-tryouts 0.4.0 → 0.4.1

data/CHANGES.txt

@@ -1,6 +1,11 @@
 TRYOUTS, CHANGES
 
 
+#### 0.4.1 (2009-06-07) ###############################
+
+* CHANGE: The CLI output is no longer terrifyingly ugly.
+
+
 #### 0.4.0 (2009-06-05) ###############################
 
 NOTE: Initial public release

data/README.rdoc

@@ -1,11 +1,7 @@
-= Tryouts - v0.5 ALPHA
+= Tryouts - v0.4 BETA
 
 Tryouts is a high-level testing library for your command-line applications and Ruby codes.
 
-*WORK IN PROGRESS* 
-
-2009-05-24 - A BBQ started nearby as I was writing this documentation. It's incomplete and I'm sorry about that but I can tell you that this BBQ smells really, really good. 
-
 
 == Terminology
 
@@ -27,9 +23,9 @@ The tryout definition would look like this:
 
     command :executable, "path/2/executable"
     
-    tryout "Common Usage", :cli do
+    tryout "Common Usage" do
       drill  "No Command"
-      drill "YAML Output", :f, "yaml"
+      drill "YAML Output", :f, 'yaml'
     end
     
 And the expected output would be defined like this:
@@ -56,7 +52,7 @@ Tryouts employs the same approach for testing Ruby codes. The return value of th
 
     library :caesars, LIBRARY_PATH
 
-    tryout "Common Usage", :api do
+    tryout "Common Usage" do
       dream "Some Maths", 3 
       drill "Some Maths" do
         12 / 4

data/bin/tryouts

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/local/bin/ruby
 
 TRYOUTS_HOME = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
@@ -15,9 +15,10 @@ require 'tryouts/cli'
 module TryoutsCLI
   extend Drydock
   
-  debug :on
+  debug :off
   default :run, :with_args
   
+  global :q, :quiet, "Decrease output"
   global :v, :verbose, "Increase output" do 
     @verbose ||= 0
     @verbose += 1

data/lib/tryouts/cli/run.rb

@@ -28,47 +28,97 @@ class Tryouts; module CLI
     end
     
     def run
+      if @global.verbose > 0
+        puts "#{Tryouts.sysinfo.to_s} (#{RUBY_VERSION})"
+      end
+      
       load_available_tryouts_files
-      Tryouts.run
+
+      passed, failed = 0, 0
+      Tryouts.instances.each_pair do |group,tryouts_inst|
+        puts '', ' %-60s'.att(:reverse) % group
+        puts "  #{tryouts_inst.paths.join("\n  ")}" if @global.verbose > 0
+        tryouts_inst.tryouts.each_pair do |name,to|
+          to.run
+          to.report
+          STDOUT.flush
+          passed += to.passed
+          failed += to.failed
+        end
+      end
+      unless @global.quiet
+        if failed == 0
+          puts MOOKIE if @global.verbose > 5
+          puts $/, " All #{passed+failed} dreams came true ".att(:reverse).color(:green)
+        else
+          puts $/, " #{passed} of #{passed+failed} dreams came true ".att(:reverse).color(:red)
+        end
+        
+      end
     end
     
     def list
       load_available_tryouts_files
-      if @global.verbose > 0
-        puts Tryouts.instances.to_yaml
-      else
-        Tryouts.instances.each_pair do |n,tryouts|
+      ##if @global.verbose > 2
+      ##  puts Tryouts.instances.to_yaml   # BUG: Raises "can't dump anonymous class Class"
+      ##else
+        Tryouts.instances.each_pair do |n,tryouts_inst|
           puts n
-          tryouts.tryouts.each do |tryout|
+          if @global.verbose > 0
+            puts "  #{tryouts_inst.paths.join("\n  ")}"
+          end
+          tryouts_inst.tryouts.each_pair do |t2,tryout|
             puts "  " << tryout.name
             tryout.drills.each do |drill|
               puts "    " << drill.name
             end
           end
         end
-      end
+      ##end
     end
     
   private 
     def load_available_tryouts_files
       @tryouts_files = []
-      
-      if @argv.files
-        @argv.files.each do |file|
+      # If file paths were given, check those only. 
+      unless @argv.empty?
+        @argv.each do |file|
           file = File.join(file, '**', '*_tryouts.rb') if File.directory?(file)
           @tryouts_files += Dir.glob file
         end
+      # Otherwise check the default globs
       else
         @tryouts_globs.each do |glob|
           @tryouts_files += Dir.glob glob
         end
       end
-      
-      @tryouts_files.uniq!
-
-      puts "FOUND:", @tryouts_files if @global.verbose > 0
-      
+      @tryouts_files.uniq!  # Don't load the same file twice
+      @tryouts_files.each { |f| puts "LOADING: #{f}"} if @global.verbose > 0
       @tryouts_files.each { |file| Tryouts.parse_file file }
     end
   end
-end; end
+end; end
+
+MOOKIE = %q{
+      __,-----._                       ,-. 
+    ,'   ,-.    \`---.          ,-----<._/ 
+   (,.-. o:.`    )),"\\\-._    ,'         `. 
+  ('"-` .\       \`:_ )\  `-;'-._          \ 
+ ,,-.    \` ;  :  \( `-'     ) -._     :   `: 
+(    \ `._\\\ ` ;             ;    `    :    ) 
+ \`.  `-.    __   ,         /  \        ;, ( 
+  `.`-.___--'  `-          /    ;     | :   | 
+    `-' `-.`--._          '           ;     | 
+          (`--._`.                ;   /\    | 
+           \     '                \  ,  )   : 
+           |  `--::----            \'   ;  ;| 
+           \    .__,-      (        )   :  :| 
+            \    : `------; \      |    |   ; 
+             \   :       / , )     |    |  ( 
+    -hrr-     \   \      `-^-|     |   / , ,\ 
+               )  )          | -^- ;   `-^-^' 
+            _,' _ ;          |    | 
+           / , , ,'         /---. : 
+           `-^-^'          (  :  :,' 
+                            `-^--' 
+}

data/lib/tryouts/drill/response.rb

@@ -8,8 +8,7 @@ class Tryouts::Drill
     attr_accessor :output, :format, :rcode, :emsg, :backtrace
     def initialize(output=nil, format=nil, rcode=0)
       @output, @format, @rcode = output, format, (rcode || 0)
-      @format ||= :string
-      @output ||= []
+      @output = nil if @output.nil?
       normalize!
     end
     
@@ -39,35 +38,31 @@ class Tryouts::Drill
       @format = @format.to_sym if @format.is_a?(String)
     end
     def compare_output(other)
-      return true if @output == other.output
-      
-      if @format == :class
-        if @output.is_a?(Class)
-          klass, payload = @output, other.output
-        elsif other.output.is_a?(Class)
-          klass, payload = other.output, @output
-        end
-        return payload.is_a?(klass)
+      #
+      # The dream is always on the left (Does your dream match reality?)
+      # This check is important so we can support both:
+      # @dream == @reality
+      #  AND
+      # @reality == @dream
+      #
+      if self.is_a? Tryouts::Drill::Dream
+        dream, reality = self, other
+      elsif self.is_a? Tryouts::Drill::Reality
+        dream, reality = other, self
+      else
+        # If self isn't a Dream or a Reality, then we have a problem
+        return false
       end
       
-      if @output.kind_of?(Array) && other.kind_of?(Array)
-        return false unless @output.size == other.output.size
-      
-        if @output.first.is_a?(Regexp)
-          expressions, strings = @output, other.output
-        elsif other.output.first.is_a?(Regexp)
-          expressions, strings = other.output, @output
-        end
-      
-        if !expressions.nil? && !strings.nil?
-          expressions.each_with_index do |regex, index|
-            return false unless strings[index] =~ regex
-          end
-          return true
-        end
+      # The matching statement will be the return value.         
+      if dream.format.nil? || (dream.class == reality.class)
+        dream.output == reality.output
+      elsif reality.respond_to? dream.format
+        reality.output.send(dream.format) == dream.output 
+      else
+        false
       end
       
-      false
     end
 
   end
@@ -94,8 +89,9 @@ class Tryouts::Drill
     # Takes a String +val+ and splits the lines into an Array. Each line
     # has 
     def inline(val=nil)
-      lines = (val.split($/) || []).collect { |line| line.strip }
-      lines.reject! { |line| line == "" }
+      lines = (val.split($/) || [])
+      lines.shift if lines.first.strip == ""
+      lines.pop if lines.last.strip == ""
       lines
     end
   end

data/lib/tryouts/drill/sergeant/cli.rb

@@ -18,7 +18,7 @@ class Tryouts; class Drill; module Sergeant
       @rbox = Rye::Box.new
     end
   
-    # NOTE: Context is ignored for this Sergeant. 
+    # NOTE: Context is ignored for the CLI Sergeant. 
     def run(block, context=nil, &inline)
       # A Proc object takes precedence over an inline block. 
       runtime = (block.nil? ? inline : block)

data/lib/tryouts/drill.rb

@@ -32,36 +32,38 @@ class Tryouts
     @name, @dtype, @drill = name, dtype, drill
     @sergeant = hire_sergeant *drill_args
     # For CLI drills, a block takes precedence over inline args. 
+    # A block will contain multiple shell commands (see Rye::Box#batch)
     drill_args = [] if dtype == :cli && drill.is_a?(Proc)
+    @reality = Tryouts::Drill::Reality.new
   end
   
   def hire_sergeant(*drill_args)
     if @dtype == :cli
       Tryouts::Drill::Sergeant::CLI.new(*drill_args)
     elsif @dtype == :api
-      Tryouts::Drill::Sergeant::API.new(*drill_args)
+      Tryouts::Drill::Sergeant::API.new(drill_args.first)
     else
       raise NoSergeant, "What is #{@dtype}?"
     end
   end
   
   def run(context=nil)
-    context ||= Class.new
+    return false if @dream.nil?
     begin
       print Tryouts::DRILL_MSG % @name
       @reality = @sergeant.run @drill, context
       process_reality
     rescue => ex
-      @reality = Tryouts::Drill::Reality.new
       @reality.rcode = -2
       @reality.emsg, @reality.backtrace = ex.message, ex.backtrace
     end  
     note = @dream ? discrepency.join(', ') : 'nodream'
-    puts self.success? ? "PASS" : "FAIL (#{note})"
+    puts self.success? ? "PASS".color(:green) : "FAIL (#{note})".color(:red)
     self.success?
   end
   
   def success?
+    return false if @dream.nil? || @reality.nil?
     @dream == @reality
   end
   
@@ -69,7 +71,7 @@ class Tryouts
     diffs = []
     if @dream
       diffs << "rcode" if @dream.rcode != @reality.rcode
-      diffs << "output" if @dream.output != @reality.output
+      diffs << "output" if !@dream.compare_output(@reality)
       diffs << "emsg" if @dream.emsg != @reality.emsg
     end
     diffs
@@ -84,19 +86,12 @@ class Tryouts
   def process_reality
     @reality.normalize!
     return unless @dream && @dream.format
-    if @dream.format.to_s == "yaml"
+    if @dream.format == :to_yaml
       @reality.output = YAML.load(@reality.output.join("\n"))
-    elsif  @dream.format.to_s == "json"
+    elsif  @dream.format == :to_json
       @reality.output = JSON.load(@reality.output.join("\n"))
     end
     
-    if @reality.output.is_a?(Array)
-      # Remove new lines from String output
-      @reality.output = @reality.output.collect do |line|
-        line.is_a?(String) ? line.strip : line
-      end
-    end
-    
     #p [:process, @name, @dream.format, @reality.output]
   end
   

data/lib/tryouts/tryout.rb

@@ -9,26 +9,24 @@ class Tryouts
   
     # The name of this tryout
   attr_reader :name
-  
-    # A Hash of Dream objects for this Tryout. The keys are drill names. 
-  attr_accessor :dreams
-  
-    # An Array of Drill objects
-  attr_reader :drills
-  
     # A default value for Drill.dtype
   attr_reader :dtype
-  
-    # For drill type :cli, this is the name of the command to test. It
-    # should be a valid method available to a Rye::Box object.
-    # For drill type :api, this attribute is ignored. 
-  attr_reader :command
-  
     # A block to executed one time before starting the drills
   attr_reader :setup
-  
     # A block to executed one time before starting the drills
   attr_reader :clean
+    # An Array of Drill objects
+  attr_reader :drills
+    # The number of dreams that came true (successful drills)
+  attr_reader :passed
+    # The number of dreams that did not come true (failed drills)
+  attr_reader :failed
+    # For drill type :cli, this is the name of the command to test. It
+    # should be a valid method available to a Rye::Box object.
+    # For drill type :api, this attribute is ignored. 
+  attr_reader :command
+    # A Hash of Dream objects for this Tryout. The keys are drill names. 
+  attr_accessor :dreams
   
   @@valid_dtypes = [:cli, :api]
   
@@ -42,48 +40,46 @@ class Tryouts
     raise "Must supply command for dtype :cli" if dtype == :cli && command.nil?
     raise "#{dtype} is not a valid drill type" if !@@valid_dtypes.member?(dtype)
     @name, @dtype, @command = name, dtype, command
-    @drills = []
-    @dreams = {}
+    @drills, @dreams = [], {}
+    @passed, @failed = 0, 0
   end
   
   ## ---------------------------------------  EXTERNAL API  -----
   
   # Populate this Tryout from a block. The block should contain calls to 
   # the external DSL methods: dream, drill, xdrill
-  def from_block(b, &inline)
-    instance_eval &b
+  def from_block(b=nil, &inline)
+    runtime = b.nil? ? inline : b
+    instance_eval &runtime
   end
   
   # Execute all Drill objects
   def run
     update_drills!   # Ensure all drills have all known dreams
-    DrillContext.new.instance_eval &setup if setup.is_a?(Proc)
-    puts Tryouts::TRYOUT_MSG % @name
+    DrillContext.class_eval &setup if setup.is_a?(Proc)
+    puts Tryouts::TRYOUT_MSG.bright % @name
     @drills.each do |drill|
       drill.run(DrillContext.new)      # Returns true or false
+      drill.success? ? @passed += 1 : @failed += 1
     end
-    DrillContext.new.instance_eval &clean if clean.is_a?(Proc)
+    DrillContext.class_eval &clean if clean.is_a?(Proc)
   end
   
   # Prints error output. If there are no errors, it prints nothing. 
   def report
-    if success?
-      puts $/, "All your dreams came true"
-      return
-    end
-    puts $/, "ERRORS:"
-    @drills.each do |drill|
-      next if drill.success?
-      puts Tryouts::DRILL_MSG % drill.name
-      if drill.reality.rcode < 0
-        puts '%24s' % drill.reality.emsg 
-        next
-      end
+    return true if success?
+    failed = @drills.select { |d| !d.success? }
+    failed.each_with_index do |drill,index|
+      title = ' %-59s' % %Q{ERROR #{index+1}/#{failed.size} in "#{drill.name}"}
+      puts $/, ' ' << title.color(:red).att(:reverse)
       
       if drill.dream
-        drill.discrepency.each do |d|
-          puts '%24s: %s' % ["dream #{d}", drill.dream.send(d).inspect]
-          puts '%24s: %s' % ["reality #{d}", drill.reality.send(d).inspect]
+        puts '%24s: %s (expected %s)' % ["response code", drill.reality.rcode, drill.dream.rcode]
+        puts '%24s: %s' % ["expected output", drill.dream.output.inspect]
+        puts '%24s: %s' % ["actual output", drill.reality.output.inspect]
+        if drill.reality.emsg || (drill.reality.emsg != drill.dream.emsg)
+          puts '%24s: %s' % ["expected error msg", drill.dream.emsg.inspect]
+            puts '%24s: %s' % ["actual error msg", drill.reality.emsg.inspect]
         end
       else
         puts '%24s' % ["[nodream]"]
@@ -94,15 +90,19 @@ class Tryouts
       end
       
       if drill.reality.rcode > 0
-        puts '%24s: %s' % ["backtrace", drill.reality.backtrace.inspect]
+        puts '%24s: ' % ["backtrace"]
+        puts drill.reality.backtrace, $/
       end
+      
     end
+    false
   end
   
   # Did every Tryout finish successfully?
   def success?
+    return @success unless @success.nil?
     # Returns true only when every Tryout result returns true
-    !(@drills.collect { |r| r.success? }.member?(false))
+    @success = !(@drills.collect { |r| r.success? }.member?(false))
   end
   
   # Add a Drill object to the list for this Tryout. If there is a dream
@@ -146,7 +146,7 @@ class Tryouts
   # +definition+ is a block which will be run on an instance of Dream
   #
   # NOTE: This method is DSL-only. It's not intended to be used in OO syntax. 
-  def dream(name, output=nil, format=:string, rcode=0, emsg=nil, &definition)
+  def dream(name, output=nil, format=nil, rcode=0, emsg=nil, &definition) 
     if output.nil?
       dobj = Tryouts::Drill::Dream.from_block definition
     else
@@ -154,41 +154,18 @@ class Tryouts
       dobj.format, dobj.rcode, dobj.emsg = format, rcode, emsg
     end
     @dreams[name] = dobj
-    
     dobj
   end
 
   # Create and add a Drill object to the list for this Tryout
   # +name+ is the name of the drill. 
   # +args+ is sent directly to the Drill class. The values are specific on the Sergeant.
-  def drill(name, *args, &b)
+  def drill(name, *args, &definition)
     args.unshift(@command) if @dtype == :cli
-    drill = Tryouts::Drill.new(name, @dtype, *args, &b)
+    drill = Tryouts::Drill.new(name, @dtype, *args, &definition)
     add_drill drill
   end
   def xdrill(*args, &b); end # ignore calls to xdrill
   
   
-  
-  
-  private
-  
-  # Convert every Hash of dream params into a Tryouts::Drill::Dream object. 
-  # DEPRECATED: This is not used anymore since we have the dreams DSL syntax.
-  def parse_dreams!
-    if @dreams.kind_of?(Hash)
-      #raise BadDreams, 'Not deep enough' unless @@dreams.deepest_point == 2
-      @dreams.each_pair do |tname, drills|
-        drills.each_pair do |dname, dream_params|
-          next if dream_params.is_a?(Tryouts::Drill::Dream)
-          dream = Tryouts::Drill::Dream.new
-          dream_params.each_pair { |n,v| dream.send("#{n}=", v) }
-          @dreams[tname][dname] = dream
-        end
-      end
-    else
-      raise BadDreams, 'Not a kind of Hash'
-    end
-  end
-  
 end; end

data/lib/tryouts.rb

@@ -30,50 +30,56 @@ class Tryouts
   # Raised when there is a problem loading or parsing a Tryouts::Drill::Dream object
   class BadDreams < Exception; end
   
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'
   require 'tryouts/drill'
   
-  TRYOUT_MSG = "\n     %s "
-  DRILL_MSG  = ' %20s: '
+  require 'tryouts/orderedhash'
+  HASH_TYPE = (RUBY_VERSION =~ /1.9/) ? ::Hash : Tryouts::OrderedHash
   
+  TRYOUT_MSG = "\n  %s "
+  DRILL_MSG  = '    %-50s '
+  DRILL_ERR  = '    %s: '
+  
+    # An Array of +_tryouts.rb+ file paths that have been loaded.
+  @@loaded_files = []
     # An Hash of Tryouts instances stored under the name of the Tryouts subclass. 
-  @@instances = {}
-    # The most recent tryouts name specified in the DSL
-  @@instance_pointer = nil
+  @@instances = HASH_TYPE.new
+    # An instance of SysInfo
+  @@sysinfo = SysInfo.new
+  
+  # Returns +@@instances+
+  def self.instances; @@instances; end
+  # Returns +@@sysinfo+
+  def self.sysinfo;   @@sysinfo;   end
   
     # The name of this group of Tryout objects
   attr_accessor :group
-    # An Array of Tryout objects
-  attr_accessor :tryouts
-    # A Hash of Tryout names pointing to index values of :tryouts
-  attr_accessor :map
-    # A Symbol representing the command taking part in the tryouts. For @dtype :cli only. 
-  attr_accessor :command
-    # A Symbol representing the name of the library taking part in the tryouts. For @dtype :api only.
-  attr_accessor :library
     # A Symbol representing the default drill type. One of: :cli, :api
   attr_accessor :dtype
-  
+    # An Array of file paths which populated this instance of Tryouts
+  attr_accessor :paths
     # A Hash of dreams for all tryouts in this class. The keys should
     # match the names of each tryout. The values are hashes will drill
     # names as keys and response
   attr_accessor :dreams
+    # An Array of Tryout objects
+  attr_accessor :tryouts
+    # A Symbol representing the command taking part in the tryouts. For @dtype :cli only. 
+  attr_accessor :command
+    # A Symbol representing the name of the library taking part in the tryouts. For @dtype :api only.
+  attr_accessor :library
     # The name of the most recent dreams group (see self.dream)
   attr_accessor :dream_pointer
-  
-  # Returns +@@instances+
-  def self.instances; @@instances; end
 
   def initialize(group=nil)
     @group = group || "Default Group"
-    @tryouts = []
-    @map = {}
+    @tryouts = HASH_TYPE.new
+    @paths = []
     @command = nil
-    @dtype = :cli
-    @dreams = {}
+    @dreams = HASH_TYPE.new
     @dream_pointer = nil
   end
   
@@ -84,16 +90,21 @@ class Tryouts
   end
   
   # Execute Tryout#report for each Tryout in +@tryouts+
-  def report; @tryouts.each { |to| to.report }; end
+  def report
+    successes = []
+    @tryouts.each_pair { |n,to| successes << to.report }
+    puts $/, "All your dreams came true" unless successes.member?(false)
+  end
   
   # Execute Tryout#run for each Tryout in +@tryouts+
-  def run; @tryouts.each { |to| to.run }; end
+  def run; @tryouts.each_pair { |n,to| to.run }; end
   
   # Add a shell command to Rye::Cmd and save the command name
   # in @@commands so it can be used as the default for drills
   def command(name=nil, path=nil)
     return @command if name.nil?
     @command = name.to_sym
+    @dtype = :cli
     Rye::Cmd.module_eval do
       define_method(name) do |*args|
         cmd(path || name, *args)
@@ -105,7 +116,7 @@ class Tryouts
   #
   # NOTE: this is a standalone DSL-syntax method. 
   def self.command(*args)
-    @@instances[ @@instance_pointer ].command(*args)
+    @@instances.last.command(*args)
   end
   
   
@@ -116,6 +127,7 @@ class Tryouts
   def library(name=nil, path=nil)
     return @library if name.nil?
     @library = name.to_sym
+    @dtype = :api
     $LOAD_PATH.unshift path unless path.nil?
     require @library.to_s
   end
@@ -123,7 +135,7 @@ class Tryouts
   #
   # NOTE: this is a standalone DSL-syntax method.
   def self.library(*args)
-    @@instances[ @@instance_pointer ].library(*args)
+    @@instances.last.library(*args)
   end
   
   def group(name=nil)
@@ -135,11 +147,11 @@ class Tryouts
     @group
   end
   # Raises a Tryouts::Exception. +group+ is not support in the standalone syntax
-  # because the group name is take from the name of the class. See inherited. 
+  # because the group name is taken from the name of the class. See inherited. 
   #
   # NOTE: this is a standalone DSL-syntax method.
   def self.group(*args)
-    raise "Group is already set: #{@@instances[ @@instance_pointer ].group}"
+    raise "Group is already set: #{@@instances.last.group}"
   end
   
   # Create a new Tryout object and add it to the list for this Tryouts class. 
@@ -149,24 +161,34 @@ class Tryouts
   # * +b+ is a block definition for the Tryout. See Tryout#from_block
   #
   # NOTE: This is a DSL-only method and is not intended for OO use. 
-  def tryout(name, type=nil, command=nil, &block)
+  def tryout(name, dtype=nil, command=nil, &block)
     return if name.nil?
-    type ||= @dtype
-    command ||= @command if type == :cli
-    to = Tryouts::Tryout.new(name, type, command)
+    dtype ||= @dtype
+    command ||= @command if dtype == :cli
+    to = find_tryout(name, dtype)
+    if to.nil?
+      to = Tryouts::Tryout.new(name, dtype, command)
+      @tryouts[name] = to
+    end
     # Populate the dreams if they've already been loaded
     to.dreams = @dreams[name] if @dreams.has_key?(name)
     # Process the rest of the DSL
     to.from_block block if block
-    @tryouts << to
-    @map[name] = @tryouts.size - 1
     to
   end
   # Calls Tryouts#tryout on the current instance of Tryouts
   #
   # NOTE: this is a standalone DSL-syntax method.
   def self.tryout(*args, &block)
-    @@instances[ @@instance_pointer ].tryout(*args, &block)
+    @@instances.last.tryout(*args, &block)
+  end
+
+  # Find matching Tryout objects by +name+ and filter by 
+  # +dtype+ if specified. Returns a Tryout object or nil.
+  def find_tryout(name, dtype=nil)
+    by_name = @tryouts.values.select { |t| t.name == name }
+    by_name = by_name.select { |t| t.dtype == dtype } if dtype
+    by_name.first  # by_name is an Array. We just want the Object. 
   end
   
   # This method does nothing. It provides a quick way to disable a tryout.
@@ -178,28 +200,45 @@ class Tryouts
   # NOTE: this is a standalone DSL-syntax method.
   def self.xtryout(*args, &block); end
   
-  # Load dreams from a file, or Hash.
+  # Load dreams from a file or directory or if a block is given
+  # it's processed 
   # Raises a Tryouts::BadDreams exception when something goes awry. 
   #
   # This method is used in two ways:
   # * In the dreams file DSL
-  # * As a getter method on a Tryout object
+  # * As a getter method on a Tryouts object
   def dreams(tryout_name=nil, &definition)
     return @dreams unless tryout_name
+
+    #
+    # dreams "path/2/dreams"
+    #  OR
+    # dreams "path/2/file_of_dreams.rb"
+    #
     if File.exists?(tryout_name)
       dfile = tryout_name
       # If we're given a directory we'll build the filename using the class name
       if File.directory?(tryout_name)
-        dfile = self.class.find_dreams_file(tryout_name, group) 
+        dfile = self.class.find_dreams_file(tryout_name, @group) 
       end
       raise BadDreams, "Cannot find dreams file (#{tryout_name})" unless dfile
-      @dreams = load_dreams_file dfile
-    elsif tryout_name.kind_of?(Hash)
-      @dreams = tryout_name
+      @dreams = load_dreams_file( dfile) || {}
+    
+    #
+    # dreams "Tryout Name" do
+    #   dream "drill name" ...
+    # end
+    #
     elsif tryout_name.kind_of?(String) && definition  
-      @dream_pointer = tryout_name  # Used in Tryouts.dream
-      @dreams[ @dream_pointer ] ||= {}
-      definition.call
+      to = find_tryout(tryout_name, @dtype)
+      
+      if to.nil?
+        @dream_pointer = tryout_name  # Used in Tryouts.dream
+        @dreams[ @dream_pointer ] ||= {}
+        definition.call
+      else
+        to.from_block &definition
+      end
     else
       raise BadDreams, tryout_name
     end
@@ -217,7 +256,8 @@ class Tryouts
       end
       return dreams
     else
-      @@instances[ @@instance_pointer ].dreams(*args, &block)
+      # Call the Tryouts#dreams instance method
+      @@instances.last.dreams(*args, &block)
     end
   end
   
@@ -225,22 +265,34 @@ class Tryouts
   # +output+ A String or Array of expected output. A Dream object will be created using this value (optional)
   # +definition+ is a block which will be run on an instance of Dream
   #
+  # This method is different than Tryout#dream because this one stores
+  # dreams inside an instance variable of the current Tryouts object.
+  # This allows for the situation where the dreams block appears before
+  # the tryout block. See Tryouts#tryout
   #
   # NOTE: This method is DSL-only. It's not intended to be used in OO syntax. 
-  def dream(name, output=nil, format=:string, rcode=0, emsg=nil, &definition)
-    if output.nil?
-      dobj = Tryouts::Drill::Dream.from_block definition
+  def dream(name, output=nil, format=nil, rcode=0, emsg=nil, &definition)
+    to = find_tryout(@dream_pointer, @dtype)
+    if to.nil?
+      if output.nil?
+        dobj = Tryouts::Drill::Dream.from_block definition
+      else
+        dobj = Tryouts::Drill::Dream.new(output)
+        dobj.format, dobj.rcode, dobj.emsg = format, rcode, emsg
+      end
+      @dreams[@dream_pointer][name] = dobj
     else
-      dobj = Tryouts::Drill::Dream.new(output)
-      dobj.format, dobj.rcode, dobj.emsg = format, rcode, emsg
+      # Let the Tryout object process the dream DSL.
+      # We'll get here if the dream is placed after 
+      # the drill with the same name in the same block.
+      to.dream name, output, format, rcode, emsg, &definition
     end
-    @dreams[@dream_pointer][name] = dobj
   end
   # Calls Tryouts#dream on the current instance of Tryouts
   #
   # NOTE: this is a standalone DSL-syntax method.
   def self.dream(*args, &block)
-    @@instances[ @@instance_pointer ].dream(*args, &block)
+    @@instances.last.dream(*args, &block)
   end
   
   # Populate @@dreams with the content of the file +dpath+. 
@@ -265,10 +317,15 @@ class Tryouts
   # NOTE: this is an OO syntax method
   def self.parse_file(fpath)
     raise "No such file: #{fpath}" unless File.exists?(fpath)
+    file_content = File.read(fpath)
     to = Tryouts.new
-    to.instance_eval(File.read(fpath), fpath)
-    @@instance_pointer = to.group
-    @@instances[ @@instance_pointer ] = to
+    to.instance_eval file_content, fpath
+    if @@instances.has_key? to.group
+      to = @@instances[to.group]
+      to.instance_eval file_content, fpath
+    end
+    to.paths << fpath
+    @@instances[to.group] = to
   end
   
   # Run all Tryout objects in +@tryouts+
@@ -276,9 +333,7 @@ class Tryouts
   # NOTE: this is an OO syntax method
   def self.run
     @@instances.each_pair do |group, inst|
-      puts "-"*60
-      puts "Tryouts for #{group}"
-      inst.tryouts.each do |to|
+      inst.tryouts.each_pair do |name,to|
         to.run
         to.report
         STDOUT.flush
@@ -292,10 +347,11 @@ class Tryouts
   #
   # NOTE: this is a standalone DSL-syntax method.
   def self.inherited(klass)
-    to = Tryouts.new
+    to = @@instances[ klass ]
+    to ||= Tryouts.new
+    to.paths << __FILE__
     to.group = klass
-    @@instance_pointer = to.group
-    @@instances[ @@instance_pointer ] = to
+    @@instances[to.group] = to
   end
   
   
@@ -318,7 +374,7 @@ class Tryouts
   #
   def self.find_dreams_file(dir, group=nil)
     dpath = nil
-    group ||= @@instance_pointer
+    group ||= @@instances.last.group
     group = group.to_s.downcase.tr(' ', '')
     [:rb, :yaml].each do |ext|
       tmp = File.join(dir, "#{group}_dreams.#{ext}")

data/tryouts/mockoutcli_dreams.rb

@@ -2,13 +2,13 @@
 dreams "Common Usage" do
   dream "No args" do
     output inline(%Q{
-         Date:                                   2009-02-16
-       Owners:            greg, rupaul, telly, prince kinko
-      Players:            d-bam, alberta, birds, condor man
+    Date:                                   2009-02-16
+  Owners:            greg, rupaul, telly, prince kinko
+ Players:            d-bam, alberta, birds, condor man
     })
   end
   dream "YAML Output" do
-    format :yaml
+    format :to_yaml
     output ({
       "Date" => "2009-02-16",
       "Players" => ["d-bam", "alberta", "birds", "condor man"],

data/tryouts/mockoutcli_dreams.yaml

@@ -3,7 +3,6 @@ common usage:
     :format: :yaml
     :rcode: 0
   no args: 
-    :format: :string
     :rcode: 0
     :output: 
     - "    Date:                                   2009-02-16\n"

data/tryouts/mockoutcli_tryouts.rb

@@ -4,12 +4,13 @@ MOCKOUT_PATH = File.join(TRYOUTS_HOME, "bin", "mockout")
 
 group "mockout cli"
 command :mockout, MOCKOUT_PATH
+dreams File.join(GYMNASIUM_HOME, 'mockoutcli_dreams.rb')
 
 tryout "Common Usage" do
   drill  "No Command"
-  drill     "No args",             :info
-  drill "YAML Output", :f, "yaml", :info
-  drill "JSON Output", :f, "json", :info
+  drill     "No args",            :info
+  drill "YAML Output", :f, :yaml, :info
+  drill "JSON Output", :f, :json, :info
 end
 
 tryout "inline dream that passes", :cli, :mockout do

data/tryouts.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "tryouts"
   s.rubyforge_project = "tryouts"
-	s.version = "0.4.0"
+	s.version = "0.4.1"
 	s.summary = "Tryouts are high-level tests for your Ruby code. May all your dreams come true!"
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delano-tryouts
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Delano Mandelbaum