nestor 0.1.1 → 0.2.0

data/test/machine_test.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+
+context "" do
+  setup do
+    @mapper = Object.new
+    class << @mapper
+      def log(*args); end
+    end
+  end
+
+  context "A new machine" do
+    setup { Nestor::Machine.new(@mapper) }
+    should("be in the :booting state") { topic.booting? }
+  end
+
+  context "A new machine with an :initial_state option" do
+    setup { Nestor::Machine.new(@mapper, :quick => true) }
+    should("start with the specified state") { topic.green? }
+  end
+end

data/test/rails_mapper_test.rb

@@ -0,0 +1,88 @@
+require "test_helper"
+require "nestor/mappers/rails/test/unit"
+
+context "Nestor::Mappers::Rails::Test::Unit" do
+  setup { Nestor::Mappers::Rails::Test::Unit.new }
+
+  context "#map" do
+    should_map \
+      "app/models/user.rb"                        => ["test/unit/user_test.rb"],
+      "app/models/topic.rb"                       => ["test/unit/topic_test.rb"],
+      "app/models/timeline_observer.rb"           => ["test/unit/timeline_observer_test.rb", "test/unit/timeline_test.rb"],
+
+      "app/controllers/users_controller.rb"       => ["test/functional/users_controller_test.rb"],
+      "app/views/users/index.html.erb"            => ["test/functional/users_controller_test.rb"],
+
+      "app/helpers/users_helper.rb"               => ["test/unit/helpers/users_helper_test.rb", "test/functional/users_controller_test.rb"],
+
+      "lib/core_ext/rails/hash.rb"                => ["test/unit/core_ext/rails/hash_test.rb"],
+
+      "test/unit/user_test.rb"                    => ["test/unit/user_test.rb"],
+      "test/functional/users_controller_test.rb"  => ["test/functional/users_controller_test.rb"],
+      "test/integration/signup_test.rb"           => ["test/integration/signup_test.rb"],
+      "test/performance/home_page_test.rb"        => ["test/performance/home_page_test.rb"],
+
+      # Implies running all tests under the specified directory
+      "app/controllers/application_controller.rb" => ["test/functional/"],
+      "app/helpers/application_helper.rb"         => ["test/unit/helpers/", "test/functional/"],
+
+      # Implies running all tests
+      "db/schema.rb"                              => [],
+      "test/test_helper.rb"                       => [],
+      "config/environment.rb"                     => [],
+      "config/environments/test.rb"               => [],
+
+      # Implies no tests to run
+      "README.rdoc"                               => nil
+  end
+end
+
+context "A Test::Unit failure after being parsed by Rails::Test::Unit" do
+  setup do
+    failure = Object.new
+    class << failure
+      def location
+        ["/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'"]
+      end
+
+      def test_name
+        "test: Api::TemplatesController should flunk. (Api::TemplatesControllerTest)"
+      end
+    end
+
+    test_files = ["test/functional/api/templates_controller_test.rb"]
+
+    Nestor::Mappers::Rails::Test::Unit.parse_failure(failure, test_files)
+  end
+
+  should("return the filename as #first")   { topic.first }.equals("test/functional/api/templates_controller_test.rb")
+  should("return the test's name as #last") { topic.last  }.equals("test: Api::TemplatesController should flunk")
+end
+
+context "A Test::Unit error after being parsed by Rails::Test::Unit" do
+  setup 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 = Object.new
+    class << failure
+      attr_accessor :exception, :test_name
+    end
+    failure.exception = exception
+    failure.test_name = "test: Api::TemplatesController should flunk. (Api::TemplatesControllerTest)"
+
+    test_files = ["test/functional/api/templates_controller_test.rb"]
+
+    Nestor::Mappers::Rails::Test::Unit.parse_failure(failure, test_files)
+  end
+
+  should("return the filename as #first")   { topic.first }.equals("test/functional/api/templates_controller_test.rb")
+  should("return the test's name as #last") { topic.last  }.equals("test: Api::TemplatesController should flunk")
+end

data/test/riot_macros/map.rb

@@ -0,0 +1,13 @@
+module Nestor
+  module Test
+    module Macros
+      def should_map(params)
+        params.each_pair do |key, values|
+          asserts(key.inspect) { topic.map(key) }.equals(values)
+        end
+      end
+    end
+  end
+end
+
+Riot::Context.instance_eval { include Nestor::Test::Macros }

data/test/script_test.rb

@@ -0,0 +1,7 @@
+require "test_helper"
+
+context "Nestor::Script" do
+  setup { Nestor::Script.new(Nestor::Mappers::Rails::Test::Unit.default_script_path) }
+
+  asserts("has a #nestor_machine= method") { topic }.respond_to(:nestor_machine=)
+end

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require "rubygems"
+require "riot"
+require "nestor"
+require "riot_macros/map"
+
+begin
+  require "ruby-debug"
+rescue LoadError
+  # NOP, don't care
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nestor
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,28 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 -04:00
+date: 2009-11-17 00:00:00 -05:00
 default_executable: nestor
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yard
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: riot
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.12
     version: 
 - !ruby/object:Gem::Dependency 
   name: watchr
