tconsole 1.2.8 → 1.3.0.pre0

data/bin/rconsole

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), "..", "lib", "tconsole")
+
+TConsole::Runner.new(:rspec, ARGV).run

data/bin/tconsole

@@ -2,4 +2,4 @@
 
 require File.join(File.dirname(__FILE__), "..", "lib", "tconsole")
 
-TConsole::Runner.new(ARGV).run
+TConsole::Runner.new(:minitest, ARGV).run

data/lib/tconsole.rb

@@ -11,9 +11,8 @@ require "tconsole/config"
 require "tconsole/reporter"
 require "tconsole/console"
 require "tconsole/server"
+require "tconsole/minitest_server"
+require "tconsole/rspec_server"
 require "tconsole/test_result"
 require "tconsole/util"
 require "tconsole/runner"
-
-
-

data/lib/tconsole/config.rb

@@ -1,5 +1,8 @@
 module TConsole
   class Config
+    # Lets us know if we're running rspec or minitest
+    attr_accessor :mode
+    
     # Lets us know if we should include trace output
     attr_accessor :trace_execution
 
@@ -37,15 +40,31 @@ module TConsole
     # Only runs the command passed on the command line, and then exits
     attr_accessor :once
 
-    def initialize(argv = [])
+    def initialize(mode, argv = [])
+      self.mode = mode
+      
       self.trace_execution = false
-      self.test_dir = "test"
-      self.include_paths = ["./test", "./lib"]
+      
+      if mode == :rspec
+        self.test_dir = "spec"
+        self.include_paths = ["./spec", "./lib"]
+      else
+        self.test_dir = "test"
+        self.include_paths = ["./test", "./lib"]
+      end
+      
       self.preload_paths = []
       self.fail_fast = false
-      self.file_sets = {
-        "all" => ["#{test_dir}/**/*_test.rb"]
-      }
+      
+      if mode == :rspec
+        self.file_sets = {
+          "all" => ["#{test_dir}/**/*_spec.rb"]
+        }
+      else
+        self.file_sets = {
+          "all" => ["#{test_dir}/**/*_test.rb"]
+        }
+      end
 
       # load any args into this config that were passed
       load_args(argv)
@@ -156,21 +175,24 @@ module TConsole
     end
 
     # Returns an appropriate tconsole config based on the environment
-    def self.configure(argv = [])
-      config = Config.new(argv)
+    def self.configure(mode, argv = [])
+      config = Config.new(mode, argv)
 
       if is_rails?
         config.preload_paths = ["./config/application"]
-        config.include_paths = ["./test"]
-        config.file_sets = {
-          "all" => ["#{config.test_dir}/unit/**/*_test.rb", "#{config.test_dir}/functional/**/*_test.rb",
-            "#{config.test_dir}/integration/**/*_test.rb"],
-          "units" => ["#{config.test_dir}/unit/**/*_test.rb"],
-          "unit" => ["#{config.test_dir}/unit/**/*_test.rb"],
-          "functionals" => ["#{config.test_dir}/functional/**/*_test.rb"],
-          "functional" => ["#{config.test_dir}/functional/**/*_test.rb"],
-          "integration" => ["#{config.test_dir}/integration/**/*_test.rb"]
-        }
+        
+        if mode == :minitest
+          config.include_paths = ["./test"]
+          config.file_sets = {
+            "all" => ["#{config.test_dir}/unit/**/*_test.rb", "#{config.test_dir}/functional/**/*_test.rb",
+              "#{config.test_dir}/integration/**/*_test.rb"],
+            "units" => ["#{config.test_dir}/unit/**/*_test.rb"],
+            "unit" => ["#{config.test_dir}/unit/**/*_test.rb"],
+            "functionals" => ["#{config.test_dir}/functional/**/*_test.rb"],
+            "functional" => ["#{config.test_dir}/functional/**/*_test.rb"],
+            "integration" => ["#{config.test_dir}/integration/**/*_test.rb"]
+          }
+        end
 
         config.before_load do
           ENV["RAILS_ENV"] ||= "test"

data/lib/tconsole/minitest_server.rb

