tconsole 1.1.2pre4 → 1.1.2pre5

data/lib/tconsole.rb

@@ -6,6 +6,7 @@ require "tconsole/pipe_server"
 require "tconsole/test_result"
 require "tconsole/util"
 
+require "optparse"
 require "readline"
 require "benchmark"
 require "drb/drb"
@@ -31,8 +32,7 @@ module TConsole
       # set up the config
       Config.load_config(File.join(Dir.home, ".tconsole"))
       Config.load_config(File.join(Dir.pwd, ".tconsole"))
-      config = Config.configure
-      config.trace_execution = true if argv.include?("--trace")
+      config = Config.configure(argv)
 
       config_errors = config.validation_errors
       if config_errors.length > 0

data/lib/tconsole/config.rb

@@ -31,7 +31,13 @@ module TConsole
     # Element names we know
     attr_accessor :cached_elements
 
-    def initialize
+    # First command to run when tconsole loads
+    attr_accessor :run_command
+
+    # Only runs the command passed on the command line, and then exits
+    attr_accessor :once
+
+    def initialize(argv)
       self.trace_execution = false
       self.test_dir = "./test"
       self.include_paths = ["./test", "./lib"]
@@ -41,6 +47,9 @@ module TConsole
         "all" => ["#{test_dir}/**/*_test.rb"]
       }
 
+      # load any args into this config that were passed
+      load_args(argv)
+
       @after_load = nil
       @before_load = nil
       @before_test_run = nil
@@ -49,6 +58,28 @@ module TConsole
       @cached_elements = {}
     end
 
+    def option_parser
+      @option_parser ||= OptionParser.new do |opts|
+        opts.on("-t", "--trace", "Enable verbose output.") do
+          self.trace_execution = true
+        end
+
+        opts.on("-o", "--once", "Run whatever command is passed and then exit.") do
+          self.once = true
+        end
+      end
+    end
+
+    # Public: Loads any passed command line arguments into the config.
+    #
+    # argv  - The array of command line arguments we're loading
+    def load_args(argv)
+      args = argv.clone
+
+      option_parser.parse!(args)
+      self.run_command = args.join(" ")
+    end
+
     def trace?
       self.trace_execution
     end
@@ -125,8 +156,8 @@ module TConsole
     end
 
     # Returns an appropriate tconsole config based on the environment
-    def self.configure
-      config = Config.new
+    def self.configure(argv = [])
+      config = Config.new(argv)
 
       if is_rails?
         config.preload_paths = ["./config/application"]

data/lib/tconsole/console.rb

@@ -42,38 +42,27 @@ module TConsole
         print prompt
       end
 
-      while line = Readline.readline(prompt, false)
-        line.strip!
-        args = Shellwords.shellwords(line)
+      # Run any commands that have been passed
+      result = process_command(@config.run_command)
+      if result == :exit || @config.once
+        send_message(:stop)
+        return false
+      elsif result == :reload
+        send_message(:stop)
+        return true
+      end
 
-        # save the line unless we're exiting or repeating the last command
-        unless args[0] == "exit" || (Readline::HISTORY.length > 0 && Readline::HISTORY[Readline::HISTORY.length - 1] == line)
-          Readline::HISTORY << line
-        end
+      # The command entry loop
+      while command = Readline.readline(prompt, false)
+        command.strip!
+        result = process_command(command)
 
-        if line == ""
-          # do nothing
-        elsif args[0] == "exit"
+        if result == :exit
           send_message(:stop)
-          self.pipe_server = nil
           return false
-        elsif args[0] == "reload"
+        elsif result == :reload
           send_message(:stop)
           return true
-        elsif args[0] == "help"
-          print_help
-        elsif args[0] == "!failed"
-          send_message(:run_failed)
-        elsif args[0] == "!timings"
-          send_message(:show_performance, args[1])
-        elsif args[0] == "info"
-          send_message(:run_info)
-        elsif args[0] == "set"
-          send_message(:set, args[1], args[2])
-        elsif @config.file_sets.has_key?(args[0])
-          send_message(:run_file_set, args[0])
-        else
-          send_message(:run_all_tests, args)
         end
       end
 
@@ -81,6 +70,45 @@ module TConsole
       false
     end
 
+    # Public: Process a command however it needs to be handled.
+    #
+    # command - The command we need to parse and handle
+    def process_command(command)
+      args = Shellwords.shellwords(command)
+
+      # save the command unless we're exiting or repeating the last command
+      unless args[0] == "exit" || (Readline::HISTORY.length > 0 && Readline::HISTORY[Readline::HISTORY.length - 1] == command)
+        Readline::HISTORY << command
+      end
+
+     if command == ""
+        # do nothing
+      elsif args[0] == "exit"
+        send_message(:stop)
+        self.pipe_server = nil
+        return :exit
+      elsif args[0] == "reload"
+        send_message(:stop)
+        return :reload
+      elsif args[0] == "help"
+        print_help
+      elsif args[0] == "!failed"
+        send_message(:run_failed)
+      elsif args[0] == "!timings"
+        send_message(:show_performance, args[1])
+      elsif args[0] == "info"
+        send_message(:run_info)
+      elsif args[0] == "set"
+        send_message(:set, args[1], args[2])
+      elsif @config.file_sets.has_key?(args[0])
+        send_message(:run_file_set, args[0])
+      else
+        send_message(:run_all_tests, args)
+      end
+
+      nil
+    end
+
     def send_message(message, *args)
       pipe_server.write({:action => message.to_sym, :args => args})
       pipe_server.read

