pbind 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e4fc51921052509464b90b73e739278ea397f5
-  data.tar.gz: 870f80bf09baa2fd496be63832384670021cdb6f
+  metadata.gz: 81e1f081ae44630a0c6fc01ddd9875ac5bc751ef
+  data.tar.gz: d12dfa76614ead7d6e29d8b90d1ff13f4d7382d3
 SHA512:
-  metadata.gz: c6def51b03be6d197676e9f95e8e23f85c35eb70af527eb217c77a53500103cf80f922978ad4693d64823b732d57d0f89068e7cdbdd8f3c063d9df991e057c84
-  data.tar.gz: 90b2e4bc7751110ccedad5bcf935cf01e59769984d9d87d5741c02831729f626130a4cf7f951f60571a54b0e92268030e99387775c96531eb2eaab6b61e597cd
+  metadata.gz: be3540ef369e882c103a469e87e76ba3463e4428c2371926e728683a0825308c562d9d54b9a57411ee390061ca060d8c70444d1535119088cc5a908ed4a00aa9
+  data.tar.gz: 62dd698fe2c428e4dfc06eddb24dc1791a476a4a1620ff898e45445a975a3c441dd11b191b46573d8da899f85adfed7bb945f868ffddf586ca9a9f78c867ab65

data/lib/pbind.rb

@@ -3,91 +3,4 @@ require 'xcodeproj'
 
 module Pbind
   require_relative 'pbind/command'
-end
-
-# class Pbind
-    
-#     install_dir = 'PBPlayground'
-
-#     # project.targets.each do |target|
-#     #   puts target.name
-#     # end
-
-#     # target = project.targets.first
-#     # files = target.source_build_phase.files.to_a.map do |pbx_build_file|
-#     #   pbx_build_file.file_ref.real_path.to_s
-
-#     # end.select do |path|
-#     #   path.end_with?(".m", ".mm", ".swift")
-
-#     # end.select do |path|
-#     #   File.exists?(path)
-#     # end
-
-#     # puts files
-
-#     define_method :downloadSource do
-#         if File.exists?(install_dir)
-#             return true
-#         end
-
-#         `curl -OL https://github.com/wequick/Pbind/releases/download/0.6.0/PBPlayground.zip && tar -xvf PBPlayground.zip && rm PBPlayground.zip`
-#         return File.exists?(install_dir)
-#     end
-
-#     define_method :addReferences do |project_path|
-#         project = Xcodeproj::Project.open(project_path)
-#         target = project.targets.first
-
-#         group = project.main_group.find_subpath(install_dir, true)
-#         group.set_source_tree('SOURCE_ROOT')
-#         group.clear
-
-#         file_refs = Array.new
-#         Dir.foreach(install_dir) do |file|
-#             if !File.directory?(file)
-#                 file_refs << group.new_reference(File.join(install_dir, file))
-#             end
-#         end
-
-#         target.add_file_references(file_refs)  
-#         project.save
-#     end
-
-#     def logSuccess
-#         puts "[  \e[32mOK\e[0m  ]"
-#     end
-
-#     def logFailed
-#         puts "[\e[31mFAILED\e[0m]"
-#     end
-
-#     define_method :install do
-#         project_paths = Dir.glob("*.xcodeproj")
-#         if project_paths.empty?
-#             puts "Failed to find any xcodeproj!"
-#             return
-#         end
-
-#         project_path = project_paths[0]
-#         print '%-64s' % 'Downloading PBPlayground source...'
-#         ret = downloadSource
-#         if !ret
-#             logFailed
-#             return
-#         end
-#         logSuccess
-
-#         print '%-64s' % 'Add PBPlayground reference to project...'
-#         addReferences project_path
-#         logSuccess
-#     end
-
-#     def self.hi
-#         puts "Hello world!"
-#     end
-
-#     def self.exec argv
-#         puts "Hello #{argv[0]}"
-#     end
-# end
+end

data/lib/pbind/command.rb

@@ -5,11 +5,12 @@ module Pbind
   class Command < CLAide::Command
 
     require_relative 'command/watch'
