shindo 0.0.10 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.13

data/bin/shindo

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo')
 
-files = []
+helpers = Dir.glob(File.join(Dir.pwd, '**', '*helper.rb'))
+tests = []
 tags = []
 for argument in ARGV
   if argument.match(/^[\+\-]/)
@@ -9,33 +10,40 @@ for argument in ARGV
   else
     path = File.expand_path(argument)
     if File.directory?(path)
-      files |= Dir.glob(File.join(path, '**', '*_tests.rb'))
+      tests |= Dir.glob(File.join(path, '**', '*tests.rb'))
     else
-      files << path
+      tests << path
     end
   end
 end
 
+if tests.empty?
+  tests << 'tests'
+end
+
 @success = true
-def run_in_thread(files, tags)
-  tests = Thread.new {
+def run_in_thread(helpers, tests, tags)
+  shindo = Thread.new {
     Thread.current[:tags] = tags
-    for file in files
+    for file in helpers
+      load(file)
+    end
+    for file in tests
       load(file)
     end
   }
-  tests.join
-  if tests[:reload]
+  shindo.join
+  if shindo[:reload]
     @success = true
-    run_in_thread(files, tags)
+    run_in_thread(helpers, tests, tags)
   else
-    @success = @success && tests[:success]
+    @success = @success && shindo[:success]
   end
 end
-run_in_thread(files, tags)
+run_in_thread(helpers, tests, tags)
 
 if @success
   Kernel.exit(0)
 else
   Kernel.exit(1)
-end
+end

data/lib/shindo.rb

@@ -4,16 +4,16 @@ require 'formatador'
 
 module Shindo
 
-  def self.tests(header = nil, &block)
+  def self.tests(description = nil, tags = [], &block)
     STDOUT.sync = true
-    Shindo::Tests.new(header, &block)
+    Shindo::Tests.new(description, tags, &block)
   end
 
   class Tests
 
     attr_accessor :backtrace
 
-    def initialize(header, tags = [], &block)
+    def initialize(description, tags = [], &block)
       @afters     = []
       @annals     = Annals.new
       @befores    = []
@@ -29,7 +29,7 @@ module Shindo
                           select {|tag| tag.match(/^\-/)}.
                           map {|tag| tag[1..-1]}
       @formatador.display_line('')
-      tests(header, tags, &block)
+      tests(description, tags, &block)
       @formatador.display_line('')
       Thread.current[:success] = @success
     end
@@ -129,13 +129,14 @@ module Shindo
     end
 
     def tests(description, tags = [], &block)
-      @tag_stack.push([*tags])
+      tags = [*tags]
+      @tag_stack.push(tags)
       @befores.push([])
       @afters.push([])
 
       taggings = ''
       unless tags.empty?
-        taggings = " (#{[*tags].join(', ')})"
+        taggings = " (#{tags.join(', ')})"
       end
 
       @formatador.display_line((description || 'Shindo.tests') << taggings)
@@ -149,10 +150,11 @@ module Shindo
     end
 
     def test(description, tags = [], &block)
-      @tag_stack.push([*tags])
+      tags = [*tags]
+      @tag_stack.push(tags)
       taggings = ''
       unless tags.empty?
-        taggings = " (#{[*tags].join(', ')})"
+        taggings = " (#{tags.join(', ')})"
       end
 
       # if the test includes +tags and discludes -tags, evaluate it

data/shindo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shindo}
-  s.version = "0.0.10"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-12-24}
+  s.date = %q{2010-03-28}
   s.default_executable = %q{shindo}
   s.description = %q{Simple depth first ruby testing}
   s.email = %q{me@geemus.com}
@@ -19,23 +19,23 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/shindo",
-     "lib/shindo.rb",
-     "lib/shindo/rake.rb",
-     "shindo.gemspec",
-     "tests/basic_tests.rb",
-     "tests/tag_tests.rb",
-     "tests/tests_helper.rb"
+    ".gitignore",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/shindo",
+    "lib/shindo.rb",
+    "lib/shindo/rake.rb",
+    "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"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{shindo}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ruby testing}
 
   if s.respond_to? :specification_version then

data/tests/basic_tests.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), 'tests_helper')
-
 success = Tempfile.new('success')
 success << <<-TESTS
 Shindo.tests do

data/tests/tag_tests.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), 'tests_helper')
-
 negative = Tempfile.new('negative')
 negative << <<-TESTS
 Shindo.tests do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: shindo
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-24 00:00:00 -08:00
+date: 2010-03-28 00:00:00 -07:00
 default_executable: shindo
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: annals
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: formatador
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Simple depth first ruby testing
 email: me@geemus.com
 executables: 
@@ -66,18 +79,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: shindo
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ruby testing