nestor 0.1.0 → 0.1.1

data/lib/nestor/cli.rb

@@ -32,7 +32,7 @@ module Nestor
       else
         puts "Launching..."
       end
-      Nestor::Watchers::Rails.run(:script => Pathname.new(options[:script]))
+      Nestor::Watchers::Rails.run(:script => options[:script] ? Pathname.new(options[:script]) : nil)
     end
 
     desc("customize PATH", <<-EODESC.gsub(/^\s{6}/, ""))

data/lib/nestor/machine.rb

@@ -47,7 +47,7 @@ module Nestor
     # The list of failing tests or examples being focused on right now
     attr_reader :focuses       # :nodoc:
 
-    # +strategy+ is required, and must implement a couple of methods.  See Nestor::Strategies for the required calls.
+    # +strategy+ is required, and must implement a couple of methods.  See {Nestor::Strategies} for the required calls.
     def initialize(strategy)
       super() # Have to specify no-args, or else it'll raise an ArgumentError
 
@@ -79,6 +79,7 @@ module Nestor
       end
 
       event :run do
+        transition [:running_all, :running_multi, :running_focused] => same
         transition :run_focused_pending => :running_focused
         transition :run_multi_pending => :running_multi
       end

data/lib/nestor/strategies/test/unit.rb

@@ -52,6 +52,33 @@ module Nestor
           end
         end
 
+        # Utility method to extract data from a Test::Unit failure.
+        #
+        # @param failure [Test::Unit::Failure, Test::Unit::Error] The Test::Unit failure or error from which to extract information.
+        # @param test_files [Array<String>] The list of files that might have generated this failure.  This is used to detect the file that caused the failure.
+        #
+        # @return [String, String] Returns the filename and test name as a 2 element Array.
+        def self.parse_failure(failure, test_files)
+          filename = if failure.respond_to?(:location) then
+                       failure.location.map do |loc|
+                         filename = loc.split(":", 2).first
+                         test_files.detect {|tf| filename.include?(tf)}
+                       end.compact.first
+                     elsif failure.respond_to?(:exception) then
+                       failure.exception.backtrace.map do |loc|
+                         filename = loc.split(":", 2).first
+                         loc = loc[1..-1] if loc[0,1] == "/"
+                         test_files.detect {|tf| filename.include?(tf)}
+                       end.compact.first
+                     else
+                       raise "Unknown object type received as failure: #{failure.inspect} doesn't have #exception or #location methods."
+                     end
+
+          test_name = failure.test_name.split("(", 2).first.strip.sub(/\.$/, "")
+
+          [filename, test_name]
+        end
+
         private
 
         # Since we forked, we can't call into the Machine from the child process.  Upstream
@@ -61,26 +88,10 @@ module Nestor
           info = {"status" => test_runner.passed? ? "successful" : "failed", "failures" => {}}
           failures = info["failures"]
           test_runner.faults.each do |failure|
-            filename = if failure.respond_to?(:location) then
-                         failure.location.detect do |loc|
-                           filename = loc.split(":", 2).first
-                           test_files.detect {|tf| filename.include?(tf)}
-                         end
-                       elsif failure.respond_to?(:exception) then
-                         failure.exception.backtrace.detect do |loc|
-                           filename = loc.split(":", 2).first
-                           test_files.detect {|tf| filename.include?(tf)}
-                         end
-                       else
-                         raise "Unknown object type received as failure: #{failure.inspect} doesn't have #exception or #location methods."
-                       end
-
-            test_name = failure.test_name.split("(", 2).first.strip
+            filename, test_name = self.class.parse_failure(failure, test_files)
             if filename.nil? then
-              log("Could not map #{failure.test_name.inspect} to a specific test file: mapping to #{test_files.length}")
-              test_files.each do |tf|
-                failures[test_name] = tf
-              end
+              log("Could not map #{failure.test_name.inspect} to a specific test file: mapping to #{test_files.length} files")
+              failures[test_name] = test_files
             else
               log("Failed #{failure.test_name.inspect} in #{filename.inspect}")
               failures[test_name] = filename

data/lib/nestor/strategies.rb

@@ -1,15 +1,15 @@
 module Nestor
