rb-fchange 0.0.2 → 0.0.4

data/README.md

@@ -1,6 +1,6 @@
 # rb-fchange
 
-Code not ready. It's just proof of concept
+Code is working. But there is still a lot of work.
 This is a simple wrapper over the Windows Kernel functions for monitoring the specified directory or subtree.
 
 Example
@@ -28,4 +28,5 @@ Example
  - default flag for events :all_events
  - rework interface (should more look like rb-fsevent)
  - add specs (can use specs from rb-fsevent)
- - publish on rubygems
+ - add none-ANSI path support
+ - add jRuby support

data/lib/rb-fchange/native.rb

@@ -1,4 +1,4 @@
-require 'win32/api'
+require 'ffi'
 
 module FChange
   # This module contains the low-level foreign-function.
@@ -6,65 +6,40 @@ module FChange
   #
   # @private
   module Native
+    extend FFI::Library
+    ffi_lib 'kernel32'
+    ffi_convention :stdcall
 
-    #
-    INFINITE = 0xFFFFFFFF
+    # HANDLE FindFirstChangeNotification(
+    #  LPCTSTR lpPathName,    // directory name
+    #  BOOL bWatchSubtree,    // monitoring option
+    #  DWORD dwNotifyFilter   // filter conditions
+    #);
+    attach_function :FindFirstChangeNotificationW, [:pointer, :int, :long], :long
 
-    #
-    WAIT_OBJECT_0 = 0x00000000
-      
     # HANDLE FindFirstChangeNotification(
     #  LPCTSTR lpPathName,    // directory name
     #  BOOL bWatchSubtree,    // monitoring option
     #  DWORD dwNotifyFilter   // filter conditions
     #);
-    @_k32FindFirstChangeNotification = 
-      Win32::API.new('FindFirstChangeNotification', ['P', 'I', 'L'], 'L')
+    attach_function :FindFirstChangeNotificationA, [:pointer, :int, :long], :long
 
-    # @return handle
-    def k32FindFirstChangeNotification(path, recursive, flag)
-        @_k32FindFirstChangeNotification.call(path, recursive ? 1 : 0, flag)
-    end
-    
-    module_function "k32FindFirstChangeNotification"
-    
     # BOOL FindNextChangeNotification(
     #  HANDLE hChangeHandle   // handle to change notification
     # );
-    @_k32FindNextChangeNotification = 
-      Win32::API.new('FindNextChangeNotification', ['L'], 'I')
-    
-    def k32FindNextChangeNotification(handle)
-        @_k32FindNextChangeNotification.call(handle)
-    end
-    
-    module_function "k32FindNextChangeNotification"
+    attach_function :FindNextChangeNotification, [:long], :int
 
-    # DWORD WaitForMultipleObjects(
+    # DAORD WaitForMultipleObjects(
     #   DWORD nCount,             // number of handles in array
     #   CONST HANDLE *lpHandles,  // object-handle array
     #   BOOL bWaitAll,            // wait option
     #   DWORD dwMilliseconds      // time-out interval
     # );
-    @_k32WaitForMultipleObjects = 
-      Win32::API.new('WaitForMultipleObjects', ['L', 'P', 'I', 'L'], 'L')
-    
-    def k32WaitForMultipleObjects(count, handles, wait_all, time)
-        @_k32WaitForMultipleObjects.call(count, handles, wait_all, time)
-    end
-    
-    module_function "k32WaitForMultipleObjects"
+    attach_function :WaitForMultipleObjects, [:long, :pointer, :int, :long], :long
 
     # BOOL FindCloseChangeNotification(
     #   HANDLE hChangeHandle
     # );
-    @_k32FindCloseChangeNotification = 
-      Win32::API.new('FindCloseChangeNotification', ['L'], 'I')
-
-    def k32FindCloseChangeNotification(handle)
-        @_k32FindCloseChangeNotification.call(handle)
-    end
-    
-    module_function "k32FindCloseChangeNotification"
+    attach_function :FindCloseChangeNotification, [:long], :int
   end
 end

data/lib/rb-fchange/notifier.rb

@@ -15,6 +15,13 @@ module FChange
   #   # Nothing happens until you run the notifier!
   #   notifier.run
   class Notifier
+
+    #
+    INFINITE = 0xFFFFFFFF
+
+    #
+    WAIT_OBJECT_0 = 0x00000000
+
     # A hash from {Watcher} ids to the instances themselves.
     #
     # @private
