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,7 +23,7 @@ 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'
     end
@@ -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

@@ -15,7 +15,7 @@ require 'tryouts/cli'
 module TryoutsCLI
   extend Drydock
   
-  debug :on
+  debug :off
   default :run, :with_args
   
   global :q, :quiet, "Decrease output"

data/lib/tryouts/cli/run.rb

@@ -29,25 +29,31 @@ class Tryouts; module CLI
     
     def run
       if @global.verbose > 0
-        puts "RUBY #{RUBY_VERSION} - #{RUBY_PLATFORM}"
+        puts "#{Tryouts.sysinfo.to_s} (#{RUBY_VERSION})"
       end
       
       load_available_tryouts_files
 
-      successes = []
+      passed, failed = 0, 0
       Tryouts.instances.each_pair do |group,tryouts_inst|
-        puts '', '-'*60 unless @global.quiet
-        puts group
+        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
-          successes << to.success?
+          passed += to.passed
+          failed += to.failed
         end
       end
-      unless successes.member?(false)
-        puts $/, "All your dreams came true" unless @global.quiet
+      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
     
@@ -87,8 +93,32 @@ class Tryouts; module CLI
         end
       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 }
-      puts @tryouts_files if @global.verbose > 0
     end
   end
-end; end
+end; end
+
+MOOKIE = %q{
+      __,-----._                       ,-. 
+    ,'   ,-.    \`---.          ,-----<._/ 
+   (,.-. o:.`    )),"\\\-._    ,'         `. 
+  ('"-` .\       \`:_ )\  `-;'-._          \ 
+ ,,-.    \` ;  :  \( `-'     ) -._     :   `: 
+(    \ `._\\\ ` ;             ;    `    :    ) 
+ \`.  `-.    __   ,         /  \        ;, ( 
+  `.`-.___--'  `-          /    ;     | :   | 
+    `-' `-.`--._          '           ;     | 
+          (`--._`.                ;   /\    | 
+           \     '                \  ,  )   : 
+           |  `--::----            \'   ;  ;| 
+           \    .__,-      (        )   :  :| 
+            \    : `------; \      |    |   ; 
+             \   :       / , )     |    |  ( 
+    -hrr-     \   \      `-^-|     |   / , ,\ 
+               )  )          | -^- ;   `-^-^' 
+            _,' _ ;          |    | 
+           / , , ,'         /---. : 
+           `-^-^'          (  :  :,' 
+                            `-^--' 
+}

data/lib/tryouts/drill/response.rb

@@ -54,8 +54,8 @@ class Tryouts::Drill
         return false
       end
       
-      # The matching statement will be the return value. 
-      if dream.format.nil?
+      # 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 

data/lib/tryouts/drill.rb

@@ -58,7 +58,7 @@ class Tryouts
       @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
   

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,8 +40,8 @@ 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  -----
@@ -59,9 +57,10 @@ class Tryouts
   def run
     update_drills!   # Ensure all drills have all known dreams
     DrillContext.class_eval &setup if setup.is_a?(Proc)
-    puts Tryouts::TRYOUT_MSG % @name
+    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.class_eval &clean if clean.is_a?(Proc)
   end
@@ -71,8 +70,8 @@ class Tryouts
     return true if success?
     failed = @drills.select { |d| !d.success? }
     failed.each_with_index do |drill,index|
-      
-      puts '%sERROR %2d/%-2d in "%s"' % [$/, index+1, failed.size, drill.name]
+      title = ' %-59s' % %Q{ERROR #{index+1}/#{failed.size} in "#{drill.name}"}
+      puts $/, ' ' << title.color(:red).att(:reverse)
       
       if drill.dream
         puts '%24s: %s (expected %s)' % ["response code", drill.reality.rcode, drill.dream.rcode]
@@ -94,6 +93,7 @@ class Tryouts
         puts '%24s: ' % ["backtrace"]
         puts drill.reality.backtrace, $/
       end
+      
     end
     false
   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.0"
+  VERSION = "0.4.1"
   
   require 'tryouts/mixins'
   require 'tryouts/tryout'
@@ -40,13 +40,20 @@ class Tryouts
   HASH_TYPE = (RUBY_VERSION =~ /1.9/) ? ::Hash : Tryouts::OrderedHash
   
   TRYOUT_MSG = "\n  %s "
-  DRILL_MSG  = ' %30s: '
-  DRILL_ERR  = '  %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 = 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
@@ -66,9 +73,6 @@ class Tryouts
   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"

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_tryouts.rb

@@ -4,6 +4,7 @@ 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"

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: tryouts
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Delano Mandelbaum