@@ -0,0 +1,120 @@
+module TConsole
+  class MinitestServer < Server
+
+    # Loads the files that match globs and then executes tests against them. Limit tests
+    # with class names, method names, and test ids using match_patterns.
+    def run_tests(globs, match_patterns, message = "Running tests...")
+      time = Benchmark.realtime do
+        reporter.info(message)
+        reporter.info
+
+        paths = []
+        globs.each do |glob|
+          paths.concat(Dir.glob(glob))
+        end
+
+        if paths.length == 0
+          reporter.warn("No test files match your requested test set: #{globs.join(",")}.")
+          reporter.warn("Skipping execution.")
+          return nil
+        end
+
+        self.last_result = run_in_fork do
+
+          paths.each do |path|
+            reporter.trace("Requested path `#{path}` doesn't exist.") unless File.exist?(path)
+            require File.expand_path(path)
+          end
+
+          reporter.trace("Running before_test_run callback")
+          config.before_test_run!
+          reporter.trace("Completed before_test_run callback")
+
+          result = nil
+          if defined?(::MiniTest)
+            reporter.trace("Detected minitest.")
+            require File.join(File.dirname(__FILE__), "minitest_handler")
+
+            reporter.trace("Running tests.")
+            runner = MiniTestHandler.setup(match_patterns, config)
+
+            # Handle trapping interrupts
+            trap("SIGINT") do
+              reporter.warn
+              reporter.warn("Trapped interrupt. Halting tests.")
+
+              runner.interrupted = true
+            end
+
+            runner.run
+
+            result = runner.results
+
+            # Make sure minitest doesn't run automatically
+            MiniTestHandler.patch_minitest
+
+            reporter.trace("Finished running tests.")
+
+            if runner.interrupted
+              reporter.error("Test run was interrupted.")
+            end
+
+          elsif defined?(::Test::Unit)
+            reporter.error("Sorry, but tconsole doesn't support Test::Unit")
+          end
+
+          result
+        end
+
+        if self.last_result == nil
+          # Just in case anything crazy goes down with marshalling
+          self.last_result = TConsole::TestResult.new
+        end
+
+        config.cache_test_ids(self.last_result)
+
+        true
+      end
+
+      reporter.info
+      reporter.info("Tests ran in #{"%0.6f" % time}s. Finished at #{Time.now.strftime('%Y-%m-%d %l:%M:%S %p')}.")
+      reporter.info
+    end
+
+    # Preloads our autocomplete cache
+    def preload_test_ids
+      result = run_in_fork do
+        paths = []
+        config.file_sets["all"].each do |glob|
+          paths.concat(Dir.glob(glob))
+        end
+
+        paths.each { |path| require File.expand_path(path) }
+
+        require File.join(File.dirname(__FILE__), "minitest_handler")
+        MiniTestHandler.preload_elements
+      end
+
+      config.cache_test_ids(result) unless result.nil?
+    end
+
+    # Runs all tests against the match patterns given
+    def run_all_tests(match_patterns = nil)
+      run_tests(config.file_sets["all"], match_patterns)
+    end
+
+    # Runs a file set out of the config
+    def run_file_set(set)
+      run_tests(config.file_sets[set], nil)
+    end
+
+    def run_failed
+      if last_result.failures.empty?
+        reporter.info("No tests failed in your last run, or you haven't run any tests in this session yet.")
+        reporter.info
+      else
+        run_tests(config.file_sets["all"], last_result.failures)
+      end
+    end
+  end
+end

data/lib/tconsole/rspec_server.rb

@@ -0,0 +1,135 @@
+module TConsole
+  class RSpecServer < Server
+
+    # Loads the files that match globs and then executes tests against them. Limit tests
+    # with class names, method names, and test ids using match_patterns.
+    def run_tests(globs, match_patterns, message = "Running tests...")
+      time = Benchmark.realtime do
+        reporter.info(message)
+        reporter.info
+
+        paths = []
+        globs.each do |glob|
+          paths.concat(Dir.glob(glob))
+        end
+
+        if paths.length == 0
+          reporter.warn("No test files match your requested test set: #{globs.join(",")}.")
+          reporter.warn("Skipping execution.")
+          return nil
+        end
+
+        self.last_result = run_in_fork do
+
+          # Make sure rspec is loaded up
+          require 'rspec'
+          
+          paths.each do |path|
+            reporter.trace("Requested path `#{path}` doesn't exist.") unless File.exist?(path)
+            require File.expand_path(path)
+          end
+
+          reporter.trace("Running before_test_run callback")
+          config.before_test_run!
+          reporter.trace("Completed before_test_run callback")
+
+          result = nil
+          if defined?(::RSpec)
+            reporter.trace("Detected rspec.")
+            
+            reporter.trace("Running tests.")
+
+            # Handle trapping interrupts
+            trap("SIGINT") do
+              reporter.warn
+              reporter.warn("Trapped interrupt. Halting tests.")
+            end
+            
+            # Actually run the tests!
+            configuration = RSpec::configuration
+            world = RSpec::world
+            options = RSpec::Core::ConfigurationOptions.new([])
+            options.parse_options
+            
+            configuration.error_stream = STDERR
+            configuration.output_stream = STDOUT
+            
+            options.configure(configuration)
+            
+            configuration.files_to_run = paths
+            
+            configuration.reporter.report(world.example_count, configuration.randomize? ? configuration.seed : nil) do |reporter|
+                begin
+                    configuration.run_hook(:before, :suite)
+                    world.example_groups.ordered.map {|g| g.run(reporter)}.all? ? 0 : configuration.failure_exit_code
+                ensure
+                    configuration.run_hook(:after, :suite)
+                end    
+            end
+            
+            # Patch RSpec to disable autorun
+            ::RSpec::Core::Runner.class_eval do
+              def self.run(args = [], err=$stderr, out=$stdout)
+                # do nothing
+              end
+            end
+
+            reporter.trace("Finished running tests.")
+          end
+
+          nil
+        end
+
+        if self.last_result == nil
+          # Just in case anything crazy goes down with marshalling
+          self.last_result = TConsole::TestResult.new
+        end
+
+        config.cache_test_ids(self.last_result)
+
+        true
+      end
+
+      reporter.info
+      reporter.info("Tests ran in #{"%0.6f" % time}s. Finished at #{Time.now.strftime('%Y-%m-%d %l:%M:%S %p')}.")
+      reporter.info
+    end
+
+    # Preloads our autocomplete cache
+    def preload_test_ids
+      result = nil
+      # result = run_in_fork do
+      #   paths = []
+      #   config.file_sets["all"].each do |glob|
+      #     paths.concat(Dir.glob(glob))
+      #   end
+      # 
+      #   paths.each { |path| require File.expand_path(path) }
+      # 
+      #   require File.join(File.dirname(__FILE__), "minitest_handler")
+      #   MiniTestHandler.preload_elements
+      # end
+
+      config.cache_test_ids(result) unless result.nil?
+    end
+
+    # Runs all tests against the match patterns given
+    def run_all_tests(match_patterns = nil)
+      run_tests(config.file_sets["all"], match_patterns)
+    end
+
+    # Runs a file set out of the config
+    def run_file_set(set)
+      run_tests(config.file_sets[set], nil)
+    end
+
+    def run_failed
+      if last_result.failures.empty?
+        reporter.info("No tests failed in your last run, or you haven't run any tests in this session yet.")
+        reporter.info
+      else
+        run_tests(config.file_sets["all"], last_result.failures)
+      end
+    end
+  end
+end

data/lib/tconsole/runner.rb

@@ -1,19 +1,21 @@
 module TConsole
   class Runner
 
-    attr_accessor :config, :reporter, :console, :stty_save
+    attr_accessor :mode, :config, :reporter, :console, :stty_save
 
     # Public: Sets up the new runner's config.
-    def initialize(argv = [])
+    def initialize(mode, argv = [])
+      self.mode = mode
+      
       # try to load the default configs
       Config.load_config(File.join(Dir.home, ".tconsole"))
       Config.load_config(File.join(Dir.pwd, ".tconsole"))
-      self.config = Config.configure(argv)
+      self.config = Config.configure(mode, argv)
       self.reporter = Reporter.new(config)
     end
 
-    # Spawns a new environment. Looks at the results of the environment to determine whether to stop or
-    # keep running
+    # Spawns a new environment. Looks at the results of the environment to determine 
+    # whether to stop or keep running
     def run
       prepare_process
       reporter.welcome_message
@@ -108,7 +110,17 @@ module TConsole
     # Internal: Run loop for the server.
     def server_run_loop(pipe_server)
       pipe_server.callee!
-      server = Server.new(config, reporter)
+      
+      if mode == :minitest
+        server = MinitestServer.new(config, reporter)
+      elsif mode == :rspec
+        server = RSpecServer.new(config, reporter)
+      else
+        reporter.error
+        reporter.error("The given test mode isn't supported.")
+        reporter.error
+        exit
+      end
 
       while message = pipe_server.read
         reporter.trace("Server Received Message: #{message[:action]}")

data/lib/tconsole/server.rb

@@ -214,6 +214,9 @@ module TConsole
       reporter.info("Defined Constants:")
       reporter.info(Module.constants.sort.join("\n"))
       reporter.info
+      reporter.info("Configuration:")
+      reporter.info("Mode: #{config.mode}")
+      reporter.info()
       reporter.info
     end
 

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "1.2.8"
-end
+  VERSION = "1.3.0.pre0"
+end

data/tconsole.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "chattyproc", "~> 1.0.0"
   s.add_runtime_dependency "term-ansicolor", "~> 1.0.7"
-  s.add_runtime_dependency "minitest", "~> 4.3.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.2.8
-  prerelease: 
+  version: 1.3.0.pre0
+  prerelease: 6
 platform: ruby
 authors:
 - Alan Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chattyproc
@@ -43,22 +43,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.7
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.3.0
 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
@@ -66,6 +50,7 @@ description: ! "    tconsole allows Rails developers to easily and quickly run t
 email:
 - alan@commondream.net
 executables:
+- rconsole
 - tconsole
 extensions: []
 extra_rdoc_files: []
@@ -75,13 +60,16 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/rconsole
 - bin/tconsole
 - cibuild
 - lib/tconsole.rb
 - lib/tconsole/config.rb
 - lib/tconsole/console.rb
 - lib/tconsole/minitest_handler.rb
+- lib/tconsole/minitest_server.rb
 - lib/tconsole/reporter.rb
+- lib/tconsole/rspec_server.rb
 - lib/tconsole/runner.rb
 - lib/tconsole/server.rb
 - lib/tconsole/test_result.rb
@@ -108,9 +96,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: tconsole
 rubygems_version: 1.8.24
@@ -123,3 +111,4 @@ test_files:
 - spec/sample_config
 - spec/spec_helper.rb
 - spec/util_spec.rb
+has_rdoc: