tryouts 0.8.1 → 0.8.2

data/CHANGES.txt

@@ -1,5 +1,13 @@
 TRYOUTS, CHANGES
 
+
+#### 0.8.2 (2009-07-19) ###############################
+
+* CHANGE: Moved Drill and Reality to separate files. 
+* CHANGE: dream blocks are now lazy executed just before the
+  drill is executed.
+  
+
 #### 0.8.1 (2009-07-14) ###############################
 
 * CHANGE: Fixed parentheses warning in tryouts.rb for Ruby 1.8

data/lib/tryouts/drill/response.rb

@@ -114,103 +114,4 @@ class Tryouts::Drill
   end
 
 
-  # = Dream
-  #
-  # Contains the expected response of a Drill
-  #
-  class Dream < Tryouts::Drill::Response
-    
-    def self.from_block(definition)
-      d = Tryouts::Drill::Dream.new
-      d.from_block definition
-      d
-    end
-    
-    def from_block(definition)
-      self.output = instance_eval &definition
-      self
-    end
-    
-    # Takes a String +val+ and splits the lines into an Array.
-    def inline(val=nil)
-      lines = (val.split($/) || [])
-      lines.shift if lines.first.strip == ""
-      lines.pop if lines.last.strip == ""
-      lines
-    end
-    
-    def ==(reality)
-      return @answer unless @answer.nil?
-      @answer = Response.compare(self, reality)
-    end
-    
-    def test_to_string(reality)
-      return @test_string unless @test_string.nil?
-      @test_string = Response.compare_string(self, reality)
-    end
-    
-    def comparison_value
-      return @ret unless @ret.nil?
-      @ret = case @format
-      when :gt, :gte, :lt, :lte, :ne
-        op = {:gt=>'>',:gte=>'>=', :lt=>'<', :lte => '<=', :ne => '!='}.find { |i| i[0] == @format }
-        @output
-      when :proc
-        true
-      when :respond_to?, :is_a?, :kind_of?
-        true
-      when :grep
-        @output
-      else 
-        @output
-      end
-    end
-  end
-
-  # = Reality 
-  #
-  # Contains the actual response of a Drill
-  #
-  class Reality < Tryouts::Drill::Response
-      # An ordered hash taken from the DrillContext that created this Reality. 
-    attr_accessor :stash
-    attr_accessor :error
-    attr_accessor :trace
-    attr_accessor :ecode
-    attr_accessor :etype
-      # For :cli drills only. Contains the shell command string. 
-    attr_accessor :command
-    def initialize
-      @stash = Tryouts::HASH_TYPE.new
-    end
-    
-    def ==(dream)
-      Response.compare(dream, self)
-    end
-    
-    def comparison_value(dream)
-      case dream.format
-      when :proc
-        test = dream.output
-        (test.arity > 0 ? test.call(@output) : test.call)
-      when :exception
-        @etype
-      when :respond_to?, :is_a?, :kind_of?, :grep
-        @output.send(dream.format, dream.output)
-      when nil
-        @output
-      else 
-        return nil if @output.nil? 
-        
-        if !dream.format.is_a?(Symbol)
-          "This dream format is not a Symbol: #{dream.format}"
-        elsif @output.respond_to?(dream.format)
-          @output.send(dream.format)
-        else
-          @output
-        end
-      end
-    end
-  end
-
 end

data/lib/tryouts/drill.rb

@@ -10,6 +10,8 @@ class Tryouts
     
   require 'tryouts/drill/context'
   require 'tryouts/drill/response'
+  require 'tryouts/drill/dream'
+  require 'tryouts/drill/reality'
   require 'tryouts/drill/sergeant/cli'
   require 'tryouts/drill/sergeant/api'
   require 'tryouts/drill/sergeant/benchmark'
@@ -24,7 +26,6 @@ class Tryouts
   attr_reader :name
     # A Proc object which contains the drill logic. 
   attr_reader :drill
-  
     # A Sergeant object which executes the drill
   attr_reader :sergeant
     # An Array of Dream objects (the expected output of the test)
