rb-inotify 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8bfbc849234644754ef17ee3c69eb44712c59a6
-  data.tar.gz: fb589b6683906a14828beda595056d5ce5a129fe
+  metadata.gz: 2e68a4e4d80d820bab261f4cd6742fc858171c4b
+  data.tar.gz: 55307ef87345ba46c926335d00e2307e5a835333
 SHA512:
-  metadata.gz: d7e8ae116d90c6ff2dd1e56dc9ad132f05833f67a2629284759f1086a7fc7eeb28a0193d82edd061b8c7c245d3193da41ce3c015030df52199fb3bde0ef2ad62
-  data.tar.gz: 1fc4a3584ece0192eb2a90e061bf9eb7274e6e746373dd01942c17f16b728935461f6fce894346a9c61aee68dd2abfb0c35c1c4766fe7353e7ff0e9c0306d272
+  metadata.gz: 3d40f287530b9a2dabf0ef6411eb0d287422a827c21f47a67f801e92184c39830b45b204ea775062579f398737d6c39a8b7343f691f75244db8b9149014a8eab
+  data.tar.gz: e34970a92bb2708a5366f46eca2b65cd7fc8f58ddc1234dda075663ea7404e9f909f1888383c395bb830999e63fbcf6ba3bbe63b653f63ccfa56f4a4bc379f0b

data/.gitignore

@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.tags*
+.rspec_status

data/.travis.yml

@@ -0,0 +1,21 @@
+language: ruby
+sudo: false
+dist: trusty
+cache: bundler
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - jruby-head
+  - ruby-head
+  - jruby-9.1.8.0
+  - jruby-head
+  - rbx-3
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-3
+  fast_finish: true

data/Gemfile

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in utopia.gemspec
+gemspec
+
+group :development do
+	gem 'pry'
+	gem 'pry-coolline'
+	
+	gem 'tty-prompt'
+end
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
+end

data/README.md

@@ -6,6 +6,10 @@ It uses the [FFI](http://wiki.github.com/ffi/ffi) gem to avoid having to compile
 
 [API documentation is available on rdoc.info](http://rdoc.info/projects/nex3/rb-inotify).
 
+[![Build Status](https://secure.travis-ci.org/guard/rb-inotify.svg)](http://travis-ci.org/guard/rb-inotify)
+[![Code Climate](https://codeclimate.com/github/guard/rb-inotify.svg)](https://codeclimate.com/github/guard/rb-inotify)
+[![Coverage Status](https://coveralls.io/repos/guard/rb-inotify/badge.svg)](https://coveralls.io/r/guard/rb-inotify)
+
 ## Basic Usage
 
 The API is similar to the inotify C API, but with a more Rubyish feel.
@@ -64,3 +68,36 @@ It can even be used with EventMachine:
 Unfortunately, this currently doesn't work under JRuby.
 JRuby currently doesn't use native file descriptors for the IO object,
 so we can't use the notifier's file descriptor as a stand-in.
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## License
+
+Released under the MIT license.
+
+Copyright, 2009, by Nathan Weizenbaum.  
+Copyright, 2017, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
+
+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.

data/Rakefile

@@ -1,54 +1,16 @@
-require 'rubygems'
-require 'rake'
+require "bundler/gem_tasks"
+require 'rake/testtask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rb-inotify"
-    gem.summary = "A Ruby wrapper for Linux's inotify, using FFI"
-    gem.description = gem.summary
-    gem.email = "nex342@gmail.com"
-    gem.homepage = "http://github.com/nex3/rb-inotify"
-    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"
+Rake::TestTask.new do |t|
+  t.libs << 'test'
 end
 
-task(:permissions) {sh %{chmod -R a+r .}}
-Rake::Task[:build].prerequisites.unshift('permissions')
+desc "Run tests"
+task :default => :test
 
-module Jeweler::VersionHelper::PlaintextExtension
-  def write_with_inotify
-    write_without_inotify
-    filename = File.join(File.dirname(__FILE__), "lib/rb-inotify.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_inotify, :write
-  alias_method :write, :write_with_inotify
-end
-
-class Jeweler::Commands::Version::Base
-  def commit_version_with_inotify
-    return unless self.repo
-    self.repo.add(File.join(File.dirname(__FILE__), "lib/rb-inotify.rb"))
-    commit_version_without_inotify
-  end
-  alias_method :commit_version_without_inotify, :commit_version
-  alias_method :commit_version, :commit_version_with_inotify
-end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
+task :console do
+  require 'rb-inotify'
+  require 'pry'
+  
+  binding.pry
 end

data/lib/rb-inotify.rb

@@ -1,3 +1,4 @@
+require 'rb-inotify/version'
 require 'rb-inotify/native'
 require 'rb-inotify/native/flags'
 require 'rb-inotify/notifier'
@@ -11,8 +12,4 @@ require 'rb-inotify/errors'
 # * {Watcher} -- A watcher for a single file or directory
 # * {Event} -- An filesystem event notification
 module INotify
-  # An array containing the version number of rb-inotify.
-  # The numbers in the array are the major, minor, and patch versions,
-  # respectively.
-  VERSION = [0, 9, 8]
 end

data/lib/rb-inotify/native.rb

@@ -28,6 +28,7 @@ module INotify
     attach_function :inotify_init, [], :int
     attach_function :inotify_add_watch, [:int, :string, :uint32], :int
     attach_function :inotify_rm_watch, [:int, :uint32], :int
+    attach_function :fpathconf, [:int, :int], :long
 
     attach_function :read, [:int, :pointer, :size_t], :ssize_t
     attach_function :close, [:int], :int

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

@@ -65,6 +65,11 @@ module INotify
       # Event occurred against dir.
       IN_ISDIR = 0x40000000
 
+      ## fpathconf Macros
+
+      # returns the maximum length of a filename in the directory path or fd that the process is allowed to create.  The corresponding macro is _POSIX_NAME_MAX.
+      PC_NAME_MAX = 3
+
       # Converts a list of flags to the bitmask that the C API expects.
       #
       # @param flags [Array<Symbol>]

data/lib/rb-inotify/notifier.rb

@@ -239,7 +239,10 @@ module INotify
     #
     # @see #run
     def process
-      read_events.each {|event| event.callback!}
+      read_events.each do |event|
+        event.callback!
+        event.flags.include?(:ignored) && event.notifier.watchers.delete(event.watcher_id)
+      end
     end
 
     # Close the notifier.
@@ -268,7 +271,7 @@ module INotify
     #
     # {#run} or {#process} are ususally preferable to calling this directly.
     def read_events
-      size = 64 * Native::Event.size
+      size = Native::Event.size + Native.fpathconf(fd, Native::Flags::PC_NAME_MAX) + 1
       tries = 1
 
       begin
@@ -302,10 +305,14 @@ module INotify
       # Use Ruby's readpartial if possible, to avoid blocking other threads.
       begin
         return to_io.readpartial(size) if self.class.supports_ruby_io?
-      rescue Errno::EBADF
+      rescue Errno::EBADF, IOError
         # If the IO has already been closed, reading from it will cause
-        # Errno::EBADF.
+        # Errno::EBADF. In JRuby it can raise IOError with invalid or
+        # closed file descriptor.
         return nil
+      rescue IOError => ex
+        return nil if ex.message =~ /stream closed/
+        raise
       end
 
       tries = 0

data/lib/rb-inotify/version.rb

@@ -0,0 +1,24 @@
+# Copyright, 2012, by Natalie Weizenbaum.
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# 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.
+
+module INotify
+  VERSION = '0.9.9'
+end

data/rb-inotify.gemspec

@@ -1,54 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rb-inotify 0.9.8 ruby lib
+require_relative 'lib/rb-inotify/version'
 
-Gem::Specification.new do |s|
-  s.name = "rb-inotify"
-  s.version = "0.9.8"
+Gem::Specification.new do |spec|
+  spec.name     = 'rb-inotify'
+  spec.version  = INotify::VERSION
+  spec.platform = Gem::Platform::RUBY
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Nathan Weizenbaum"]
-  s.date = "2017-01-26"
-  s.description = "A Ruby wrapper for Linux's inotify, using FFI"
-  s.email = "nex342@gmail.com"
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    ".yardopts",
-    "MIT-LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/rb-inotify.rb",
-    "lib/rb-inotify/errors.rb",
-    "lib/rb-inotify/event.rb",
-    "lib/rb-inotify/native.rb",
-    "lib/rb-inotify/native/flags.rb",
-    "lib/rb-inotify/notifier.rb",
-    "lib/rb-inotify/watcher.rb",
-    "rb-inotify.gemspec"
-  ]
-  s.homepage = "http://github.com/nex3/rb-inotify"
-  s.rubygems_version = "2.4.8"
-  s.summary = "A Ruby wrapper for Linux's inotify, using FFI"
+  spec.summary     = 'A Ruby wrapper for Linux inotify, using FFI'
+  spec.authors     = ['Natalie Weizenbaum', 'Samuel Williams']
+  spec.email       = ['nex342@gmail.com', 'samuel.williams@oriontransfer.co.nz']
+  spec.homepage    = 'https://github.com/guard/rb-inotify'
+  spec.licenses    = ['MIT']
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= 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
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  
+  spec.required_ruby_version = '>= 2.0.0'
+  
+  spec.add_dependency "ffi", "~> 1.0"
+  
+  spec.add_development_dependency "rspec", "~> 3.4.0"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
 end
-

data/spec/rb-inotify/errors_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe INotify do
+  describe "QueueOverflowError" do
+    it "exists" do
+      expect(INotify::QueueOverflowError).to be_truthy
+    end
+  end
+end

data/spec/rb-inotify_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe INotify do
+  describe "version" do
+    it "exists" do
+      expect(INotify::VERSION).to be_truthy
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+
+if ENV['COVERAGE'] || ENV['TRAVIS']
+	begin
+		require 'simplecov'
+		
+		SimpleCov.start do
+			add_filter "/spec/"
+		end
+		
+		if ENV['TRAVIS']
+			require 'coveralls'
+			Coveralls.wear!
+		end
+	rescue LoadError
+		warn "Could not load simplecov: #{$!}"
+	end
+end
+
+require "bundler/setup"
+require "rb-inotify"
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = ".rspec_status"
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

metadata

@@ -1,65 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: rb-inotify
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
-- Nathan Weizenbaum
+- Natalie Weizenbaum
+- Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-description: A Ruby wrapper for Linux's inotify, using FFI
-email: nex342@gmail.com
+        version: '0'
+description: 
+email:
+- nex342@gmail.com
+- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - ".yardopts"
-- MIT-LICENSE
+- Gemfile
 - README.md
 - Rakefile
-- VERSION
 - lib/rb-inotify.rb
 - lib/rb-inotify/errors.rb
 - lib/rb-inotify/event.rb
 - lib/rb-inotify/native.rb
 - lib/rb-inotify/native/flags.rb
 - lib/rb-inotify/notifier.rb
+- lib/rb-inotify/version.rb
 - lib/rb-inotify/watcher.rb
 - rb-inotify.gemspec
-homepage: http://github.com/nex3/rb-inotify
-licenses: []
+- spec/rb-inotify/errors_spec.rb
+- spec/rb-inotify_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/guard/rb-inotify
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -69,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -77,8 +113,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: A Ruby wrapper for Linux's inotify, using FFI
-test_files: []
+summary: A Ruby wrapper for Linux inotify, using FFI
+test_files:
+- spec/rb-inotify/errors_spec.rb
+- spec/rb-inotify_spec.rb
+- spec/spec_helper.rb

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Nathan Weizenbaum
-
-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.

data/VERSION

@@ -1 +0,0 @@
-0.9.8