shindo 0.2.2 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shindo (0.2.0)
+    shindo (0.2.2)
       formatador (>= 0.0.16)
 
 GEM
@@ -13,5 +13,4 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  formatador (>= 0.0.16)
   shindo!

data/lib/shindo.rb

@@ -3,8 +3,10 @@ require 'formatador'
 
 module Shindo
 
+  class Pending < StandardError; end
+
   unless const_defined?(:VERSION)
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 
   def self.tests(description = nil, tags = [], &block)
@@ -45,10 +47,7 @@ module Shindo
     end
 
     def pending
-      catch(:pending) do
-        @pending = true
-      end
-      throw(:pending)
+      raise(Shindo::Pending.new)
     end
 
     def tests(description, tags = [], &block)
@@ -74,11 +73,11 @@ module Shindo
           begin
             display_description(description)
             Formatador.indent { instance_eval(&block) }
+          rescue Shindo::Pending
+            display_pending(description)
           rescue => error
             display_error(error)
           end
-        else
-          @description = description
         end
       else
         display_description("[light_black]#{description}[/]")
@@ -129,13 +128,15 @@ module Shindo
           for after in @afters.flatten.compact
             after.call
           end
+        rescue Shindo::Pending
+          @pending = true
         rescue => error
           success = false
           value = error
         end
         if @pending
-          display_pending(description)
           @pending = false
+          display_pending(description)
         elsif success
           display_success(description)
         else

data/shindo.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'shindo'
-  s.version           = '0.2.2'
-  s.date              = '2011-01-28'
+  s.version           = '0.3.0'
+  s.date              = '2011-03-10'
   s.rubyforge_project = 'shindo'
 
   ## Make sure your summary is short. The description may be as long

data/tests/bin_tests.rb

@@ -14,8 +14,9 @@ Shindo.tests('bin') do
 
   tests('pending') do
     @output = bin(path('pending'))
-    includes('# implicit pending') { @output }
-    includes('# explicit pending') { @output }
+    includes('# test implicit pending') { @output }
+    includes('# test explicit pending') { @output }
+    includes('# tests explicit pending') { @output }
     tests('$?.exitstatus').returns(0) { $?.exitstatus }
   end
 

data/tests/data/pending

@@ -1,4 +1,5 @@
 Shindo.tests do
-  test('implicit pending')
-  test('explicit pending') { pending }
+  test('test implicit pending')
+  test('test explicit pending') { pending }
+  tests('tests explicit pending') { pending }
 end

metadata

@@ -2,12 +2,12 @@
 name: shindo
 version: !ruby/object:Gem::Version 
   hash: 19
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shindo
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 2
 summary: Simple depth first Ruby testing.