rb-fsevent 0.9.3 → 0.9.4

data/ext/fsevent_watch/compat.c

@@ -18,3 +18,8 @@ FSEventStreamEventFlags   kFSEventStreamEventFlagItemIsFile         = 0x00010000
 FSEventStreamEventFlags   kFSEventStreamEventFlagItemIsDir          = 0x00020000;
 FSEventStreamEventFlags   kFSEventStreamEventFlagItemIsSymlink      = 0x00040000;
 #endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+FSEventStreamCreateFlags  kFSEventStreamCreateFlagMarkSelf          = 0x00000020;
+FSEventStreamEventFlags   kFSEventStreamEventFlagOwnEvent           = 0x00080000;
+#endif

data/ext/fsevent_watch/compat.h

@@ -37,4 +37,11 @@ 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
+extern FSEventStreamCreateFlags kFSEventStreamCreateFlagMarkSelf;
+extern FSEventStreamEventFlags  kFSEventStreamEventFlagOwnEvent;
+#endif
+
+
 #endif // fsevent_watch_compat_h

data/ext/fsevent_watch/main.c

@@ -234,6 +234,15 @@ static inline void parse_cli_settings(int argc, const char* argv[])
     }
   }
 
+  if (args_info.mark_self_flag) {
+    if ((osMajorVersion == 10) & (osMinorVersion >= 9)) {
+      config.flags |= kFSEventStreamCreateFlagMarkSelf;
+    } else {
+      fprintf(stderr, "MacOSX 10.9 or later required for --mark-self\n");
+      exit(EXIT_FAILURE);
+    }
+  }
+
   if (args_info.inputs_num == 0) {
     append_path(".");
   } else {
@@ -451,35 +460,6 @@ static void callback(__attribute__((unused)) FSEventStreamRef streamRef,
 
 int main(int argc, const char* argv[])
 {
-  /*
-   * a subprocess will initially inherit the process group of its parent. the
-   * process group may have a control terminal associated with it, which would
-   * be the first tty device opened by the group leader. typically the group
-   * leader is your shell and the control terminal is your login device. a
-   * subset of signals triggered on the control terminal are sent to all members
-   * of the process group, in large part to facilitate sane and consistent
-   * cleanup (ex: control terminal was closed).
-   *
-   * so why the overly descriptive lecture style comment?
-   *   1. SIGINT and SIGQUIT are among the signals with this behavior
-   *   2. a number of applications gank the above for their own use
-   *   3. ruby's insanely useful "guard" is one of these applications
-   *   4. despite having some level of understanding of POSIX signals and a few
-   *      of the scenarios that might cause problems, i learned this one only
-   *      after reading ruby 1.9's process.c
-   *   5. if left completely undocumented, even slightly obscure bugfixes
-   *      may be removed as cruft by a future maintainer
-   *
-   * hindsight is 20/20 addition: if you're single-threaded and blocking on IO
-   * with a subprocess, then handlers for deferrable signals might not get run
-   * when you expect them to. In the case of Ruby 1.8, that means making use of
-   * IO::select, which will preserve correct signal handling behavior.
-   */
-  if (setpgid(0,0) < 0) {
-    fprintf(stderr, "Unable to set new process group.\n");
-    return 1;
-  }
-
   parse_cli_settings(argc, argv);
 
   FSEventStreamContext context = {0, NULL, NULL, NULL, NULL};

data/ext/rakefile.rb

@@ -1,13 +1,14 @@
+# -*- encoding: utf-8 -*-
 require 'rubygems' unless defined?(Gem)
 require 'pathname'
 require 'date'
 require 'time'
-
+require 'rake/clean'
 
 raise "unable to find xcodebuild" unless system('which', 'xcodebuild')
 
-FSEVENT_WATCH_EXE_VERSION = '0.1.3'
 
+FSEVENT_WATCH_EXE_VERSION = '0.1.3'
 
 $this_dir = Pathname.new(__FILE__).dirname.expand_path
 $final_exe = $this_dir.parent.join('bin/fsevent_watch')
@@ -18,21 +19,30 @@ $obj_dir = $this_dir.join('build')
 SRC = Pathname.glob("#{$src_dir}/*.c")
 OBJ = SRC.map {|s| $obj_dir.join("#{s.basename('.c')}.o")}
 
-
 $now = DateTime.now.xmlschema rescue Time.now.xmlschema
 
 $CC = ENV['CC'] || `which clang || which gcc`.strip
-$CFLAGS = ENV['CFLAGS'] || '-fconstant-cfstrings -fstrict-aliasing -funroll-loops'
+$CFLAGS = ENV['CFLAGS'] || '-fconstant-cfstrings -fno-strict-aliasing -Wall'
 $ARCHFLAGS = ENV['ARCHFLAGS'] || '-arch x86_64 -arch i386'
 $DEFINES = "-DNS_BUILD_32_LIKE_64 -DNS_BLOCK_ASSERTIONS -DOS_OBJECT_USE_OBJC=0 -DPROJECT_VERSION=#{FSEVENT_WATCH_EXE_VERSION}"
 
-$GCC_C_LANGUAGE_STANDARD = 'gnu99'
+$GCC_C_LANGUAGE_STANDARD = ENV['GCC_C_LANGUAGE_STANDARD'] || 'gnu99'
+
+# generic developer id name so it'll match correctly for anyone who has only
+# one developer id in their keychain (not that I expect anyone else to bother)
 $CODE_SIGN_IDENTITY = 'Developer ID Application'
 
 $arch = `uname -m`.strip
 $os_release = `uname -r`.strip
 $BUILD_TRIPLE = "#{$arch}-apple-darwin#{$os_release}"
 
+$CCVersion = `#{$CC} --version | head -n 1`.strip
+
+
+CLEAN.include OBJ.map(&:to_s)
+CLEAN.include $obj_dir.join('Info.plist').to_s
+CLEAN.include $obj_dir.join('fsevent_watch').to_s
+CLOBBER.include $final_exe.to_s
 
 
 task :sw_vers do
@@ -112,49 +122,73 @@ SRC.zip(OBJ).each do |source, object|
   end
 end
 
-desc 'generate an Info.plist used for code signing as well as embedding build settings into the resulting binary'
 file $obj_dir.join('Info.plist').to_s => [$obj_dir.to_s, :setup_env] do
   File.open($obj_dir.join('Info.plist').to_s, 'w+') do |file|
-    file << '<?xml version="1.0" encoding="UTF-8"?>'
-    file << '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">'
-    file << '<plist version="1.0">'
-    file << '<dict>'
-
-    file << '<key>CFBundleExecutable</key>'
-    file << '<string>fsevent_watch</string>'
-    file << '<key>CFBundleIdentifier</key>'
-    file << '<string>com.teaspoonofinsanity.fsevent_watch</string>'
-    file << '<key>CFBundleName</key>'
-    file << '<string>fsevent_watch</string>'
-
-    file << '<key>CFBundleVersion</key>'
-    file << "<string>#{FSEVENT_WATCH_EXE_VERSION}</string>"
-    file << '<key>LSMinimumSystemVersion</key>'
-    file << "<string>#{$MACOSX_DEPLOYMENT_TARGET}</string>"
-    file << '<key>DTSDKBuild</key>'
-    file << "<string>#{$SDK_INFO['ProductBuildVersion']}</string>"
-    file << '<key>DTSDKName</key>'
-    file << "<string>macosx#{$SDK_INFO['SDKVersion']}</string>"
-    file << '<key>BuildMachineOSBuild</key>'
-    file << "<string>#{$mac_build_version}</string>"
-    file << '<key>BuildMachineOSVersion</key>'
-    file << "<string>#{$mac_product_version}</string>"
-    file << '<key>FSEWCompiledAt</key>'
-    file << "<string>#{$now}</string>"
-    file << '<key>FSEWVersionInfoBuilder</key>'
-    file << "<string>#{`whoami`.strip}</string>"
-    file << '<key>FSEWBuildTriple</key>'
-    file << "<string>#{$BUILD_TRIPLE}</string>"
-    file << '<key>FSEWCC</key>'
-    file << "<string>#{$CC}</string>"
-    file << '<key>FSEWCFLAGS</key>'
-    file << "<string>#{$CFLAGS}</string>"
-
-    file << '</dict>'
-    file << '</plist>'
+    indentation = ''
+    indent      =  lambda {|num|    indentation = ' ' * num               }
+    add         =  lambda {|str| file << "#{indentation}#{str}\n"   }
+    key         =  lambda {|str| add["<key>#{str}</key>"]           }
+    string      =  lambda {|str| add["<string>#{str}</string>"]     }
+
+
+    add['<?xml version="1.0" encoding="UTF-8"?>']
+    add['<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">']
+    add['<plist version="1.0">']
+
+    indent[2]
+    add['<dict>']
+    indent[4]
+
+    key['CFBundleExecutable']
+    string['fsevent_watch']
+    key['CFBundleIdentifier']
+    string['com.teaspoonofinsanity.fsevent_watch']
+    key['CFBundleName']
+    string['fsevent_watch']
+    key['CFBundleDisplayName']
+    string['FSEvent Watch CLI']
+    key['NSHumanReadableCopyright']
+    string['Copyright (C) 2011-2013 Travis Tilley']
+
+    key['CFBundleVersion']
+    string["#{FSEVENT_WATCH_EXE_VERSION}"]
+    key['LSMinimumSystemVersion']
+    string["#{$MACOSX_DEPLOYMENT_TARGET}"]
+    key['DTSDKBuild']
+    string["#{$SDK_INFO['ProductBuildVersion']}"]
+    key['DTSDKName']
+    string["macosx#{$SDK_INFO['SDKVersion']}"]
+    key['DTSDKPath']
+    string["#{$SDK_INFO['Path']}"]
+    key['BuildMachineOSBuild']
+    string["#{$mac_build_version}"]
+    key['BuildMachineOSVersion']
+    string["#{$mac_product_version}"]
+    key['FSEWCompiledAt']
+    string["#{$now}"]
+    key['FSEWVersionInfoBuilder']
+    string["#{`whoami`.strip}"]
+    key['FSEWBuildTriple']
+    string["#{$BUILD_TRIPLE}"]
+    key['FSEWCC']
+    string["#{$CC}"]
+    key['FSEWCCVersion']
+    string["#{$CCVersion}"]
+    key['FSEWCFLAGS']
+    string["#{$CFLAGS}"]
+
+    indent[2]
+    add['</dict>']
+    indent[0]
+
+    add['</plist>']
   end
 end
 
+desc 'generate an Info.plist used for code signing as well as embedding build settings into the resulting binary'
+task :plist => $obj_dir.join('Info.plist').to_s
+
+
 file $obj_dir.join('fsevent_watch').to_s => [$obj_dir.to_s, $obj_dir.join('Info.plist').to_s] + OBJ.map(&:to_s) do
   cmd = [
     $CC,
@@ -187,5 +221,5 @@ task :replace_exe => :build do
   sh "mv #{$obj_dir.join('fsevent_watch')} #{$final_exe}"
 end
 
-task :default => :replace_exe
+task :default => [:replace_exe, :clean]
 

data/lib/rb-fsevent.rb

@@ -1,2 +1,3 @@
+# -*- encoding: utf-8 -*-
 require 'rb-fsevent/fsevent'
-require 'rb-fsevent/version'
+require 'rb-fsevent/version'

data/lib/rb-fsevent/fsevent.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 class FSEvent
   class << self
     class_eval <<-END
@@ -104,6 +106,7 @@ class FSEvent
     opts.concat(['--latency', options[:latency]]) if options[:latency]
     opts.push('--no-defer') if options[:no_defer]
     opts.push('--watch-root') if options[:watch_root]
+    opts.push('--file-events') if options[:file_events]
     # ruby 1.9's IO.popen(array-of-stuff) syntax requires all items to be strings
     opts.map {|opt| "#{opt}"}
   end

data/lib/rb-fsevent/version.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 class FSEvent
-  VERSION = "0.9.3"
+  VERSION = '0.9.4'
 end

data/rb-fsevent.gemspec

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "rb-fsevent/version"
+
+Gem::Specification.new do |s|
+  s.name        = 'rb-fsevent'
+  s.version     = FSEvent::VERSION
+  s.authors     = ['Thibaud Guillaume-Gentil', 'Travis Tilley']
+  s.email       = ['thibaud@thibaud.gg', 'ttilley@gmail.com']
+  s.homepage    = 'http://rubygems.org/gems/rb-fsevent'
+  s.summary     = 'Very simple & usable FSEvents API'
+  s.description = 'FSEvents API with Signals catching (without RubyCocoa)'
+  s.license     = 'MIT'
+
+  s.files        = `git ls-files`.split($/)
+  s.test_files   = s.files.grep(%r{^spec/})
+  s.require_path = 'lib'
+
+  s.add_development_dependency  'bundler',     '~> 1.0'
+  s.add_development_dependency  'rspec',       '~> 2.11'
+  s.add_development_dependency  'guard-rspec', '~> 4.2'
+end
+

data/spec/rb-fsevent/fsevent_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe FSEvent do
+
+  before(:each) do
+    @results = []
+    @fsevent = FSEvent.new
+    @fsevent.watch @fixture_path.to_s, {:latency => 0.5} do |paths|
+      @results += paths
+    end
+  end
+
+  it "shouldn't pass anything to watch when instantiated without a path" do
+    fsevent = FSEvent.new
+    fsevent.paths.should be_nil
+    fsevent.callback.should be_nil
+  end
+
+  it "should pass path and block to watch when instantiated with them" do
+    blk = proc { }
+    fsevent = FSEvent.new(@fixture_path, &blk)
+    fsevent.paths.should == [@fixture_path]
+    fsevent.callback.should == blk
+  end
+
+  it "should have a watcher_path that resolves to an executable file" do
+    File.exists?(FSEvent.watcher_path).should be_true
+    File.executable?(FSEvent.watcher_path).should be_true
+  end
+
+  it "should work with path with an apostrophe" do
+    custom_path = @fixture_path.join("custom 'path")
+    file = custom_path.join("newfile.rb").to_s
+    File.delete file if File.exists? file
+    @fsevent.watch custom_path.to_s do |paths|
+      @results += paths
+    end
+    @fsevent.paths.should == ["#{custom_path}"]
+    run
+    FileUtils.touch file
+    stop
+    File.delete file
+    @results.should == [custom_path.to_s + '/']
+  end
+
+  it "should catch new file" do
+    file = @fixture_path.join("newfile.rb")
+    File.delete file if File.exists? file
+    run
+    FileUtils.touch file
+    stop
+    File.delete file
+    @results.should == [@fixture_path.to_s + '/']
+  end
+
+  it "should catch file update" do
+    file = @fixture_path.join("folder1/file1.txt")
+    File.exists?(file).should be_true
+    run
+    FileUtils.touch file
+    stop
+    @results.should == [@fixture_path.join("folder1/").to_s]
+  end
+
+  it "should catch files update" do
+    file1 = @fixture_path.join("folder1/file1.txt")
+    file2 = @fixture_path.join("folder1/folder2/file2.txt")
+    File.exists?(file1).should be_true
+    File.exists?(file2).should be_true
+    run
+    FileUtils.touch file1
+    FileUtils.touch file2
+    stop
+    @results.should == [@fixture_path.join("folder1/").to_s, @fixture_path.join("folder1/folder2/").to_s]
+  end
+
+  def run
+    sleep 1
+    Thread.new { @fsevent.run }
+    sleep 1
+  end
+
+  def stop
+    sleep 1
+    @fsevent.stop
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+require 'rspec'
+require 'rb-fsevent'
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+  
+  config.before(:each) do
+    @fixture_path = Pathname.new(File.expand_path('../fixtures/', __FILE__))
+  end
+  
+  config.before(:all) do
+    system "cd ext; rake"
+    puts "fsevent_watch compiled"
+  end
+  
+  config.after(:all) do
+    gem_root = Pathname.new(File.expand_path('../../', __FILE__))
+    system "rm -rf #{gem_root.join('bin')}"
+  end
+  
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-fsevent
 version: !ruby/object:Gem::Version
-  version: 0.9.3
-  prerelease: 
+  version: 0.9.4
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
@@ -10,68 +9,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
-  name: bundler
 - !ruby/object:Gem::Dependency
-  prerelease: false
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
-  name: rspec
 - !ruby/object:Gem::Dependency
-  prerelease: false
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    none: false
+        version: '4.2'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    none: false
-  name: guard-rspec
+        version: '4.2'
 description: FSEvents API with Signals catching (without RubyCocoa)
 email:
-- thibaud@thibaud.me
+- thibaud@thibaud.gg
 - ttilley@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- Gemfile
+- Guardfile
+- LICENSE.txt
+- README.md
+- Rakefile
 - bin/fsevent_watch
-- lib/rb-fsevent/fsevent.rb
-- lib/rb-fsevent/version.rb
-- lib/rb-fsevent.rb
+- bin/fsevent_watch_10_5
 - ext/LICENSE
 - ext/fsevent_watch/TSICTString.c
 - ext/fsevent_watch/TSICTString.h
@@ -83,31 +80,42 @@ files:
 - ext/fsevent_watch/defines.h
 - ext/fsevent_watch/main.c
 - ext/rakefile.rb
-- LICENSE
-- README.rdoc
+- lib/rb-fsevent.rb
+- lib/rb-fsevent/fsevent.rb
+- lib/rb-fsevent/version.rb
+- rb-fsevent.gemspec
+- spec/fixtures/custom 'path/.gitignore
+- spec/fixtures/folder1/file1.txt
+- spec/fixtures/folder1/folder2/file2.txt
+- spec/rb-fsevent/fsevent_spec.rb
+- spec/spec_helper.rb
 homepage: http://rubygems.org/gems/rb-fsevent
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project: rb-fsevent
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Very simple & usable FSEvents API
-test_files: []
-has_rdoc: 
+test_files:
+- spec/fixtures/custom 'path/.gitignore
+- spec/fixtures/folder1/file1.txt
+- spec/fixtures/folder1/folder2/file2.txt
+- spec/rb-fsevent/fsevent_spec.rb
+- spec/spec_helper.rb