shindo 0.0.14 → 0.0.16

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.16

data/bin/shindo

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo')
 
-helpers = Dir.glob(File.join(Dir.pwd, '**', '*helper.rb'))
+helpers = Dir.glob(File.join(Dir.pwd, 'tests', '**', '*helper.rb'))
 tests = []
 tags = []
 for argument in ARGV

data/lib/shindo.rb

@@ -161,14 +161,18 @@ module Shindo
       if (@if_tagged.empty? || !(@if_tagged & @tag_stack.flatten).empty?) &&
           (@unless_tagged.empty? || (@unless_tagged & @tag_stack.flatten).empty?)
         if block_given?
-          for before in @befores.flatten.compact
-            before.call
-          end
-
-          @annals.start
           begin
+            for before in @befores.flatten.compact
+              before.call
+            end
+
+            @annals.start
             success = instance_eval(&block)
             @annals.stop
+
+            for after in @afters.flatten.compact
+              after.call
+            end
           rescue => error
             @annals.stop
             success = false
@@ -190,10 +194,6 @@ module Shindo
               prompt(description, &block)
             end
           end
-
-          for after in @afters.flatten.compact
-            after.call
-          end
         else
           @formatador.display_line("[yellow]* #{description}#{taggings}[/]")
         end

data/shindo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shindo}
-  s.version = "0.0.14"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]

data/tests/basic_tests.rb

@@ -1,38 +1,50 @@
-success = Tempfile.new('success')
-success << <<-TESTS
-Shindo.tests do
-  test('success') { true }
-end
-TESTS
-success.close
-
-failure = Tempfile.new('failure')
-failure << <<-TESTS
-Shindo.tests do
-  test('failure') { false }
-end
-TESTS
-failure.close
-
-pending = Tempfile.new('pending')
-pending << <<-TESTS
-Shindo.tests do
-  test('pending')
-end
-TESTS
-pending.close
-
 Shindo.tests('basics') do
+  tests('exception') do
+    before do
+      @tempfile = tempfile('exception', <<-TESTS)
+      Shindo.tests do
+        test('exception') { raise StandardError.new('exception') }
+      end
+      TESTS
+      @output = bin(@tempfile.path)
+    end
+    test('output') { @output.include?('- exception') }
+    test('status') { $?.exitstatus == 1 }
+  end
   tests('failure') do
-    test('output') { `#{BIN} #{failure.path}`.include?('- failure') }
+    before do
+      @tempfile = tempfile('failure', <<-TESTS)
+      Shindo.tests do
+        test('failure') { false }
+      end
+      TESTS
+      @output = bin(@tempfile.path)
+    end
+    test('output') { @output.include?('- failure') }
     test('status') { $?.exitstatus == 1 }
   end
   tests('pending') do
-    test('output') { `#{BIN} #{pending.path}`.include?('* pending') }
+    before do
+      @tempfile = tempfile('pending', <<-TESTS)
+      Shindo.tests do
+        test('pending')
+      end
+      TESTS
+      @output = bin(@tempfile.path)
+    end
+    test('output') { @output.include?('* pending') }
     test('status') { $?.exitstatus == 0 }
   end
   tests('success') do
-    test('output') { `#{BIN} #{success.path}`.include?('+ success') }
+    before do
+      @tempfile = tempfile('success', <<-TESTS)
+      Shindo.tests do
+        test('success') { true }
+      end
+      TESTS
+      @output = bin(@tempfile.path)
+    end
+    test('output') { @output.include?('+ success') }
     test('status') { $?.exitstatus == 0 }
   end
 end

data/tests/tag_tests.rb

@@ -1,32 +1,30 @@
-negative = Tempfile.new('negative')
-negative << <<-TESTS
-Shindo.tests do
-  test('is tested') { true }
-  test('is skipped', 'negative') { false }
-end
-TESTS
-negative.close
-
-positive = Tempfile.new('positive')
-positive << <<-TESTS
-Shindo.tests do
-  test('is tested', 'positive') { true }
-  test('is skipped') { false }
-end
-TESTS
-positive.close
-
 Shindo.tests('tags') do
 
   tests('negative') do
-    before { @output = `#{BIN} #{negative.path} -negative` }
+    before do
+      @tempfile = tempfile('negative', <<-TESTS)
+      Shindo.tests do
+        test('is tested') { true }
+        test('is skipped', 'negative') { false }
+      end
+      TESTS
+      @output = bin("#{@tempfile.path} -negative")
+    end
     test('is tested')   { @output.include?('+ is tested') }
     test('is skipped')  { @output.include?('_ is skipped (negative)') }
     test('status')      { $?.exitstatus == 0 }
   end
 
   tests('positive') do
-    before { @output = `#{BIN} #{positive.path} +positive` }
+    before do
+      @tempfile = tempfile('positive', <<-TESTS)
+      Shindo.tests do
+        test('is tested', 'positive') { true }
+        test('is skipped') { false }
+      end
+      TESTS
+      @output = bin("#{@tempfile.path} +positive")
+    end
     test('is tested')   { @output.include?('+ is tested (positive)') }
     test('is skipped')  { @output.include?('_ is skipped') }
     test('status')      { $?.exitstatus == 0 }

data/tests/tests_helper.rb

@@ -1,16 +1,16 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'shindo'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo'))
+
 require 'tempfile'
 
-unless Object.const_defined?(:BIN)
-  BIN = File.join(File.dirname(__FILE__), '..', 'bin', 'shindo')
+BIN = File.join(File.dirname(__FILE__), '..', 'bin', 'shindo')
+
+def bin(arguments)
+  `#{BIN} #{arguments}`
 end
-tags = Thread.current[:tags] || []
-ARGV.each do |arg|
-    if arg.match(/^[\+\-]/)
-      tags << arg
-    ARGV.delete(arg)
-  end
+
+def tempfile(name, data)
+  tempfile = Tempfile.new(name)
+  tempfile << data
+  tempfile.close
+  tempfile
 end
-Thread.current[:tags] = tags

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - geemus (Wesley Beary)