tryouts 2.0.1.002 → 2.0.3

data/CHANGES.txt

@@ -1,5 +1,15 @@
 TRYOUTS, CHANGES
 
+#### 2.0.3 (2010-11-03) ###############################
+
+* FIXED: Print test value not expected value twice!
+
+#### 2.0.2 (2010-11-03) ###############################
+
+* FIXED: Properly skip test cases with commented out expectations (i.e ##=>)
+* CHANGE: Revised CLI output. Print output for each test case as it's running.
+
+
 #### 2.0.1.002 (2010-07-21) ###############################
 
 * FIXED: clean error (bad value for range). Didn't run tryouts. Bad Delano!

data/README.rdoc

@@ -1,8 +1,10 @@
 = Tryouts v2.0 ALPHA
 
-<i>Put your Ruby tests in comments.</i>
+<i>Don't waste your time writing tests.</i>
 
-<b>NOTE: Tryouts syntax changed 0.x. The old version is still available in the 0.8-FINAL branch.</b>
+<b>NOTE: Tryouts syntax changed since 0.x. The old version is still available in the 0.8-FINAL branch.</b>
+
+Check out the screencast[http://www.rubypulse.com/episode-0.46_tryouts.html] created by Alex Peuchert.
 
 
 == Basic syntax
@@ -36,7 +38,7 @@
       end
     #=> :success
 
-For real world examples, see the Gibbler[github.com/delano/gibbler/tree/master/try/] tryouts.
+For real world examples, see the Gibbler[http://github.com/delano/gibbler/tree/master/try/] tryouts.
 
 == Setup / Cleanup
 
@@ -89,5 +91,6 @@ With help from:
 == Thanks
 
 * Syntenic[http://syntenic.com/] for the hackfest venue. 
+* AlexPeuchert[http://www.rubypulse.com/] for the screencast.
 
 <i>This collision was brought to you by Montreal.rb.</i>

data/Rakefile

@@ -17,10 +17,10 @@ name = "stella"
 begin
   require "jeweler"
   Jeweler::Tasks.new do |gem|
-    gem.version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}.#{config[:BUILD]}"
+    gem.version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}"
     gem.name = "tryouts"
     gem.rubyforge_project = gem.name
-    gem.summary = "Put your Ruby tests in comments."
+    gem.summary = "Don't waste your time writing tests"
     gem.description = gem.summary
     gem.email = "delano@solutious.com"
     gem.homepage = "http://github.com/delano/tryouts"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :MAJOR: 2
 :MINOR: 0
-:PATCH: 1
-:BUILD: '002'
+:PATCH: 3
+:BUILD: '001'

data/lib/tryouts.rb

@@ -43,7 +43,7 @@ class Tryouts
     
     def run_all *paths
       batches = paths.collect do |path|
-        run path
+        parse path
       end
       
       all, skipped_tests, failed_tests = 0, 0, 0
@@ -52,45 +52,42 @@ class Tryouts
       msg 'Ruby %s @ %-40s' % [RUBY_VERSION, Time.now], $/
       
       batches.each do |batch|
-        if !batch.run?
-          skipped_batches += 1 
-          status = "SKIP"
-        elsif batch.failed?
-          failed_batches += 1 
-          status = Console.color(:red, "FAIL").bright
-        else
-          status = Console.color(:green, "PASS").bright
-        end
         
         path = batch.path.gsub(/#{Dir.pwd}\/?/, '')
         
-        msg '%-60s %s' % [path, status]
-        batch.each do |t|
-          if t.failed? && failed_tests == 0
-            #msg Console.reverse(" %-60s" % 'Errors')
+        msg '%-60s %s' % [path, ''] # status
+        
+        before_handler = Proc.new do |t|
+          msg Console.reverse(' %-58s ' % [t.desc.to_s])
+          msg t.test.inspect, t.exps.inspect
+        end
+        
+        batch.run(before_handler) do |t|
+          if t.failed? 
+            failed_tests += 1
+            msg Console.color(:red, t.failed.join($/)), $/
+          elsif t.skipped? || !t.run?
+            skipped_tests += 1
+            msg Console.bright(t.skipped.join($/)), $/
+          else
+            msg Console.color(:green, t.passed.join($/)), $/
           end
           
           all += 1
-          skipped_tests += 1 unless t.run?
-
-          if t.failed?
-            msg if (failed_tests += 1) == 1
-            msg Console.reverse(' %-58s ' % [t.desc.to_s])
-            msg t.test.inspect, t.exps.inspect
-            msg Console.color(:red, t.failed.join($/)), $/
-          end
+          
         end
       end
+      
       msg
       if all > 0
         suffix = 'tests passed'
-        suffix << " (#{skipped_tests} skipped)" if skipped_tests > 0
+        suffix << " (and #{skipped_tests} skipped)" if skipped_tests > 0
         msg cformat(all-failed_tests-skipped_tests, all-skipped_tests, suffix) if all-skipped_tests > 0
       end
       if batches.size > 1
         if batches.size-skipped_batches > 0
           suffix = "batches passed"
-          suffix << " (#{skipped_batches} skipped)" if skipped_batches > 0
+          suffix << " (and #{skipped_batches} skipped)" if skipped_batches > 0
           msg cformat(batches.size-skipped_batches-failed_batches, batches.size-skipped_batches, suffix)
         end  
       end
@@ -172,7 +169,7 @@ class Tryouts
           batch << TestCase.new(desc, test, exps)
         end
       end
-
+      
       batch
     end
     
@@ -208,7 +205,7 @@ class Tryouts
     private
     
     def expectation? str
-      !ignore?(str) && str.strip.match(/^\#\s*=>/)
+      !ignore?(str) && str.strip.match(/\A\#+\s*=>/)
     end
     
     def comment? str
@@ -224,8 +221,8 @@ class Tryouts
     end
     
     def test_begin? str
-      ret = !str.strip.match(/^\#+\s*TEST/i).nil? ||
-      !str.strip.match(/^\#\#+[\s\w]+/i).nil?
+      ret = !str.strip.match(/\#+\s*TEST/i).nil? ||
+      !str.strip.match(/\A\#\#+[\s\w]+/i).nil?
       ret
     end
 
@@ -246,10 +243,15 @@ class Tryouts
       @container = Container.new.metaclass
       @run = false
     end
-    def run
+    def run(before_test, &after_test)
       return if empty?
       setup
-      ret = self.select { |tc| !tc.run } # select failed
+      ret = self.select { |tc| 
+        before_test.call(tc) unless before_test.nil?
+        ret = !tc.run 
+        after_test.call(tc)
+        ret # select failed tests
+      } 
       @failed = ret.size
       @run = true
       clean
@@ -275,7 +277,7 @@ class Tryouts
     end
   end
   class TestCase
-    attr_reader :desc, :test, :exps, :failed, :passed
+    attr_reader :desc, :test, :exps, :failed, :passed, :skipped
     def initialize(d,t,e)
       @desc, @test, @exps, @path = d,t,e
     end
@@ -288,24 +290,38 @@ class Tryouts
     def run
       Tryouts.debug '%s:%d' % [@test.path, @test.first]
       Tryouts.debug inspect, $/
-      test_value = Tryouts.eval @test.to_s, @test.path, @test.first
-      @passed, @failed = [], []
-      exps.each_with_index { |exp,idx| 
-        exp =~ /\#+\s*=>\s*(.+)$/
-        exp_value = Tryouts.eval($1, @exps.path, @exps.first+idx)
-        ret = test_value == exp_value
-        if ret
-          @passed << '     %s == %s' % [test_value.inspect, exp_value.inspect] 
+      expectations = exps.collect { |exp,idx| 
+        exp =~ /\A\#?\s*=>\s*(.+)\Z/
+        $1  # this will be nil if the expectation is commented out
+      }
+      
+      # Evaluate test block only if there are valid expectations
+      unless expectations.compact.empty?
+        test_value = Tryouts.eval @test.to_s, @test.path, @test.first
+        @has_run = true
+      end
+      
+      @passed, @failed, @skipped = [], [], []
+      expectations.each_with_index { |exp,idx| 
+        if exp.nil?
+          @skipped <<  '     [skipped]'
         else
-          @failed << '     %s != %s' % [test_value.inspect, exp_value.inspect] 
+          exp_value = Tryouts.eval(exp, @exps.path, @exps.first+idx)
+          if test_value == exp_value
+            @passed << '     ==  %s' % [test_value.inspect] 
+          else
+            @failed << '     !=  %s' % [test_value.inspect] 
+          end
         end
-        ret
       }
       Tryouts.debug
       @failed.empty?
     end
+    def skipped?
+      !@skipped.nil? && !@skipped.empty?
+    end
     def run?
-      !@failed.nil?
+      @has_run == true
     end
     def failed?
       !@failed.nil? && !@failed.empty?

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tryouts
 version: !ruby/object:Gem::Version 
-  hash: 111
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  - 2
-  version: 2.0.1.002
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -16,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: try
 dependencies: []
 
-description: Put your Ruby tests in comments.
+description: Don't waste your time writing tests
 email: delano@solutious.com
 executables: 
 - try
@@ -76,6 +75,6 @@ rubyforge_project: tryouts
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Put your Ruby tests in comments.
+summary: Don't waste your time writing tests
 test_files: []