tryouts 0.5.0 → 0.5.1

data/CHANGES.txt

@@ -1,5 +1,10 @@
 TRYOUTS, CHANGES
 
+#### 0.5.1 (2009-06-13) ###############################
+
+* ADDED: dream method is now available inside drill block
+* ADDED: Drills that return true are assumed to pass
+
 
 #### 0.5.0 (2009-06-07) ###############################
 
@@ -13,7 +18,7 @@ TRYOUTS, CHANGES
 
 #### 0.4.1 (2009-06-07) ###############################
 
-* CHANGE: The CLI output is no longer terrifyingly ugly.
+* CHANGE: The CLI output is no longer terrifyingly ugly
 
 
 #### 0.4.0 (2009-06-05) ###############################

data/README.rdoc

@@ -1,4 +1,4 @@
-= Tryouts - v0.4 BETA
+= Tryouts - v0.5 BETA
 
 Tryouts is a high-level testing library for your command-line applications and Ruby codes.
 

data/Rakefile

@@ -74,7 +74,7 @@ Rake::RDocTask.new do |t|
 	t.rdoc_files.include(LICENSE)
 	t.rdoc_files.include(README)
 	t.rdoc_files.include(CHANGES)
-	t.rdoc_files.include('bin/tryouts')
+	t.rdoc_files.include('bin/sergeant')
 	t.rdoc_files.include('lib/**/*.rb')
 end
 

data/bin/sergeant

@@ -19,6 +19,10 @@ module TryoutsCLI
   default :run, :with_args
   
   global :q, :quiet, "Decrease output"
+  global :V, :version, "Display version number" do
+    puts "Tryouts version: #{Tryouts::VERSION}"
+    exit 0
+  end
   global :v, :verbose, "Increase output" do 
     @verbose ||= 0
     @verbose += 1

data/lib/tryouts/cli/run.rb

