rb-fsevent 0.9.7 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ec2a04c1e09fcc2b15f66a283c02222b102fef8
-  data.tar.gz: 1a63e413a9d9cbf3fb71558322652d4d6ecc2f18
+SHA256:
+  metadata.gz: 8fa142a3dd92401ead21804759f41c08f1098b51e825e1568a16c831d116ab65
+  data.tar.gz: 6fdee72304339d8bab6b2407a1e5c2c281ad185435f7c11d34279225c9fb3406
 SHA512:
-  metadata.gz: b9d7321a62fbd19b4b25464a19b5ca23adbd79f7e1adcb015b70512c58814d782969654c99dd6e8863a496e81a8a63b2c950f1fe93409591fc6904d190b5ad6e
-  data.tar.gz: 449890feca668e4827d2c679caf4b46a1ae11173b4a73064da0c09f8b267006adadd06029bea97a5ef85983d1641724209518e1179a27681d0330daff576229d
+  metadata.gz: c3e43118e4d444d59d0ad47ff692c7f90477bee895a56f0b26ba98cb5da1bf8ac7d21a4e382bf8605ec1ef166b3f549cf11b3d08bebbfa436400b2da909a1168
+  data.tar.gz: ea47ee332c8640d39ada051f9d06867e2c09ee1daff6915160615dd177be82f8d068954f236da62d2899d04ce355a045f162fdd3e07fb1fb26523cff1ad062af

data/Gemfile

@@ -1,6 +1,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-gem 'rake'
-

data/README.md

@@ -5,17 +5,18 @@
 
 Very simple & usable Mac OSX FSEvents API
 
-* RubyCocoa not required!
 * Signals are working (really)
-* Tested on MRI 2.1, RBX 2.5, JRuby
-* Tested on 10.10
+* Tested on MRI 2.4.1, RBX 3.72, JRuby 1.7.26 and 9.1.8.0
+* Tested on 10.8
 
 ## HFS+ filename corruption bug
 
-There is a _very_ long-standing (since 2011) OSX bug where sometimes the filename metadata for HFS+ filesystems will get corrupted, resulting in some APIs returning one case for a file, and other APIs returning another. This corruption is not currently fixed by their tools, though Apple has been made aware of the issue and are working on it (as of may 2015). The result is that sometimes, _for no visible reason to the user_, fsevents would simply not work. As of rb-fsevent 0.9.5 this issue is properly detected and an insanely hacky (but effective) workaround is used that replaces the system `realpath()` with a custom implementation that should always return the same value as the kernel reporting (thus fixing fsevents).
+There is a _very_ long-standing (since 2011) OSX bug where sometimes the filename metadata for HFS+ filesystems will get corrupted, resulting in some APIs returning one case for a file, and other APIs returning another. The result is that sometimes, _for no visible reason to the user_, fsevents would simply not work. As of rb-fsevent 0.9.5 this issue is properly detected and an insanely hacky (but effective) workaround is used that replaces the system `realpath()` with a custom implementation that should almost always return the same value as the kernel reporting (thus fixing fsevents). The major flaw in the workaround is that it may return the wrong path for hard links.
 
 Please note that this doesn't repair the underlying issue on disk. Other apps and libraries using fsevents will continue to break with no warning. There may be other issues unrelated to fsevents.
 
+__This bug is resolved in MacOS 10.12 and all users are strongly encouraged to upgrade.__
+
 ## Install
 
     gem install rb-fsevent
