nestor 0.2.3 → 0.2.4

data/TODO

@@ -0,0 +1 @@
+* Handle test/fixtures in Rails::Test::Unit

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/nestor/mappers/rails/test/rails_test_unit.rb

@@ -25,10 +25,11 @@ def sendoff(timeout=0.8, path="tmp/nestor-sendoff") #:nodoc:
   end
 end
 
-def changed!(filename) #:nodoc:
+def changed!(filename, should_sendoff=true) #:nodoc:
   return if File.directory?(filename)
+  log "Detected change on #{filename.inspect}"
   @machine.changed! filename
-  sendoff
+  sendoff if should_sendoff
 end
 
 watch 'config/(?:.+)\.(?:rb|ya?ml)' do |md|
@@ -46,7 +47,7 @@ end
 watch 'db/schema.rb' do |md|
   log "Detected changed schema: preparing test DB"
   system("rake db:test:prepare")
-  changed! md[0]
+  changed! md[0], false
 end
 
 # This is only to trigger the tests after a slight delay, but from the main thread.

data/lib/nestor/mappers/rails/test/unit.rb

@@ -58,7 +58,7 @@ module Nestor::Mappers::Rails
           log "Run all tests"
           test_files = load_test_files(["test"])
 
-          ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+          reset_db_connection_post_fork
           test_runner = ::Nestor::Mappers::Rails::Test::TestRunner.new(nil)
           result = ::Test::Unit::AutoRunner.run(false, nil, []) do |autorunner|
             autorunner.runner = lambda { test_runner }
@@ -76,7 +76,7 @@ module Nestor::Mappers::Rails
           log "Running #{focuses.length} focused tests"
           load_test_files(test_files)
 
-          ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+          reset_db_connection_post_fork
           test_runner = ::Nestor::Mappers::Rails::Test::TestRunner.new(nil)
           result = ::Test::Unit::AutoRunner.run(false, nil, []) do |autorunner|
             autorunner.runner = lambda { test_runner }
@@ -156,6 +156,13 @@ module Nestor::Mappers::Rails
 
       private
 
+      # In an ideal world, this wouldn't be required, but because we forked,
+      # the socket connection to the DB goes bad in the child process.  Reset
+      # it here so we can use it.
+      def reset_db_connection_post_fork
+        ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+      end
+
       def setup_lifeline
         ppid = Process.ppid
         log "Setting up lifeline on #{Process.pid} for #{Process.ppid}"

data/nestor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nestor}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fran\303\247ois Beausoleil"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
+     "TODO",
      "VERSION",
      "bin/nestor",
      "doc/.gitignore",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nestor
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -67,6 +67,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - bin/nestor
 - doc/.gitignore