data/lib/tconsole/minitest_handler.rb

@@ -215,21 +215,25 @@ module TConsole
     end
 
     def puke(klass, meth, e)
+      id = results.elements["#{klass}##{meth}"]
+
       e = case e
           when MiniTest::Skip then
             @skips += 1
             results.skip_count += 1
-            return "S" unless @verbose
-            ["S", COLOR_MAP["S"] + "Skipped:\n#{meth}(#{klass})" + ::Term::ANSIColor.reset + " [#{location e}]:\n#{e.message}\n"]
+            ["S", COLOR_MAP["S"] + "Skipped:\n#{klass}##{meth} (#{id})" + ::Term::ANSIColor.reset + " [#{location e}]:\n#{e.message}\n"]
           when MiniTest::Assertion then
             @failures += 1
             results.failure_count += 1
-            ["F", COLOR_MAP["F"] + "Failure:\n#{meth}(#{klass})" + ::Term::ANSIColor.reset + " [#{location e}]:\n#{e.message}\n"]
+            ["F", COLOR_MAP["F"] + "Failure:\n#{klass}##{meth} (#{id})" + ::Term::ANSIColor.reset + " [#{location e}]:\n#{e.message}\n"]
           else
             @errors += 1
             results.error_count += 1
-            bt = MiniTest::filter_backtrace(e.backtrace).join "\n    "
-            ["E", COLOR_MAP["E"] + "Error:\n#{meth}(#{klass}):\n" + ::Term::ANSIColor.reset + "#{e.class}: #{e.message}\n    #{bt}\n"]
+
+            filtered_backtrace = Util.filter_backtrace(e.backtrace)
+            backtrace_text = MiniTest::filter_backtrace(filtered_backtrace).join "\n    "
+
+            ["E", COLOR_MAP["E"] + "Error:\n#{klass}##{meth} (#{id}):\n" + ::Term::ANSIColor.reset + "#{e.class}: #{e.message}\n    #{backtrace_text}\n"]
           end
       @report << e[1]
       e[0]

data/lib/tconsole/util.rb

@@ -17,5 +17,17 @@ module TConsole
     rescue
       nil
     end
+
+    # Public: Filters a backtrace to exclude things that happened in TConsole
+    #
+    # backtrace: The backtrace array that we're filtering.
+    #
+    # Returns the updated backtrace.
+    def self.filter_backtrace(backtrace)
+      tconsole_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..")) + File::SEPARATOR
+      backtrace.select do |item|
+        !item.start_with?(tconsole_path)
+      end
+    end
   end
 end

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "1.1.2pre4"
+  VERSION = "1.1.2pre5"
 end

data/test/unit/config_test.rb

@@ -4,8 +4,8 @@ module TConsole
   class ConfigTest < MiniTest::Unit::TestCase
 
     a "Config" do
-      setup do
-        @config = TConsole::Config.new
+      before do
+        @config = TConsole::Config.new([])
       end
 
       it "should have appropriate defaults" do
@@ -34,8 +34,28 @@ module TConsole
       end
     end
 
+    a "Config with command line arguments" do
+      it "should set up tracing correctly" do
+        @config = Config.new(Shellwords.shellwords("--trace"))
+
+        assert @config.trace_execution
+      end
+
+      it "should set up only running the passed command and exiting" do
+        @config = Config.new(Shellwords.shellwords("--once all"))
+
+        assert @config.once
+      end
+
+      it "should set all remaining unparsed text to be the first command to run" do
+        @config = Config.new(Shellwords.shellwords("--trace set fast on"))
+
+        assert_equal "set fast on", @config.run_command
+      end
+    end
+
     the "Config class" do
-      setup do
+      before do
         TConsole::Config.clear_loaded_configs
       end
 

data/test/unit/util_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+module TConsole
+  class ConfigTest < MiniTest::Unit::TestCase
+    a "Backtrace" do
+      before do
+        @non_tconsole_path = "/Users/alan/Projects/commondream/tconsole-test/test/functional/posts_controller_test.rb:16:in `block in <class:PostsControllerTest>'"
+        @tconsole_path = "#{File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))}/posts_controller_test.rb:16:in `block in <class:PostsControllerTest>'"
+
+        @backtrace = [
+          @non_tconsole_path,
+          @tconsole_path
+        ]
+
+        @filtered_backtrace = Util.filter_backtrace(@backtrace)
+      end
+
+      it "should remove the tconsole path" do
+        assert_equal 1, @filtered_backtrace.length
+        assert !@filtered_backtrace.include?(@tconsole_path), "Should filter backtrace item under tconsole"
+      end
+
+      it "shouldn't remove the non-tconsole path" do
+        assert @filtered_backtrace.include?(@non_tconsole_path), "Should not filter backtrace item outside of tconsole"
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.1.2pre4
+  version: 1.1.2pre5
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70361103592140 !ruby/object:Gem::Requirement
+  requirement: &70325951774240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70361103592140
+  version_requirements: *70325951774240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70361103591480 !ruby/object:Gem::Requirement
+  requirement: &70325951773400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70361103591480
+  version_requirements: *70325951773400
 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
@@ -63,6 +63,7 @@ files:
 - test/test_helper.rb
 - test/unit/config_test.rb
 - test/unit/sample_config
+- test/unit/util_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -91,3 +92,4 @@ test_files:
 - test/test_helper.rb
 - test/unit/config_test.rb
 - test/unit/sample_config
+- test/unit/util_test.rb