delano-tryouts 0.6.1 → 0.6.2

data/CHANGES.txt

@@ -1,6 +1,17 @@
 TRYOUTS, CHANGES
 
 
+#### 0.6.2 (2009-06-24) ###############################
+
+NOTE: command testing (:cli) is still disabled. 
+
+* CHANGE: dream arguments are now ordered: format, output
+* ADDED: One-liner drill syntax
+* ADDED: new dream formats: :regex, :gt, :gte, :lt, :lte, :size
+* ADDED: Calls to xdrill now also clear the dream catcher
+* ADDED: Support for multiple dreams per drill
+
+
 #### 0.6.1 (2009-06-24) ###############################
 
 NOTE: command testing (:cli) is still disabled. 

data/bin/sergeant

@@ -2,6 +2,8 @@
 
 TRYOUTS_HOME = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
+$:.unshift File.join(TRYOUTS_HOME, 'lib')
+
 #local_libs = %w{tryouts net-scp amazon-ec2 aws-s3 caesars drydock rye storable sysinfo annoy}
 #local_libs.each { |dir| $:.unshift File.join(TRYOUTS_HOME, '..', dir, 'lib') }
 

data/lib/tryouts.rb

@@ -29,7 +29,7 @@ class Tryouts
   # Raised when there is a problem loading or parsing a Tryouts::Drill::Dream object
   class BadDreams < Exception; end
   
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'
@@ -41,7 +41,7 @@ class Tryouts
   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. 
@@ -86,7 +86,7 @@ class Tryouts
   end
   
   # Populate this Tryouts from a block. The block should contain calls to 
-  # the external DSL methods: tryout, command, dreams
+  # the external DSL methods: tryout, command, library, group
   def from_block(b, &inline)
     instance_eval &b
   end

data/lib/tryouts/cli/run.rb

@@ -58,8 +58,8 @@ class Run < Drydock::Command
         msg = " You didn't even try to acheive your dreams :[ "
       elsif failed == 0
         puts PUG if Tryouts.verbose > 4
-        msg = " All %s dreams came true ".color(:green)
-        msg = msg % [passed+failed]
+        msg = passed > 1 ? "All %s dreams" : "Your only dream"
+        msg = (" #{msg} came true " % [passed+failed]).color(:green)
       else
         puts BUG if Tryouts.verbose > 4
         score = (passed.to_f / (passed.to_f+failed.to_f)) * 100

data/lib/tryouts/drill.rb

@@ -24,30 +24,29 @@ class Tryouts
   
     # A Sergeant object which executes the drill
   attr_reader :sergeant
-    # A Dream object (the expected output of the test)
-  attr_reader :dream
+    # An Array of Dream objects (the expected output of the test)
+  attr_reader :dreams
     # A Reality object (the actual output of the test)
   attr_reader :reality
       
-  def initialize(name, dtype, *opts, &drill)
+  def initialize(name, dtype, *args, &drill)
     @name, @dtype, @drill = name, dtype, drill
-    @sergeant = hire_sergeant opts
-    # 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(opts={})
+    @dreams = []
     if @dtype == :cli
-      Tryouts::Drill::Sergeant::CLI.new(*opts)
+      @sergeant = Tryouts::Drill::Sergeant::CLI.new *args
     elsif @dtype == :api
-      Tryouts::Drill::Sergeant::API.new(opts.first) # should be a hash
+      default_output = drill.nil? ? args.shift : nil
+      @sergeant = Tryouts::Drill::Sergeant::API.new default_output
+      @dreams << Tryouts::Drill::Dream.new(*args) unless args.empty?
     else
       raise NoSergeant, "Weird drill sergeant: #{@dtype}"
     end
+    # 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 run(context=nil)
     begin
       print Tryouts::DRILL_MSG % @name
@@ -55,11 +54,10 @@ class Tryouts
       # Store the stash from the drill block
       @reality.stash = context.stash if context.respond_to? :stash
       # If the drill block returned true we assume success if there's no dream
-      if @dream.nil? && @reality.output == true
-        @dream = Tryouts::Drill::Dream.new
-        @dream.output = true
+      if @dreams.empty? && @reality.output == true
+        @dreams << Tryouts::Drill::Dream.new
+        @dreams.first.output = true
       end
-      process_reality
     rescue => ex
       @reality.ecode, @reality.etype = -2, ex.class
       @reality.error, @reality.trace = ex.message, ex.backtrace
@@ -68,24 +66,14 @@ class Tryouts
   end
   
   def success?
-    @dream == @reality
+    @dreams.each { |d| return false unless d == @reality }
+    true
   end
   
   
-  def add_dream(d)
-    @dream = d 
-  end
+  def add_dream(d); @dreams << d; end
+  def add_dreams(*d); @dreams += d; end
   
   private 
-  
-  # Use the :format provided in the dream to convert the output from reality
-  def process_reality
-    case @dream.format
-    when :class
-      @reality.output = @reality.output.class
-    when :exception
-      @reality.output = @reality.etype
-    end
-  end
-  
+    
 end; end

data/lib/tryouts/drill/response.rb

@@ -19,7 +19,27 @@ class Tryouts::Drill
       ## I don't think this check is necessary or useful
       ##return false unless reality.error.nil? && reality.trace.nil?
       return true if reality.output == true and dream.nil?