@@ -146,26 +146,26 @@ class Tryouts::CLI::Run
                    `-=;_-'  `-----'  `-_;=-'        -bodom-
 }
 PUG = %q{
-                  __,-----._                       ,-. 
-                ,'   ,-.    \`---.          ,-----<._/ 
-               (,.-. o:.`    )),"\\\-._    ,'         `. 
-              ('"-` .\       \`:_ )\  `-;'-._          \ 
-             ,,-.    \` ;  :  \( `-'     ) -._     :   `: 
-            (    \ `._\\\ ` ;             ;    `    :    ) 
-             \`.  `-.    __   ,         /  \        ;, ( 
-              `.`-.___--'  `-          /    ;     | :   | 
-                `-' `-.`--._          '           ;     | 
-                      (`--._`.                ;   /\    | 
-                       \     '                \  ,  )   : 
-                       |  `--::----            \'   ;  ;| 
-                       \    .__,-      (        )   :  :| 
-                        \    : `------; \      |    |   ; 
-                         \   :       / , )     |    |  ( 
-                          \   \      `-^-|     |   / , ,\ 
-                           )  )          | -^- ;   `-^-^' 
-                        _,' _ ;          |    | 
-                       / , , ,'         /---. : 
-                       `-^-^'          (  :  :,'    
-                                        `-^--'      -hrr- 
+              __,-----._                       ,-. 
+            ,'   ,-.    \`---.          ,-----<._/ 
+           (,.-. o:.`    )),"\\\-._    ,'         `. 
+          ('"-` .\       \`:_ )\  `-;'-._          \ 
+         ,,-.    \` ;  :  \( `-'     ) -._     :   `: 
+        (    \ `._\\\ ` ;             ;    `    :    ) 
+         \`.  `-.    __   ,         /  \        ;, ( 
+          `.`-.___--'  `-          /    ;     | :   | 
+            `-' `-.`--._          '           ;     | 
+                  (`--._`.                ;   /\    | 
+                   \     '                \  ,  )   : 
+                   |  `--::----            \'   ;  ;| 
+                   \    .__,-      (        )   :  :| 
+                    \    : `------; \      |    |   ; 
+                     \   :       / , )     |    |  ( 
+                      \   \      `-^-|     |   / , ,\ 
+                       )  )          | -^- ;   `-^-^' 
+                    _,' _ ;          |    | 
+                   / , , ,'         /---. : 
+                   `-^-^'          (  :  :,'    
+                                    `-^--'          -hrr- 
 }
 end

data/lib/tryouts/drill.rb

@@ -48,11 +48,25 @@ class Tryouts
   end
   
   def run(context=nil)
-    return false if @dream.nil?
     begin
       print Tryouts::DRILL_MSG % @name
       @reality = @sergeant.run @drill, context
+      # Store the stash from the drill block
       @reality.stash = context.stash if context.respond_to? :stash
+      # Create or overwrite an existing dream if onw was defined in the block
+      if context.respond_to?(:dream) && context.has_dream?
+        @dream = Tryouts::Drill::Dream.new
+        @dream.output = context.dream
+        @dream.format = context.format unless context.format.nil?
+        @dream.rcode = context.rcode unless context.rcode.nil?
+        @dream.emsg = context.emsg unless context.emsg.nil?
+      end
+      
+      # 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
+      end
       process_reality
     rescue => ex
       @reality.rcode = -2

data/lib/tryouts/tryout.rb

@@ -36,8 +36,19 @@ class Tryouts
   # The before and after blocks are also run in this context.
   class DrillContext
       # An ordered Hash of stashed objects. 
-    attr_reader :stash
-    def initialize; @stash = Tryouts::HASH_TYPE.new; end
+    attr_writer :stash
+      # A value used as the dream output that will overwrite a predefined dream
+    attr_writer :dream
+    attr_writer :format
+    attr_writer :rcode
+    attr_writer :emsg
+    attr_writer :output
+    
+    def initialize; @stash = Tryouts::HASH_TYPE.new; @has_dream = false; end
+    
+    # Set to to true by DrillContext#dream
+    def has_dream?; @has_dream; 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.
@@ -45,13 +56,37 @@ class Tryouts
     #     stash :name, 'some value'   # => 'some value'
     #
     def stash(*args)
-      if args.empty?
-        @stash
-      else
-        @stash[args[0]] = args[1] 
-        args[1] 
-      end
+      return @stash if args.empty?
+      @stash[args[0]] = args[1] 
+      args[1] 
+    end
+    
+    # If called with no arguments, returns +@dream+. 
+    # If called with one argument, it will overwrite +@dream+ with the
+    # first element. If called with two arguments, it will check if
+    # the second argument is a Symbol or Fixnum. If it's a Symbol it 
+    # will assume it's +@format+. If it's a Fixnum, it will assume 
+    # it's +@rcode+. If there's a there's a third argument and it's a
+    # Fixnum, it's assumed to be +@rcode+. In all cases, this method 
+    # returns the value of +@dream+. e.g.
+    #
+    #     dream 'some value'         # => 'some value'
+    #     dream :val1, :class, 1     # => :val1
+    #
+    def dream(*args)
+      return @dream if args.empty?
+      @has_dream = true
+      @dream = args.shift
+      @format = args.shift if args.first.is_a? Symbol
+      @rcode = args.shift if args.first.is_a? Fixnum
+      @emsg = args.shift if args.first.is_a? String
     end
+    
+    def output(*args); return @output if args.empty?; @output = args.first; end
+    def format(*args); return @format if args.empty?; @format = args.first; end
+    def rcode(*args); return @rcode if args.empty?; @rcode = args.first; end
+    def emsg(*args); return @emsg if args.empty?; @emsg = args.first; end
+    
   end
      
   def initialize(name, dtype, command=nil, *args)
@@ -108,7 +143,8 @@ class Tryouts
           puts drill.reality.backtrace, $/
         end
       else
-        puts '%24s' % ["[nodream]"]
+        puts '%24s: %s' % ["expected output", "[nodream]"]
+        puts '%24s: %s' % ["actual output", drill.reality.output.inspect]
       end
       
     end

data/lib/tryouts.rb

@@ -1,5 +1,4 @@
 
-require 'rubygems'
 require 'ostruct'
 require 'rye'
 require 'yaml'
@@ -30,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.5.0"
+  VERSION = "0.5.1"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tryouts
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -04:00
+date: 2009-06-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency