rb-fsevent 0.3.9 → 0.3.10

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Thibaud Guillaume-Gentil
+Copyright (c) 2011 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/ext/fsevent/fsevent_watch.c

@@ -19,9 +19,14 @@ void callback(ConstFSEventStreamRef streamRef,
 }
 
 int main (int argc, const char * argv[]) {
+  // Collect arguments as paths to watch
+  CFMutableArrayRef pathsToWatch = CFArrayCreateMutable(NULL, argc-1, NULL);
+  int i;
+  for(i=1; i<argc; i++) {
+    CFArrayAppendValue(pathsToWatch, CFStringCreateWithCString(kCFAllocatorDefault, argv[i], kCFStringEncodingUTF8));
+  }
+
   // 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;
@@ -34,11 +39,11 @@ int main (int argc, const char * argv[]) {
     latency,
     kFSEventStreamCreateFlagNone
   );
-  
+
   // Add stream to run loop
   FSEventStreamScheduleWithRunLoop(stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
   FSEventStreamStart(stream);
   CFRunLoopRun();
-  
+
   return 2;
-}
+}

data/lib/rb-fsevent/fsevent.rb

@@ -1,16 +1,16 @@
 class FSEvent
-  attr_reader :path, :callback, :pipe
-  
-  def watch(path, &callback)
-    @path     = path
+  attr_reader :paths, :callback, :pipe
+
+  def watch(paths, &callback)
+    @paths    = paths.kind_of?(Enumerable) ? paths : [paths]
     @callback = callback
   end
-  
+
   def run
     launch_bin
     listen
   end
-  
+
   def stop
     if pipe
       Process.kill("KILL", pipe.pid)
@@ -18,17 +18,17 @@ class FSEvent
     end
   rescue IOError
   end
-  
+
 private
-  
+
   def bin_path
     File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin'))
   end
-  
+
   def launch_bin
-    @pipe = IO.popen("#{bin_path}/fsevent_watch #{shellescape(path)}")
+    @pipe = IO.popen("#{bin_path}/fsevent_watch #{shellescaped_paths}")
   end
-  
+
   def listen
     while !pipe.eof?
       if line = pipe.readline
@@ -39,23 +39,27 @@ private
   rescue Interrupt, IOError
     stop
   end
-  
+
+  def shellescaped_paths
+    @paths.map {|path| shellescape(path)}.join(' ')
+  end
+
   # for Ruby 1.8.6  support
   def shellescape(str)
     # An empty argument will be skipped, so return empty quotes.
     return "''" if str.empty?
-    
+
     str = str.dup
-    
+
     # Process as a single byte sequence because not all shell
     # implementations are multibyte aware.
     str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
-    
+
     # A LF cannot be escaped with a backslash because a backslash + LF
     # combo is regarded as line continuation and simply ignored.
     str.gsub!(/\n/, "'\n'")
-    
+
     return str
   end
-  
+
 end

data/lib/rb-fsevent/version.rb

@@ -1,3 +1,3 @@
 class FSEvent
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rb-fsevent
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 3
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 10
+        version: 1.0.10
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 27
         segments: 
         - 2
+        - 5
         - 0
-        - 1
-        version: 2.0.1
+        version: 2.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 9
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 9
+        version: 0.1.9
   type: :development
   version_requirements: *id003
 description: FSEvents API with Signals catching (without RubyCocoa)
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rb-fsevent
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Very simple & usable FSEvents API