rspactor 0.5.4 → 0.6.2

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Andreas Wolff
+Copyright (c) 2009 Mislav Marohnić
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -0,0 +1,18 @@
+=== Install
+
+  git clone git://github.com/guillaumegentil/rspactor.git
+  cd rspactor
+  rake install
+
+=== Usage
+
+  cd /path/to/rails/root/
+  rspactor
+
+=== Command Line Options
+
+* <code> --coral    </code>
+* <code> --drb      </code>
+* <code> --view     </code>
+* <code> --clear    </code>
+* <code> --run_in   </code>

data/Rakefile

@@ -1,58 +1,51 @@
-task :default => :spec
+require 'rubygems'
+require 'rake'
 
-desc "starts RSpactor"
-task :spec do
-  system "ruby -Ilib bin/rspactor"
-end
-
-desc "generates .gemspec file"
-task :gemspec => "version:read" do
-  spec = Gem::Specification.new do |gem|
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
     gem.name = "rspactor"
-    gem.summary = "RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest)."
-    gem.description = "read summary!"
-    gem.email = "guillaumegentil@gmail.com"
-    gem.homepage = "http://github.com/guillaumegentil/rspactor"
+    gem.summary = "RSpactor is a command line tool to automatically run your changed specs & cucumber features."
+    gem.description = "RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest)."
+    gem.email = "thibaud@thibaud.me"
+    gem.homepage = "http://github.com/thibaudgg/rspactor"
     gem.authors = ["Mislav Marohnić", "Andreas Wolff", "Pelle Braendgaard", "Thibaud Guillaume-Gentil"]
-    gem.has_rdoc = false
-    
-    gem.version = GEM_VERSION
-    gem.files = FileList['Rakefile', '{bin,lib,images,spec}/**/*', 'README*', 'LICENSE*']
-    gem.executables = Dir['bin/*'].map { |f| File.basename(f) }
-  end
-  
-  spec_string = spec.to_ruby
-  
-  begin
-    Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join 
-  rescue
-    abort "unsafe gemspec: #{$!}"
-  else
-    File.open("#{spec.name}.gemspec", 'w') { |file| file.write spec_string }
+    gem.add_dependency "ruby-fsevent", ">= 0.2.1"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-task :bump => ["version:bump", :gemspec]
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
 
-namespace :version do
-  task :read do
-    unless defined? GEM_VERSION
-      GEM_VERSION = File.read("VERSION")
-    end
-  end
-  
-  task :bump => :read do
-    if ENV['VERSION']
-      GEM_VERSION.replace ENV['VERSION']
-    else
-      GEM_VERSION.sub!(/\d+$/) { |num| num.to_i + 1 }
-    end
-    
-    File.open("VERSION", 'w') { |v| v.write GEM_VERSION }
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :release => :bump do
-  system %(git commit VERSION *.gemspec -m "release v#{GEM_VERSION}")
-  system %(git tag -am "release v#{GEM_VERSION}" v#{GEM_VERSION})
+desc "starts RSpactor"
+task :rspactor do
+  system "ruby -Ilib bin/rspactor"
+end
+
+task :spec => :check_dependencies
+
+task :default => :rspactor
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rspactor #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -0,0 +1 @@
+0.6.2

data/bin/rspactor

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/rspactor'))
+require 'rspactor/runner'
 
 RSpactor::Runner.start({
   :coral => ARGV.delete('--coral'),
-  :celerity => ARGV.delete('--celerity'),
   :spork => ARGV.delete('--drb'),
   :view => ARGV.delete('--view'), # by default, rspactor didn't catch specs view
   :clear => ARGV.delete('--clear'),

data/lib/cucumber_growler.rb

@@ -4,13 +4,13 @@ require File.dirname(__FILE__) + '/rspactor/growl'
 
 module CucumberGrowler
   include RSpactor::Growl
-  
+
   def self.included(base)
     base.class_eval do
       alias original_print_stats print_stats
       include InstanceMethods
-      
-      def print_stats(features)
+
+      def print_stats(features, profiles = [])
         title, icon, messages = '', '', []
         [:failed, :skipped, :undefined, :pending, :passed].reverse.each do |status|
           if step_mother.steps(status).any?
@@ -19,13 +19,13 @@ module CucumberGrowler
             messages << dump_count(step_mother.steps(status).length, "step", status.to_s)
           end
         end
-        
+
         notify "Cucumber Results", messages.reverse.join(", "), icon
-        original_print_stats(features)
+        original_print_stats(features, profiles = [])
       end
     end
   end
-  
+
   module InstanceMethods
     def icon_for(status)
       case status
@@ -37,7 +37,7 @@ module CucumberGrowler
         'failed'
       end
     end
-    
+
     def title_for(status)
       case status
       when :passed
@@ -53,7 +53,7 @@ module CucumberGrowler
       end
     end
   end
-  
+
 end
 
 module Cucumber::Formatter::Console

data/lib/rspactor/inspector.rb

@@ -16,6 +16,8 @@ module RSpactor
     def determine_files(file)
       candidates = translate(file)
       cucumberable = candidates.delete('cucumber')
+      runner.spork.reload if candidates.delete('spork') && runner.spork?
+      
       candidates.reject { |candidate| candidate.index('.') }.each do |dir|
         candidates.reject! { |candidate| candidate.index("#{dir}/") == 0 }
       end
@@ -38,6 +40,7 @@ module RSpactor
         candidates << file
       elsif cucumber_file?(file)
         candidates << 'cucumber'
+        candidates << 'spork' if file =~ /^features\/support\//
       else
         spec_file = append_spec_file_extension(file)
         
@@ -46,13 +49,18 @@ module RSpactor
           if file =~ %r:^app/controllers/application(_controller)?.rb$:
             candidates << 'controllers'
           elsif file == 'app/helpers/application_helper.rb'
-            candidates << 'helpers' << 'views'
-          elsif !file.include?("app/views/") || runner.options[:view]
+            candidates << 'helpers'
+            candidates << 'views' if runner.options[:view]
+          elsif file.include?("app/views/")
+            if runner.options[:view]
+              candidates << spec_file.sub('app/', '')
+              if file =~ %r:^app/(views/.+\.[a-z]+)\.[a-z]+$:
+                candidates << append_spec_file_extension($1)
+              end
+            end
+          else
             candidates << spec_file.sub('app/', '')
-            
-            if file =~ %r:^app/(views/.+\.[a-z]+)\.[a-z]+$:
-              candidates << append_spec_file_extension($1)
-            elsif file =~ %r:app/helpers/(\w+)_helper.rb:
+            if file =~ %r:app/helpers/(\w+)_helper.rb:
               candidates << "views/#{$1}"
             elsif file =~ /_observer.rb$/
               candidates << candidates.last.sub('_observer', '')
@@ -65,16 +73,16 @@ module RSpactor
           # lib/bar_spec.rb -> bar_spec.rb
           candidates << candidates.last.sub(%r:\w+/:, '') if candidates.last.index('/')
         when 'config/routes.rb'
-          candidates << 'controllers' << 'helpers' << 'views' << 'routing'
+          candidates << 'controllers' << 'helpers' << 'routing'
+          candidates << 'views' if runner.options[:view]
         when 'config/database.yml', 'db/schema.rb', 'spec/factories.rb'
           candidates << 'models'
         when 'config/boot.rb', 'config/environment.rb', %r:^config/environments/:, %r:^config/initializers/:, %r:^vendor/:, 'spec/spec_helper.rb'
-          Spork.reload if runner.options[:spork]
-          Celerity.restart if runner.options[:celerity]
+          candidates << 'spork'
           candidates << 'spec'
         when %r:^config/:
           # nothing
-        when %r:^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$:, 'spec/spec.opts', 'spec/fakeweb.rb'
+        when %r:^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$:, 'spec/spec.opts', 'spec/fakewebs.rb'
           candidates << 'spec'
         else
           candidates << spec_file
@@ -82,7 +90,7 @@ module RSpactor
       end
       
       candidates.map do |candidate|
-        if candidate == 'cucumber'
+        if candidate == 'cucumber' || candidate == 'spork'
           candidate
         elsif candidate.index('spec') == 0
           File.join(root, candidate)

data/lib/rspactor/interactor.rb

@@ -10,12 +10,26 @@ module RSpactor
       ticker
     end
     
-    def self.ticker_msg(msg, seconds_to_wait = 3)
+    def self.ticker_msg(msg, seconds_to_wait = 3, &block)
       $stdout.print msg
-      seconds_to_wait.times do
-        $stdout.print('.')
-        $stdout.flush
-        sleep 1
+      if block
+        @yielding_ticker = true
+        Thread.new do
+          loop do
+            $stdout.print('.') if @yielding_ticker == true
+            $stdout.flush
+            sleep 1.0
+          end
+        end
+        
+        yield
+        @yielding_ticker = false
+      else
+        seconds_to_wait.times do
+          $stdout.print('.')
+          $stdout.flush
+          sleep 1
+        end
       end
       $stdout.puts "\n"
     end
@@ -46,6 +60,8 @@ module RSpactor
               runner.run_cucumber_command
             when "ca\n" # Cucumber All: ~pending tagged feature
               runner.run_cucumber_command('~@wip,~@pending')
+            when "r\n"
+              runner.spork.reload if runner.spork
             else
               if wait_for_enter_key("** Running all specs... Hit <enter> again to exit RSpactor", 1)
                 @main_thread.exit

data/lib/rspactor/listener.rb

@@ -1,76 +1,38 @@
-require 'osx/foundation'
-OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
+require 'fsevent'
 
 module RSpactor
-  # based on http://rails.aizatto.com/2007/11/28/taming-the-autotest-beast-with-fsevents/
-  class Listener
-    attr_reader :last_check, :callback, :valid_extensions
+  # based on http://github.com/sandro/beholder/commit/2ac026f8fc199b75944b8a2c1a3f80ee277dd81b
+  class Listener < FSEvent
+    attr_reader :last_event, :callback, :valid_extensions, :modified_directories
     
     def initialize(valid_extensions = nil)
       @valid_extensions = valid_extensions
-      timestamp_checked
-      
-      @callback = lambda do |stream, ctx, num_events, paths, marks, event_ids|
-        changed_files = extract_changed_files_from_paths(split_paths(paths, num_events))
-        timestamp_checked
-        yield changed_files unless changed_files.empty?
-      end
-    end
-    
-    def run(directories)
-      dirs = Array(directories)
-      stream = OSX::FSEventStreamCreate(OSX::KCFAllocatorDefault, callback, nil, dirs, OSX::KFSEventStreamEventIdSinceNow, 0.5, 0)
-      unless stream
-        $stderr.puts "Failed to create stream"
-        exit(1)
-      end
-      
-      OSX::FSEventStreamScheduleWithRunLoop(stream, OSX::CFRunLoopGetCurrent(), OSX::KCFRunLoopDefaultMode)
-      unless OSX::FSEventStreamStart(stream)
-        $stderr.puts "Failed to start stream"
-        exit(1)
-      end
-      
-      begin
-        OSX::CFRunLoopRun()
-      rescue Interrupt
-        OSX::FSEventStreamStop(stream)
-        OSX::FSEventStreamInvalidate(stream)
-        OSX::FSEventStreamRelease(stream)
-      end
+      update_last_event
+      super()
     end
     
-    def timestamp_checked
-      @last_check = Time.now
+    def on_change(directories)
+      @modified_directories = directories
+      callback.call(modified_files)
+      update_last_event
     end
     
-    def split_paths(paths, num_events)
-      paths.regard_as('*')
-      rpaths = []
-      num_events.times { |i| rpaths << paths[i] }
-      rpaths
+    def watch_directories(directories, &block)
+      super(directories)
+      @callback = block
     end
     
-    def extract_changed_files_from_paths(paths)
-      changed_files = []
-      paths.each do |path|
-        next if ignore_path?(path)
-        Dir.glob(path + "*").each do |file|
-          next if ignore_file?(file)
-          changed_files << file if file_changed?(file)
-        end
-      end
-      changed_files
-    end
     
-    def file_changed?(file)
-      File.stat(file).mtime > last_check
-    rescue Errno::ENOENT
-      false
+    def potentially_modified_files
+      Dir.glob(modified_directories.map {|dir| File.join(dir, "**", "*")})
     end
     
-    def ignore_path?(path)
-      path =~ /(?:^|\/)\.(git|svn)/
+    def modified_files
+      potentially_modified_files.select do |file|
+        next if File.directory?(file)
+        next if ignore_file?(file)
+        File.mtime(file) >= last_event || File.atime(file) >= last_event
+      end
     end
     
     def ignore_file?(file)
@@ -84,5 +46,10 @@ module RSpactor
     def valid_extension?(file)
       valid_extensions.nil? or valid_extensions.include?(file_extension(file))
     end
+    
+    def update_last_event
+      @last_event = Time.now
+    end
+    
   end
 end

data/lib/rspactor/runner.rb

@@ -7,26 +7,27 @@ module RSpactor
       new(run_in, options).start
     end
     
-    attr_reader :dir, :options, :inspector, :interactor
+    attr_reader :dir, :options, :inspector, :interactor, :spork
     
     def initialize(dir, options = {})
       @dir = dir
       @options = options
+      @spork = Spork.new(self) if options[:spork]
       read_git_head
     end
     
     def start
       load_dotfile
       puts "** RSpactor, now watching at '#{dir}'"
-      Spork.start if options[:spork]
-      Celerity.start(dir) if options[:celerity]
+      spork.start if spork?
       start_interactor
       start_listener
     end
     
     def start_interactor
       @interactor = Interactor.new(self)
-      aborted = @interactor.wait_for_enter_key("** Hit <enter> to skip initial spec & cucumber run", 2, false)
+      message = "** Hit <enter> to skip initial spec #{"& cucumber " if cucumber?}run"
+      aborted = @interactor.wait_for_enter_key(message, 2, false)
       @interactor.start_termination_handler
       unless aborted
         run_all_specs
@@ -37,9 +38,12 @@ module RSpactor
     def start_listener
       @inspector = Inspector.new(self)
       
-      Listener.new(Inspector::EXTENSIONS) do |files|
+      @listener = Listener.new(Inspector::EXTENSIONS)
+      @listener.latency = 0.2
+      @listener.watch_directories(dir) do |files|
         changed_files(files) unless git_head_changed?
-      end.run(dir)
+      end
+      @listener.start
     end
     
     def load_dotfile
@@ -68,21 +72,27 @@ module RSpactor
     end
     
     def run_cucumber_command(tags = '@wip:2', clear = @options[:clear])
-      return unless File.exist?(File.join(dir, 'features'))
+      return unless cucumber?
       
       system("clear;") if clear
       puts "** Running all #{tags} tagged features..."
       cmd = [ruby_opts, cucumber_runner, cucumber_opts(tags)].flatten.join(' ')
       @last_run_failed = run_command(cmd)
-      # Workaround for killing jruby process when used with celerity and spork
-      Celerity.kill_jruby if options[:celerity] && options[:spork]
     end
     
     def last_run_failed?
       @last_run_failed == false
     end
     
-    protected
+    def cucumber?
+      @cucumber ||= File.exist?(File.join(dir, 'features'))
+    end
+    
+    def spork?
+      spork != nil
+    end
+    
+  protected
     
     def run_command(cmd)
       system(cmd)
@@ -116,7 +126,7 @@ module RSpactor
       end
     end
     
-    private
+  private
     
     def spec_opts
       if File.exist?('spec/spec.opts')
@@ -124,21 +134,16 @@ module RSpactor
       else
         opts = "--color"
       end
-      
+      opts << " --drb" if spork
       opts << spec_formatter_opts
       # only add the "progress" formatter unless no other (besides growl) is specified
       opts << ' -f progress' unless opts.scan(/\s(?:-f|--format)\b/).length > 1
-      
       opts
     end
     
     def cucumber_opts(tags)
-      if File.exist?('features/support/cucumber.opts')
-        opts = File.read('features/support/cucumber.opts').gsub("\n", ' ')
-      else
-        opts = "--color --format progress --drb --no-profile"
-      end
-      
+      opts = "--profile rspactor"
+      opts << " --drb" if spork
       opts << " --tags #{tags}"
       opts << cucumber_formatter_opts
       opts << " --require features" # because using require option overwrite default require

data/lib/rspactor/spork.rb

@@ -1,25 +1,60 @@
 require 'rspactor'
+require 'socket'
 
 module RSpactor
   class Spork
+    RSPEC_PORT    = 8989
+    CUCUMBER_PORT = 8990
     
-    def self.start
-      kill_and_launch
-      Interactor.ticker_msg "** Launching Spork for rspec & cucumber"
+    attr_accessor :use_cucumber
+    
+    def initialize(runner)
+      @use_cucumber = runner.cucumber?
+    end
+    
+    def start
+      execute(:start)
     end
     
-    def self.reload
-      kill_and_launch
-      Interactor.ticker_msg "** Reloading Spork for rspec & cucumber"
+    def reload
+      execute(:reload)
     end
     
   private
     
-    def self.kill_and_launch
-      system("kill $(ps aux | awk '/spork/&&!/awk/{print $2;}') >/dev/null 2>&1")
-      system("spork >/dev/null 2>&1 < /dev/null &")
-      system("spork cu >/dev/null 2>&1 < /dev/null &")
+    def execute(start_or_reload)
+      action_message = (start_or_reload == :start) ? "Starting" : "Reloading"
+      message = "** #{action_message} Spork for rspec"
+      message += " & cucumber" if use_cucumber
+      kill_and_launch(message)
     end
     
+    def kill_and_launch(message)
+      Interactor.ticker_msg message do
+        
+        system("kill $(ps aux | awk '/spork/&&!/awk/{print $2;}') >/dev/null 2>&1")
+        
+        system("spork >/dev/null 2>&1 < /dev/null &")
+        wait_for('RSpec', RSPEC_PORT)
+        
+        if use_cucumber
+          system("spork cu >/dev/null 2>&1 < /dev/null &")
+          wait_for('Cucumber', CUCUMBER_PORT)
+        end
+      end
+    end
+    
+    def wait_for(sporker, port)
+      15.times do
+        begin
+          TCPSocket.new('localhost', port).close
+        rescue Errno::ECONNREFUSED
+          sleep(1)
+          next
+        end
+        return true
+      end
+      raise "could not load spork for #{sporker}; make sure you can use it manually first"
+    end
   end
-end
+end

data/lib/rspactor.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
-
 module RSpactor
   autoload :Interactor, 'rspactor/interactor'
   autoload :Listener, 'rspactor/listener'
@@ -7,5 +5,4 @@ module RSpactor
   autoload :Runner, 'rspactor/runner'
   autoload :Growl, 'rspactor/growl'
   autoload :Spork, 'rspactor/spork'
-  autoload :Celerity, 'rspactor/celerity'
 end

data/rspactor.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rspactor}
+  s.version = "0.6.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Mislav Marohni\304\207", "Andreas Wolff", "Pelle Braendgaard", "Thibaud Guillaume-Gentil"]
+  s.date = %q{2010-01-31}
+  s.default_executable = %q{rspactor}
+  s.description = %q{RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest).}
+  s.email = %q{thibaud@thibaud.me}
+  s.executables = ["rspactor"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     ".rspactor",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/rspactor",
+     "images/failed.png",
+     "images/pending.png",
+     "images/success.png",
+     "lib/cucumber_growler.rb",
+     "lib/rspactor.rb",
+     "lib/rspactor/growl.rb",
+     "lib/rspactor/inspector.rb",
+     "lib/rspactor/interactor.rb",
+     "lib/rspactor/listener.rb",
+     "lib/rspactor/runner.rb",
+     "lib/rspactor/spork.rb",
+     "lib/rspec_growler.rb",
+     "rspactor.gemspec",
+     "spec/inspector_spec.rb",
+     "spec/listener_spec.rb",
+     "spec/runner_spec.rb"
+  ]
+  s.homepage = %q{http://github.com/thibaudgg/rspactor}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{RSpactor is a command line tool to automatically run your changed specs & cucumber features.}
+  s.test_files = [
+    "spec/inspector_spec.rb",
+     "spec/listener_spec.rb",
+     "spec/runner_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ruby-fsevent>, [">= 0.2.1"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<ruby-fsevent>, [">= 0.2.1"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<ruby-fsevent>, [">= 0.2.1"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

data/spec/inspector_spec.rb

@@ -2,7 +2,7 @@ require 'rspactor/inspector'
 
 describe RSpactor::Inspector do
   before(:all) do
-    options = { :view => true }
+    options = { :view => true, :spork? => false  }
     @inspector = described_class.new(mock('Runner', :dir => '/project', :options => options))
   end
   
@@ -54,7 +54,7 @@ describe RSpactor::Inspector do
     end
     
     it "should consider all controllers, helpers and views when routes.rb changes" do
-      translate('config/routes.rb').should == ['/project/spec/controllers', '/project/spec/helpers', '/project/spec/views', '/project/spec/routing']
+      translate('config/routes.rb').should == ['/project/spec/controllers', '/project/spec/helpers', '/project/spec/routing', '/project/spec/views']
     end
     
     it "should consider all models when config/database.yml changes" do
@@ -74,7 +74,7 @@ describe RSpactor::Inspector do
     end
     
     it "should consider all specs when spec_helper changes" do
-      translate('spec/spec_helper.rb').should == ['/project/spec']
+      translate('spec/spec_helper.rb').should == ['spork', '/project/spec']
     end
     
     it "should consider all specs when code under spec/shared/ changes" do
@@ -82,15 +82,15 @@ describe RSpactor::Inspector do
     end
     
     it "should consider all specs when app configuration changes" do
-      translate('config/environment.rb').should == ['/project/spec']
-      translate('config/environments/test.rb').should == ['/project/spec']
-      translate('config/boot.rb').should == ['/project/spec']
+      translate('config/environment.rb').should == ['spork', '/project/spec']
+      translate('config/environments/test.rb').should == ['spork', '/project/spec']
+      translate('config/boot.rb').should == ['spork', '/project/spec']
     end
     
     it "should consider cucumber when a features file change" do
       translate('features/login.feature').should == ['cucumber']
       translate('features/steps/webrat_steps.rb').should == ['cucumber']
-      translate('features/support/env.rb').should == ['cucumber']
+      translate('features/support/env.rb').should == ['cucumber', 'spork']
     end
     
   end

data/spec/listener_spec.rb

@@ -6,15 +6,7 @@ describe RSpactor::Listener do
   end
   
   it "should be timestamped" do
-    @listener.last_check.should be_instance_of(Time)
-  end
-  
-  it "should not ignore regular directories" do
-    @listener.ignore_path?('/project/foo/bar').should_not be
-  end
-  
-  it "should ignore .git directories" do
-    @listener.ignore_path?('/project/.git/index').should be
+    @listener.last_event.should be_instance_of(Time)
   end
   
   it "should ignore dotfiles" do

data/spec/runner_spec.rb

@@ -110,7 +110,9 @@ describe RSpactor::Runner do
       end
       
       it "should run Listener" do
-        @listener.should_receive(:run).with('/my/path')
+        @listener.should_receive(:start)
+        @listener.should_receive(:latency=).with(0.2)
+        @listener.should_receive(:watch_directories).with('/my/path')
         RSpactor::Listener.should_receive(:new).with(instance_of(Array)).and_return(@listener)
         setup
       end

metadata

@@ -1,56 +1,80 @@
 --- !ruby/object:Gem::Specification 
 name: rspactor
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.6.2
 platform: ruby
 authors: 
-- Andreas Wolff
 - "Mislav Marohni\xC4\x87"
+- Andreas Wolff
 - Pelle Braendgaard
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +02:00
+date: 2010-01-31 00:00:00 +01:00
 default_executable: rspactor
-dependencies: []
-
-description: read summary!
-email: rubyphunk@gmail.com
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-fsevent
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+description: RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest).
+email: thibaud@thibaud.me
 executables: 
 - rspactor
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
 files: 
+- .gitignore
+- .rspactor
+- LICENSE
+- README.rdoc
 - Rakefile
+- VERSION
 - bin/rspactor
+- images/failed.png
+- images/pending.png
+- images/success.png
 - lib/cucumber_growler.rb
-- lib/rspactor/celerity.rb
+- lib/rspactor.rb
 - lib/rspactor/growl.rb
 - lib/rspactor/inspector.rb
 - lib/rspactor/interactor.rb
 - lib/rspactor/listener.rb
 - lib/rspactor/runner.rb
 - lib/rspactor/spork.rb
-- lib/rspactor.rb
 - lib/rspec_growler.rb
-- images/failed.png
-- images/pending.png
-- images/success.png
+- rspactor.gemspec
 - spec/inspector_spec.rb
 - spec/listener_spec.rb
 - spec/runner_spec.rb
-- LICENSE
 has_rdoc: true
-homepage: http://github.com/rubyphunk/rspactor
+homepage: http://github.com/thibaudgg/rspactor
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,6 +95,8 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: RSpactor is a command line tool to automatically run your changed specs & cucumber features (much like autotest).
-test_files: []
-
+summary: RSpactor is a command line tool to automatically run your changed specs & cucumber features.
+test_files: 
+- spec/inspector_spec.rb
+- spec/listener_spec.rb
+- spec/runner_spec.rb

data/lib/rspactor/celerity.rb

@@ -1,29 +0,0 @@
-require 'rspactor'
-
-module RSpactor
-  class Celerity
-    
-    def self.start(dir)
-      pid_path = "#{dir}/tmp/pids/mongrel_celerity.pid"
-      if File.exist?(pid_path)
-        system("kill $(head #{pid_path}) >/dev/null 2>&1")
-        system("rm #{pid_path} >/dev/null 2>&1")
-      end
-      # kill other mongrels
-      system("kill $(ps aux | grep 'mongrel_rails' | grep -v grep | awk '//{print $2;}') >/dev/null 2>&1")
-      system("rake celerity_server:start >/dev/null 2>&1 &")
-      Interactor.ticker_msg "** Starting celerity server"
-    end
-    
-    def self.restart
-      system("rake celerity_server:stop >/dev/null 2>&1 && rake celerity_server:start >/dev/null 2>&1 &")
-      Interactor.ticker_msg "** Restarting celerity server"
-    end
-    
-    def self.kill_jruby
-      system("kill $(ps aux | grep jruby | grep -v grep | awk '//{print $2;}') >/dev/null 2>&1")
-      true
-    end
-    
-  end
-end