+    require_relative 'command/mock'
 
     self.abstract_command = true
     self.command = 'pbind'
     self.version = version
-    self.description = 'Pbind, the Pbind xcode project helper.'
+    self.description = 'Pbind, the Pbind XcodeProject Helper.'
     self.plugin_prefixes = %w(claide pbind)
 
     def self.report_error(exception)
@@ -22,7 +23,7 @@ module Pbind
         raise
       else
         # if ENV['PBIND_ENV'] != 'development'
-        #   puts UI::ErrorReport.report(exception)
+          # puts UI::ErrorReport.report(exception)
         #   UI::ErrorReport.search_for_exceptions(exception)
         #   exit 1
         # else
@@ -31,5 +32,34 @@ module Pbind
       end
     end
 
+    def self.options
+      [
+        ['--project=path/to/Project.xcodeproj', 'The path of the XcodeProject.']
+      ].concat(super)
+    end
+
+    def initialize(argv)
+      super
+
+      @project_path = argv.option('project')
+    end
+
+    def verify_project_exists
+      if @project_path == nil
+        projects = Dir.glob("*.xcodeproj")
+        num_project = projects.length
+
+        help! 'No `*.xcodeproj\' found in the project directory.' if num_project == 0
+        help! "Could not automatically select an Xcode project. Specify one in your arguments like so:\
+        \n\n    --project=path/to/Project.xcodeproj" unless num_project == 1
+
+        @project_path = projects[0]
+      else
+        help! 'The Xcode project should ends with `*.xcodeproj`.' unless @project_path.end_with?('.xcodeproj')
+        absolute_path = File.absolute_path(@project_path)
+        help! "Unable to find the Xcode project `#{absolute_path}`." unless File.exists?(absolute_path)
+      end
+    end
+
   end
 end

data/lib/pbind/command/mock.rb

@@ -0,0 +1,109 @@
+require 'xcodeproj'
+require 'pathname'
+require 'fileutils'
+
+module Pbind
+  class Command
+    class Mock < Command
+      self.summary = 'Enable JSON mocking feature for Pbind.'
+      self.description = <<-DESC
+        Create `CLIENT`/`ACTION`.json under PBLocalhost directory for the XCODEPROJ. 
+      DESC
+
+      self.arguments = [
+        CLAide::Argument.new(%(CLIENT ACTION), true),
+      ]
+
+      def initialize(argv)
+        super
+        @client = argv.shift_argument
+        @action = argv.shift_argument
+      end
+
+      def validate!
+        verify_project_exists
+        help! 'The client is required.' unless @client
+        help! 'The action is required.' unless @action
+      end
+
+      def run
+        @api_name = 'PBLocalhost'
+        @project_root = File.dirname(@project_path)
+        @api_install_dir = File.absolute_path(File.join(@project_root, @api_name))
+        @project = Xcodeproj::Project.open(@project_path)
+        @changed = false
+
+        add_mock_json
+
+        if !@changed
+          puts 'All are UP-TO-DATE.'
+        end
+      end
+
+      private
+
+      #----------------------------------------#
+
+      # !@group Private helpers
+
+      # Create [CLIENT]/[ACTION].json under PBLocalhost directory
+      #
+      # @return [void]
+      #
+      def add_mock_json
+        project = @project
+        target = project.targets.first
+        changed = false
+
+        # Add PBLocalhost group
+        group = project.main_group.find_subpath(@api_name, true)
+        if group.empty?
+          group.clear
+          file_refs = Array.new
+          Dir.foreach(@api_install_dir) do |file|
+            if !File.directory?(file)
+              file_refs << group.new_reference(File.join(@api_install_dir, file))
+            end
+          end
+          target.add_file_references(file_refs)
+          changed = true
+        end
+
+        # Create directory
+        client_dir = File.join(@api_install_dir, @client)
+        if !File.exists?(client_dir)
+          Dir.mkdir client_dir
+          changed = true
+        end
+
+        # Create json file
+        json_path = File.join(client_dir, "#{@action}.json")
+        if !File.exists?(json_path)
+          json_file = File.new(json_path, 'w')
+          json_file.puts("{\n  \n}")
+          changed = true
+        end
+
+        # Add json file reference
+        group = group.find_subpath(@client, true)
+        if group.empty?
+          group.clear
+          file_refs = Array.new
+          file_refs << group.new_reference(json_path)
+          target.add_file_references(file_refs)
+          changed = true
+        end
+
+        # Save
+        if !changed
+          return
+        end
+
+        UI.section("Creating PBLocalhost/#{@client}/#{@action}.json.") do
+          project.save
+          @changed = true
+        end
+      end
+    end
+  end
+end

