turn 0.8.2 → 0.8.3

data/lib/turn/command.rb

@@ -16,6 +16,7 @@ module Turn
   #   -I --loadpath=PATHS   add given PATHS to the $LOAD_PATH
   #   -r --requires=LIBS    require given LIBS before running tests
   #   -m --minitest         Force use of MiniTest framework.
+  #   -t --trace            Turn on invoke/execute tracing, enable full backtrace.
   #
   # RUN MODES
   #      --normal      run all tests in a single process [default]
@@ -64,6 +65,9 @@ module Turn
     # Output mode.
     attr :outmode
 
+    # Enable full backtrace
+    attr :trace
+
     #
     def initialize
       @live      = nil
@@ -75,6 +79,7 @@ module Turn
       @runmode   = nil
       @outmode   = nil
       @framework = RUBY_VERSION >= "1.9" ? :minitest : :testunit
+      @trace     = nil
     end
 
     #
@@ -118,6 +123,10 @@ module Turn
           @framework = :minitest
         end
 
+        opts.on("-T", '--trace', "Turn on invoke/execute tracing, enable full backtrace") do
+          @trace = true
+        end
+
         # Turn does not support Test::Unit 2.0+
         #opts.on('-u', '--testunit', "Force use of TestUnit framework") do
         #  @framework = :testunit
@@ -203,9 +212,10 @@ module Turn
 
       @loadpath = ['lib'] if loadpath.empty?
 
-      tests = ARGV.empty? ? nil : ARGV.dup
+      tests = ARGV.empty? ? nil : argv.dup
 
-      controller = Turn::Controller.new do |c|
+      #config = Turn::Configuration.new do |c|
+      config = Turn.config do |c|
         c.live      = live
         c.log       = log
         c.loadpath  = loadpath
@@ -216,8 +226,11 @@ module Turn
         c.pattern   = pattern
         c.matchcase = matchcase
         c.framework = framework
+        c.trace     = trace
       end
 
+      controller = Turn::Controller.new(config)
+
       result = controller.start
 
       if result

data/lib/turn/components/method.rb

@@ -12,27 +12,38 @@ module Turn
       @name      = name
       @fail      = false
       @error     = false
+      @skip      = false
       @raised    = nil
       @message   = nil
       @backtrace = []
     end
 
     def fail!(assertion)
-      @fail, @error = true, false
+      @fail, @error, @skip = true, false, false
       @raised    = assertion
       @message   = assertion.message
       @backtrace = assertion.backtrace
     end
 
     def error!(exception)
-      @fail, @error = false, true
+      @fail, @error, @skip = false, true, false
       @raised    = exception
       @message   = exception.message
       @backtrace = exception.backtrace
     end
 
+    def skip!(assertion)
+      @fail, @error, @skip = false, false, true
+      @raised    = assertion
+      @message   = assertion.message
+      @backtrace = assertion.backtrace
+    end
+
     def fail?  ; @fail  ; end
     def error? ; @error ; end
+    def skip?  ; @skip  ; end
+
+    # TODO: should this include `or @skip`?
     def pass?  ; !(@fail or @error) ; end
 
     def to_s ; name ; end

data/lib/turn/controller.rb

@@ -1,17 +1,26 @@
 require 'fileutils'
 
 module Turn
+
   require 'turn/version'
+  require 'turn/autoload'
   require 'turn/components/suite.rb'
   require 'turn/components/case.rb'
   require 'turn/components/method.rb'
 
-  # = Controller
+  # Configure Turn
+  def self.config(&block)
+    @config ||= Configuration.new
+    block.call(@config) if block
+    @config
+  end
+
+  #
   #
   #--
   # TODO: Add support to test run loggging.
   #++
-  class Controller
+  class Configuration
 
     # List of if file names or glob pattern of tests to run.
     attr_accessor :tests
@@ -51,8 +60,15 @@ module Turn
     # Test framework, either :minitest or :testunit
     attr_accessor :framework
 
+    # Enable full backtrace
+    attr_accessor :trace
+
+    # Use natural language case names.
+    attr_accessor :natural
+
     def verbose? ; @verbose ; end
     def live?    ; @live    ; end
+    def natural? ; @natural ; end
 
   private
 
@@ -63,15 +79,19 @@ module Turn
 
     #
     def initialize_defaults
-      @loadpath ||= ['lib']
-      @tests    ||= ["test/**/{test,}*{,test}.rb"]
-      @exclude  ||= []
-      @requires ||= []
-      @live     ||= false
-      @log      ||= true
-      #@format  ||= nil
+      @loadpath  ||= ['lib']
+      @tests     ||= ["test/**/{test,}*{,test}.rb"]
+      @exclude   ||= []
+      @requires  ||= []
+      @live      ||= false
+      @log       ||= true
+      #@format   ||= nil
       #@runner   ||= RUBY_VERSION >= "1.9" ? MiniRunner : TestRunner
-      @pattern  ||= /.*/
+      @matchcase ||= nil
+      @pattern   ||= /.*/
+      @natural   ||= false
+
+      @files = nil  # reset files just in case
     end
 
     # Collect test configuation.
@@ -134,61 +154,88 @@ module Turn
         ex = ex.flatten.reject{ |f| File.directory?(f) }
 
         (fs - ex).uniq.map{ |f| File.expand_path(f) }
-      )
+      ).flatten
     end
 
-    def start
-      @files = nil  # reset files just in case
-
-      if files.empty?
-        $stderr.puts "No tests."
-        return
-      end
-
-      testrun = runner.new(self)
-
-      testrun.start
+    # TODO: Better name ?
+    def suite_name
+      files.map{ |path| File.dirname(path).sub(Dir.pwd+'/','') }.uniq.join(',')
     end
 
     # Select reporter based on output mode.
     def reporter
       @reporter ||= (
+        opts = { :trace=>trace, :natural=>natural? }
         case format
         when :marshal
           require 'turn/reporters/marshal_reporter'
-          Turn::MarshalReporter.new($stdout)
+          Turn::MarshalReporter.new($stdout, opts)
         when :progress
           require 'turn/reporters/progress_reporter'
-          Turn::ProgressReporter.new($stdout)
+          Turn::ProgressReporter.new($stdout, opts)
         when :dotted
           require 'turn/reporters/dot_reporter'
-          Turn::DotReporter.new($stdout)
+          Turn::DotReporter.new($stdout, opts)
         when :pretty
           require 'turn/reporters/pretty_reporter'
-          Turn::PrettyReporter.new($stdout)
+          Turn::PrettyReporter.new($stdout, opts)
         when :cue
           require 'turn/reporters/cue_reporter'
-          Turn::CueReporter.new($stdout)
+          Turn::CueReporter.new($stdout, opts)
         else
           require 'turn/reporters/outline_reporter'
-          Turn::OutlineReporter.new($stdout)
+          Turn::OutlineReporter.new($stdout, opts)
         end
       )
     end
 