-      reality.output == dream.output
+
+      case dream.format
+      when :class
+        reality.output.class == dream.output
+      when :exception
+        reality.etype == dream.output
+      when :regex
+        !reality.output.match(dream.output).nil?
+      when :size
+        reality.output.size == dream.output
+      when :gt
+        reality.output > dream.output
+      when :gte
+        reality.output >= dream.output
+      when :lt
+        reality.output < dream.output
+      when :lte
+        reality.output <= dream.output
+      else 
+        reality.output == dream.output
+      end
       
     end
   end

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

@@ -9,14 +9,14 @@ class Tryouts; class Drill; module Sergeant
   #
   class API
     
-    attr_reader :opts
+    attr_reader :output
     
     # +opts+ is a Hash with the following optional keys:
     #
     # * +:output+ specify a return value. This will be 
     # used if no block is specified for the drill.
-    def initialize(opts={})
-      @opts = opts
+    def initialize(output=nil)
+      @output = output
     end
   
     def run(block, context, &inline)
@@ -24,7 +24,7 @@ class Tryouts; class Drill; module Sergeant
       runtime = (block.nil? ? inline : block)
       response = Tryouts::Drill::Reality.new
       if runtime.nil?
-        response.output = @opts[:output]
+        response.output = @output
       else
         begin
           response.output = context.instance_eval &runtime

data/lib/tryouts/mixins/hash.rb

@@ -20,6 +20,12 @@ class Hash
     end
     steps
   end
-
+  
+  unless method_defined?(:last)
+    def last
+      self[ self.keys.last ]
+    end
+  end
+  
 end
 

data/lib/tryouts/tryout.rb

@@ -53,7 +53,7 @@ class Tryouts
     puts Tryouts::TRYOUT_MSG.bright % @name
     @drills.each do |drill|
       drill.run DrillContext.new
-      note = @dream ? '' : '(nodream)'
+      note = drill.dreams.empty? ? '[nodream]' : ''
       puts drill.success? ? "PASS".color(:green) : "FAIL #{note}".color(:red)
       puts "      #{drill.reality.output.inspect}" if Tryouts.verbose > 0
       if Tryouts.verbose > 1
@@ -71,12 +71,17 @@ class Tryouts
     return true if success?
     failed = @drills.select { |d| !d.success? }
     failed.each_with_index do |drill,index|
-      dream, reality = drill.dream, drill.reality
+      dreams, reality = drill.dreams, drill.reality
       title = ' %-59s' % %Q{ERROR #{index+1}/#{failed.size} "#{drill.name}"}
       puts $/, ' ' << title.color(:red).att(:reverse)
       
-      if dream
-        puts '%12s: %s' % [ "expected", dream.output.inspect]
+      if dreams.empty?
+        puts '%12s: %s' % ["expected", "[nodream]"]
+        puts '%12s: %s' % ["returned", reality.output.inspect]
+      else
+        dreams.each do |dream|
+          puts '%12s: %s' % [ "expected", dream.output.inspect]
+        end
         puts '%12s: %s' % ["returned", reality.output.inspect]
         unless reality.error.nil?
           puts '%12s: %s' % ["error", reality.error.inspect]
@@ -85,11 +90,8 @@ class Tryouts
           puts '%12s: %s' % ["trace", reality.trace.join($/ + ' '*14)]
           puts
         end
-      else
-        puts '%12s: %s' % ["expected", "[nodream]"]
-        puts '%12s: %s' % ["returned", reality.output.inspect]
+        
       end
-      
     end
     false
   end
@@ -105,8 +107,8 @@ class Tryouts
   # more dreams in +@dream_catcher+, it will be added to drill +d+. 
   def add_drill(d)
     unless @dream_catcher.empty?
-      d.add_dream @dream_catcher.first
-      @dream_catcher.clear
+      d.add_dreams *@dream_catcher.clone   # We need to clone here b/c
+      @dream_catcher.clear                 # Ruby passes by reference.
     end
     drills << d
     d
@@ -131,15 +133,11 @@ class Tryouts
   # +args+ is sent directly to the Drill class. The values are specific on the Sergeant.
   def drill(dname, *args, &definition)
     raise "Empty drill name (#{@name})" if dname.nil? || dname.empty?
-    if definition.nil?
-      drill = Tryouts::Drill.new(dname, @dtype, :output => args.first)
-    else
-      drill = Tryouts::Drill.new(dname, @dtype, args.first, &definition)
-    end
+    drill = Tryouts::Drill.new(dname, @dtype, *args, &definition)
     self.add_drill drill
   end
   # A quick way to comment out a drill
-  def xdrill(*args, &b); end # ignore calls to xdrill
+  def xdrill(*args, &b); @dream_catcher.clear; end # ignore calls to xdrill
   
   
   #
@@ -149,12 +147,12 @@ class Tryouts
       dobj = Tryouts::Drill::Dream.from_block definition
     else
       if args.size == 1
-        dobj = Tryouts::Drill::Dream.new(args.shift)    # dream 'OUTPUT'
+        dobj = Tryouts::Drill::Dream.new(args.shift)  # dream 'OUTPUT'
       else
-        dobj = Tryouts::Drill::Dream.new(*args.reverse) # dream :form, 'OUTPUT'
+        dobj = Tryouts::Drill::Dream.new(*args)       # dream 'OUTPUT', :format
       end
     end
-    @dream_catcher << dobj
+    @dream_catcher.push dobj
     dobj
   end
   # A quick way to comment out a dream

data/tryouts.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "tryouts"
   s.rubyforge_project = "tryouts"
-	s.version = "0.6.1"
+	s.version = "0.6.2"
 	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.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Delano Mandelbaum