rb-fsevent 0.2.1 → 0.3.0

data/README.rdoc

@@ -2,7 +2,6 @@
 
 Very simple & usable Mac OSX FSEvents API
 
-- No compilation needed (FFI)
 - RubyCocoa not required!
 - Signals are working
 - Tested on Ruby 1.8.7 & 1.9.2
@@ -21,6 +20,10 @@ Very simple & usable Mac OSX FSEvents API
     end
     fsevent.run
 
+== Not about FFI
+
+rb-fsevent doesn't use {ruby-ffi}[http://github.com/ffi/ffi] anymore because it sadly doesn't allow to catch Signals, you can see the code in {ffi branch}[http://github.com/thibaudgg/rb-fsevent/tree/ffi].
+
 == Development
 
 - Source hosted at {GitHub}[http://github.com/thibaudgg/rb-fsevent]

data/ext/extconf.rb

@@ -0,0 +1,19 @@
+# Workaround to make Rubygems believe it builds a native gem
+require 'mkmf'
+create_makefile('none')
+
+raise "Only Darwin (Mac OS X) systems are supported" unless `uname -s`.chomp == 'Darwin'
+
+gem_root      = File.expand_path(File.join('..'))
+darwin_verion = `uname -r`.to_i
+sdk_verion    = { 9 => '10.5', 10 => '10.6', 11 => '10.7' }[darwin_verion]
+
+raise "Only Darwin systems greather than 8 (Mac OS X 10.5+) are supported" unless sdk_verion
+
+# Compile the actual fsevent_watch binary
+system "mkdir -p #{File.join(gem_root, 'bin')}"
+system "CFLAGS='-isysroot /Developer/SDKs/MacOSX#{sdk_verion}.sdk -mmacosx-version-min=#{sdk_verion}' /usr/bin/gcc -framework CoreServices -o '#{gem_root}/bin/fsevent_watch' fsevent/fsevent_watch.c"
+
+unless File.executable?("#{gem_root}/bin/fsevent_watch")
+  raise "Compilation of fsevent_watch failed (see README)"
+end

data/ext/fsevent/fsevent_watch.c

@@ -0,0 +1,44 @@
+#include <CoreServices/CoreServices.h>
+
+void callback(ConstFSEventStreamRef streamRef,
+  void *clientCallBackInfo,
+  size_t numEvents,
+  void *eventPaths,
+  const FSEventStreamEventFlags eventFlags[],
+  const FSEventStreamEventId eventIds[]
+) {
+  // Print modified dirs
+  int i;
+  char **paths = eventPaths;
+  for (i = 0; i < numEvents; i++) {
+    printf("%s", paths[i]);
+    printf(":");
+  }
+  printf("\n");
+  fflush(stdout);
+}
+
+int main (int argc, const char * argv[]) {
+  // Create event stream
+  CFStringRef pathToWatch = CFStringCreateWithCString(kCFAllocatorDefault, argv[1], kCFStringEncodingUTF8);
+  CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void **)&pathToWatch, 1, NULL);  
+  void *callbackInfo = NULL;
+  FSEventStreamRef stream;
+  CFAbsoluteTime latency = 0.5;
+  stream = FSEventStreamCreate(
+    kCFAllocatorDefault,
+    callback,
+    callbackInfo,
+    pathsToWatch,
+    kFSEventStreamEventIdSinceNow,
+    latency,
+    kFSEventStreamCreateFlagNone
+  );
+  
+  // Add stream to run loop
+  FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+  FSEventStreamStart(stream);
+  CFRunLoopRun();
+  
+  return 2;
+}

data/lib/rb-fsevent/fsevent.rb

@@ -1,9 +1,8 @@
 class FSEvent
-  attr_reader :path, :latency, :callback, :pipe
+  attr_reader :path, :callback, :pipe
   
-  def watch(path, options = {}, &callback)
+  def watch(path, &callback)
     @path     = path
-    @latency  = options[:latency] || 0.5
     @callback = callback
   end
   
@@ -13,7 +12,7 @@ class FSEvent
   end
   
   def stop
-    Process.kill("KILL", pipe.pid) if pipe
+    Process.kill("HUP", pipe.pid) if pipe
   end
   
 private
@@ -23,16 +22,18 @@ private
   end
   
   def launch_bin
-    @pipe = IO.popen("#{bin_path}/rb-fsevent #{path} #{latency}")
+    @pipe = IO.popen("#{bin_path}/fsevent_watch #{path}")
   end
   
   def listen
     while !pipe.eof?
       if line = pipe.readline
-        modified_dir_paths = line.split(" ")
+        modified_dir_paths = line.split(":").select { |dir| dir != "\n" }
         callback.call(modified_dir_paths)
       end
     end
+  rescue Interrupt
+    stop
   end
   
 end

data/lib/rb-fsevent/version.rb

@@ -1,3 +1,3 @@
 module RbFSEvent
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rb-fsevent
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -15,29 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 +02:00
+date: 2010-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +33,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +49,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,21 +65,22 @@ dependencies:
         - 3
         version: 0.1.3
   type: :development
-  version_requirements: *id004
-description: FSEvents API using FFI (without RubyCocoa)
+  version_requirements: *id003
+description: FSEvents API with Signals catching (without RubyCocoa)
 email: 
 - thibaud@thibaud.me
 executables: []
 
-extensions: []
-
+extensions: 
+- ext/extconf.rb
 extra_rdoc_files: []
 
 files: 
-- bin/rb-fsevent
 - lib/rb-fsevent/fsevent.rb
 - lib/rb-fsevent/version.rb
 - lib/rb-fsevent.rb
+- ext/extconf.rb
+- ext/fsevent/fsevent_watch.c
 - LICENSE
 - README.rdoc
 has_rdoc: true

data/bin/rb-fsevent

@@ -1,72 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'ffi'
-
-paths, latency = ARGV[0].split(','), ARGV[1].to_f
-
-module CarbonCore
-  extend FFI::Library
-  ffi_lib '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/Current/CarbonCore'
-  
-  attach_function :CFStringCreateWithCString, [:pointer, :string, :int], :pointer
-  KCFStringEncodingUTF8 = 0x08000100
-  attach_function :CFStringGetLength, [:pointer, :pointer, :int, :pointer, :pointer, :pointer], :int
-  
-  attach_function :CFArrayCreate, [:pointer, :pointer, :int, :pointer], :pointer
-  
-  attach_function :CFRunLoopRun, :CFRunLoopRun, [], :void
-  attach_function :CFRunLoopGetCurrent, [], :pointer
-  attach_variable :kCFRunLoopDefaultMode, :pointer
-  
-  callback :FSEventStreamCallback, [:pointer, :pointer, :int, :pointer, :pointer, :pointer], :void
-  
-  KFSEventStreamEventIdSinceNow = -1
-  attach_function :FSEventStreamCreate, [:pointer, :FSEventStreamCallback, :pointer, :pointer, :long, :double, :int], :pointer
-  attach_function :FSEventStreamScheduleWithRunLoop, [:pointer, :pointer, :pointer], :void
-  attach_function :FSEventStreamStart, [:pointer], :void
-  attach_function :FSEventStreamStop, [:pointer], :void
-end
-
-class FSEventStream
-  KFSEventStreamEventFlagMustScanSubDirs = 0x1
-  
-  class StreamError < StandardError;
-  end
-  
-  attr_accessor :stream
-  
-  def initialize(paths, latency)
-    # Create array of paths to observe
-    paths_ptr = FFI::MemoryPointer.new(:pointer)
-    paths.each do |path|
-      path_cfstring = CarbonCore.CFStringCreateWithCString(nil, path, CarbonCore::KCFStringEncodingUTF8)
-      paths_ptr.write_pointer(path_cfstring)
-    end
-    paths_cfarray = CarbonCore.CFArrayCreate nil, paths_ptr, 1, nil
-    
-    # Create callback
-    callback = lambda do |stream, client_callback_info, number_of_events, event_paths, event_flags, event_ids|
-      if number_of_events > 0
-        paths = event_paths.get_array_of_string(0, number_of_events)
-        $stdout.puts paths.join(" ")
-        $stdout.flush
-      end
-    end
-    
-    @stream = CarbonCore.FSEventStreamCreate(nil, callback, nil, paths_cfarray, CarbonCore::KFSEventStreamEventIdSinceNow, latency, 0)
-    
-    CarbonCore.FSEventStreamScheduleWithRunLoop(stream, CarbonCore.CFRunLoopGetCurrent, CarbonCore.kCFRunLoopDefaultMode)
-    CarbonCore.FSEventStreamStart(stream)
-  end
-  
-  def run_loop
-    CarbonCore.CFRunLoopRun
-  end
-  
-  def stop
-    CarbonCore.FSEventStreamStop(stream)
-  end
-end
-
-stream = FSEventStream.new(paths, latency)
-stream.run_loop