+  end
+
+  # = Controller
+  #
+  class Controller
+
+    #
+    def initialize(config=Turn.config)
+      @config = config
+    end
+
+    #
+    attr :config
+
+    #
+    def start
+      if config.files.empty?
+        $stderr.puts "No tests."
+        return
+      end
+
+      setup
+
+      testrun = runner.new
+      testrun.start
+    end
+
+    #
+    def setup
+      config.loadpath.each{ |path| $: << path } unless config.live?
+      config.requires.each{ |path| require(path) }
+      config.files.each{ |path| require(path) }
+    end
+
     # # Insatance of Runner, selected based on format and runmode.
     def runner
       @runner ||= (
-        case framework
+        case config.framework
         when :minitest
           require 'turn/runners/minirunner'
         else
           require 'turn/runners/testrunner'
         end
 
-        case runmode
+        case config.runmode
         when :marshal
-          if framework == :minitest
+          if config.framework == :minitest
             Turn::MiniRunner
           else
             Turn::TestRunner
@@ -200,7 +247,7 @@ module Turn
           require 'turn/runners/crossrunner'
           Turn::CrossRunner
         else
-          if framework == :minitest
+          if config.framework == :minitest
             Turn::MiniRunner
           else
             Turn::TestRunner
@@ -212,4 +259,3 @@ module Turn
   end
 
 end
-

data/lib/turn/reporter.rb

@@ -18,8 +18,10 @@ module Turn
 
     attr :io
 
-    def initialize(io)
-      @io = io || $stdout
+    def initialize(io, opts={})
+      @io      = io || $stdout
+      @trace   = opts[:trace]
+      @natural = opts[:natural]
     end
 
     # These methods are called in the process of running the tests.

data/lib/turn/reporters/cue_reporter.rb

@@ -105,7 +105,7 @@ module Turn
       pass    = total - failure - error
 
       bar = '=' * 78
-      if COLORIZE
+      if colorize?
         bar = if pass == total then Colorize.green(bar)
               else Colorize.red(bar) end
       end

data/lib/turn/reporters/dot_reporter.rb

@@ -55,7 +55,11 @@ module Turn
         list.uniq.each do |testunit|
           message = testunit.fail? ? ' ' + FAIL : ERROR
           message = message + ' ' + testunit.message.tabto(0)
-          message << "\n" + (filter_backtrace(testunit.backtrace).first || '')
+          backtrace = filter_backtrace(testunit.backtrace)
+          message << "\n" + (backtrace.shift || '')
+          if @trace
+            message << "\n" + backtrace.join("\n")
+          end
           report << "\n" << message << "\n"
         end
         report << "\n"

data/lib/turn/reporters/outline_reporter.rb

@@ -33,7 +33,14 @@ module Turn
       #  @file = test.file
       #  io.puts(test.file)
       #end
-      io.print "    %-69s" % test.name
+
+      name = if @natural
+               " #{test.name.gsub("test_", "").gsub(/_/, " ")}" 
+             else
+               " #{test.name}"
+             end
+
+      io.print "    %-69s" % name
 
       @stdout.rewind
       @stderr.rewind
@@ -59,10 +66,15 @@ module Turn
 
       io.puts(" #{FAIL}")
       io.puts Colorize.bold(message).tabto(8)
+
       unless backtrace.empty?
-        backtrace = "Assertion at " + filter_backtrace(assertion.backtrace).first
-        io.puts "STDERR:".tabto(8)
-        io.puts(backtrace.tabto(8))
+        label = "Assertion at "
+        tabsize = 8
+        backtrace1 = label + backtrace.shift
+        io.puts(backtrace1.tabto(tabsize))
+        if @trace
+          io.puts backtrace.map{|l| l.tabto(label.length + tabsize) }.join("\n")
+        end
       end
       show_captured_output
     end
@@ -125,7 +137,7 @@ module Turn
       pass    = total - failure - error
 
       bar = '=' * 78
-      if COLORIZE
+      if colorize?
         bar = if pass == total then Colorize.green(bar)
               else Colorize.red(bar) end
       end

data/lib/turn/reporters/pretty_reporter.rb

@@ -66,16 +66,19 @@ module Turn
 
       message = assertion.message
 
-      if assertion.respond_to?(:backtrace)
-        trace = filter_backtrace(assertion.backtrace).first
-      else
-        trace = filter_backtrace(assertion.location).first
-      end
-
+      _trace = if assertion.respond_to?(:backtrace)
+                 filter_backtrace(assertion.backtrace)
+               else
+                 filter_backtrace(assertion.location).first
+               end
       io.puts
-      #io.puts pad(message, 10)
-      io.puts message.tabto(10)
-      io.puts trace.tabto(10)
+      tabsize = 10
+      #io.puts pad(message, tabsize)
+      io.puts message.tabto(tabsize)
+      io.puts _trace.shift.tabto(tabsize)
+      if @trace
+        io.puts _trace.map{|l| l.tabto(tabsize) }.join("\n")
+      end
       #show_captured_output
     end
 
@@ -89,15 +92,19 @@ module Turn
 
       message = exception.message
 
-      if exception.respond_to?(:backtrace)
-        trace = filter_backtrace(exception.backtrace).first
-      else
-        trace = filter_backtrace(exception.location).first
-      end
-
+      _trace = if exception.respond_to?(:backtrace)
+                 filter_backtrace(exception.backtrace)
+               else
+                 filter_backtrace(exception.location)
+               end
+      trace = _trace.shift
       io.puts
-      io.puts message.tabto(10)
-      io.puts trace.tabto(10)
+      tabsize = 10
+      io.puts message.tabto(tabsize)
+      io.puts trace.tabto(tabsize)
+      if @trace
+        io.puts _trace.map{|l| l.tabto(tabsize) }.join("\n")
+      end
     end
 
     # TODO: skip support

data/lib/turn/runners/crossrunner.rb

@@ -15,8 +15,8 @@ module Turn
     def start
       suite = TestSuite.new
 
-      files = @controller.files
-      viles = @controller.files # TODO: make selectable ?
+      files = @config.files
+      viles = @config.files # TODO: make selectable ?
 
       #files = files.select{ |f| File.extname(f) == '.rb' and File.file?(f) }
       #viles = viles.select{ |f| File.extname(f) == '.rb' and File.file?(f) }

data/lib/turn/runners/isorunner.rb

@@ -19,14 +19,15 @@ module Turn
 
   private
 
-    def initialize(controller)
-      @controller = controller
-      @reporter   = controller.reporter
+    def initialize
+      @config = Turn.config
+
+      @reporter = @config.reporter
       #yield(self) if block_given?
-      @loadpath = controller.loadpath
-      @requires = controller.requires
-      @live     = controller.live?
-      @minitest = controller.framework == :minitest
+      @loadpath = @config.loadpath
+      @requires = @config.requires
+      @live     = @config.live?
+      @minitest = @config.framework == :minitest
     end
 
   public
@@ -36,7 +37,7 @@ module Turn
     #
     def start
       suite = TestSuite.new
-      testruns = @controller.files.collect do |file|
+      testruns = @config.files.collect do |file|
         name = file.sub(Dir.pwd+'/','')
         suite.new_case(name, file)
       end
@@ -95,7 +96,8 @@ module Turn
         files = kase.files
 
         # remove any unexpected output injected at the beginning
-        yaml = out[out.index(/^---/)..-1]
+        b = out.index(/^---/)
+        yaml = out[b..-1]
         sub_suite = YAML.load(yaml)
 
         # TODO: How to handle pairs?
@@ -164,4 +166,3 @@ module Turn
   end#class IsoRunner
 
 end#module Turn
-