data/lib/pbind/command/watch.rb

@@ -5,33 +5,28 @@ require 'fileutils'
 module Pbind
   class Command
     class Watch < Command
-      self.summary = 'Enable Pbind can watch sources and apply instant changes at runtime.'
+      self.abstract_command = false
+      self.summary = 'Enable the live load feature for Pbind.'
       self.description = <<-DESC
-        1. Download `PBPlayground` sources from GitHub, create a new group named `PBPlayground` and add it to the current project.
+        Downloads all dependencies of `PBLiveLoader` for the Xcode project.
 
-        2. Modify the project `Info.plist` and set `PBResourcesPath` to `$(SRCROOT)/[project_name]`, `PBLocalhost` to `$(SRCROOT)/PBLocalhost`.
+        The Xcode project file should be specified in `--project` like this:
 
-        3. At runtime: `[PBPlayground load]` observe the application lifecycle and watch the above paths to apply instant changes. 
-      DESC
+            --project=path/to/Project.xcodeproj
 
-      self.arguments = [
-        CLAide::Argument.new('XCODEPROJ', true),
-      ]
+        If no project is specified, then a search for an Xcode project will be made. If
+        more than one Xcode project is found, the command will raise an error.
 
-      def initialize(argv)
-        @project_path = argv.shift_argument
-      end
+        This will configure the project to reference the Pbind LiveLoader library
+        and add a PBLocalhost directory for later JSON mocking. 
+      DESC
 
       def validate!
-        # super
-        help! 'A path for the xcodeproj is required.' unless @project_path
-        @project_path = @project_path.chomp('/')
-        help! 'The xcodeproj path should ends with ".xcodeproj"' unless @project_path.end_with?('.xcodeproj')
-        help! "The xcodeproj path '#{@project_path}' is not exists." unless File.exists?(@project_path) 
+        verify_project_exists
       end
 
       def run
-        @src_name = 'PBPlayground'
+        @src_name = 'PBLiveLoader'
         @api_name = 'PBLocalhost'
         @src_key = 'PBResourcesPath'
         @project_root = File.dirname(@project_path)
@@ -55,7 +50,7 @@ module Pbind
 
       # !@group Private helpers
 
-      # Install the `PBPlayground`, `PBLocalhost` sources
+      # Install the `PBLiveLoader`, `PBLocalhost` sources
       #
       # @return [void]
       #
@@ -65,7 +60,7 @@ module Pbind
         end
 
         source_dir = ENV['PBIND_SOURCE']
-        UI.section("Copying `#{source_dir}` into `#{@project_root}`.") do
+        UI.section("Copying [`#{@src_name}`, `#{@api_name}`] into `#{@project_root}`.") do
           FileUtils.cp_r File.join(source_dir, @src_name), @project_root
           FileUtils.cp_r File.join(source_dir, @api_name), @project_root
           @changed = true
@@ -113,7 +108,7 @@ module Pbind
         end
       end
 
-      # Add `PBPlayground`, `PBLocalhost` group references to the project
+      # Add `PBLiveLoader`, `PBLocalhost` group references to the project
       #
       # @return [Bool] something changed
       #
@@ -122,7 +117,7 @@ module Pbind
         target = project.targets.first
         changed = false
 
-        # Add PBPlayground group
+        # Add PBLiveLoader group
         group = project.main_group.find_subpath(@src_name, true)
         if group.empty?
           group.set_source_tree('SOURCE_ROOT')

data/source/PBLiveLoader/PBDirectoryWatcher.h

