exemplor 2.7.0 → 2.9.0

data/TODO

@@ -1,6 +1,7 @@
 * exemplor executable that can run multiple example files
 * #teardown
 * Use fancy unicode characters for tests status:
+* TextMate bundle that does nice cmd+r output
 # (i) = ∙
 # (I) = •
 # (s) = ✓

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.9.0

data/examples.rb

@@ -1,5 +1,5 @@
-# TODO: switch to gem version
-require 'lib/exemplor'
+# uses the gem version, not the one being tested
+require 'exemplor'
 
 # slow because each test runs in a subshell
 
@@ -25,7 +25,8 @@ eg.helpers do
 end
 
 eg "version matches file" do
-  Check(Exemplor.version).is(File.read(__FILE__.sub('examples.rb','VERSION')))
+  version = `ruby -Ilib -e "require 'exemplor' ; print Exemplor.version"`
+  Check(version).is(File.read(__FILE__.sub('examples.rb','VERSION')))
 end
 
 eg "errors are caught and nicely displayed" do

data/examples/check_parsing.rb

@@ -1,5 +1,21 @@
 require 'exemplor'
 
+eg.helpers do
+  def foo() 'bar' end
+end
+
+eg "plain call" do
+  Check(foo)
+end
+
+eg "whitespace after the call (seriously)" do
+  Check(foo) 
+end
+
+eg "comment after the call" do
+  Check(foo) # comment!
+end
+
 eg "with brackets" do
   Check(String.new('test'))
 end
@@ -10,6 +26,12 @@ end
 
 __END__
 
+(I) plain call: 
+  (i) foo: bar
+(I) whitespace after the call (seriously): 
+  (i) foo: bar
+(I) comment after the call: 
+  (i) foo: bar
 (I) with brackets: 
   (i) String.new('test'): test
 (s) with brackets and is: 

data/examples/checking_nil.rb

@@ -1,10 +1,16 @@
 require 'exemplor'
 
-eg "checking for nil works correctly" do
+eg "checking nil works correctly" do
+  Check(nil)
+end
+
+eg "asserting for nil works correctly" do
   Check(nil).is(nil)
 end
 
 __END__
 
-(s) checking for nil works correctly: 
-  (s) nil:
+(I) checking nil works correctly: 
+  (i) nil: 
+(s) asserting for nil works correctly: 
+  (s) nil: 

data/exemplor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exemplor}
-  s.version = "2.7.0"
+  s.version = "2.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myles Byrne"]
-  s.date = %q{2009-10-23}
+  s.date = %q{2009-10-29}
   s.email = %q{myles@myles.id.au}
   s.extra_rdoc_files = [
     "README"

data/lib/exemplor.rb

@@ -71,7 +71,7 @@ module Exemplor
     def Check(value)
       file, line_number = caller.first.match(/^(.+):(\d+)/).captures
       line = File.read(file).map[line_number.to_i - 1]
-      name = line[/Check\((.+?)\)($|\.is.+)/,1]
+      name = line[/Check\((.+?)\)\s*($|#|\[|\.is.+)/,1]
       check = Check.new(name, value)
       _checks << check
       check
@@ -96,8 +96,9 @@ module Exemplor
       patterns = Regexp.new(patterns.join('|'))
       @examples.each do |name, body|
         if name =~ patterns
-          status, out = run_example(body)
+          status, out, stderr = run_example(body)
           print_yaml("#{status_icon(status)} #{name}" => out)
+          print_stderr stderr
         end
       end
     end
@@ -114,6 +115,12 @@ module Exemplor
       print(out)
     end
     
+    def print_stderr(stderr)
+      unless stderr.empty?
+        $stdout.tty? ? $stdout.puts("#{Term::ANSIColor.reset}(STDERR):\n#{stderr}") : $stderr.puts(stderr)
+      end
+    end
+    
     # hacky
     def colorize(out)
       require 'term/ansicolor'
@@ -127,7 +134,7 @@ module Exemplor
           start_color(line, :red)
         when /^(?:\s{2})?(\(i\))/i
           start_color(line, :blue)
-        else          
+        else
           line
         end
       end.join("\n") + "\n#{Term::ANSIColor.reset}"
@@ -140,7 +147,11 @@ module Exemplor
     def run_example(code)
       status = :info
       env = Example.new
+      stderr = StringIO.new
       out = begin
+        real_stderr = $stderr
+        $stderr = stderr
+        
         env.instance_eval(&Example.setup_block) if Example.setup_block
         value = env.instance_eval(&code)
         if env._checks.empty?
@@ -154,8 +165,10 @@ module Exemplor
       rescue Object => error
         status = :error
         render_error(error)
+      ensure
+        $stderr = real_stderr
       end
-      [status, out]
+      [status, out, stderr.rewind && stderr.read]
     end
     
     def render_checks(checks)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exemplor
 version: !ruby/object:Gem::Version 
-  version: 2.7.0
+  version: 2.9.0
 platform: ruby
 authors: 
 - Myles Byrne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 +11:00
+date: 2009-10-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency