tconsole 1.0.1pre5 → 1.1.0pre1

data/lib/tconsole.rb

@@ -1,5 +1,6 @@
 require "tconsole/version"
 require "tconsole/server"
+require "tconsole/test_result"
 
 require "readline"
 require "benchmark"
@@ -36,7 +37,7 @@ module TConsole
 
       # A little welcome
       puts
-      puts "Welcome to tconsole. Type 'help' for help or 'exit' to quit."
+      puts "Welcome to tconsole (v#{TConsole::VERSION}). Type 'help' for help or 'exit' to quit."
 
       # Set up our console input handling and history
       console = Console.new
@@ -133,6 +134,8 @@ module TConsole
           server.run_uncommitted(args[1])
         elsif args[0] == "all"
           server.run_tests(["test/unit/**/*_test.rb", "test/functional/**/*_test.rb", "test/integration/**/*_test.rb"], args[1])
+        elsif args[0] == "!failed"
+          server.run_failed
         elsif args[0] == "info"
           server.run_info
         else
@@ -154,11 +157,11 @@ module TConsole
       puts "integration [test_pattern]  # Run integration tests"
       puts "recent [test_pattern]       # Run tests for recently changed files"
       puts "uncommitted [test_pattern]  # Run tests for uncommitted changes"
+      puts "!failed                     # Runs the last set of failing tests"
       puts "[filename] [test_pattern]   # Run the tests contained in the given file"
       puts "reload                      # Reload your Rails environment"
       puts "exit                        # Exit the console"
       puts
-      puts
       puts "Working with test patterns:"
       puts
       puts "All of the test execution commands include an optional test_pattern argument. A"

data/lib/tconsole/minitest_handler.rb

@@ -6,9 +6,21 @@ module TConsole
         args = ["--name", name_pattern]
       end
 
-      MiniTest::Unit.new.run(args)
+      # Make sure we have a recent version of minitest, and use it
+      if ::MiniTest::Unit.respond_to?(:runner=)
+        ::MiniTest::Unit.runner = TConsole::MiniTestUnit.new
+      else
+        raise "MiniTest v#{MiniTest::Unit::VERSION} is not compatible with tconsole. Please load a more recent version of MiniTest"
+      end
+
+      # Run it
+      runner = MiniTest::Unit.runner
+      runner.run(args)
 
+      # Make sure that minitest doesn't run automatically when the process exits
       patch_minitest
+
+      runner.results
     end
 
     # We're basically breaking MiniTest autorun here, since we want to manually run our
@@ -18,7 +30,7 @@ module TConsole
     # rather than rebuilding all of the code in Rake just to get test prep happening
     # correctly.
     def self.patch_minitest
-      MiniTest::Unit.class_eval do
+      ::MiniTest::Unit.class_eval do
         alias_method :old_run, :run
         def run(args = [])
           # do nothing
@@ -26,4 +38,40 @@ module TConsole
       end
     end
   end
+
+  # Custom minitest runner for tconsole
+  class MiniTestUnit < ::MiniTest::Unit
+    attr_accessor :results
+
+    def initialize
+      self.results = TConsole::TestResult.new
+
+      super
+    end
+
+    def puke(klass, meth, e)
+      e = case e
+          when MiniTest::Skip then
+            @skips += 1
+            results.skips += 1
+            return "S" unless @verbose
+            "Skipped:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+          when MiniTest::Assertion then
+            @failures += 1
+            results.failures += 1
+            results.append_failure_details(klass, meth)
+            "Failure:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+          else
+            @errors += 1
+            results.errors += 1
+            results.append_failure_details(klass, meth)
+            bt = MiniTest::filter_backtrace(e.backtrace).join "\n    "
+            "Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n    #{bt}\n"
+          end
+      @report << e
+      e[0, 1]
+    end
+  end
 end
+
+

data/lib/tconsole/server.rb

@@ -1,9 +1,10 @@
 module TConsole
   class Server
-    attr_accessor :config
+    attr_accessor :config, :last_result
 
     def initialize(config)
       self.config = config
