shindo 0.0.2 → 0.0.3

data/README.rdoc

@@ -8,65 +8,65 @@ There are two commands you should know, 'tests' and 'test'. Tests help you group
 
 A successful test should return true. (yay)
 
-  Shindo.tests {
+  Shindo.tests do
     test('something really important') { true }
-  }
+  end
 
 A failing test should return false or nil. (boo)
 
-  Shindo.tests {
+  Shindo.tests do
     test('something (hopefully) less important') { false }
-  }
+  end
 
 A pending test shouldn't even have a block (meh)
 
-  Shindo.tests {
+  Shindo.tests do
     test('something that hasn't been gotten around to yet')
-  }
+  end
 
 Grouping tests
 
-  Shindo.tests {
-    tests('foo/bar') {
+  Shindo.tests do
+    tests('foo/bar') do
       test('foo') { true }
       test('bar') { true }
-    }
-  }
+    end
+  end
 
 You can also have descriptions for Shindo.tests, and write that last one like this
 
-  Shindo.tests('foo/bar') {
+  Shindo.tests('foo/bar') do
     test('foo') { true }
     test('bar') { false }
-  }
+  end
 
 Nest tests as deeply as you would like.
 
 Then, if you want to get real fancy you can also tag your tests, to help narrow down which ones to run
 
-  Shindo.tests {
-    tests('foo/bar', ['foo', 'bar']) {
+  Shindo.tests do
+    tests('foo/bar', ['foo', 'bar']) do
       test('foo') { true }
       test('bar') { true }
-    }
-  }
+    end
+  end
 
 Or if you can narrow down even more tightly
 
-  Shindo.tests {
-    tests('foo/bar') {
+  Shindo.tests do
+    tests('foo/bar') do
       test('foo', ['foo']) { true }
       test('bar', ['bar']) { true }
-    }
-  }
+    end
+  end
 
 == Running tests
 
 Run tests with the shindo command, the easiest is to specify a file name:
 
-  shindo some_test_file.rb
+  shindo something_tests.rb
 
-You can also give directories and it will run all .rb files inside (recurses through subdirectories)
+You can also give directories and it will run all files ending in _tests.rb (recurses through subdirectories)
 
   shindo some_test_directory
 

data/Rakefile

@@ -20,16 +20,16 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.libs << 'lib' << 'tests'
+  test.pattern = 'tests/**/*_tests.rb'
   test.verbose = true
 end
 
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
+    test.libs << 'tests'
+    test.pattern = 'tests/**/*_tests.rb'
     test.verbose = true
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/shindo

@@ -9,14 +9,14 @@ for argument in ARGV
   else
     path = File.expand_path(argument)
     if File.directory?(path)
-      files |= Dir.glob(File.join(path, '**', '*.rb'))
+      files |= Dir.glob(File.join(path, '**', '*_tests.rb'))
     else
       files << path
     end
   end
 end
 
-success = true
+@success = true
 def run_in_thread(files, tags)
   tests = Thread.new {
     Thread.current[:tags] = tags
@@ -26,17 +26,16 @@ def run_in_thread(files, tags)
   }
   tests.join
   if tests[:reload]
+    @success = true
     run_in_thread(files, tags)
   else
-    success = success && tests[:success]
+    @success = @success && tests[:success]
   end
 end
 run_in_thread(files, tags)
 
-at_exit {
-  if success
-    Kernel.exit(0)
-  else
-    Kernel.exit(1)
-  end
-}
+if @success
+  Kernel.exit(0)
+else
+  Kernel.exit(1)
+end

data/lib/shindo.rb

@@ -17,8 +17,12 @@ module Shindo
       @annals     = Annals.new
       @befores    = []
       @description_stack = []
-      @if_tagged      = Thread.current[:tags].select {|tag| tag.match(/^\+/)}
-      @unless_tagged  = Thread.current[:tags].select {|tag| tag.match(/^\-/)}.map {|tag| tag[1..-1]}
+      self.if_tagged      = Thread.current[:tags].
+                              select {|tag| tag.match(/^\+/)}.
+                              map {|tag| tag[1..-1]}
+      self.unless_tagged  = Thread.current[:tags].
+                              select {|tag| tag.match(/^\-/)}.
+                              map {|tag| tag[1..-1]}
       @indent     = 1
       @success    = true
       @tag_stack  = []
@@ -27,7 +31,7 @@ module Shindo
       tests(header, &block)
       print("\n")
       if @success
-        Thread.current[:success] = false
+        Thread.current[:success] = true
       else
         Thread.current[:success] = false
       end

data/shindo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shindo}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-10-07}
+  s.date = %q{2009-11-02}
   s.default_executable = %q{shindo}
   s.description = %q{Simple depth first ruby testing}
   s.email = %q{me@geemus.com}
@@ -25,7 +25,10 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/shindo",
      "lib/shindo.rb",
-     "shindo.gemspec"
+     "shindo.gemspec",
+     "tests/basic_tests.rb",
+     "tests/tag_tests.rb",
+     "tests/tests_helper.rb"
   ]
   s.homepage = %q{http://github.com/geemus/shindo}
   s.rdoc_options = ["--charset=UTF-8"]

data/tests/basic_tests.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), 'tests_helper')
+
+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('failure') do
+    test('output') { `#{BIN} #{failure.path}`.include?('- failure') }
+    test('status') { $?.exitstatus == 1 }
+  end
+  tests('pending') do
+    test('output') { `#{BIN} #{pending.path}`.include?('* pending') }
+    test('status') { $?.exitstatus == 0 }
+  end
+  tests('success') do
+    test('output') { `#{BIN} #{success.path}`.include?('+ success') }
+    test('status') { $?.exitstatus == 0 }
+  end
+end

data/tests/tag_tests.rb

@@ -0,0 +1,37 @@
+require File.join(File.dirname(__FILE__), 'tests_helper')
+
+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` }
+    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` }
+    test('is tested')   { @output.include?('+ is tested [positive]') }
+    test('is skipped')  { @output.include?('_ is skipped') }
+    test('status')      { $?.exitstatus == 0 }
+  end
+
+end

data/tests/tests_helper.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'shindo'
+require 'tempfile'
+
+unless Object.const_defined?(:BIN)
+  BIN = File.join(File.dirname(__FILE__), '..', 'bin', 'shindo')
+end
+tags = Thread.current[:tags] || []
+ARGV.each do |arg|
+    if arg.match(/^[\+\-]/)
+      tags << arg
+    ARGV.delete(arg)
+  end
+end
+Thread.current[:tags] = tags

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shindo
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -07:00
+date: 2009-11-02 00:00:00 -08:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,9 @@ files:
 - bin/shindo
 - lib/shindo.rb
 - shindo.gemspec
+- tests/basic_tests.rb
+- tests/tag_tests.rb
+- tests/tests_helper.rb
 has_rdoc: true
 homepage: http://github.com/geemus/shindo
 licenses: []