@@ -0,0 +1,38 @@
+//
+//  PBDirectoryWatcher.h
+//  Pbind
+//
+//  Created by Galen Lin on 2016/12/9.
+//
+
+#include <targetconditionals.h>
+
+#if (DEBUG && TARGET_IPHONE_SIMULATOR)
+
+#import <Foundation/Foundation.h>
+
+typedef enum : NSUInteger {
+    PBDirEventNewFolder,
+    PBDirEventNewFile,
+    PBDirEventDeleteFolder,
+    PBDirEventDeleteFile,
+    PBDirEventModifyFile
+} PBDirEvent;
+
+/**
+ A watcher that recursively watch directories|files create|modify|delete events.
+ */
+@interface PBDirectoryWatcher : NSObject
+
+/**
+ Start watching the directory.
+
+ @param dir     the watching directory root.
+ @param handler the handler to handle all the events.
+ */
+- (void)watchDir:(NSString *)dir
+         handler:(void (^)(NSString *path, BOOL initial, PBDirEvent event))handler;
+
+@end
+
+#endif

data/source/PBLiveLoader/PBDirectoryWatcher.m

@@ -0,0 +1,466 @@
+//
+//  PBDirectoryWatcher.m
+//  Pbind
+//
+//  Created by Galen Lin on 2016/12/9.
+//
+
+#import "PBDirectoryWatcher.h"
+
+#if (DEBUG && TARGET_IPHONE_SIMULATOR)
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/event.h>
+
+typedef void(^file_handler)(const char *dir, const char *file, const char *name, BOOL isDir);
+static int walk_dir(const char *path, int depth_limit, file_handler handler);
+
+//
+
+@interface _PBMonitorFile : NSObject
+
+@property (nonatomic, strong) NSString *path;
+@property (nonatomic, assign) NSTimeInterval lastModified;
+
+- (instancetype)initWithPath:(NSString *)path;
+- (BOOL)updateLastModified;
+
+@end
+
+//
+
+@class _PBDirWatcher;
+@protocol _PBDirWatcherDelegate <NSObject>
+
+- (void)directoryDidChange:(_PBDirWatcher *)watcher;
+
+@end
+
+//
+
+@interface _PBDirWatcher : NSObject
+
+@property (nonatomic, readonly) NSString *path;
+@property (copy, nonatomic) void (^update)(void);
+
+- (instancetype)initWithDir:(NSString *)dir file:(NSString *)file delegate:(id<_PBDirWatcherDelegate>)delegate;
+
+- (void)addSubdir:(NSString *)dir;
+- (void)addFile:(NSString *)file;
+- (_PBMonitorFile *)fileForPath:(NSString *)path;
+- (NSArray<NSString *> *)updateSubdirs:(NSArray<NSString *> *)subdirs;
+- (NSArray<NSString *> *)updateFiles:(NSArray<NSString *> *)subdirs;
+
+- (void)invalidate;
+
+@end
+
+
+@interface PBDirectoryWatcher () <_PBDirWatcherDelegate>
+{
+    NSMutableArray<_PBDirWatcher *> *_dirWatchers;
+    NSArray<NSString *> *_extensions;
+    void (^_handler)(NSString *path, BOOL initial, PBDirEvent event);
+}
+
+@end
+
+@implementation PBDirectoryWatcher
+
+- (void)watchDir:(NSString *)dir
+         handler:(void (^)(NSString *path, BOOL initial, PBDirEvent event))handler
+{
+    _dirWatchers = [[NSMutableArray alloc] init];
+    _handler = handler;
+    [self scan:dir watcher:nil];
+}
+
+- (void)scan:(NSString *)path watcher:(_PBDirWatcher *)watcher
+{
+    BOOL initial = (watcher == nil);
+    int walk_depth = initial ? 0 : 1;
+    
+    NSMutableArray *subdirs;
+    NSMutableArray *files;
+    if (!initial) {
+        subdirs = [[NSMutableArray alloc] init];
+        files = [[NSMutableArray alloc] init];
+    }
+    
+    walk_dir([path UTF8String], walk_depth, ^(const char *dir, const char *file, const char *name, BOOL isDir) {
+        if (isDir) {
+            NSString *resDir = [[NSString alloc] initWithUTF8String:file];
+            NSString *parentDir = [[NSString alloc] initWithUTF8String:dir];
+            NSArray *filteredWatchers = [_dirWatchers filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"path == %@", parentDir]];
+            if (filteredWatchers.count == 1) {
+                _PBDirWatcher *parentWatcher = filteredWatchers[0];
+                [parentWatcher addSubdir:resDir];
+            }
+            
+            filteredWatchers = [_dirWatchers filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"path == %@", resDir]];
+            if (filteredWatchers.count == 0) {
+                // New dir
+                _PBDirWatcher *dirMonitor = [[_PBDirWatcher alloc] initWithDir:resDir file:nil delegate:self];
+                [_dirWatchers addObject:dirMonitor];
+                _handler(resDir, initial, PBDirEventNewFolder);
+            }
+            
+            if (!initial) {
+                [subdirs addObject:resDir];
+            }
+            
+            return;
+        }
+        
+        NSString *resDir = [[NSString alloc] initWithUTF8String:dir];
+        NSString *resFilePath = [[NSString alloc] initWithUTF8String:file];
+        NSArray *filteredWatchers = [_dirWatchers filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"path == %@", resDir]];
+        _PBDirWatcher *dirWatcher;
+        if (filteredWatchers.count == 0) {
+            // New dir to watch
+            dirWatcher = [[_PBDirWatcher alloc] initWithDir:resDir file:resFilePath delegate:self];
+            [_dirWatchers addObject:dirWatcher];
+            _handler(resDir, initial, PBDirEventNewFolder);
+            _handler(resFilePath, initial, PBDirEventNewFile); // notify change
+        } else {
+            // Old dir had watch
+            dirWatcher = filteredWatchers[0];
+            _PBMonitorFile *resFile = [dirWatcher fileForPath:resFilePath];
+            if (resFile == nil) {
+                // New file
+                [dirWatcher addFile:resFilePath];
+                
+                _handler(resFilePath, initial, PBDirEventNewFile); // notify change
+            } else {
+                // Old file
+                if ([resFile updateLastModified]) {
+                    // Modified
+                    
+                    _handler(resFilePath, initial, PBDirEventModifyFile); // notify change
+                }
+            }
+        }
+        
+        if (!initial) {
+            [files addObject:resFilePath];
+        }
+    });
+    
+    if (!initial) {
+        // Check if any directory be deleted.
+        NSArray *deletedDirs = [watcher updateSubdirs:subdirs];
+        if (deletedDirs != nil) {
+            // Unwatch
+            NSArray *filters = [_dirWatchers filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"path in %@", deletedDirs]];
+            for (_PBDirWatcher *watcher in filters) {
+                [watcher invalidate];
+            }
+            [_dirWatchers removeObjectsInArray:filters];
+            
+            // Notify change
+            for (NSString *dir in deletedDirs) {
+                _handler(dir, initial, PBDirEventDeleteFolder);
+            }
+        }
+        
+        // Check if any file be deleted.
+        NSArray *deletedFiles = [watcher updateFiles:files];
+        if (deletedFiles != nil) {
+            for (NSString *file in deletedFiles) {
+                _handler(file, initial, PBDirEventDeleteFile);
+            }
+        }
+    }
+}
+
+- (void)directoryDidChange:(_PBDirWatcher *)watcher {
+    [self scan:watcher.path watcher:watcher];
+}
+
+- (void)dealloc
+{
+    _dirWatchers = nil;
+    _handler = nil;
+}
+
+@end
+
+//
+
+@implementation _PBMonitorFile
+
+- (instancetype)initWithPath:(NSString *)path
+{
+    if (self = [super init]) {
+        _path = path;
+        _lastModified = [self currentLastModified];
+    }
+    return self;
+}
+
+- (BOOL)updateLastModified
+{
+    NSTimeInterval currentLastModified = [self currentLastModified];
+    if (_lastModified != currentLastModified) {
+        _lastModified = currentLastModified;
+        return YES;
+    }
+    return NO;
+}
+
+- (NSTimeInterval)currentLastModified
+{
+    NSError *error = nil;
+    NSDictionary *attrs = [[NSFileManager defaultManager] attributesOfItemAtPath:_path error:&error];
+    NSTimeInterval lastModified = 0;
+    if (error == nil) {
+        lastModified = [[attrs fileModificationDate] timeIntervalSince1970];
+    }
+    return lastModified;
+}
+
+@end
+
+// Directory watcher
+// @see https://developer.apple.com/library/content/samplecode/DocInteraction/Listings/Classes_DirectoryWatcher_m.html
+
+@implementation _PBDirWatcher {
+    int                 kq;
+    int                 dirFD;
+    CFFileDescriptorRef dirKQRef;
+    __weak id<_PBDirWatcherDelegate> delegate;
+    NSMutableArray<NSString *>       *subdirs;
+    NSMutableArray<_PBMonitorFile *> *files;
+}
+
+static void KQCallback(CFFileDescriptorRef kqRef, CFOptionFlags callBackTypes, void *info) {
+    _PBDirWatcher* obj = (__bridge _PBDirWatcher*) info;
+    
+    assert([obj isKindOfClass:[_PBDirWatcher class]]);
+    assert(kqRef == obj->dirKQRef);
+    assert(callBackTypes == kCFFileDescriptorReadCallBack);
+    
+    [obj kqueueFired];
+}
+
+- (instancetype)initWithDir:(NSString *)dir file:(NSString *)file delegate:(id<_PBDirWatcherDelegate>)aDelegate
+{
+    if (self = [super init]) {
+        kq = -1;
+        dirFD = -1;
+        delegate = aDelegate;
+        
+        _path = dir;
+        files = [[NSMutableArray alloc] init];
+        if (file != nil) {
+            _PBMonitorFile *resFile = [[_PBMonitorFile alloc] initWithPath:file];
+            [files addObject:resFile];
+        }
+        [self start];
+    }
+    return self;
+}
+
+- (void)addSubdir:(NSString *)dir
+{
+    if (subdirs == nil) {
+        subdirs = [[NSMutableArray alloc] init];
+    }
+    [subdirs addObject:dir];
+}
+
+- (void)addFile:(NSString *)file
+{
+    _PBMonitorFile *resFile = [[_PBMonitorFile alloc] initWithPath:file];
+    [files addObject:resFile];
+}
+
+- (_PBMonitorFile *)fileForPath:(NSString *)path
+{
+    NSArray *filteredFiles = [files filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"path==%@", path]];
+    if (filteredFiles.count == 0) {
+        return nil;
+    }
+    return filteredFiles[0];
+}
+
+- (NSArray<NSString *> *)updateSubdirs:(NSArray<NSString *> *)the_subdirs
+{
+    if (subdirs == nil) return nil;
+    
+    NSArray *filters = [subdirs filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"NOT SELF IN %@", the_subdirs]];
+    if (filters.count > 0) {
+        [subdirs removeObjectsInArray:filters];
+        return filters;
+    }
+    
+    return nil;
+}
+
+- (NSArray<NSString *> *)updateFiles:(NSArray<NSString *> *)the_files
+{
+    if (files == nil) return nil;
+    
+    NSArray *filters = [files filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"NOT path IN %@", the_files]];
+    if (filters.count > 0) {
+        [files removeObjectsInArray:filters];
+        return [filters valueForKey:@"path"];
+    }
+    
+    return nil;
+}
+
+- (void)dealloc {
+    [self invalidate];
+}
+
+- (void)kqueueFired {
+    assert(kq >= 0);
+    
+    struct kevent   event;
+    struct timespec timeout = {0, 0};
+    int             eventCount;
+    
+    eventCount = kevent(kq, NULL, 0, &event, 1, &timeout);
+    assert((eventCount >= 0) && (eventCount < 2));
+    
+    // call our delegate of the directory change
+    [delegate directoryDidChange:self];
+    
+    CFFileDescriptorEnableCallBacks(dirKQRef, kCFFileDescriptorReadCallBack);
+}
+
+- (void)start {
+    // Double initializing is not going to work...
+    if (dirKQRef != NULL) return;
+    if (dirFD != -1) return;
+    if (kq != -1) return;
+    
+    if (_path == nil) return;
+    
+    // Open the directory we're going to watch
+    dirFD = open([_path fileSystemRepresentation], O_EVTONLY);
+    if (dirFD < 0) return;
+    
+    // Create a kqueue for our event messages...
+    kq = kqueue();
+    if (kq < 0) {
+        close(dirFD);
+        return;
+    }
+    
+    struct kevent eventToAdd;
+    eventToAdd.ident  = dirFD;
+    eventToAdd.filter = EVFILT_VNODE;
+    eventToAdd.flags  = EV_ADD | EV_CLEAR;
+    eventToAdd.fflags = NOTE_WRITE;
+    eventToAdd.data   = 0;
+    eventToAdd.udata  = NULL;
+    
+    int errNum = kevent(kq, &eventToAdd, 1, NULL, 0, NULL);
+    if (errNum != 0) {
+        close(kq);
+        close(dirFD);
+        return;
+    }
+    
+    // Passing true in the third argument so CFFileDescriptorInvalidate will close kq.
+    CFFileDescriptorContext context = { 0, (__bridge void *)(self), NULL, NULL, NULL };
+    dirKQRef = CFFileDescriptorCreate(NULL, kq, true, KQCallback, &context);
+    if (dirKQRef == NULL) {
+        close(kq);
+        close(dirFD);
+        return;
+    }
+    
+    // Spin out a pluggable run loop source from the CFFileDescriptorRef
+    // Add it to the current run loop, then release it
+    CFRunLoopSourceRef rls = CFFileDescriptorCreateRunLoopSource(NULL, dirKQRef, 0);
+    if (rls == NULL) {
+        CFRelease(dirKQRef);
+        close(kq);
+        close(dirFD);
+        dirKQRef = NULL;
+        return;
+    }
+    
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), rls, kCFRunLoopDefaultMode);
+    CFRelease(rls);
+    CFFileDescriptorEnableCallBacks(dirKQRef, kCFFileDescriptorReadCallBack);
+}
+
+- (void)invalidate
+{
+    if (dirKQRef != NULL) {
+        CFFileDescriptorInvalidate(dirKQRef);
+        CFRelease(dirKQRef);
+        dirKQRef = NULL;
+        // We don't need to close the kq, CFFileDescriptorInvalidate closed it instead.
+        // Change the value so no one thinks it's still live.
+        kq = -1;
+    }
+    
+    if (dirFD != -1) {
+        close(dirFD);
+        dirFD = -1;
+    }
+}
+
+@end
+
+#pragma mark -
+#pragma mark - Directory walker with pure C.
+
+static int walk_dir_sub(const char *path, int depth_limit, int depth, file_handler handler) {
+    DIR *d;
+    struct dirent *file;
+    struct stat sb;
+    char current[256];
+    int next_depth = depth + 1;
+    
+    if (!(d = opendir(path))) {
+        NSLog(@"error opendir %s!", path);
+        return -1;
+    }
+    
+    while ((file = readdir(d)) != NULL) {
+        const char *name = file->d_name;
+        if (*name == '.') {
+            continue;
+        }
+        
+        sprintf(current, "%s/%s", path, name);
+        if (stat(current, &sb) < 0) {
+            continue;
+        }
+        
+        if (S_ISDIR(sb.st_mode)) {
+            handler(path, current, name, true);
+            if (depth_limit == next_depth) {
+                continue;
+            }
+            
+            walk_dir_sub(current, depth_limit, next_depth, handler);
+            continue;
+        }
+        
+        handler(path, current, name, false);
+    }
+    
+    closedir(d);
+    
+    return 0;
+}
+
+static int walk_dir(const char *path, int depth_limit, file_handler handler) {
+    return walk_dir_sub(path, depth_limit, 0, handler);
+}
+
+#endif