-  # Nestor::Cli will require a file named +nestor/strategies/#{strategy_name}+.  If you want
+  # {Nestor::Cli} will require a file named +nestor/strategies/#{strategy_name}+.  If you want
   # to provide custom strategies, make it available to Nestor using the correct path.
   #
   # Strategies are simple objects that implement the following protocol:
   #
   # <tt>log(message)</tt>:: Logs a simple message, either to the console or a logfile.
-  #                         The Machine will use the +log+ method to notify about it's
+  #                         The {Nestor::Machine} will use the +log+ method to notify about it's
   #                         state transitions.
   #
   # <tt>run_all</tt>:: Runs all the tests, no matter what.  In the Rails &
-  #                    +Test::Unit+ case, this means <tt>Dir["test/**/*_test.rb"]</tt>.
+  #                    {Nestor::Strategies::Test::Unit} case, this means <tt>Dir["test/**/*_test.rb"]</tt>.
   #
   # <tt>run(tests_files, focused_cases=[])</tt>:: Runs only a subset of the tests, maybe
   #                                               focusing on only a couple of tests / examples.

data/lib/nestor/watchers/rails.rb

@@ -5,12 +5,12 @@ module Nestor
   module Watchers
     # Knows how to map file change events from Rails conventions to the corresponding test case.
     module Rails
-      # Launches a Watchr::Controller to and never returns.  The Controller will
+      # Launches a {Watchr::Controller} to and never returns.  The Controller will
       # listen for file change events and trigger appropriate events on the Machine.
       #
-      # By default, the Rails watcher will use the +Test::Unit+ strategy.
+      # By default, the Rails watcher will use the +{Nestor::Strategies::Test::Unit}+ strategy.
       #
-      # @option options :strategy [Nestor::Strategies] The strategy to use.  Must be an instance of a class that implements the protocol defined in Nestor::Strategies.
+      # @option options :strategy [Nestor::Strategies] ({Nestor::Strategies::Test::Unit}) The strategy to use.  Must be an instance of a class that implements the protocol defined in {Nestor::Strategies}.
       # @option options :script The path to the Watchr script.
       #
       # @return Never...

data/lib/nestor/watchers/rails_script.rb

@@ -26,6 +26,7 @@ def sendoff(timeout=0.8, path="tmp/nestor-sendoff") #:nodoc:
 end
 
 def changed!(filename) #:nodoc:
+  return if File.directory?(filename)
   @machine.changed! filename
   sendoff
 end
@@ -59,6 +60,11 @@ watch 'test/test_helper\.rb' do |md|
   @machine.reset!
 end
 
+watch 'db/schema.rb' do |_|
+  log "Detected changed schema: preparing test DB"
+  system("rake db:test:prepare")
+end
+
 watch 'test/(?:unit|functional|integration|performance)/.*' do |md|
   log "#{md[0].inspect} => #{md[0].inspect}"
   changed! md[0]
@@ -72,7 +78,7 @@ watch 'tmp/nestor-results.yml' do |md|
   info = YAML.load_file(md[0])
   log "New results in: #{info.inspect}"
   failures = info["failures"]
-  @machine.send("run_#{info["status"]}!", failures.values.uniq, failures.keys)
+  @machine.send("run_#{info["status"]}!", failures.values.flatten.uniq, failures.keys)
 end
 
 watch 'tmp/nestor-sendoff' do |_|

data/spec/machine_spec.rb

@@ -7,50 +7,3 @@ describe Nestor::Machine do
     machine.strategy.should be_equal(strategy) 
   end
 end