@@ -97,6 +98,9 @@ class Tryouts
   def skip?; @skip; end
   
   def run(context=nil)
+    unless @dreams.empty?
+      @dreams.each { |d| d.execute_output_block }
+    end
     begin
       @reality = @sergeant.run @drill, context
       # Store the stash from the drill block

data/lib/tryouts/tryout.rb

@@ -147,11 +147,11 @@ class Tryouts
       args = args.size == 1 ? [args.first] : args.reverse
       dobj = Tryouts::Drill::Dream.new(*args)
     else
-      if args.size > 1
-        raise "Dreams with a block can take only one argument (#{@name})"
-      end
-      dobj = Tryouts::Drill::Dream.from_block definition
+      msg = "Dreams with blocks take only 1 argument (Tryout: '#{@name}')"
+      raise TooManyArgs, msg if args.size > 1
+      dobj = Tryouts::Drill::Dream.new
       dobj.format = args.first if args.size == 1
+      dobj.output_block = definition
     end
     @dream_catcher.push dobj
     dobj

data/lib/tryouts.rb

@@ -34,9 +34,9 @@ class Tryouts
   class Exception < RuntimeError; end
   # = BadDreams
   # Raised when there is a problem loading or parsing a Tryouts::Drill::Dream object
-  class BadDream < Exception; end
-  
-  class NoDrillType < Exception
+  class BadDream < Tryouts::Exception; end
+  class TooManyArgs < Tryouts::Exception; end
+  class NoDrillType < Tryouts::Exception
     attr_accessor :tname
     def initialize(t); @tname = t; end
     def message
@@ -45,7 +45,7 @@ class Tryouts
     end
   end
     
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'

data/tryouts/15_dreams_tryouts.rb

@@ -3,6 +3,10 @@ group "Syntax"
 
 tryouts "Dreams" do
   
+  setup do
+    Tryouts.const_set :TEST_VALUE, 9000
+  end
+  
   drill "dream inline", :muggsy do
     :muggsy
   end
@@ -15,7 +19,7 @@ tryouts "Dreams" do
   dream do
     :muggsy
   end
-  drill "dream output in a block" do
+  drill "dream output can be specified with a block" do
     :muggsy
   end
   
@@ -26,15 +30,25 @@ tryouts "Dreams" do
     :muggsy
   end
   
-  ## NOTE: The following should raise a Runtime error b/c dreams takes 1 arg
+  # NOTE: The constant is defined in the setup block which is called before the
+  # drill block is executed. As of 0.8.2 the dream block is executed literally
+  # just before the drill block which is why this test returns true. 
+  dream do
+    Tryouts.const_get :TEST_VALUE
+  end
+  drill "dream output from a block is executed just before the drill" do
+    9000
+  end
+  
+  ## NOTE: The following should raise a Tryouts::TooManyArgs error b/c dreams takes 1 arg
+  #
+  #dream :class, 2 do
+  #  Symbol
+  #end
+  #drill "dream with a format argument and a block" do
+  #  :muggsy
+  #end
   #
-  ##dream :class, 2 do
-  ##  Symbol
-  ##end
-  ##drill "dream with a format argument and a block" do
-  ##  :muggsy
-  ##end
-  
-  xdrill "this drill will fail b/c it has no dream", :muggsy
+  #drill "this drill will fail b/c it has no dream", :muggsy
   
 end

data/tryouts/20_cli_tryouts.rb

@@ -8,7 +8,7 @@ command :mockout, MOCKOUT_PATH
 tryout "Mockouts", :cli do
   
   # This fails. Rye problem?
-  dream :class, Array
+  dream :class, Rye::Rap
   dream []
   drill "No args"
   

data/tryouts.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "tryouts"
   s.rubyforge_project = "tryouts"
-	s.version = "0.8.1"
+	s.version = "0.8.2"
 	s.summary = "Tryouts is a high-level testing library (DSL) for your Ruby codes and command-line applications."
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tryouts
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -04:00
+date: 2009-07-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency