tconsole 1.2.2 → 1.2.3

data/cibuild

@@ -0,0 +1,4 @@
+mkdir -p vendor
+bundle install --path vendor/gems --binstubs
+
+rake test

data/lib/tconsole/minitest_handler.rb

@@ -1,6 +1,6 @@
 module TConsole
   class MiniTestHandler
-    def self.run(match_patterns, config)
+    def self.setup(match_patterns, config)
       # Make sure we have a recent version of minitest, and use it
       if ::MiniTest::Unit.respond_to?(:runner=)
         ::MiniTest::Unit.runner = TConsole::MiniTestUnit.new(match_patterns, config)
@@ -8,14 +8,7 @@ module TConsole
         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
-
-      # Make sure that minitest doesn't run automatically when the process exits
-      patch_minitest
-
-      runner.results
+      ::MiniTest::Unit.runner
     end
 
     # Preloads our element cache for autocompletion. Assumes tests are already loaded
@@ -62,7 +55,7 @@ module TConsole
       "P" => ::Term::ANSIColor.green
     }
 
-    attr_accessor :match_patterns, :config, :results, :passes
+    attr_accessor :match_patterns, :config, :results, :passes, :interrupted
 
     def initialize(match_patterns, config)
       self.match_patterns = match_patterns
@@ -158,7 +151,7 @@ module TConsole
         suite_id = results.elements[suite.to_s]
 
         # If we're using failed fast mode and we already failed, just return
-        skip = true if @failed_fast
+        skip = true if @failed_fast || interrupted
 
         # If we've got match patterns, see if this matches them
         if !match_patterns.empty?

data/lib/tconsole/server.rb

@@ -115,14 +115,6 @@ module TConsole
 
         self.last_result = run_in_fork do
 
-          # handle trapping interrupts
-          trap("SIGINT") do
-            puts
-            puts "Trapped interrupt. Exiting tests."
-
-            exit(1)
-          end
-
           paths.each do |path|
             config.trace("Requested path `#{path}` doesn't exist.") unless File.exist?(path)
             require File.expand_path(path)
@@ -138,8 +130,29 @@ module TConsole
             require File.join(File.dirname(__FILE__), "minitest_handler")
 
             config.trace("Running tests.")
-            result = MiniTestHandler.run(match_patterns, config)
+            runner = MiniTestHandler.setup(match_patterns, config)
+
+            # Handle trapping interrupts
+            trap("SIGINT") do
+              puts
+              puts "Trapped interrupt. Halting tests."
+
+              runner.interrupted = true
+            end
+
+            runner.run
+
+            result = runner.results
+
+            # Make sure minitest doesn't run automatically
+            MiniTestHandler.patch_minitest
+
             config.trace("Finished running tests.")
+
+            if runner.interrupted
+              puts ::Term::ANSIColor.red("Test run was interrupted.")
+            end
+
           elsif defined?(::Test::Unit)
             puts "Sorry, but tconsole doesn't support Test::Unit yet"
           elsif defined?(::RSpec)
@@ -160,7 +173,7 @@ module TConsole
       end
 
       puts
-      puts "Test time (including load): #{"%0.6f" % time}s"
+      puts "Tests ran in #{"%0.6f" % time}s. Finished at #{Time.now.strftime('%Y-%m-%d %l:%M:%S %p')}."
       puts
     end
 

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70175839954960 !ruby/object:Gem::Requirement
+  requirement: &70247970275880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70175839954960
+  version_requirements: *70247970275880
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70175839954360 !ruby/object:Gem::Requirement
+  requirement: &70247970274560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70175839954360
+  version_requirements: *70247970274560
 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
   test environment to ensure that developers don't have to reload their entire Rails
@@ -50,6 +50,7 @@ files:
 - README.md
 - Rakefile
 - bin/tconsole
+- cibuild
 - lib/tconsole.rb
 - lib/tconsole/config.rb
 - lib/tconsole/console.rb