tconsole 0.0.3.pre → 0.0.4.pre

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "bundle/nerdcommenter"]
+	path = bundle/nerdcommenter
+	url = git://github.com/scrooloose/nerdcommenter.git

data/lib/tconsole.rb

@@ -25,7 +25,7 @@ module TConsole
       while running
         # ignore ctrl-c during load, since things can get kind of messy if we don't
 
-        pid = fork do
+        fork do
           begin
             server = Server.new
 
@@ -63,7 +63,7 @@ module TConsole
         running = command_loop(server) if running
 
         server.stop
-        Process.wait2(pid)
+        Process.waitall
       end
 
       puts
@@ -73,24 +73,31 @@ module TConsole
 
     def self.command_loop(server)
       while line = Readline.readline("tconsole> ", true)
+        line.strip!
+        args = line.split(/\s/)
+
         if line == ""
           # do nothing
-        elsif line == "exit"
+        elsif args[0] == "exit"
           return false
-        elsif line == "reload"
+        elsif args[0] == "reload"
           return true
-        elsif line == "help"
+        elsif args[0] == "help"
           help
-        elsif line == "units"
-          server.run_tests(["test/unit/**/*_test.rb"])
-        elsif line == "functionals"
-          server.run_tests(["test/functional/**/*_test.rb"])
-        elsif line == "integration"
-          server.run_tests(["test/integration/**/*_test.rb"])
-        elsif line == "all"
-          server.run_tests(["test/unit/**/*_test.rb", "test/functional/**/*_test.rb", "test/integration/**/*_test.rb"])
+        elsif args[0] == "units"
+          server.run_tests(["test/unit/**/*_test.rb"], args[1])
+        elsif args[0] == "functionals"
+          server.run_tests(["test/functional/**/*_test.rb"], args[1])
+        elsif args[0] == "integration"
+          server.run_tests(["test/integration/**/*_test.rb"], args[1])
+        elsif args[0] == "recent"
+          server.run_recent(args[1])
+        elsif args[0] == "uncommitted"
+          server.run_uncommitted(args[1])
+        elsif args[0] == "all"
+          server.run_tests(["test/unit/**/*_test.rb", "test/functional/**/*_test.rb", "test/integration/**/*_test.rb"], args[1])
         else
-          server.run_tests([line])
+          server.run_tests([args[0]], args[1])
         end
       end
 
@@ -102,13 +109,23 @@ module TConsole
       puts
       puts "Available commands:"
       puts
-      puts "all          # Run all test types (units, functionals, integration)"
-      puts "units        # Run unit tests"
-      puts "functionals  # Run functional tests"
-      puts "integration  # Run integration tests"
-      puts "[filename]   # Run the tests contained in the given file"
-      puts "reload       # Reload your Rails environment"
-      puts "exit         # Exit the console"
+      puts "all [test_pattern]          # Run all test types (units, functionals, integration)"
+      puts "units [test_pattern]        # Run unit tests"
+      puts "functionals [test_pattern]  # Run functional tests"
+      puts "integration [test_pattern]  # Run integration tests"
+      puts "recent [test_pattern]       # Run tests for recently changed files"
+      puts "uncommitted [test_pattern]  # Run tests for uncommitted changes"
+      puts "[filename] [test_pattern]   # Run the tests contained in the given file"
+      puts "reload                      # Reload your Rails environment"
+      puts "exit                        # Exit the console"
+      puts
+      puts
+      puts "Working with test patterns:"
+      puts
+      puts "All of the test execution commands include an optional test_pattern argument. A"
+      puts "test pattern can be given to filter the executed tests to only those tests whose"
+      puts "name matches the pattern given. This is especially useful when rerunning a failing"
+      puts "test."
       puts
     end
   end

data/lib/tconsole/minitest_handler.rb

@@ -0,0 +1,29 @@
+module TConsole
+  class MiniTestHandler
+    def self.run(name_pattern)
+      args = []
+      unless name_pattern.nil?
+        args = ["--name", name_pattern]
+      end
+
+      MiniTest::Unit.runner.run(args)
+
+      patch_minitest
+    end
+
+    # We're basically breaking MiniTest autorun here, since we want to manually run our
+    # tests and Rails relies on autorun
+    #
+    # A big reason for the need for this is that we're trying to work in the Rake environment
+    # rather than rebuilding all of the code in Rake just to get test prep happening
+    # correctly.
+    def self.patch_minitest
+      MiniTest::Unit.class_eval do
+        alias_method :old_run, :run
+        def run(args = [])
+          # do nothing
+        end
+      end
+    end
+  end
+end

data/lib/tconsole/server.rb

@@ -30,11 +30,11 @@ module TConsole
       return true
     end
 
-    def run_tests(globs)
+    def run_tests(globs, name_pattern, message = "Running tests...")
       time = Benchmark.realtime do
-        pid = fork do
+        fork do
 
-          puts "Running tests..."
+          puts message
           puts
 
           paths = []
@@ -49,14 +49,82 @@ module TConsole
           if defined? ActiveRecord
             ActiveRecord::Base.connection.reconnect!
           end
+
+          if defined?(MiniTest)
+            require File.join(File.dirname(__FILE__), "minitest_handler")
+
+            MiniTestHandler.run(name_pattern)
+          elsif defined?(Test::Unit)
+            puts "Sorry, but tconsole doesn't support Test::Unit yet"
+            return
+          elsif defined?(RSpec)
+            puts "Sorry, but tconsole doesn't support RSpec yet"
+            return
+          end
         end
 
-        Process.wait2(pid)
+        Process.waitall
       end
 
       puts
       puts "Test time (including load): #{time}s"
       puts
     end
+
+    # This code is from the rails test:recents command
+    def run_recent(test_pattern)
+      touched_since = Time.now - 600 # 10 minutes ago
+      files = recent_files(touched_since, "app/models/**/*.rb", "test/unit")
+      files.concat(recent_files(touched_since, "app/controllers/**/*.rb", "test/functional"))
+
+      message = "Running #{files.length} #{files.length == 1 ? "test file" : "test files"} based on changed files..."
+      run_tests(files, test_pattern, message)
+    end
+
+    def recent_files(touched_since, source_pattern, test_path)
+      Dir.glob(source_pattern).map do |path|
+        if File.mtime(path) > touched_since
+          tests = []
+          source_dir = File.dirname(path).split("/")
+          source_file = File.basename(path, '.rb')
+
+          # Support subdirs in app/models and app/controllers
+          modified_test_path = source_dir.length > 2 ? "#{test_path}/" << source_dir[1..source_dir.length].join('/') : test_path
+
+          # For modified files in app/ run the tests for it. ex. /test/functional/account_controller.rb
+          test = "#{modified_test_path}/#{source_file}_test.rb"
+          tests.push test if File.exist?(test)
+
+          # For modified files in app, run tests in subdirs too. ex. /test/functional/account/*_test.rb
+          test = "#{modified_test_path}/#{File.basename(path, '.rb').sub("_controller","")}"
+          File.glob("#{test}/*_test.rb").each { |f| tests.push f } if File.exist?(test)
+
+          return tests
+
+        end
+      end.flatten.compact
+    end
+
+    # Based on the code from rake test:uncommitted in Rails
+    def run_uncommitted(test_pattern)
+      if File.directory?(".svn")
+        changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
+      elsif File.directory?(".git")
+        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.split.map { |path| path.chomp }
+      else
+        puts "Not a Subversion or Git checkout."
+        return
+      end
+
+      models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
+      controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
+
+      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
+      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      files = (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
+
+      message = "Running #{files.length} #{files.length == 1 ? "test file" : "test files"} based on uncommitted changes..."
+      run_tests(files, test_pattern, message)
+    end
   end
 end

data/lib/tconsole/version.rb

@@ -1,3 +1,3 @@
 module TConsole
-  VERSION = "0.0.3.pre"
+  VERSION = "0.0.4.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 0.0.3.pre
+  version: 0.0.4.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000 Z
+date: 2011-12-17 00:00:00.000000000 Z
 dependencies: []
 description: tconsole gives you a helpful console for running Rails tests
 email:
@@ -20,11 +20,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - Gemfile
 - README.md
 - Rakefile
 - bin/tconsole
 - lib/tconsole.rb
+- lib/tconsole/minitest_handler.rb
 - lib/tconsole/server.rb
 - lib/tconsole/version.rb
 - tconsole.gemspec