tconsole 1.1.0pre11 → 1.1.0pre12

data/Gemfile

@@ -3,4 +3,5 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in tconsole.gemspec
 gemspec
 
-gem 'rake'
+gem "rake"
+gem "nutrasuite"

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end

data/lib/tconsole.rb

@@ -28,9 +28,18 @@ module TConsole
       puts "Welcome to tconsole (v#{TConsole::VERSION}). Type 'help' for help or 'exit' to quit."
 
       # 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_errors = config.validation_errors
+      if config_errors.length > 0
+        puts
+        puts config_errors.first
+        exit(1)
+      end
+
       # Set up our console input handling and history
       console = Console.new(config)
 
@@ -49,7 +58,17 @@ module TConsole
 
             while message = pipe_server.read
               config.trace("Server Received Message: #{message[:action]}")
-              pipe_server.write(server.handle(message))
+              begin
+                result = server.handle(message)
+                pipe_server.write(result)
+              rescue => e
+                puts
+                puts "An error occured: #{e.message}"
+                config.trace("===========")
+                config.trace(e.backtrace.join("\n"))
+                config.trace("===========")
+                pipe_server.write(nil)
+              end
             end
 
           rescue Interrupt

data/lib/tconsole/config.rb

@@ -91,10 +91,44 @@ module TConsole
       self.cached_elements = result.elements
     end
 
+    # Returns true if this config is valid or false otherwise
+    def validation_errors
+      errors = []
+
+      unless Dir.exists?(test_dir)
+        errors << "Couldn't find test directory `#{test_dir}`. Exiting."
+      end
+
+      unless file_sets.is_a?(Hash) && !file_sets["all"].nil?
+        errors << "No `all` file set is defined in your configuration. Exiting."
+      end
+
+      errors
+    end
+
+    # Loads up a config file
+    def self.load_config(path)
+      if File.exist?(path)
+        load path
+      end
+    end
+
+    # Saves a configuration block that we can apply to the configuration once it's
+    # loaded
+    def self.run(&block)
+      @loaded_configs ||= []
+      @loaded_configs << block
+    end
+
+    def self.clear_loaded_configs
+      @loaded_configs = nil
+    end
+
     # Returns an appropriate tconsole config based on the environment
     def self.configure
+      config = Config.new
+
       if is_rails?
-        config = Config.new
         config.preload_paths = ["./config/application"]
         config.include_paths = ["./test"]
         config.file_sets = {
@@ -127,11 +161,14 @@ module TConsole
             ::ActiveRecord::Base.establish_connection
           end
         end
+      end
 
-        config
-      else
-        Config.new
+      @loaded_configs ||= []
+      @loaded_configs.each do |block|
+        block.call(config)
       end
+
+      config
     end
 
     def self.is_rails?

data/lib/tconsole/console.rb

@@ -21,7 +21,7 @@ module TConsole
 
         known_elements = []
         unless pipe_server.nil?
-          known_elements = send_message_to_server({:action => "autocomplete", :text => str})
+          known_elements = send_message(:autocomplete, str)
         end
 
         known_commands.concat(known_elements)
@@ -47,34 +47,34 @@ module TConsole
         if line == ""
           # do nothing
         elsif args[0] == "exit"
-          send_message_to_server({:action => "exit"})
+          send_message(:stop)
           self.pipe_server = nil
           return false
         elsif args[0] == "reload"
-          send_message_to_server({:action => "exit"})
+          send_message(:stop)
           return true
         elsif args[0] == "help"
           print_help
         elsif args[0] == "!failed"
-          send_message_to_server({:action => "run_failed"})
+          send_message(:run_failed)
         elsif args[0] == "!timings"
-          send_message_to_server({:action => "show_performance", :limit => args[1]})
+          send_message(:show_performance, args[1])
         elsif args[0] == "info"
-          send_message_to_server({:action => "run_info"}, pipe_server)
+          send_message(:run_info)
         elsif args[0] == "set"
-          send_message_to_server({:action => "set", :var => args[1], :value => args[2]})
+          send_message(:set, args[1], args[2])
         elsif @config.file_sets.has_key?(args[0])
-          send_message_to_server({:action => "run_file_set", :set => args[0]})
+          send_message(:run_file_set, args[0])
         else
-          send_message_to_server({:action => "run_all_tests", :args => args})
+          send_message(:run_all_tests, args)
         end
       end
 
       true
     end
 
-    def send_message_to_server(message)
-      pipe_server.write(message)
+    def send_message(message, *args)
+      pipe_server.write({:action => message.to_sym, :args => args})
       pipe_server.read
     end
 

data/lib/tconsole/minitest_handler.rb

@@ -9,7 +9,7 @@ module TConsole
       end
 
       # Run it
-      runner = MiniTest::Unit.runner
+      runner = ::MiniTest::Unit.runner
       runner.run
 
       # Make sure that minitest doesn't run automatically when the process exits
@@ -60,7 +60,7 @@ module TConsole
       "P" => ::Term::ANSIColor.green
     }
 
-    attr_accessor :match_patterns, :config, :results
+    attr_accessor :match_patterns, :config, :results, :passes
 
     def initialize(match_patterns, config)
       self.match_patterns = match_patterns
@@ -69,10 +69,15 @@ module TConsole
       self.config = config
       self.results = TConsole::TestResult.new
 
+      self.passes = 0
+
       results.suite_counts = config.cached_suite_counts
       results.elements = config.cached_elements
 
       super()
+
+      # We do this since plugins like turn may have tweaked it
+      @@out = $stdout
     end
 
     def _run_anything(type)
@@ -109,8 +114,25 @@ module TConsole
     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]
+      format = "%d tests, %d assertions, "
+
+      format << COLOR_MAP["P"] if passes > 0
+      format << "%d passes, "
+      format << ::Term::ANSIColor.reset if passes > 0
+
+      format << COLOR_MAP["F"] if failures > 0
+      format << "%d failures, "
+      format << ::Term::ANSIColor.reset if failures > 0
+
+      format << COLOR_MAP["E"] if errors > 0
+      format << "%d errors, "
+      format << ::Term::ANSIColor.reset if errors > 0
+
+      format << COLOR_MAP["S"] if skips > 0
+      format << "%d skips"
+      format << ::Term::ANSIColor.reset if skips > 0
+
+      io.puts format % [test_count, assertion_count, passes, failures, errors, skips]
     end
 
     def _run_suite(suite, type)
@@ -154,7 +176,10 @@ module TConsole
           time = Time.now - @start_time
           results.add_timing(suite, method, time)
 
-          result = "P" if result == "."
+          if result == "."
+            result = "P"
+            self.passes += 1
+          end
 
           results.failures << id unless result == "P"
 
@@ -184,19 +209,19 @@ module TConsole
             @skips += 1
             results.skip_count += 1
             return "S" unless @verbose
-            "Skipped:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+            ["S", COLOR_MAP["S"] + "Skipped:\n#{meth}(#{klass})" + ::Term::ANSIColor.reset + " [#{location e}]:\n#{e.message}\n"]
           when MiniTest::Assertion then
             @failures += 1
             results.failure_count += 1
-            "Failure:\n#{meth}(#{klass}) [#{location e}]:\n#{e.message}\n"
+            ["F", COLOR_MAP["F"] + "Failure:\n#{meth}(#{klass})" + ::Term::ANSIColor.reset + " [#{location e}]:\n#{e.message}\n"]
           else
             @errors += 1
             results.error_count += 1
             bt = MiniTest::filter_backtrace(e.backtrace).join "\n    "
-            "Error:\n#{meth}(#{klass}):\n#{e.class}: #{e.message}\n    #{bt}\n"
+            ["E", COLOR_MAP["E"] + "Error:\n#{meth}(#{klass}):\n" + ::Term::ANSIColor.reset + "#{e.class}: #{e.message}\n    #{bt}\n"]
           end
-      @report << e
-      e[0, 1]
+      @report << e[1]
+      e[0]
     end
   end
 end

data/lib/tconsole/server.rb

@@ -10,25 +10,32 @@ module TConsole
     # Processes the message sent from the console
     def handle(message)
       action = message[:action]
-      if action == "load_environment"
-        load_environment
-      elsif action == "run_failed"
-        run_failed
-      elsif action == "show_performance"
-        show_performance(message[:limit])
-      elsif action == "run_info"
-        run_info
-      elsif action == "set"
-        set(message[:var], message[:value])
-      elsif action == "run_file_set"
-        run_file_set(message[:set])
-      elsif action == "run_all_tests"
-        run_all_tests(message[:args])
-      elsif action == "autocomplete"
-        autocomplete(message[:text])
-      elsif action == "exit"
-        exit(0)
-      end
+      args = message[:args]
+
+      send(action, *args)
+      # if action == "load_environment"
+      #   load_environment
+      # elsif action == "run_failed"
+      #   run_failed
+      # elsif action == "show_performance"
+      #   show_performance(message[:limit])
+      # elsif action == "run_info"
+      #   run_info
+      # elsif action == "set"
+      #   set(message[:var], message[:value])
+      # elsif action == "run_file_set"
+      #   run_file_set(message[:set])
+      # elsif action == "run_all_tests"
+      #   run_all_tests(message[:args])
+      # elsif action == "autocomplete"
+      #   autocomplete(message[:text])
+      # elsif action == "exit"
+      #   exit(0)
+      # end
+    end
+
+    def stop
+      Kernel.exit(0)
     end
 
     def load_environment