@@ -131,6 +132,23 @@ end
 fsevent.run
 ```
 
+### Using _full_ event information
+
+```ruby
+require 'rb-fsevent'
+fsevent = FSEvent.new
+fsevent.watch Dir.pwd do |paths, event_meta|
+  event_meta['events'].each do |event|
+    puts "event ID: #{event['id']}"
+    puts "path: #{event['path']}"
+    puts "c flags: #{event['cflags']}"
+    puts "named flags: #{event['flags'].join(', ')}"
+    # named flags will include strings such as `ItemInodeMetaMod` or `OwnEvent`
+  end
+end
+fsevent.run
+```
+
 ## Options
 
 When defining options using a hash or hash-like object, it gets checked for validity and converted to the appropriate fsevent\_watch commandline arguments array when the FSEvent class is instantiated. This is obviously the safest and preferred method of passing in options.
@@ -233,7 +251,7 @@ Pull requests are quite welcome! Please ensure that your commits are in a topic
 
 The list of tested targets is currently:
 
-    %w[2.2.2 2.3.0-dev rbx-2.5.5 jruby-1.7.9]
+    %w[2.4.1 rbx-3.72 jruby-1.7.26 jruby-9.1.8.0]
 
 ## Authors
 

data/Rakefile

@@ -9,7 +9,7 @@ task :default => :spec
 namespace(:spec) do
   desc "Run all specs on multiple ruby versions"
   task(:portability) do
-    versions = %w[2.2.2 2.3.0-dev rbx-2.5.5 jruby-1.7.9]
+    versions = %w[2.4.1 rbx-3.72 jruby-1.7.26 jruby-9.1.8.0]
     versions.each do |version|
       # system <<-BASH
       #   bash -c 'source ~/.rvm/scripts/rvm;
@@ -24,6 +24,7 @@ namespace(:spec) do
                  [[ ! -a $HOME/.rbenv/versions/#{version} ]] && rbenv install #{version};
                  rbenv shell #{version};
                  rbenv which bundle 2> /dev/null || gem install bundler;
+                 rm Gemfile.lock;
                  bundle install;
                  rake spec;'
       BASH

data/ext/fsevent_watch/TSICTString.c

@@ -113,27 +113,6 @@ static inline CFStringRef TSICTStringCreateStringFromIntermediateRepresentation(
     return string;
 }
 
-static inline CFDataRef TSICTStringCreateDataWithDataOfTypeAndFormat(CFDataRef data, TSITStringTag type, TSITStringFormat format)
-{
-    CFRetain(data);
-
-    if (format == kTSITStringFormatDefault) {
-        format = TSICTStringGetDefaultFormat();
-    }
-
-    TStringIRep* rep = TSICTStringCreateWithDataOfTypeAndFormat(data, type, format);
-    if (rep == NULL) {
-        return NULL;
-    }
-
-    CFDataRef result = TSICTStringCreateDataFromIntermediateRepresentation(rep);
-
-    TSICTStringDestroy(rep);
-    CFRelease(data);
-
-    return result;
-}
-
 static inline void TSICTStringAppendObjectToMutableDataWithFormat(CFTypeRef object, CFMutableDataRef buffer, TSITStringFormat format)
 {
     if (object == NULL) {

data/ext/fsevent_watch/cli.c

@@ -27,7 +27,7 @@ static void default_args (struct cli_info* args_info)
   args_info->ignore_self_flag   = false;
   args_info->file_events_flag   = false;
   args_info->mark_self_flag     = false;
-  args_info->format_arg         = kFSEventWatchOutputFormatClassic;
+  args_info->format_arg         = kFSEventWatchOutputFormatOTNetstring;
 }
 
 static void cli_parser_release (struct cli_info* args_info)
@@ -199,4 +199,3 @@ int cli_parser (int argc, const char** argv, struct cli_info* args_info)
 
   return EXIT_SUCCESS;
 }
-

data/ext/fsevent_watch/compat.c

@@ -1,10 +1,13 @@
 #include "compat.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_6) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0)
 FSEventStreamCreateFlags  kFSEventStreamCreateFlagIgnoreSelf        = 0x00000008;
 #endif
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_7) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0)
 FSEventStreamCreateFlags  kFSEventStreamCreateFlagFileEvents        = 0x00000010;
 FSEventStreamEventFlags   kFSEventStreamEventFlagItemCreated        = 0x00000100;
 FSEventStreamEventFlags   kFSEventStreamEventFlagItemRemoved        = 0x00000200;
@@ -19,7 +22,20 @@ FSEventStreamEventFlags   kFSEventStreamEventFlagItemIsDir          = 0x00020000
 FSEventStreamEventFlags   kFSEventStreamEventFlagItemIsSymlink      = 0x00040000;
 #endif
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_9) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_7_0)
 FSEventStreamCreateFlags  kFSEventStreamCreateFlagMarkSelf          = 0x00000020;
 FSEventStreamEventFlags   kFSEventStreamEventFlagOwnEvent           = 0x00080000;
 #endif
+
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_10) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_9_0)
+FSEventStreamEventFlags   kFSEventStreamEventFlagItemIsHardlink     = 0x00100000;
+FSEventStreamEventFlags   kFSEventStreamEventFlagItemIsLastHardlink = 0x00200000;
+#endif
+
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_13) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_11_0)
+FSEventStreamCreateFlags  kFSEventStreamCreateFlagUseExtendedData   = 0x00000040;
+FSEventStreamEventFlags   kFSEventStreamEventFlagItemCloned         = 0x00400000;
+#endif

data/ext/fsevent_watch/compat.h

@@ -9,20 +9,57 @@
  */
 
 
-#ifndef fsevent_watch_compat_h
-#define fsevent_watch_compat_h
+#ifndef listen_fsevents_compat_h
+#define listen_fsevents_compat_h
 
 #ifndef __CORESERVICES__
 #include <CoreServices/CoreServices.h>
 #endif // __CORESERVICES__
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-// ignoring events originating from the current process introduced in 10.6
+#ifndef __AVAILABILITY__
+#include <Availability.h>
+#endif // __AVAILABILITY__
+
+#ifndef __MAC_10_6
+#define __MAC_10_6            1060
+#endif
+#ifndef __MAC_10_7
+#define __MAC_10_7            1070
+#endif
+#ifndef __MAC_10_9
+#define __MAC_10_9            1090
+#endif
+#ifndef __MAC_10_10
+#define __MAC_10_10         101000
+#endif
+#ifndef __MAC_10_13
+#define __MAC_10_13         101300
+#endif
+#ifndef __IPHONE_6_0
+#define __IPHONE_6_0         60000
+#endif
+#ifndef __IPHONE_7_0
+#define __IPHONE_7_0         70000
+#endif
+#ifndef __IPHONE_9_0
+#define __IPHONE_9_0         90000
+#endif
+#ifndef __IPHONE_11_0
+#define __IPHONE_11_0       110000
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_6) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0)
 extern FSEventStreamCreateFlags kFSEventStreamCreateFlagIgnoreSelf;
 #endif
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
-// file-level events introduced in 10.7
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_7) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0)
 extern FSEventStreamCreateFlags kFSEventStreamCreateFlagFileEvents;
 extern FSEventStreamEventFlags  kFSEventStreamEventFlagItemCreated,
                                 kFSEventStreamEventFlagItemRemoved,
@@ -37,11 +74,27 @@ extern FSEventStreamEventFlags  kFSEventStreamEventFlagItemCreated,
                                 kFSEventStreamEventFlagItemIsSymlink;
 #endif
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
-// marking, rather than ignoring, events originating from the current process introduced in 10.9
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_9) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_7_0)
 extern FSEventStreamCreateFlags kFSEventStreamCreateFlagMarkSelf;
 extern FSEventStreamEventFlags  kFSEventStreamEventFlagOwnEvent;
 #endif
 
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_10) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_9_0)
+extern FSEventStreamEventFlags  kFSEventStreamEventFlagItemIsHardlink,
+                                kFSEventStreamEventFlagItemIsLastHardlink;
+#endif
+
+#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < __MAC_10_13) || \
+    (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_11_0)
+extern FSEventStreamCreateFlags kFSEventStreamCreateFlagUseExtendedData;
+extern FSEventStreamEventFlags  kFSEventStreamEventFlagItemCloned;
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
 
-#endif // fsevent_watch_compat_h
+#endif // listen_fsevents_compat_h

data/ext/fsevent_watch/defines.h

@@ -22,6 +22,8 @@
 #define TARGET_CPU "i386"
 #elif defined(__x86_64__)
 #define TARGET_CPU "x86_64"
+#elif defined(__arm64__)
+#define TARGET_CPU "arm64"
 #else
 #define TARGET_CPU "unknown"
 #endif

data/ext/fsevent_watch/main.c

@@ -1,4 +1,5 @@
 #include "common.h"
+#include "signal_handlers.h"
 #include "cli.h"
 #include "FSEventsFix.h"
 
@@ -23,7 +24,7 @@ static struct {
   (double) 0.3,
   (CFOptionFlags) kFSEventStreamCreateFlagNone,
   NULL,
-  kFSEventWatchOutputFormatClassic
+  kFSEventWatchOutputFormatOTNetstring
 };
 
 // Prototypes
@@ -349,18 +350,54 @@ static void tstring_output_format(size_t numEvents,
                        false);
     CFDictionarySetValue(event, CFSTR("path"), path);
 
-    CFNumberRef flags = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &eventFlags[i]);
-    CFDictionarySetValue(event, CFSTR("flags"), flags);
-
     CFNumberRef ident = CFNumberCreate(kCFAllocatorDefault, kCFNumberLongLongType, &eventIds[i]);
     CFDictionarySetValue(event, CFSTR("id"), ident);
 
+    CFNumberRef cflags = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &eventFlags[i]);
+    CFDictionarySetValue(event, CFSTR("cflags"), cflags);
+
+    CFMutableArrayRef flags = CFArrayCreateMutable(kCFAllocatorDefault,
+                              0, &kCFTypeArrayCallBacks);
+
+#define FLAG_ADD_NAME(flagsnum, flagnum, flagname, flagarray)   \
+  do {                                                          \
+    if (FLAG_CHECK(flagsnum, flagnum)) {                        \
+      CFArrayAppendValue(flagarray, CFSTR(flagname)); } }       \
+  while(0)
+
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagMustScanSubDirs,     "MustScanSubDirs", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagUserDropped,         "UserDropped", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagKernelDropped,       "KernelDropped", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagEventIdsWrapped,     "EventIdsWrapped", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagHistoryDone,         "HistoryDone", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagRootChanged,         "RootChanged", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagMount,               "Mount", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagUnmount,             "Unmount", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemCreated,         "ItemCreated", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemRemoved,         "ItemRemoved", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemInodeMetaMod,    "ItemInodeMetaMod", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemRenamed,         "ItemRenamed", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemModified,        "ItemModified", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemFinderInfoMod,   "ItemFinderInfoMod", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemChangeOwner,     "ItemChangeOwner", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemXattrMod,        "ItemXattrMod", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemIsFile,          "ItemIsFile", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemIsDir,           "ItemIsDir", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemIsSymlink,       "ItemIsSymlink", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagOwnEvent,            "OwnEvent", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemIsHardlink,      "ItemIsHardLink", flags);
+    FLAG_ADD_NAME(eventFlags[i], kFSEventStreamEventFlagItemIsLastHardlink,  "ItemIsLastHardLink", flags);
+
+    CFDictionarySetValue(event, CFSTR("flags"), flags);
+
+
     CFArrayAppendValue(events, event);
 
     CFRelease(event);
     CFRelease(path);
-    CFRelease(flags);
     CFRelease(ident);
+    CFRelease(cflags);
+    CFRelease(flags);
   }
 
   CFMutableDictionaryRef meta = CFDictionaryCreateMutable(kCFAllocatorDefault,
@@ -445,7 +482,10 @@ static void callback(__attribute__((unused)) FSEventStreamRef streamRef,
                       "    Item is a directory");
     FLAG_CHECK_STDERR(eventFlags[i], kFSEventStreamEventFlagItemIsSymlink,
                       "    Item is a symbolic link");
-
+    FLAG_CHECK_STDERR(eventFlags[i], kFSEventStreamEventFlagItemIsHardlink,
+                      "    Item is a hard link");
+    FLAG_CHECK_STDERR(eventFlags[i], kFSEventStreamEventFlagItemIsLastHardlink,
+                      "    Item is the last hard link");
     fprintf(stderr, "  event path: %s\n", paths[i]);
     fprintf(stderr, "\n");
   }
@@ -470,6 +510,7 @@ static void callback(__attribute__((unused)) FSEventStreamRef streamRef,
 
 int main(int argc, const char* argv[])
 {
+  install_signal_handlers();
   parse_cli_settings(argc, argv);
 
   if (needs_fsevents_fix) {

data/ext/fsevent_watch/signal_handlers.c

@@ -0,0 +1,66 @@
+#include "signal_handlers.h"
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <unistd.h>
+
+
+#define PPID_ALARM_INTERVAL 2 // send SIGALRM every this seconds
+
+
+static pid_t orig_ppid;
+
+
+static void signal_handler(int _) {
+  exit(EXIT_FAILURE);
+}
+
+static void check_ppid(void) {
+  if (getppid() != orig_ppid) {
+    exit(EXIT_FAILURE);
+  }
+}
+
+static void check_stdout_open(void) {
+  if (fcntl(STDOUT_FILENO, F_GETFD) < 0) {
+    exit(EXIT_FAILURE);
+  }
+}
+
+static void alarm_handler(int _) {
+  check_ppid();
+  check_stdout_open();
+  alarm(PPID_ALARM_INTERVAL);
+  signal(SIGALRM, alarm_handler);
+}
+
+static void die(const char *msg) {
+  fprintf(stderr, "\nFATAL: %s\n", msg);
+  abort();
+}
+
+static void install_signal_handler(int sig, void (*handler)(int)) {
+  if (signal(sig, handler) == SIG_ERR) {
+    die("Could not install signal handler");
+  }
+}
+
+void install_signal_handlers(void) {
+  // check pipe is still connected
+  check_stdout_open();
+
+  // watch getppid() every PPID_ALARM_INTERVAL seconds 
+  orig_ppid = getppid();
+  if (orig_ppid <= 1) {
+    die("prematurely zombied");
+  }
+  install_signal_handler(SIGALRM, alarm_handler);
+  alarm(PPID_ALARM_INTERVAL);
+
+  // be sure to exit on SIGHUP, SIGPIPE
+  install_signal_handler(SIGHUP,  signal_handler);
+  install_signal_handler(SIGPIPE, signal_handler);
+}
+

data/ext/fsevent_watch/signal_handlers.h

@@ -0,0 +1,16 @@
+/**
+ * @headerfile signal_handlers.h
+ * Signal handlers to stop the zombie hordes
+ *
+ * Catch and handle signals better so that we die faster like a good meat puppet.
+ */
+
+
+#ifndef fsevent_watch_signal_handlers_h
+#define fsevent_watch_signal_handlers_h
+
+
+void install_signal_handlers(void);
+
+
+#endif // fsevent_watch_signal_handlers_h

data/ext/rakefile.rb

@@ -8,7 +8,7 @@ require 'rake/clean'
 raise "unable to find xcodebuild" unless system('which', 'xcodebuild')
 
 
-FSEVENT_WATCH_EXE_VERSION = '0.1.4'
+FSEVENT_WATCH_EXE_VERSION = '0.1.5'
 
 $this_dir = Pathname.new(__FILE__).dirname.expand_path
 $final_exe = $this_dir.parent.join('bin/fsevent_watch')
@@ -99,6 +99,11 @@ task :x86 do
   $ARCHFLAGS = '-arch i386'
 end
 
+desc 'set build arch to arm64'
+task :arm64 do
+  $ARCHFLAGS = '-arch arm64'
+end
+
 task :setup_env => [:set_build_type, :sw_vers, :get_sdk_info]
 
 directory $obj_dir.to_s
@@ -148,7 +153,7 @@ file $obj_dir.join('Info.plist').to_s => [$obj_dir.to_s, :setup_env] do
     key['CFBundleDisplayName']
     string['FSEvent Watch CLI']
     key['NSHumanReadableCopyright']
-    string['Copyright (C) 2011-2015 Travis Tilley']
+    string['Copyright (C) 2011-2017 Travis Tilley']
 
     key['CFBundleVersion']
     string["#{FSEVENT_WATCH_EXE_VERSION}"]
@@ -216,8 +221,10 @@ task :codesign => :build do
   sh "codesign -s '#{$CODE_SIGN_IDENTITY}' #{$obj_dir.join('fsevent_watch')}"
 end
 
+directory $this_dir.parent.join('bin')
+
 desc 'replace bundled fsevent_watch binary with build/fsevent_watch'
-task :replace_exe => :build do
+task :replace_exe => [$this_dir.parent.join('bin'), :build] do
   sh "mv #{$obj_dir.join('fsevent_watch')} #{$final_exe}"
 end
 

data/lib/otnetstring.rb

@@ -0,0 +1,85 @@
+# Copyright (c) 2011 Konstantin Haase
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+
+require 'stringio'
+
+module OTNetstring
+  class Error < StandardError; end
+
+  class << self
+    def parse(io, encoding = 'internal', fallback_encoding = nil)
+      fallback_encoding = io.encoding if io.respond_to? :encoding
+      io = StringIO.new(io) if io.respond_to? :to_str
+      length, byte = "", nil
+
+      while byte.nil? || byte =~ /\d/
+        length << byte if byte
+        byte = io.read(1)
+      end
+
+      if length.size > 9
+        raise Error, "#{length} is longer than 9 digits"
+      elsif length !~ /\d+/
+        raise Error, "Expected '#{byte}' to be a digit"
+      end
+      length = Integer(length)
+
+      case byte
+      when '#' then Integer io.read(length)
+      when ',' then with_encoding io.read(length), encoding, fallback_encoding
+      when '~' then
+        raise Error, "nil has length of 0, #{length} given" unless length == 0
+      when '!' then io.read(length) == 'true'
+      when '[', '{'
+        array = []
+        start = io.pos
+        array << parse(io, encoding, fallback_encoding) while io.pos - start < length
+        raise Error, 'Nested element longer than container' if io.pos - start != length
+        byte == "{" ? Hash[*array] : array
+      else
+        raise Error, "Unknown type '#{byte}'"
+      end
+    end
+
+    def encode(obj, string_sep = ',')
+      case obj
+      when String   then with_encoding "#{obj.bytesize}#{string_sep}#{obj}", "binary"
+      when Integer  then encode(obj.inspect, '#')
+      when NilClass then "0~"
+      when Array    then encode(obj.map { |e| encode(e) }.join, '[')
+      when Hash     then encode(obj.map { |a,b| encode(a)+encode(b) }.join, '{')
+      when FalseClass, TrueClass then encode(obj.inspect, '!')
+      else raise Error, 'cannot encode %p' % obj
+      end
+    end
+
+    private
+
+    def with_encoding(str, encoding, fallback = nil)
+      return str unless str.respond_to? :encode
+      encoding = Encoding.find encoding if encoding.respond_to? :to_str
+      encoding ||= fallback
+      encoding ? str.encode(encoding) : str
+    rescue EncodingError
+      str.force_encoding(encoding)
+    end
+  end
+end

data/lib/rb-fsevent/fsevent.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+require 'otnetstring'
+
 class FSEvent
   class << self
     class_eval <<-END
@@ -40,9 +42,41 @@ class FSEvent
     # please note the use of IO::select() here, as it is used specifically to
     # preserve correct signal handling behavior in ruby 1.8.
     while @running && IO::select([@pipe], nil, nil, nil)
-      if line = @pipe.readline
-        modified_dir_paths = line.split(':').select { |dir| dir != "\n" }
-        callback.call(modified_dir_paths)
+      # managing the IO ourselves allows us to be careful and never pass an
+      # incomplete message to OTNetstring.parse()
+      message = ""
+      length = ""
+      byte = nil
+
+      reading_length = true
+      found_length = false
+
+      while reading_length
+        byte = @pipe.read_nonblock(1)
+        if "#{byte}" =~ /\d/
+          length << byte
+          found_length = true
+        elsif found_length == false
+          next
+        else
+          reading_length = false
+        end
+      end
+      length = Integer(length, 10)
+      type = byte
+
+      message << "#{length}#{type}"
+      message << @pipe.read(length)
+
+      decoded = OTNetstring.parse(message)
+      modified_paths = decoded["events"].map {|event| event["path"]}
+      # passing the full info as a second block param feels icky, but such is
+      # the trap of backward compatibility.
+      case callback.arity
+        when 1
+          callback.call(modified_paths)
+        when 2
+          callback.call(modified_paths, decoded)
       end
     end
   rescue Interrupt, IOError, Errno::EBADF
@@ -110,7 +144,7 @@ class FSEvent
   private
 
   def parse_options(options={})
-    opts = []
+    opts = ['--format=otnetstring']
     opts.concat(['--since-when', options[:since_when]]) if options[:since_when]
     opts.concat(['--latency', options[:latency]]) if options[:latency]
     opts.push('--no-defer') if options[:no_defer]

data/lib/rb-fsevent/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 class FSEvent
-  VERSION = '0.9.7'
+  VERSION = '0.11.0'
 end

data/rb-fsevent.gemspec

@@ -13,10 +13,14 @@ Gem::Specification.new do |s|
   s.description = 'FSEvents API with Signals catching (without RubyCocoa)'
   s.license     = 'MIT'
 
+  s.metadata = {
+    'source_code_uri' => 'https://github.com/thibaudgg/rb-fsevent'
+  }
+
   s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   s.require_path = 'lib'
 
-  s.add_development_dependency 'bundler',     '~> 1.0'
-  s.add_development_dependency 'rspec',       '~> 2.11'
+  s.add_development_dependency 'rspec',       '~> 3.6'
   s.add_development_dependency 'guard-rspec', '~> 4.2'
+  s.add_development_dependency 'rake',        '~> 12.0'
 end

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: rb-fsevent
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.11.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 - Travis Tilley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '12.0'
 description: FSEvents API with Signals catching (without RubyCocoa)
 email:
 - thibaud@thibaud.gg
@@ -80,7 +80,10 @@ files:
 - ext/fsevent_watch/compat.h
 - ext/fsevent_watch/defines.h
 - ext/fsevent_watch/main.c
+- ext/fsevent_watch/signal_handlers.c
+- ext/fsevent_watch/signal_handlers.h
 - ext/rakefile.rb
+- lib/otnetstring.rb
 - lib/rb-fsevent.rb
 - lib/rb-fsevent/fsevent.rb
 - lib/rb-fsevent/version.rb
@@ -88,8 +91,9 @@ files:
 homepage: http://rubygems.org/gems/rb-fsevent
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/thibaudgg/rb-fsevent
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.11
+signing_key:
 specification_version: 4
 summary: Very simple & usable FSEvents API
 test_files: []