@@ -110,19 +117,19 @@ module FChange
     def read_events
 
       # can return WAIT_TIMEOUT  = 0x00000102
-      dwWaitStatus = Native.k32WaitForMultipleObjects(@dwChangeHandles.count, 
+      dwWaitStatus = Native.WaitForMultipleObjects(@dwChangeHandles.count, 
         @lp_dwChangeHandles, 0, 500)
 
       events = []
 
       # this call blocks all threads completely.
       @dwChangeHandles.each_index do |index|
-        if dwWaitStatus == Native::WAIT_OBJECT_0 + index
+        if dwWaitStatus == WAIT_OBJECT_0 + index
 
           ev = Event.new(@watchers[@dwChangeHandles[index]])
           events << ev
         
-          r = Native.k32FindNextChangeNotification(@dwChangeHandles[index]) 
+          r = Native.FindNextChangeNotification(@dwChangeHandles[index]) 
           if r == 0 
               raise SystemCallError.new("Failed to watch", r) 
           end

data/lib/rb-fchange/watcher.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module FChange
   # Watchers monitor a single path for changes,
   # specified by {FChange::Notifier#watch event flags}.
@@ -50,12 +52,26 @@ module FChange
     #
     # @raise [SystemCallError] if the watch fails to be disabled for some reason
     def close
-      r = Native.k32FindCloseChangeNotification(@id)
+      r = Native.FindCloseChangeNotification(@id)
       #@notifier.remove_watcher(self)
       return if r == 0
       raise SystemCallError.new("Failed to stop watching #{@path.inspect}", r)
     end
 
+    # see http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx
+    def normalize_path(path)
+      if(path.size > 256)
+        path = "\\\\?\\" + Pathname.new(path).realpath.to_s
+      end
+#      require 'rchardet'
+#      require 'iconv'
+#      cd = CharDet.detect(path)
+#      encoding = cd['encoding']
+#      converter = Iconv.new("UTF-16LE", encoding)
+#      converter.iconv(path)
+      # path.encode!("UTF-16LE")
+    end
+
     # Creates a new {Watcher}.
     #
     # @private
@@ -65,9 +81,12 @@ module FChange
       @callback = callback || proc {}
       @path = path
       @flags = flags
-      @recursive = recursive
-      @id = Native.k32FindFirstChangeNotification(path, recursive,
+      @recursive = recursive ? 1 : 0
+
+      @id = Native.FindFirstChangeNotificationA(path, @recursive,
         Native::Flags.to_mask(flags));
+#      @id = Native.FindFirstChangeNotificationW(normalize_path(path), @recursive,
+#        Native::Flags.to_mask(flags));
  
       unless @id < 0
         @notifier.add_watcher(self)

data/rb-fchange.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = %q{rb-fchange}
   s.version     = FChange::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors 	= ["stereobooster"]
-  s.date = %q{2011-04-28}
+  s.authors     = ["stereobooster"]
+  s.date = %q{2011-05-15}
   s.description = %q{A Ruby wrapper for Windows Kernel functions for monitoring the specified directory or subtree}
-  s.email = %q{stereobooster@gmail.com}
+  s.email = ["stereobooster@gmail.com"]
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Ruby wrapper for Windows Kernel functions for monitoring the specified directory or subtree}
-  s.add_dependency('win32-api', '>= 1.4.8')
+  s.add_dependency('ffi')
 end

metadata

@@ -1,48 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rb-fchange
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - stereobooster
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-28 00:00:00 +03:00
+date: 2011-05-15 00:00:00.000000000 +03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: win32-api
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: &24277536 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 4
-        - 8
-        version: 1.4.8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: A Ruby wrapper for Windows Kernel functions for monitoring the specified directory or subtree
-email: stereobooster@gmail.com
+  prerelease: false
+  version_requirements: *24277536
+description: A Ruby wrapper for Windows Kernel functions for monitoring the specified
+  directory or subtree
+email:
+- stereobooster@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - lib/rb-fchange.rb
@@ -55,36 +44,27 @@ files:
 has_rdoc: true
 homepage: http://github.com/stereobooster/rb-fchange
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: A Ruby wrapper for Windows Kernel functions for monitoring the specified directory or subtree
+summary: A Ruby wrapper for Windows Kernel functions for monitoring the specified
+  directory or subtree
 test_files: []
-