+      self.last_result = TConsole::TestResult.new
     end
 
     def stop
@@ -48,7 +49,11 @@ module TConsole
 
     def run_tests(globs, name_pattern, message = "Running tests...")
       time = Benchmark.realtime do
+        # Pipe for communicating with child so we can get its results back
+        read, write = IO.pipe
+
         fork do
+          read.close
 
           puts message
           puts
@@ -63,13 +68,17 @@ module TConsole
           end
 
           if defined? ::ActiveRecord
-            ::ActiveRecord::Base.connection.reconnect!
+            ::ActiveRecord::Base.clear_active_connections!
+            ::ActiveRecord::Base.establish_connection
           end
 
           if defined?(::MiniTest)
             require File.join(File.dirname(__FILE__), "minitest_handler")
 
-            MiniTestHandler.run(name_pattern)
+            result = MiniTestHandler.run(name_pattern)
+
+            write.puts([Marshal.dump(result)].pack("m"))
+
           elsif defined?(::Test::Unit)
             puts "Sorry, but tconsole doesn't support Test::Unit yet"
             return
@@ -79,6 +88,17 @@ module TConsole
           end
         end
 
+        write.close
+        response = read.read
+        begin
+          self.last_result = Marshal.load(response.unpack("m")[0])
+        rescue
+          # Just in case anything crazy goes down with marshalling
+          self.last_result = TConsole::TestResult.new
+        end
+
+        read.close
+
         Process.waitall
       end
 
@@ -97,6 +117,15 @@ module TConsole
       run_tests(files, test_pattern, message)
     end
 
+    def run_failed
+      # TODO: We probably shouldn't use built in Rails methods here if we can help it
+      file_names = last_result.failure_details.map { |detail| filenameify(detail[:class]) }
+      files_to_rerun = []
+
+      files_to_rerun << file_names.map {|file| (file.match(/controller/)) ? "test/functional/#{file}.rb" : "test/unit/#{file}.rb"}
+      run_tests(files_to_rerun, nil, "Running last failed tests: #{files_to_rerun.join(", ")}")
+    end
+
     def recent_files(touched_since, source_pattern, test_path)
       Dir.glob(source_pattern).map do |path|
         if File.mtime(path) > touched_since
@@ -149,5 +178,24 @@ module TConsole
       puts
       puts
     end
+
+    def filenameify(klass_name)
+      result = ""
+      first = true
+      klass_name.chars do |char|
+        new = char.downcase!
+        if new.nil?
+          result << char
+        elsif first
+          result << new
+        else
+          result << "_#{new}"
+        end
+
+        first = false
+      end
+
+      result
+    end
   end
 end

data/lib/tconsole/test_result.rb

@@ -0,0 +1,27 @@
+module TConsole
+  class TestResult
+    # The number of failed tests in the last run
+    attr_accessor :failures
+
+    # The number of errors that occurred in the last run
+    attr_accessor :errors
+
+    # The number of skipped tests
+    attr_accessor :skips
+
+    # Details about the failures in the last run
+    attr_accessor :failure_details
+
+    def initialize
+      self.failures = 0
+      self.errors = 0
+      self.skips = 0
+      self.failure_details = []
+    end
+
+    # Adds to the failure details that we know about
+    def append_failure_details(klass, meth)
+      failure_details << { :class => klass.to_s, :method => meth.to_s }
+    end
+  end
+end

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "1.0.1pre5"
+  VERSION = "1.1.0pre1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.0.1pre5
+  version: 1.1.0pre1
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies: []
 description: ! "    tconsole allows Rails developers to easily and quickly run their
   tests as a whole or in subsets. It forks the testing processes from\n    a preloaded
@@ -31,6 +31,7 @@ files:
 - lib/tconsole.rb
 - lib/tconsole/minitest_handler.rb
 - lib/tconsole/server.rb
+- lib/tconsole/test_result.rb
 - lib/tconsole/version.rb
 - tconsole.gemspec
 homepage: ''
@@ -45,9 +46,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3424980306917930953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: