tconsole 1.1.0pre1 → 1.1.0pre2

data/README.md

@@ -106,3 +106,13 @@ Reporting Issues and Contributing
 Feel free to report issues in the issue tracker at https://github.com/commondream/tconsole/issues. Be sure to include the versions of Ruby, Rails, and your operating system. For bonus points, fork the project and send me a pull request with the fix for the issue you're seeing.
 
 tconsole is just a quick idea I had that I wanted to spike out, so there aren't any tests yet. Hopefully that will change in the near future!
+
+License
+-----
+Copyright (c) 2012 Alan Johnson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/tconsole.rb

@@ -1,10 +1,12 @@
 require "tconsole/version"
 require "tconsole/server"
 require "tconsole/test_result"
+require "tconsole/util"
 
 require "readline"
 require "benchmark"
 require "drb/drb"
+require "term/ansicolor"
 
 Readline.completion_append_character = ""
 
@@ -99,7 +101,7 @@ module TConsole
   end
 
   class Console
-    KNOWN_COMMANDS = ["exit", "reload", "help", "units", "functionals", "integration", "recent", "uncommitted", "all", "info", "!failed"]
+    KNOWN_COMMANDS = ["exit", "reload", "help", "units", "functionals", "integration", "recent", "uncommitted", "all", "info", "!failed", "!timings"]
 
     def initialize
       read_history
@@ -136,6 +138,8 @@ module TConsole
           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] == "!timings"
+          server.show_performance(args[1])
         elsif args[0] == "info"
           server.run_info
         else
@@ -158,6 +162,7 @@ module TConsole
       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 "!timings                    # Lists the timings for the last test run, sorted."
       puts "[filename] [test_pattern]   # Run the tests contained in the given file"
       puts "reload                      # Reload your Rails environment"
       puts "exit                        # Exit the console"

data/lib/tconsole/minitest_handler.rb

@@ -41,6 +41,13 @@ module TConsole
 
   # Custom minitest runner for tconsole
   class MiniTestUnit < ::MiniTest::Unit
+    COLOR_MAP = {
+      "S" => ::Term::ANSIColor.cyan,
+      "E" => ::Term::ANSIColor.red,
+      "F" => ::Term::ANSIColor.red,
+      "P" => ::Term::ANSIColor.green
+    }
+
     attr_accessor :results
 
     def initialize
@@ -49,6 +56,73 @@ module TConsole
       super
     end
 
+    def _run_anything(type)
+      suites = TestCase.send "#{type}_suites"
+      return if suites.empty?
+
+      start = Time.now
+
+      @test_count, @assertion_count = 0, 0
+      sync = output.respond_to? :"sync=" # stupid emacs
+      old_sync, output.sync = output.sync, true if sync
+
+      results = _run_suites(suites, type)
+
+      @test_count      = results.inject(0) { |sum, (tc, _)| sum + tc }
+      @assertion_count = results.inject(0) { |sum, (_, ac)| sum + ac }
+
+      output.sync = old_sync if sync
+
+      t = Time.now - start
+
+      puts
+      puts
+      puts "Finished #{type}s in %.6fs, %.4f tests/s, %.4f assertions/s." %
+        [t, test_count / t, assertion_count / t]
+
+      report.each_with_index do |msg, i|
+        puts "\n%3d) %s" % [i + 1, msg]
+      end
+
+      puts
+
+      status
+    end
+
+    def status(io = self.output)
+      format = "%d tests, %d assertions, %d failures, %d errors, %d skips"
+      io.puts format % [test_count, assertion_count, failures, errors, skips]
+    end
+
+    def _run_suite(suite, type)
+      filter = options[:filter] || '/./'
+      filter = Regexp.new $1 if filter =~ /\/(.*)\//
+
+      assertions = suite.send("#{type}_methods").grep(filter).map { |method|
+        inst = suite.new method
+        inst._assertions = 0
+
+        # Print the suite name if needed
+        if results.add_suite(suite)
+          print("\n\n", ::Term::ANSIColor.cyan, suite, ::Term::ANSIColor.reset, "\n")
+        end
+
+        @start_time = Time.now
+        result = inst.run self
+        time = Time.now - @start_time
+        results.add_timing(suite, method, time)
+
+        result = "P" if result == "."
+        output = "#{result} #{method}"
+
+        print COLOR_MAP[result], " #{output}", ::Term::ANSIColor.reset, " #{time}s\n"
+
+        inst._assertions
+      }
+
+      return assertions.size, assertions.inject(0) { |sum, n| sum + n }
+    end
+
     def puke(klass, meth, e)
       e = case e
           when MiniTest::Skip then
@@ -74,4 +148,5 @@ module TConsole
   end
 end
 
-
+# Make sure that output is only colored when it should be
+Term::ANSIColor::coloring = STDOUT.isatty

data/lib/tconsole/server.rb

@@ -93,6 +93,9 @@ module TConsole
         begin
           self.last_result = Marshal.load(response.unpack("m")[0])
         rescue
+          puts "ERROR: Unable to process test results."
+          puts
+
           # Just in case anything crazy goes down with marshalling
           self.last_result = TConsole::TestResult.new
         end
@@ -179,6 +182,28 @@ module TConsole
       puts
     end
 
+    def show_performance(limit = nil)
+
+      limit = limit.to_i
+      limit = last_result.timings.length if limit == 0
+
+      sorted_timings = last_result.timings.sort_by { |timing| timing[:time] }
+
+      puts
+      puts "Timings from last run:"
+      puts
+
+      if sorted_timings.length == 0
+        puts "No timing data available. Be sure you've run some tests."
+      else
+        sorted_timings.reverse[0, limit].each do |timing|
+          puts "#{timing[:time]}s #{timing[:suite]}##{timing[:method]}"
+        end
+      end
+
+      puts
+    end
+
     def filenameify(klass_name)
       result = ""
       first = true

data/lib/tconsole/test_result.rb

@@ -12,16 +12,39 @@ module TConsole
     # Details about the failures in the last run
     attr_accessor :failure_details
 
+    # The suites that we've run
+    attr_accessor :suites
+
+    # The timings for the tests we've run
+    attr_accessor :timings
+
     def initialize
       self.failures = 0
       self.errors = 0
       self.skips = 0
       self.failure_details = []
+      self.suites = {}
+      self.timings = []
     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 }
+      self.failure_details << { :class => klass.to_s, :method => meth.to_s }
+    end
+
+    # Records that we've encountered a particular suite. Returns true
+    # if it's new or false otherwise.
+    def add_suite(suite)
+      if suites.has_key?(suite.to_s)
+        false
+      else
+        suites[suite.to_s] = true
+        true
+      end
+    end
+
+    def add_timing(suite, method, time)
+      self.timings << { :suite => suite.to_s, :method => method.to_s, :time => time }
     end
   end
 end

data/lib/tconsole/util.rb

@@ -0,0 +1,21 @@
+module TConsole
+  class Util
+    # Returns [width, height] of terminal when detected, nil if not detected.
+    # Think of this as a simpler version of Highline's Highline::SystemExtensions.terminal_size()
+    #
+    # This is a copy of HIRB's terminal size detection code: https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb
+    def self.detect_terminal_size
+      if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
+        [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
+      elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exists?('tput')
+        [`tput cols`.to_i, `tput lines`.to_i]
+      elsif STDIN.tty? && command_exists?('stty')
+        `stty size`.scan(/\d+/).map { |s| s.to_i }.reverse
+      else
+        nil
+      end
+    rescue
+      nil
+    end
+  end
+end

data/lib/tconsole/version.rb

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

data/tconsole.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "term-ansicolor", "~> 1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.1.0pre1
+  version: 1.1.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
-dependencies: []
+date: 2012-02-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: &70111282504820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *70111282504820
 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
@@ -32,6 +43,7 @@ files:
 - lib/tconsole/minitest_handler.rb
 - lib/tconsole/server.rb
 - lib/tconsole/test_result.rb
+- lib/tconsole/util.rb
 - lib/tconsole/version.rb
 - tconsole.gemspec
 homepage: ''