-
-describe Nestor::Machine do
-  before(:each) do
-    @strategy = mock
-    @strategy.stub(:run_all)
-  end
-
-  it "should start in the :running_all state" do
-    @machine = Nestor::Machine.new(@strategy)
-    machine.should be_running_all
-  end
-
-  it "should tell the strategy to run all tests" do
-    strategy = mock
-    strategy.should_receive(:run_all).with().once
-    Nestor::Machine.new(strategy)
-  end
-
-  it "should transition to :green when calling #successful" do
-    machine.successful
-    machine.should be_green
-  end
-
-  it "should transition to :run_focused when calling #failed" do
-    machine.failed
-    machine.should be_run_focused
-  end
-
-  def machine
-    @machine ||= Nestor::Machine.new(@strategy)
-  end
-end
-
-describe Nestor::Machine, "when in the run_focused state" do
-  before(:each) do
-    @strategy = mock
-    @strategy.stub(:run_all)
-    @machine = Nestor::Machine.new(@strategy)
-    @machine.failed
-  end
-
-  it "should transition to :running_focused when calling #changed!(filename)" do
-    @strategy.should_receive(:run).with(["spec/machine_spec.rb"])
-    @machine.changed!("spec/machine_spec.rb")
-    @machine.should be_running_focused
-  end
-end

data/spec/test_unit_strategy_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + "/spec_helper"
+require "nestor/strategies/test/unit"
+
+describe Nestor::Strategies::Test::Unit, "#parse_failure" do
+  it "should return the file and test name as reported by a failure" do
+    failure = mock
+    failure.stub(:location).and_return(
+      ["/test/functional/api/templates_controller_test.rb:12:in `__bind_1256961206_373905'",
+        "/Library/Ruby/Gems/1.8/gems/thoughtbot-shoulda-2.10.2/lib/shoulda/context.rb:351:in `call'",
+        "/Library/Ruby/Gems/1.8/gems/thoughtbot-shoulda-2.10.2/lib/shoulda/context.rb:351:in `test: Api::TemplatesController should flunk. '",
+        "/Users/francois/Projects/nestor/lib/nestor/strategies/test/unit.rb:109:in `run'"])
+    failure.stub(:test_name).and_return("test: Api::TemplatesController should flunk. (Api::TemplatesControllerTest)")
+
+    test_files = ["test/functional/api/templates_controller_test.rb"]
+
+    filename, test_name = Nestor::Strategies::Test::Unit.parse_failure(failure, test_files)
+
+    filename.should  == "test/functional/api/templates_controller_test.rb"
+    test_name.should == "test: Api::TemplatesController should flunk"
+  end
+
+  it "should return the file and test name as reported by an error" do
+    exception = RuntimeError.new("bad")
+    exception.set_backtrace(["./test/functional/api/templates_controller_test.rb:12:in `__bind_1256962198_402597'",
+                             "/Library/Ruby/Gems/1.8/gems/thoughtbot-shoulda-2.10.2/lib/shoulda/context.rb:351:in `call'",
+                             "/Library/Ruby/Gems/1.8/gems/thoughtbot-shoulda-2.10.2/lib/shoulda/context.rb:351:in `test: Api::TemplatesController should flunk. '",
+                             "/Library/Ruby/Gems/1.8/gems/activesupport-2.3.4/lib/active_support/testing/setup_and_teardown.rb:62:in `__send__'",
+                             "/Library/Ruby/Gems/1.8/gems/activesupport-2.3.4/lib/active_support/testing/setup_and_teardown.rb:62:in `run'"])
+
+    failure = mock
+    failure.stub(:exception).and_return(exception)
+    failure.stub(:test_name).and_return("test: Api::TemplatesController should flunk. (Api::TemplatesControllerTest)")
+
+    test_files = ["test/functional/api/templates_controller_test.rb"]
+
+    filename, test_name = Nestor::Strategies::Test::Unit.parse_failure(failure, test_files)
+
+    filename.should  == "test/functional/api/templates_controller_test.rb"
+    test_name.should == "test: Api::TemplatesController should flunk"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nestor
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -04:00
+date: 2009-10-31 00:00:00 -04:00
 default_executable: nestor
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - lib/nestor/watchers/rails_script.rb
 - spec/machine_spec.rb
 - spec/spec_helper.rb
+- spec/test_unit_strategy_spec.rb
 - vendor/watchr-0.5.7/.gitignore
 - vendor/watchr-0.5.7/History.txt
 - vendor/watchr-0.5.7/LICENSE
@@ -150,3 +151,4 @@ summary: Nestor keeps the place tidy by running your specs/tests everytime a fil
 test_files: 
 - spec/machine_spec.rb
 - spec/spec_helper.rb
+- spec/test_unit_strategy_spec.rb