@@ -228,48 +235,24 @@ module TConsole
 
     def set(key, value)
       if key == "fast"
-        value.downcase!
-        if value == "on" || value == "true" || value == "yes"
-          config.fail_fast = true
+        if !value.nil?
+          value.downcase!
+          if ["on", "true", "yes"].include?(value)
+            config.fail_fast = true
+          else
+            config.fail_fast = false
+          end
+
+          puts ::Term::ANSIColor.green + "Fail Fast is now #{config.fail_fast ? "on" : "off"}" + ::Term::ANSIColor.reset
+          puts
         else
-          config.fail_fast = false
+          puts ::Term::ANSIColor.green + "Fail fast is currently #{config.fail_fast ? "on" : "off"}" + ::Term::ANSIColor.reset
+          puts
         end
-
-        puts "Fail Fast is now #{config.fail_fast ? "on" : "off"}"
-        puts
       else
-        puts "#{key} isn't an available runtime setting."
+        puts ::Term::ANSIColor.yellow + "I don't know how to set `#{key}`." + ::Term::ANSIColor.reset + " Usage: set {key} {value}"
         puts
       end
     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
-
-    # Totally yanked from the Rails test tasks
-    def silence_stderr
-      old_stderr = STDERR.dup
-      STDERR.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
-      STDERR.sync = true
-      yield
-    ensure
-      STDERR.reopen(old_stderr)
-    end
   end
 end

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "1.1.0pre11"
+  VERSION = "1.1.0pre12"
 end

data/tconsole.gemspec

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

data/test/config_test.rb

@@ -1,3 +1,71 @@
-class ConfigTest < MiniTest::Unit::TestCase
+require 'test_helper'
 
+module TConsole
+  class ConfigTest < MiniTest::Unit::TestCase
+
+    a "Config" do
+      setup do
+        @config = TConsole::Config.new
+      end
+
+      it "should have appropriate defaults" do
+        assert_equal false, @config.trace_execution
+        assert_equal "./test", @config.test_dir
+        assert_equal ["./test", "./lib"], @config.include_paths
+        assert_equal [], @config.preload_paths
+        assert_equal false, @config.fail_fast
+        assert_equal({ "all" => ["./test/**/*_test.rb"] }, @config.file_sets)
+      end
+
+      it "should have a validation error if the configured test directory doesn't exist" do
+        @config.test_dir = "./monkey_business"
+
+        errors = @config.validation_errors
+        refute_nil errors
+        assert_equal "Couldn't find test directory `./monkey_business`. Exiting.", errors[0]
+      end
+
+      it "should have a validation error if the configuration doesn't include an all file set" do
+        @config.file_sets = {}
+
+        errors = @config.validation_errors
+        refute_nil errors
+        assert_equal "No `all` file set is defined in your configuration. Exiting.", errors[0]
+      end
+    end
+
+    the "Config class" do
+      setup do
+        TConsole::Config.clear_loaded_configs
+      end
+
+      it "should save the proc passed to run when it's called" do
+        TConsole::Config.run do |config|
+          config.test_dir = "./awesome_sauce"
+        end
+
+        assert_equal 1, TConsole::Config.instance_variable_get(:@loaded_configs).length
+      end
+
+      it "should apply the loaded configs from first to last when configure is called" do
+        TConsole::Config.run do |config|
+          config.test_dir = "./awesome_sauce"
+        end
+
+        TConsole::Config.run do |config|
+          config.test_dir = "./awesomer_sauce"
+        end
+
+        config = TConsole::Config.configure
+
+        assert_equal "./awesomer_sauce", config.test_dir
+      end
+
+      it "should load a config file when load_config is called" do
+        TConsole::Config.load_config(File.join(File.dirname(__FILE__), "sample_config"))
+
+        assert_equal 1, TConsole::Config.instance_variable_get(:@loaded_configs).length
+      end
+    end
+  end
 end

data/test/sample_config

@@ -0,0 +1,3 @@
+TConsole::Config.run do |config|
+  config.test_dir = "./awesome_sauce"
+end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+require "rubygems"
+require "bundler/setup"
+
+require 'test/unit'
+require 'nutrasuite'
+
+require 'tconsole'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.1.0pre11
+  version: 1.1.0pre12
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70281579497440 !ruby/object:Gem::Requirement
+  requirement: &70138167691280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,18 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70281579497440
+  version_requirements: *70138167691280
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70138167690780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70138167690780
 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 +61,8 @@ files:
 - lib/tconsole/version.rb
 - tconsole.gemspec
 - test/config_test.rb
+- test/sample_config
+- test/test_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -76,3 +89,5 @@ specification_version: 3
 summary: tconsole is a helpful console for running Rails tests
 test_files:
 - test/config_test.rb
+- test/sample_config
+- test/test_helper.rb