tconsole 1.1.0pre3 → 1.1.0pre4

data/lib/tconsole.rb

@@ -1,4 +1,5 @@
 require "tconsole/version"
+require "tconsole/config"
 require "tconsole/server"
 require "tconsole/test_result"
 require "tconsole/util"
@@ -45,8 +46,10 @@ module TConsole
       console = Console.new
 
       # set up the config
-      config = {:trace => false}
-      config[:trace] = true if argv.include?("--trace")
+      config = Config.configure
+      config.trace = true if argv.include?("--trace")
+
+      socket_path = "/tmp/tconsole.#{Process.pid}"
 
       # Start the server
       while running
@@ -56,18 +59,24 @@ module TConsole
           begin
             server = Server.new(config)
 
-            drb_server = DRb.start_service("drbunix:/tmp/tconsole.#{Process.pid}", server)
+            drb_server = DRb.start_service("drbunix:#{socket_path}", server)
             DRb.thread.join
           rescue Interrupt
             # do nothing here since the outer process will shut things down for us
           end
         end
 
+        # Wait for the server to be fully started
+        wait_until = Time.now + 10
+        until(File.exist?(socket_path) || Time.now > wait_until)
+          sleep(1)
+        end
+
         # Set up our client connection to the server
-        server = DRbObject.new_with_uri("drbunix:/tmp/tconsole.#{server_pid}")
+        DRb.start_service
+        server = DRbObject.new_with_uri("drbunix:#{socket_path}")
 
         loaded = false
-        wait_until = Time.now + 10
         until loaded || Time.now > wait_until
           # Give drb a second to get set up
           sleep(1)

data/lib/tconsole/config.rb

@@ -0,0 +1,94 @@
+module TConsole
+  class Config
+    # Lets us know if we should include trace output
+    attr_accessor :trace
+
+    # Test directory for the app we're testing
+    attr_accessor :test_dir
+
+    # Paths to add to the ruby include path
+    attr_accessor :include_paths
+
+    # Paths we want to preload
+    attr_accessor :preload_paths
+
+    def initialize
+      self.trace = false
+      self.test_dir = "./test"
+      self.include_paths = ["./test", "./lib"]
+      self.preload_paths = []
+
+      @after_load = nil
+    end
+
+    def trace?
+      self.trace
+    end
+
+    # Code to run before loading the environment
+    def before_load(&block)
+      @before_load = block
+    end
+
+    # Calls the before load callback
+    def before_load!
+      @before_load.call unless @before_load.nil?
+    end
+
+    # Code to run after loading the environment
+    def after_load(&block)
+      @after_load = block
+    end
+
+    # Calls the after load callback
+    def after_load!
+      @after_load.call unless @after_load.nil?
+    end
+
+    # Calls before each test execution
+    def before_test_run(&block)
+      @before_test_run = block
+    end
+
+    def before_test_run!
+      @before_test_run.call unless @before_test_run.nil?
+    end
+
+    # Returns an appropriate tconsole config based on the environment
+    def self.configure
+      if is_rails?
+        config = Config.new
+        config.preload_paths = ["./config/application"]
+        config.include_paths = ["./test"]
+
+        config.before_load do
+          ENV["RAILS_ENV"] ||= "test"
+        end
+
+        config.after_load do
+          ::Rails.application
+          ::Rails::Engine.class_eval do
+            def eager_load!
+              # turn off eager_loading
+            end
+          end
+        end
+
+        config.before_test_run do
+          if defined? ::ActiveRecord
+            ::ActiveRecord::Base.clear_active_connections!
+            ::ActiveRecord::Base.establish_connection
+          end
+        end
+
+        config
+      else
+        Config.new
+      end
+    end
+
+    def self.is_rails?
+      @rails ||= !!File.exist?("./config/application.rb")
+    end
+  end
+end

data/lib/tconsole/server.rb

@@ -15,16 +15,28 @@ module TConsole
       result = false
 
       time = Benchmark.realtime do
+        puts
+        puts "Loading environment..."
 
         begin
-          if is_rails?
-            result = load_rails_environment
-          else
-            result = load_non_rails_environment
+          # Append our include paths
+          config.include_paths.each do |include_path|
+            $:.unshift(include_path)
           end
+
+          config.before_load!
+
+          # Load our preload files
+          config.preload_paths.each do |preload_path|
+            require preload_path
+          end
+
+          config.after_load!
+
+          result = true
         rescue Exception => e
           puts "Error - Loading your environment failed: #{e.message}"
-          if config[:trace] == true
+          if config.trace?
             puts
             puts "    #{e.backtrace.join("\n    ")}"
           end
@@ -39,42 +51,6 @@ module TConsole
       result
     end
 
-    def is_rails?
-      @rails ||= !!File.exist?("./config/application.rb")
-    end
-
-    def load_rails_environment
-      puts
-      puts "Loading Rails environment..."
-
-      # Ruby environment loading is shamelessly borrowed from spork
-      ENV["RAILS_ENV"] ||= "test"
-      $:.unshift("./test")
-
-      # This is definitely based on Sporks rails startup code. I tried initially to use Rake to get things done
-      # and match the test environment a bit better, but it didn't work out well at all
-      # TODO: Figure out how ot get rake db:test:load and rake test:prepare working in this context
-      require "./config/application"
-      ::Rails.application
-      ::Rails::Engine.class_eval do
-        def eager_load!
-          # turn off eager_loading
-        end
-      end
-
-      true
-    end
-
-    def load_non_rails_environment
-      $:.unshift("./lib")
-      $:.unshift("./test")
-
-      puts
-      puts "Loading environment..."
-
-      true
-    end
-
     def run_tests(globs, name_pattern, message = "Running tests...")
       time = Benchmark.realtime do
         # Pipe for communicating with child so we can get its results back
@@ -90,16 +66,12 @@ module TConsole
           globs.each do |glob|
             paths.concat(Dir.glob(glob))
           end
-          puts "Paths: #{paths.join(", ")}"
 
           paths.each do |path|
             require File.expand_path(path)
           end
 
-          if defined? ::ActiveRecord
-            ::ActiveRecord::Base.clear_active_connections!
-            ::ActiveRecord::Base.establish_connection
-          end
+          config.before_test_run!
 
           if defined?(::MiniTest)
             require File.join(File.dirname(__FILE__), "minitest_handler")
@@ -150,7 +122,6 @@ module TConsole
     end
 
     def run_failed
-      # TODO: We probably shouldn't use built in Rails methods here if we can help it
       file_names = last_result.failure_details.map { |detail| filenameify(detail[:class]) }
       files_to_rerun = []
 
@@ -251,5 +222,15 @@ module TConsole
 
       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.0pre3"
+  VERSION = "1.1.0pre4"
 end

data/test/config_test.rb

@@ -0,0 +1,3 @@
+class ConfigTest < MiniTest::Unit::TestCase
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tconsole
 version: !ruby/object:Gem::Version
-  version: 1.1.0pre3
+  version: 1.1.0pre4
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70275488249920 !ruby/object:Gem::Requirement
+  requirement: &70233285449540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70275488249920
+  version_requirements: *70233285449540
 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
@@ -40,12 +40,14 @@ files:
 - Rakefile
 - bin/tconsole
 - lib/tconsole.rb
+- lib/tconsole/config.rb
 - lib/tconsole/minitest_handler.rb
 - lib/tconsole/server.rb
 - lib/tconsole/test_result.rb
 - lib/tconsole/util.rb
 - lib/tconsole/version.rb
 - tconsole.gemspec
+- test/config_test.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -70,4 +72,5 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: tconsole is a helpful console for running Rails tests
-test_files: []
+test_files:
+- test/config_test.rb