rb-kqueue 0.1.0 → 0.2.0

data/.gitignore

@@ -1,3 +1,4 @@
 /pkg
 /.yardoc
 /doc
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/README.md

@@ -4,7 +4,15 @@ This is a simple wrapper over the [kqueue](http://en.wikipedia.org/wiki/Kqueue)
 BSD event notification interface (supported on FreeBSD, NetBSD, OpenBSD, and Darwin).
 It uses the [FFI](http://wiki.github.com/ffi/ffi) gem to avoid having to compile a C extension.
 
-[API documentation is available on rdoc.info](http://rdoc.info/projects/nex3/rb-kqueue).
+[API documentation is available on rdoc.info](http://rdoc.info/projects/mat813/rb-kqueue).
+
+## WARNING
+
+This code is incomplete, and didn't work last I had a chance to test it.
+I don't have time to continue working on it at the moment,
+so I'm posting it online for posterity and in case anyone wants to take a crack at it.
+
+If anyone wants commit rights, just email me at nex342@gmail.com.
 
 ## Usage
 

data/Rakefile

@@ -1,45 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rb-kqueue"
-    gem.summary = "A Ruby wrapper for BSD's kqueue, using FFI"
-    gem.description = gem.summary
-    gem.email = "nex342@gmail.com"
-    gem.homepage = "http://github.com/nex3/rb-kqueue"
-    gem.authors = ["Nathan Weizenbaum"]
-    gem.add_dependency "ffi", ">= 0.5.0"
-    gem.add_development_dependency "yard", ">= 0.4.0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-module Jeweler::VersionHelper::PlaintextExtension
-  def write_with_kqueue
-    write_without_kqueue
-    filename = File.join(File.dirname(__FILE__), "lib/rb-kqueue.rb")
-    text = File.read(filename)
-    File.open(filename, 'w') do |f|
-      f.write text.gsub(/^(  VERSION = ).*/, '\1' + [major, minor, patch].inspect)
-    end
-  end
-  alias_method :write_without_kqueue, :write
-  alias_method :write, :write_with_kqueue
-end
-
-class Jeweler::Commands::Version::Base
-  def commit_version_with_kqueue
-    return unless self.repo
-    self.repo.add(File.join(File.dirname(__FILE__), "lib/rb-kqueue.rb"))
-    commit_version_without_kqueue
-  end
-  alias_method :commit_version_without_kqueue, :commit_version
-  alias_method :commit_version, :commit_version_with_kqueue
-end
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 begin
   require 'yard'

data/lib/rb-kqueue.rb

@@ -13,7 +13,7 @@ require 'rb-kqueue/queue'
 # * {Watcher} -- A watcher for a single sort of event
 # * {Event} -- A notification that an event has occurred
 module KQueue
-  VERSION = [0, 1, 0]
+  VERSION = [0, 2, 0]
 
   # Raise an exception for a native kqueue error.
   #

data/lib/rb-kqueue/event.rb

@@ -67,7 +67,7 @@ module KQueue
       @filter = KQueue::Native::Flags.from_flag("EVFILT", @native[:filter])
       @flags = Native::Flags.from_mask("EV", @native[:flags])
 
-      KQueue.handle_error @native[:data] if @flags.inclue?(:error)
+      KQueue.handle_error @native[:data] if @flags.include?(:error)
     end
 
     # Runs the callback for this event.

data/lib/rb-kqueue/native.rb

@@ -31,6 +31,8 @@ module KQueue
         :tv_nsec, :long)
     end
 
+    ffi_lib FFI::Library::LIBC
+
     attach_function :kqueue, [], :int
     attach_function :kevent, [:int, :pointer, :int, :pointer, :int, :pointer], :int
 

data/lib/rb-kqueue/native/flags.rb

@@ -82,10 +82,11 @@ module KQueue
       # @return [Array<Symbol>]
       def self.from_mask(prefix, mask)
         re = /^#{Regexp.quote prefix}_/
-        constants.select do |c|
+        constants.select do |sym|
+          c = sym.to_s
           next false unless c =~ re
           const_get(c) & mask != 0
-        end.map {|c| c.sub("#{prefix}_", "").downcase.to_sym}
+        end.map {|c| c.to_s.sub("#{prefix}_", "").downcase.to_sym}
       end
 
       # Converts a flag to the integer that the C API expects.
@@ -104,9 +105,10 @@ module KQueue
       # @return [Symbol]
       def self.from_flag(prefix, flag)
         re = /^#{Regexp.quote prefix}_/
-        constants.each do |c|
+        constants.each do |sym|
+          c = sym.to_s
           next unless c =~ re
-          return c.sub("#{prefix}_", "").downcase.to_sym if const_get(c) == flag
+          return c.to_s.sub("#{prefix}_", "").downcase.to_sym if const_get(c) == flag
         end
       end
     end

data/lib/rb-kqueue/queue.rb

@@ -269,7 +269,7 @@ module KQueue
     # @return [Watcher] The Watcher for this event.
     # @raise [SystemCallError] If something goes wrong when registering the Watcher.
     def watch_process(pid, *flags, &callback)
-      Watcher::Process.new(self, path, flags, callback)
+      Watcher::Process.new(self, pid, flags, callback)
     end
 
     # Watches for signals to this process.
@@ -337,15 +337,26 @@ module KQueue
       read_events.each {|event| event.callback!}
     end
 
+    def poll
+      read_events(false).each {|event| event.callback!}
+    end
+
+    NULL_TIMEOUT = Native::TimeSpec.new.tap { |ts|
+      ts[:tv_sec] = 0
+      ts[:tv_nsec] = 0
+    }
+
     # Blocks until there are one or more filesystem events
     # that this notifier has watchers registered for.
     # Once there are events, returns their {Event} objects.
     #
     # @private
-    def read_events
+    def read_events(blocking = true)
       size = 1024
       eventlist = FFI::MemoryPointer.new(Native::KEvent, size)
-      res = Native.kevent(@fd, nil, 0, eventlist, size, nil)
+
+      timeout = blocking ? nil : NULL_TIMEOUT
+      res = Native.kevent(@fd, nil, 0, eventlist, size, timeout)
 
       KQueue.handle_error if res < 0
       (0...res).map {|i| KQueue::Event.new(Native::KEvent.new(eventlist[i]), self)}

data/lib/rb-kqueue/watcher/file.rb

@@ -49,7 +49,7 @@ module KQueue
               end,
               FFI.errno)
           end)
-        super(queue, @file.fileno, :vnode, flags, nil, callback)
+        super(queue, @fd, :vnode, flags, nil, callback)
       end
     end
   end

data/rb-kqueue.gemspec

@@ -3,59 +3,27 @@
 # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{rb-kqueue}
-  s.version = "0.1.0"
+Gem::Specification.new do |gem|
+  gem.name = %q{rb-kqueue}
+  gem.version = "0.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nathan Weizenbaum"]
-  s.date = %q{2010-02-08}
-  s.description = %q{A Ruby wrapper for BSD's kqueue, using FFI}
-  s.email = %q{nex342@gmail.com}
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     ".yardopts",
-     "MIT-LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/rb-kqueue.rb",
-     "lib/rb-kqueue/event.rb",
-     "lib/rb-kqueue/native.rb",
-     "lib/rb-kqueue/native/flags.rb",
-     "lib/rb-kqueue/queue.rb",
-     "lib/rb-kqueue/watcher.rb",
-     "lib/rb-kqueue/watcher/file.rb",
-     "lib/rb-kqueue/watcher/process.rb",
-     "lib/rb-kqueue/watcher/read_write.rb",
-     "lib/rb-kqueue/watcher/signal.rb",
-     "lib/rb-kqueue/watcher/socket_read_write.rb",
-     "lib/rb-kqueue/watcher/timer.rb",
-     "rb-kqueue.gemspec"
-  ]
-  s.homepage = %q{http://github.com/nex3/rb-kqueue}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A Ruby wrapper for BSD's kqueue, using FFI}
+  gem.authors = ["Mathieu Arnold", "Nathan Weizenbaum"]
+  gem.email = %q{mat@mat.cc nex342@gmail.com}
+  gem.date = %q{2012-12-03}
+  gem.description = %q{A Ruby wrapper for BSD's kqueue, using FFI}
+  gem.extra_rdoc_files = %w(README.md)
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  gem.files = `git ls-files`.split(/\n/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ffi>, [">= 0.5.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.4.0"])
-    else
-      s.add_dependency(%q<ffi>, [">= 0.5.0"])
-      s.add_dependency(%q<yard>, [">= 0.4.0"])
-    end
-  else
-    s.add_dependency(%q<ffi>, [">= 0.5.0"])
-    s.add_dependency(%q<yard>, [">= 0.4.0"])
-  end
+  gem.homepage = %q{http://github.com/mat813/rb-kqueue}
+  gem.rdoc_options = ["--charset=UTF-8"]
+  gem.require_paths = ["lib"]
+  gem.rubygems_version = %q{1.3.5}
+  gem.summary = %q{A Ruby wrapper for BSD's kqueue, using FFI}
+
+  gem.add_runtime_dependency(%q<ffi>, [">= 0.5.0"])
+  gem.add_development_dependency(%q<yard>, [">= 0.4.0"])
 end
 

metadata

@@ -1,39 +1,57 @@
 --- !ruby/object:Gem::Specification 
 name: rb-kqueue
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 23
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
+- Mathieu Arnold
 - Nathan Weizenbaum
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -08:00
-default_executable: 
+date: 2012-12-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-    version: 
+  type: :development
+  version_requirements: *id002
 description: A Ruby wrapper for BSD's kqueue, using FFI
-email: nex342@gmail.com
+email: mat@mat.cc nex342@gmail.com
 executables: []
 
 extensions: []
@@ -43,6 +61,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .yardopts
+- Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -60,8 +79,7 @@ files:
 - lib/rb-kqueue/watcher/socket_read_write.rb
 - lib/rb-kqueue/watcher/timer.rb
 - rb-kqueue.gemspec
-has_rdoc: true
-homepage: http://github.com/nex3/rb-kqueue
+homepage: http://github.com/mat813/rb-kqueue
 licenses: []
 
 post_install_message: 
@@ -70,23 +88,30 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper for BSD's kqueue, using FFI
 test_files: []
 
+has_rdoc: