delano-tryouts 0.4.1 → 0.5.0

data/CHANGES.txt

@@ -1,6 +1,16 @@
 TRYOUTS, CHANGES
 
 
+#### 0.5.0 (2009-06-07) ###############################
+
+* FIXED: Fix for running drills without dreams and for specifying verbose without a command name
+* CHANGE: The executable has been renamed to 'sergeant'
+* CHANGE: Gave reality a default rcode (0)
+* CHANGE: Now using module_eval (was: class_eval) for setup and clean
+* ADDED: Displays percentage of failed dreams
+* ADDED: Drill stash!
+* ADDED: xdream and better handling for drills and dreams with no name
+
 #### 0.4.1 (2009-06-07) ###############################
 
 * CHANGE: The CLI output is no longer terrifyingly ugly.

data/README.rdoc

@@ -67,15 +67,16 @@ Tryouts employs the same approach for testing Ruby codes. The return value of th
     end
 
 
-== ALPHA Notice
+== BETA Notice
 
 This library is very new (est. 2009-05-19) and has not been vetted by the scrutiny of time. In particular you can expect:
 
-* Ugly/awkward output from the tryouts executable. I wrote the core functionality that I needed to start writing tryouts for my other projects. I haven't spent very much time on reporting yet. However, this will change!
 * The test definition syntax may change in future releases. 
 * Unexpected errors. 
 
+
 == 3 Ways to define tryouts
+
 There are three ways to define an instance of this class:
 * In +_tryouts.rb+ files using the DSL syntax. One file per Tryouts object. 
   * See: http://github.com/delano/tryouts/blob/master/tryouts/mockoutcli_tryouts.rb

data/bin/{tryouts → sergeant}

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
 
 TRYOUTS_HOME = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
@@ -15,7 +15,7 @@ require 'tryouts/cli'
 module TryoutsCLI
   extend Drydock
   
-  debug :off
+  debug :on
   default :run, :with_args
   
   global :q, :quiet, "Decrease output"
@@ -26,14 +26,29 @@ module TryoutsCLI
   
   about "Run tryouts from current working directory"
   argv :files
+  option :q, :quiet, "Decrease output (same as global)"
+  option :v, :verbose, "Increase output (same as global)" do 
+    @verbose ||= 0
+    @verbose += 1
+  end
   command :run => Tryouts::CLI::Run
   
   about "Show dreams available from the current working directory"
   argv :files
+  option :q, :quiet, "Decrease output (same as global)"
+  option :v, :verbose, "Increase output (same as global)" do 
+    @verbose ||= 0
+    @verbose += 1
+  end
   command :dreams => Tryouts::CLI::Run
   
   about "Show tryouts available from the current working directory"
   argv :files
+  option :q, :quiet, "Decrease output (same as global)"
+  option :v, :verbose, "Increase output (same as global)" do 
+    @verbose ||= 0
+    @verbose += 1
+  end
   command :list => Tryouts::CLI::Run
   
 end

data/lib/tryouts/cli/run.rb

@@ -1,124 +1,171 @@
 
 class Tryouts; module CLI
   
-  # = Run
-  #
-  # The logic bin/tryouts uses for running tryouts. 
-  class Run < Drydock::Command
+# = Run
+#
+# The logic bin/tryouts uses for running tryouts. 
+class Run < Drydock::Command
 
-    def init
-      @tryouts_globs = [GYMNASIUM_GLOB, File.join(Dir.pwd, '*_tryouts.rb')]
-    end
-    
-    def dreams
-      load_available_tryouts_files
-      if @global.verbose > 0
-        puts Tryouts.dreams.to_yaml
-      else
-        Tryouts.dreams.each_pair do |n,dreams|
-          puts n
-          dreams.each_pair do |n, dream|
-            puts "  " << n
-            dream.each_pair do |n, drill|
-              puts "    " << n
-            end
+  def init
+    @tryouts_globs = [GYMNASIUM_GLOB, File.join(Dir.pwd, '*_tryouts.rb')]
+  end
+  
+  # $ sergeant dreams [path/2/tryouts]
+  # Display the dreams from all known tryouts
+  def dreams
+    load_available_tryouts_files
+    if @global.verbose > 0
+      puts Tryouts.dreams.to_yaml
+    else
+      Tryouts.dreams.each_pair do |n,dreams|
+        puts n
+        dreams.each_pair do |n, dream|
+          puts "  " << n
+          dream.each_pair do |n, drill|
+            puts "    " << n
           end
         end
       end
     end
+  end
+  
+  # $ sergeant run [path/2/tryouts]
+  # Executes all tryouts that can be found from the current working directory. 
+  def run
+    if @global.verbose > 0
+      puts "#{Tryouts.sysinfo.to_s} (#{RUBY_VERSION})"
+    end
     
-    def run
-      if @global.verbose > 0
-        puts "#{Tryouts.sysinfo.to_s} (#{RUBY_VERSION})"
-      end
-      
-      load_available_tryouts_files
+    load_available_tryouts_files
 
-      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
+    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
-      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
+    unless @global.quiet
+      if (passed == 0 && failed == 0)
+        puts DEV if @global.verbose > 4
+        msg = " You didn't even try to acheive your dreams :[ "
+      elsif failed == 0
+        puts PUG if @global.verbose > 4
+        msg = " All %s dreams came true ".color(:green)
+        msg = msg % [passed+failed]
+      else
+        puts BUG if @global.verbose > 4
+        score = (passed.to_f / (passed.to_f+failed.to_f)) * 100
+        msg = " %s of %s dreams came true (%d%%) ".color(:red)
+        msg = msg % [passed, passed+failed, score.to_i]
       end
+      puts $/, msg.att(:reverse)
     end
-    
-    def list
-      load_available_tryouts_files
-      ##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
-          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
+  
+  # $ sergeant list 
+  # Displays all known tryouts from the current working directory
+  def list
+    load_available_tryouts_files
+    Tryouts.instances.each_pair do |n,tryouts_inst|
+      puts n
+      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
-    
-  private 
-    def load_available_tryouts_files
-      @tryouts_files = []
-      # 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
+  
+private 
+
+  # Find and load all tryouts files
+  def load_available_tryouts_files
+    @tryouts_files = []
+    # 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
-      @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
+    @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
 
-MOOKIE = %q{
-      __,-----._                       ,-. 
-    ,'   ,-.    \`---.          ,-----<._/ 
-   (,.-. o:.`    )),"\\\-._    ,'         `. 
-  ('"-` .\       \`:_ )\  `-;'-._          \ 
- ,,-.    \` ;  :  \( `-'     ) -._     :   `: 
-(    \ `._\\\ ` ;             ;    `    :    ) 
- \`.  `-.    __   ,         /  \        ;, ( 
-  `.`-.___--'  `-          /    ;     | :   | 
-    `-' `-.`--._          '           ;     | 
-          (`--._`.                ;   /\    | 
-           \     '                \  ,  )   : 
-           |  `--::----            \'   ;  ;| 
-           \    .__,-      (        )   :  :| 
-            \    : `------; \      |    |   ; 
-             \   :       / , )     |    |  ( 
-    -hrr-     \   \      `-^-|     |   / , ,\ 
-               )  )          | -^- ;   `-^-^' 
-            _,' _ ;          |    | 
-           / , , ,'         /---. : 
-           `-^-^'          (  :  :,' 
-                            `-^--' 
-}
+class Tryouts::CLI::Run
+  DEV = %q{
+          ^^             @@@@@@@@@
+     ^^       ^^      @@@@@@@@@@@@@@@
+                    @@@@@@@@@@@@@@@@@@              ^^
+                   @@@@@@@@@@@@@@@@@@@@
+   ~~~ ~~~~~~~~ ~~ &&&&&&&&&&&&&&&&&&&& ~~~~~~~ ~~~~~~~~~~~ ~~
+   ~~   ~  ~       ~~~~~~~~~~~~~~~~~~~~ ~       ~~     ~~ ~
+   ~      ~~ ~~ ~~  ~~~~~~~~~~~~~ ~~~~  ~     ~~~    ~ ~~~  ~
+     ~         ~      ~~~~~~  ~~ ~~~       ~~ ~ ~~  ~~ ~
+    ~ ~      ~           ~~ ~~~~~~  ~      ~~  ~           ~~~
+             ~        ~      ~      ~~   ~             ~
+  }
+  BUG = %q{
+     ,--.____                                     ____.--.
+    /  .'.'"``--...----------.___.----------...--''"`.`.  \
+    | .'.'         .                       .         `.`. |
+    `. .'|     . ' - . _    `-----'    _ . - ' .     |`. .'
+     `.' `|   .'   _     "-._     _.-"     _   `.   |' `.'
+          |  |        " -.           .- "        |  |
+           \|        ;;..  "|i. .i|"  ..;;        |/
+           `|      ,---.``.   ' '   .'',---.      |'        
+            |    <'(__.'>.'---` '---`.<`.__)`>    | 
+            |   `. `~  .'  ,-------.  `.  ~'.'    |
+            |  |=_"`=.'  . `-.___.-' .  `.='"_=|  |
+            |  |  ==/  : ` :   i   : ' :  \==  |  |
+            |  | ==/      /\___|___/\      \== |  |
+             `.| =Y      .' """_""" `.      Y= |.'
+               L ||      ;  .=="==.  ;      || J 
+                \ ;     .' '       ` `.     ; /
+                 `.     ;             ;     .'
+                  ;    ;'\           /`;    ;
+                  `;  .'.'/.       ,\`.`.  ;' 
+                   `-=;_-'  `-----'  `-_;=-'        -bodom-
+}
+PUG = %q{
+                  __,-----._                       ,-. 
+                ,'   ,-.    \`---.          ,-----<._/ 
+               (,.-. o:.`    )),"\\\-._    ,'         `. 
+              ('"-` .\       \`:_ )\  `-;'-._          \ 
+             ,,-.    \` ;  :  \( `-'     ) -._     :   `: 
+            (    \ `._\\\ ` ;             ;    `    :    ) 
+             \`.  `-.    __   ,         /  \        ;, ( 
+              `.`-.___--'  `-          /    ;     | :   | 
+                `-' `-.`--._          '           ;     | 
+                      (`--._`.                ;   /\    | 
+                       \     '                \  ,  )   : 
+                       |  `--::----            \'   ;  ;| 
+                       \    .__,-      (        )   :  :| 
+                        \    : `------; \      |    |   ; 
+                         \   :       / , )     |    |  ( 
+                          \   \      `-^-|     |   / , ,\ 
+                           )  )          | -^- ;   `-^-^' 
+                        _,' _ ;          |    | 
+                       / , , ,'         /---. : 
+                       `-^-^'          (  :  :,'    
+                                        `-^--'      -hrr- 
+}
+end

data/lib/tryouts/drill/response.rb

@@ -100,6 +100,13 @@ class Tryouts::Drill
   #
   # Contains the actual response of a Drill
   #
-  class Reality < Tryouts::Drill::Response; end
+  class Reality < Tryouts::Drill::Response
+      # An ordered hash taken from the DrillContext that created this Reality. 
+    attr_accessor :stash
+    def initialize
+      @rcode = 0
+      @stash = Tryouts::HASH_TYPE.new
+    end
+  end
 
 end

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

@@ -0,0 +1,42 @@
+
+
+
+class Tryouts; class Drill; module Sergeant
+  
+  # = API
+  # 
+  # The sergeant responsible for running Ruby code (API) drills.
+  #
+  class API
+    
+    # +return_value+ specify a return value. This will be 
+    # used if no block is specified for the drill.
+    def initialize(return_value=nil)
+      @return_value = return_value
+    end
+  
+    def run(block, context, &inline)
+      
+      # A Proc object takes precedence over an inline block. 
+      runtime = (block.nil? ? inline : block)
+      response = Tryouts::Drill::Reality.new
+      if runtime.nil?
+        response.output = @return_value
+      else
+        begin
+          unless runtime.nil?
+            ret = context.instance_eval &runtime
+            response.output, response.rcode = ret, 0
+          end
+        rescue => ex
+          response.rcode = 1
+          response.output = ret
+          response.emsg = ex.message
+          response.backtrace = ex.backtrace
+        end
+      end
+      response
+    end
+    
+  end
+end; end; end

data/lib/tryouts/drill.rb

@@ -52,6 +52,7 @@ class Tryouts
     begin
       print Tryouts::DRILL_MSG % @name
       @reality = @sergeant.run @drill, context
+      @reality.stash = context.stash if context.respond_to? :stash
       process_reality
     rescue => ex
       @reality.rcode = -2

data/lib/tryouts/orderedhash.rb

@@ -0,0 +1,199 @@
+# AUTHOR
+#    jan molic /mig/at/1984/dot/cz/
+#
+# DESCRIPTION
+#    Hash with preserved order and some array-like extensions
+#    Public domain. 
+#
+# THANKS
+#    Andrew Johnson for his suggestions and fixes of Hash[],
+#    merge, to_a, inspect and shift
+class Tryouts::OrderedHash < ::Hash
+    attr_accessor :order
+
+    class << self
+        def [] *args
+          hsh = Tryouts::OrderedHash.new
+          if Hash === args[0]
+            hsh.replace args[0]
+          elsif (args.size % 2) != 0
+            raise ArgumentError, "odd number of elements for Hash"
+          else
+            0.step(args.size - 1, 2) do |a|
+              b = a + 1
+              hsh[args[a]] = args[b]
+            end
+          end
+          hsh
+        end
+    end
+    def initialize(*a, &b)
+      super
+      @order = []
+    end
+    def store_only a,b
+        store a,b
+    end
+    alias orig_store store    
+    def store a,b
+        @order.push a unless has_key? a
+        super a,b
+    end
+    alias []= store
+    def == hsh2
+        return false if @order != hsh2.order
+        super hsh2
+    end
+    def clear
+        @order = []
+        super
+    end
+    def delete key
+        @order.delete key
+        super
+    end
+    def each_key
+        @order.each { |k| yield k }
+        self
+    end
+    def each_value
+        @order.each { |k| yield self[k] }
+        self
+    end
+    def each
+        @order.each { |k| yield k,self[k] }
+        self
+    end
+    alias each_pair each    
+    def delete_if
+        @order.clone.each { |k| 
+            delete k if yield(k)
+        }
+        self
+    end
+    def values
+        ary = []
+        @order.each { |k| ary.push self[k] }
+        ary
+    end
+    def keys
+        @order
+    end
+    def first
+      {@order.first => self[@order.first]}
+    end
+    def last
+      {@order.last => self[@order.last]}
+    end
+    def invert
+        hsh2 = Hash.new    
+        @order.each { |k| hsh2[self[k]] = k }
+        hsh2
+    end
+    def reject &block
+        self.dup.delete_if &block
+    end
+    def reject! &block
+        hsh2 = reject &block
+        self == hsh2 ? nil : hsh2
+    end
+    def replace hsh2
+        @order = hsh2.keys 
+        super hsh2
+    end
+    def shift
+        key = @order.first
+        key ? [key,delete(key)] : super
+    end
+    def unshift k,v
+        unless self.include? k
+            @order.unshift k
+            orig_store(k,v)
+            true
+        else
+            false
+        end
+    end
+    def push k,v
+        unless self.include? k
+            @order.push k
+            orig_store(k,v)
+            true
+        else
+            false
+        end
+    end
+    def pop
+        key = @order.last
+        key ? [key,delete(key)] : nil
+    end
+    def to_a
+        ary = []
+        each { |k,v| ary << [k,v] }
+        ary
+    end
+    def to_s
+        self.to_a.to_s
+    end
+    def inspect
+        ary = []
+        each {|k,v| ary << k.inspect + "=>" + v.inspect}
+        '{' + ary.join(", ") + '}'
+    end
+    def update hsh2
+        hsh2.each { |k,v| self[k] = v }
+        self
+    end
+    alias :merge! update
+    def merge hsh2
+        ##self.dup update(hsh2)   ## 2009-05-12 -- delano
+        update hsh2               ## dup doesn't take an argument
+                                  ## and there's no need for it here
+    end
+    def select
+        ary = []
+        each { |k,v| ary << [k,v] if yield k,v }
+        ary
+    end
+    def class
+      Hash
+    end
+    def __class__
+      Tryouts::OrderedHash
+    end
+
+    attr_accessor "to_yaml_style"
+    def yaml_inline= bool
+      if respond_to?("to_yaml_style")
+        self.to_yaml_style = :inline
+      else
+        unless defined? @__yaml_inline_meth
+          @__yaml_inline_meth =
+            lambda {|opts|
+              YAML::quick_emit(object_id, opts) {|emitter|
+                emitter << '{ ' << map{|kv| kv.join ': '}.join(', ') << ' }'
+              }
+            }
+          class << self
+            def to_yaml opts = {}
+              begin
+                @__yaml_inline ? @__yaml_inline_meth[ opts ] : super
+              rescue
+                @to_yaml_style = :inline
+                super
+              end
+            end
+          end
+        end
+      end
+      @__yaml_inline = bool
+    end
+    def yaml_inline!() self.yaml_inline = true end
+
+    def each_with_index
+      @order.each_with_index { |k, index| yield k, self[k], index }
+      self
+    end
+end # class Tryouts::OrderedHash
+
+

data/lib/tryouts/tryout.rb

@@ -34,7 +34,25 @@ class Tryouts
   # Each Drill is executed in a new instance of this class. That means
   # instance variables are not carried through, but class variables are. 
   # The before and after blocks are also run in this context.
-  class DrillContext; end
+  class DrillContext
+      # An ordered Hash of stashed objects. 
+    attr_reader :stash
+    def initialize; @stash = Tryouts::HASH_TYPE.new; end
+    # If called with no arguments, returns +@stash+. 
+    # If called with arguments, it will add a new value to the +@stash+
+    # and return the new value.  e.g.
+    #
+    #     stash :name, 'some value'   # => 'some value'
+    #
+    def stash(*args)
+      if args.empty?
+        @stash
+      else
+        @stash[args[0]] = args[1] 
+        args[1] 
+      end
+    end
+  end
      
   def initialize(name, dtype, command=nil, *args)
     raise "Must supply command for dtype :cli" if dtype == :cli && command.nil?
@@ -56,13 +74,16 @@ class Tryouts
   # Execute all Drill objects
   def run
     update_drills!   # Ensure all drills have all known dreams
-    DrillContext.class_eval &setup if setup.is_a?(Proc)
+    DrillContext.module_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.reality.stash.each_pair do |n,v|
+        puts '%14s: %s' % [n,v.inspect]
+      end
       drill.success? ? @passed += 1 : @failed += 1
     end
-    DrillContext.class_eval &clean if clean.is_a?(Proc)
+    DrillContext.module_eval &clean if clean.is_a?(Proc)
   end
   
   # Prints error output. If there are no errors, it prints nothing. 
@@ -70,7 +91,7 @@ class Tryouts
     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}"}
+      title = ' %-59s' % %Q{ERROR #{index+1}/#{failed.size} "#{drill.name}"}
       puts $/, ' ' << title.color(:red).att(:reverse)
       
       if drill.dream
@@ -81,17 +102,13 @@ class Tryouts
           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]"]
+        
         if drill.reality.rcode > 0
-          puts '%24s: %s' % ["rcode", drill.reality.rcode.inspect]
-          puts '%24s: %s' % ["msg", drill.reality.emsg.inspect]
+          puts '%24s: ' % ["backtrace"]
+          puts drill.reality.backtrace, $/
         end
-      end
-      
-      if drill.reality.rcode > 0
-        puts '%24s: ' % ["backtrace"]
-        puts drill.reality.backtrace, $/
+      else
+        puts '%24s' % ["[nodream]"]
       end
       
     end
@@ -141,31 +158,36 @@ class Tryouts
     @clean = block
   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(dname, *args, &definition)
+    raise "Empty drill name (#{@name})" if dname.nil? || dname.empty?
+    args.unshift(@command) if @dtype == :cli
+    drill = Tryouts::Drill.new(dname, @dtype, *args, &definition)
+    add_drill drill
+  end
+  # A quick way to comment out a drill
+  def xdrill(*args, &b); end # ignore calls to xdrill
+  
   # +name+ of the Drill associated to this Dream
   # +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
   #
   # NOTE: This method is DSL-only. It's not intended to be used in OO syntax. 
-  def dream(name, output=nil, format=nil, rcode=0, emsg=nil, &definition) 
+  def dream(dname, output=nil, format=nil, rcode=0, emsg=nil, &definition) 
+    raise "Empty dream name (#{@name})" if dname.nil? || dname.empty?
     if output.nil?
+      raise "No output or block for '#{dname}' (#{@name})" if definition.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[name] = dobj
+    @dreams[dname] = 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, &definition)
-    args.unshift(@command) if @dtype == :cli
-    drill = Tryouts::Drill.new(name, @dtype, *args, &definition)
-    add_drill drill
-  end
-  def xdrill(*args, &b); end # ignore calls to xdrill
-  
+  # A quick way to comment out a dream
+  def xdream(*args, &b); end
   
 end; end

data/lib/tryouts.rb

@@ -30,7 +30,7 @@ class Tryouts
   # Raised when there is a problem loading or parsing a Tryouts::Drill::Dream object
   class BadDreams < Exception; end
   
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'
@@ -119,7 +119,6 @@ class Tryouts
     @@instances.last.command(*args)
   end
   
-  
   # Require +name+. If +path+ is supplied, it will "require path". 
   # * +name+ The name of the library in question (required). Stored as a Symbol to +@library+.
   # * +path+ Add a path to the front of $LOAD_PATH (optional). Use this if you want to load
@@ -165,6 +164,9 @@ class Tryouts
     return if name.nil?
     dtype ||= @dtype
     command ||= @command if dtype == :cli
+    
+    raise "No drill type specified for #{name}." if dtype.nil?
+    
     to = find_tryout(name, dtype)
     if to.nil?
       to = Tryouts::Tryout.new(name, dtype, command)
@@ -261,6 +263,19 @@ class Tryouts
     end
   end
   
+  # Returns +@tryouts+.
+  #
+  # Also acts as a stub for Tryouts#tryout in case someone 
+  # specifies "tryouts 'name' do ..." in the DSL. 
+  def tryouts(*args, &block)
+    return tryout(*args, &block) unless args.empty?
+    @tryouts
+  end
+  # An alias for Tryouts.tryout. 
+  def self.tryouts(*args, &block)
+    tryout(args, &block)
+  end
+  
   # +name+ of the Drill associated to this Dream
   # +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
@@ -295,6 +310,15 @@ class Tryouts
     @@instances.last.dream(*args, &block)
   end
   
+  # This method does nothing. It provides a quick way to disable a dream.
+  #
+  # NOTE: This is a DSL-only method and is not intended for OO use.
+  def xdream(*args, &block); end
+  # This method does nothing. It provides a quick way to disable a dream.
+  #
+  # NOTE: this is a standalone DSL-syntax method.
+  def self.xdream(*args, &block); end
+  
   # Populate @@dreams with the content of the file +dpath+. 
   #
   # NOTE: this is an OO syntax method

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delano-tryouts
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -55,7 +55,7 @@ dependencies:
 description: Tryouts are high-level tests for your Ruby code. May all your dreams come true!
 email: tryouts@solutious.com
 executables: 
-- tryouts
+- sergeant
 extensions: []
 
 extra_rdoc_files: 
@@ -67,20 +67,18 @@ files:
 - README.rdoc
 - Rakefile
 - bin/mockout
-- bin/tryouts
+- bin/sergeant
 - lib/tryouts.rb
 - lib/tryouts/cli.rb
 - lib/tryouts/cli/run.rb
 - lib/tryouts/drill.rb
 - lib/tryouts/drill/response.rb
+- lib/tryouts/drill/sergeant/api.rb
 - lib/tryouts/drill/sergeant/cli.rb
 - lib/tryouts/mixins.rb
 - lib/tryouts/mixins/hash.rb
+- lib/tryouts/orderedhash.rb
 - lib/tryouts/tryout.rb
-- tryouts.gemspec
-- tryouts/mockoutcli_dreams.rb
-- tryouts/mockoutcli_dreams.yaml
-- tryouts/mockoutcli_tryouts.rb
 has_rdoc: true
 homepage: http://github.com/delano/tryouts
 post_install_message: 

data/tryouts/mockoutcli_dreams.rb

@@ -1,19 +0,0 @@
-
-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
-    })
-  end
-  dream "YAML Output" do
-    format :to_yaml
-    output ({
-      "Date" => "2009-02-16",
-      "Players" => ["d-bam", "alberta", "birds", "condor man"],
-      "Owners" => ["greg", "rupaul", "telly", "prince kinko"]
-    })
-  end
-end
-

data/tryouts/mockoutcli_dreams.yaml

@@ -1,10 +0,0 @@
-common usage: 
-  yaml output: 
-    :format: :yaml
-    :rcode: 0
-  no args: 
-    :rcode: 0
-    :output: 
-    - "    Date:                                   2009-02-16\n"
-    - " Players:            d-bam, alberta, birds, condor man\n"
-    - " Coaches:               greg|rupaul|telly|prince kinko\n"

data/tryouts/mockoutcli_tryouts.rb

@@ -1,27 +0,0 @@
-
-TRYOUTS_HOME = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-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
-end
-
-tryout "inline dream that passes", :cli, :mockout do
-  output = ["we expect mockout to", "echo these lines back"]
-
-  # $ bin/mockout sergeant -e "we expect mockout to" "echo these lines back"
-  drill "echo arguments", :info, :e, output[0], output[1]
-  dream "echo arguments", output
-end
-
-tryout "inline dream that fails", :cli, :mockout do
-  dream "echo arguments", "The dream does"
-  drill "echo arguments", :info, :e, "not match reality"
-end

data/tryouts.gemspec

@@ -1,75 +0,0 @@
-@spec = Gem::Specification.new do |s|
-	s.name = "tryouts"
-  s.rubyforge_project = "tryouts"
-	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"
-	s.email = "tryouts@solutious.com"
-	s.homepage = "http://github.com/delano/tryouts"
-  
-  # = EXECUTABLES =
-  # The list of executables in your project (if any). Don't include the path, 
-  # just the base filename.
-  s.executables = %w[tryouts]
-  
-  # Directories to extract rdocs from
-  s.require_paths = %w[lib]  
-  
-  # Specific files to include rdocs from
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt]
-  
-  # Update --main to reflect the default page to display
-  s.rdoc_options = ["--line-numbers", "--title", "Tryouts: #{s.summary}", "--main", "README.rdoc"]
-  
-  # = DEPENDENCIES =
-  # Add all gem dependencies
-  s.add_dependency 'drydock', '>= 0.6.5'
-  s.add_dependency 'rye', '>= 0.6.6'
-  s.add_dependency 'sysinfo', '>= 0.5.1'
-  
-  # = MANIFEST =
-  # The complete list of files to be included in the release. When GitHub packages your gem, 
-  # it doesn't allow you to run any command that accesses the filesystem. You will get an
-  # error. You can ask your VCS for the list of versioned files:
-  # git ls-files
-  # svn list -R
-  s.files = %w(
-  CHANGES.txt
-  LICENSE.txt
-  README.rdoc
-  Rakefile
-  bin/mockout
-  bin/tryouts
-  lib/tryouts.rb
-  lib/tryouts/cli.rb
-  lib/tryouts/cli/run.rb
-  lib/tryouts/drill.rb
-  lib/tryouts/drill/response.rb
-  lib/tryouts/drill/sergeant/cli.rb
-  lib/tryouts/mixins.rb
-  lib/tryouts/mixins/hash.rb
-  lib/tryouts/tryout.rb
-  tryouts.gemspec
-  tryouts/mockoutcli_dreams.rb
-  tryouts/mockoutcli_dreams.yaml
-  tryouts/mockoutcli_tryouts.rb
-  )
-  
-  s.has_rdoc = true
-  s.rubygems_version = '1.3.0'
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
- 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<RedCloth>, [">= 4.0.4"])
-    else
-      s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
-    end
-  else
-    s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
-  end
-  
-end