@@ -85,14 +85,15 @@ files:
 - lib/nestor.rb
 - lib/nestor/cli.rb
 - lib/nestor/machine.rb
-- lib/nestor/strategies.rb
-- lib/nestor/strategies/test/unit.rb
-- lib/nestor/watchers.rb
-- lib/nestor/watchers/rails.rb
-- lib/nestor/watchers/rails_script.rb
-- spec/machine_spec.rb
-- spec/spec_helper.rb
-- spec/test_unit_strategy_spec.rb
+- lib/nestor/mappers.rb
+- lib/nestor/mappers/rails/test/rails_test_unit.rb
+- lib/nestor/mappers/rails/test/unit.rb
+- lib/nestor/script.rb
+- test/machine_test.rb
+- test/rails_mapper_test.rb
+- test/riot_macros/map.rb
+- test/script_test.rb
+- test/test_helper.rb
 - vendor/watchr-0.5.7/.gitignore
 - vendor/watchr-0.5.7/History.txt
 - vendor/watchr-0.5.7/LICENSE
@@ -149,6 +150,8 @@ signing_key:
 specification_version: 3
 summary: Nestor keeps the place tidy by running your specs/tests everytime a file changes
 test_files: 
-- spec/machine_spec.rb
-- spec/spec_helper.rb
-- spec/test_unit_strategy_spec.rb
+- test/machine_test.rb
+- test/rails_mapper_test.rb
+- test/riot_macros/map.rb
+- test/script_test.rb
+- test/test_helper.rb

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

@@ -1,127 +0,0 @@
-require "yaml"
-require "pathname"
-require "test/unit/ui/console/testrunner"
-
-module Nestor
-  module Strategies
-    module Test
-      class Unit
-        def initialize(root)
-          @root = Pathname.new(root).realpath
-        end
-
-        # Logs a message to STDOUT.  This implementation forks, so the #log method also
-        # provides the PID of the logger.
-        def log(message)
-          STDOUT.printf "[%d] %s - %s\n", Process.pid, Time.now.strftime("%H:%M:%S"), message
-          STDOUT.flush
-        end
-
-        # Runs absolutely all tests as found by walking test/.
-        def run_all
-          fork do
-            log "Run all tests"
-            test_files = Dir["test/**/*_test.rb"]
-            test_files.each {|f| log(f); load f}
-
-            ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-            test_runner = ::Nestor::Strategies::Test::TestRunner.new(nil)
-            result = ::Test::Unit::AutoRunner.run(false, nil, []) do |autorunner|
-              autorunner.runner = lambda { test_runner }
-            end
-
-            report(test_runner, test_files)
-          end
-        end
-
-        # Runs only the named files, and optionally focuses on only a couple of tests
-        # within the loaded test cases.
-        def run(test_files, focuses=[])
-          fork do
-            log "Running #{focuses.length} focused tests"
-            test_files.each {|f| log(f); load f}
-
-            ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-            test_runner = ::Nestor::Strategies::Test::TestRunner.new(nil)
-            result = ::Test::Unit::AutoRunner.run(false, nil, []) do |autorunner|
-              autorunner.runner = lambda { test_runner }
-              autorunner.filters << proc{|t| focuses.include?(t.method_name)} unless focuses.empty?
-            end
-
-            report(test_runner, test_files)
-          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
-        # communications is implemented by writing new files to the filesystem and letting
-        # the parent process catch the changes.
-        def report(test_runner, test_files)
-          info = {"status" => test_runner.passed? ? "successful" : "failed", "failures" => {}}
-          failures = info["failures"]
-          test_runner.faults.each do |failure|
-            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} files")
-              failures[test_name] = test_files
-            else
-              log("Failed #{failure.test_name.inspect} in #{filename.inspect}")
-              failures[test_name] = filename
-            end
-          end
-
-          File.open("tmp/nestor-results.yml", "w") {|io| io.write(info.to_yaml) }
-          log "Wrote #{failures.length} failure(s) to tmp/nestor-results.yml"
-        end
-      end
-
-      # A helper class that allows me to get more information from the build.
-      #
-      # This is something that definitely will change when Nestor is tested on Ruby 1.9.
-      class TestRunner < ::Test::Unit::UI::Console::TestRunner #:nodoc:
-        attr_reader :faults
-
-        # This is a duck-typing method.  Test::Unit's design requiers a #run method,
-        # but it is implemented as a class method.  I fake it here to allow me to
-        # pass an instance and have the actual TestRunner instance available afterwards.
-        def run(suite, output_level=NORMAL)
-          @suite = suite.respond_to?(:suite) ? suite.suite : suite
-          start
-        end
-
-        # Returns pass/fail status.
-        def passed?
-          @faults.empty?
-        end
-      end
-    end
-  end
-end

