rspactor 0.6.2 → 0.6.3

data/README.rdoc

@@ -1,8 +1,12 @@
+=== Dependencies
+
+RubyCocoa is needed (you can help to switch to ruby-fsevent, see branches)
+
+  Installing ruby-cocoa with rvm: http://gist.github.com/294465
+
 === Install
 
-  git clone git://github.com/guillaumegentil/rspactor.git
-  cd rspactor
-  rake install
+  gem install rspactor
 
 === Usage
 
@@ -15,4 +19,4 @@
 * <code> --drb      </code>
 * <code> --view     </code>
 * <code> --clear    </code>
-* <code> --run_in   </code>
+* <code> --run_in   </code>

data/Rakefile

@@ -10,7 +10,6 @@ begin
     gem.email = "thibaud@thibaud.me"
     gem.homepage = "http://github.com/thibaudgg/rspactor"
     gem.authors = ["Mislav Marohnić", "Andreas Wolff", "Pelle Braendgaard", "Thibaud Guillaume-Gentil"]
-    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

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/rspactor/listener.rb

@@ -1,38 +1,76 @@
-require 'fsevent'
+require 'osx/foundation'
+OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
 
 module RSpactor
-  # based on http://github.com/sandro/beholder/commit/2ac026f8fc199b75944b8a2c1a3f80ee277dd81b
-  class Listener < FSEvent
-    attr_reader :last_event, :callback, :valid_extensions, :modified_directories
+  # based on http://rails.aizatto.com/2007/11/28/taming-the-autotest-beast-with-fsevents/
+  class Listener
+    attr_reader :last_check, :callback, :valid_extensions
     
     def initialize(valid_extensions = nil)
       @valid_extensions = valid_extensions
-      update_last_event
-      super()
+      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 on_change(directories)
-      @modified_directories = directories
-      callback.call(modified_files)
-      update_last_event
+    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
     end
     
-    def watch_directories(directories, &block)
-      super(directories)
-      @callback = block
+    def timestamp_checked
+      @last_check = Time.now
     end
     
-    
-    def potentially_modified_files
-      Dir.glob(modified_directories.map {|dir| File.join(dir, "**", "*")})
+    def split_paths(paths, num_events)
+      paths.regard_as('*')
+      rpaths = []
+      num_events.times { |i| rpaths << paths[i] }
+      rpaths
     end
     
-    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
+    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
+    end
+    
+    def ignore_path?(path)
+      path =~ /(?:^|\/)\.(git|svn)/
     end
     
     def ignore_file?(file)
@@ -46,10 +84,5 @@ 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

@@ -38,12 +38,9 @@ module RSpactor
     def start_listener
       @inspector = Inspector.new(self)
       
-      @listener = Listener.new(Inspector::EXTENSIONS)
-      @listener.latency = 0.2
-      @listener.watch_directories(dir) do |files|
+      Listener.new(Inspector::EXTENSIONS) do |files|
         changed_files(files) unless git_head_changed?
-      end
-      @listener.start
+      end.run(dir)
     end
     
     def load_dotfile

data/rspactor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspactor}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   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.date = %q{2010-02-04}
   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}
@@ -59,14 +59,11 @@ Gem::Specification.new do |s|
     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/listener_spec.rb

@@ -6,7 +6,15 @@ describe RSpactor::Listener do
   end
   
   it "should be timestamped" do
-    @listener.last_event.should be_instance_of(Time)
+    @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
   end
   
   it "should ignore dotfiles" do

data/spec/runner_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspactor
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -12,19 +12,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 +01:00
+date: 2010-02-04 00:00:00 +01:00
 default_executable: rspactor
 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