data/lib/nestor/strategies.rb

@@ -1,18 +0,0 @@
-module Nestor
-  # {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 {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 &
-  #                    {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.
-  module Strategies
-  end
-end

data/lib/nestor/watchers/rails.rb

@@ -1,56 +0,0 @@
-require "watchr"
-require "pathname"
-
-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
-      # listen for file change events and trigger appropriate events on the Machine.
-      #
-      # By default, the Rails watcher will use the +{Nestor::Strategies::Test::Unit}+ strategy.
-      #
-      # @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...
-      def self.run(options={})
-        strategy = options[:strategy] || Nestor::Strategies::Test::Unit.new(Dir.pwd)
-        script = instantiate_script(options[:script])
-
-        strategy.log "Instantiating machine"
-        script.nestor_strategy = strategy
-        script.nestor_machine  = Nestor::Machine.new(strategy)
-        Watchr::Controller.new(script, Watchr.handler.new).run
-      end
-
-      def self.path_to_script
-        default_script_path
-      end
-
-      private
-
-      def self.default_script_path
-        Pathname.new(File.dirname(__FILE__) + "/rails_script.rb") 
-      end
-
-      def self.instantiate_script(path) #:nodoc:
-        # Use the default if none provided
-        path = default_script_path if path.nil?
-
-        script = Watchr::Script.new(path)
-        class << script
-          def nestor_machine=(m)
-            @machine = m
-          end
-
-          def nestor_strategy=(s)
-            @strategy = s
-          end
-        end
-
-        script
-      end
-    end
-  end
-end

data/lib/nestor/watchers/rails_script.rb

@@ -1,89 +0,0 @@
-def log(message) #:nodoc:
-  @strategy.log(message)
-end
-
-RAILS_ENV = "test" unless defined?(RAILS_ENV)
-log "Entering #{RAILS_ENV.inspect} environment"
-
-log "Creating tmp/ if it doesn't exist"
-Dir.mkdir("tmp") unless File.directory?("tmp")
-
-log "Preloading test/test_helper.rb"
-start_load_at = Time.now
-$LOAD_PATH.unshift "test" unless $LOAD_PATH.include?("test")
-require "test_helper"
-
-end_load_at = Time.now
-log "Waiting for changes (saving #{end_load_at - start_load_at} seconds per run)..."
-
-def sendoff(timeout=0.8, path="tmp/nestor-sendoff") #:nodoc:
-  Thread.start(timeout, path) do |timeout, path|
-    log "Sendoff pending #{timeout}..."
-    sleep timeout
-    File.open(path, "w") {|io| io.write(rand.to_s)}
-    log "Sendoff fired on #{path}"
-  end
-end
-
-def changed!(filename) #:nodoc:
-  return if File.directory?(filename)
-  @machine.changed! filename
-  sendoff
-end
-
-watch 'app/models/(.+)\.rb' do |md|
-  test_file = "test/unit/#{md[1]}_test.rb"
-  log "#{md[0].inspect} => #{test_file.inspect}"
-  changed! test_file if File.file?(test_file)
-end
-
-watch 'app/controllers/(.+)\.rb' do |md|
-  test_file = "test/functional/#{md[1]}_test.rb"
-  log "#{md[0].inspect} => #{test_file.inspect}"
-  changed! test_file if File.file?(test_file)
-end
-
-# It might be possible to run focused tests with the view name
-watch 'app/views/(.+)' do |md|
-  segments = md[1].split("/")
-  path     = segments[0..-2]
-  test_file = "test/functional/#{path.join("/")}_controller_test.rb"
-  log "#{md[0].inspect} => #{test_file.inspect}"
-  changed! test_file if File.file?(test_file)
-end
-
-watch 'config/' do |md|
-  @machine.reset!
-end
-
-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]
-end
-
-watch 'tmp/nestor-results.yml' do |md|
-  # Since we received the results, we must receive our child process' status, or
-  # else we'll have zombie processes lying around
-  Thread.start { Process.wait }
-
-  info = YAML.load_file(md[0])
-  log "New results in: #{info.inspect}"
-  failures = info["failures"]
-  @machine.send("run_#{info["status"]}!", failures.values.flatten.uniq, failures.keys)
-end
-
-watch 'tmp/nestor-sendoff' do |_|
-  log "Sendoff"
-  @machine.run!
-end
-
-@machine.ready!

data/lib/nestor/watchers.rb

@@ -1 +0,0 @@
-require "nestor/watchers/rails"

data/spec/machine_spec.rb

@@ -1,9 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Nestor::Machine do
-  it "should accept a strategy on instantiation" do
-    strategy = mock.as_null_object
-    machine = Nestor::Machine.new(strategy)
-    machine.strategy.should be_equal(strategy) 
-  end
-end

data/spec/spec_helper.rb

@@ -1,9 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'nestor'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end

data/spec/test_unit_strategy_spec.rb

@@ -1,41 +0,0 @@
-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