ffi-1.9.3-java & rb-inotify-0.9.5

lib/ruby/jruby/ffi-1.9.3-java/COPYING

@@ -0,0 +1,49 @@
+Copyright (c) 2008-2013, Ruby FFI project contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Ruby FFI project nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+libffi, used by this project, is licensed under the MIT license:
+
+libffi - Copyright (c) 1996-2011  Anthony Green, Red Hat, Inc and others.
+See source files for details.
+
+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.
+

lib/ruby/jruby/ffi-1.9.3-java/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2008-2013, Ruby FFI project contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Ruby FFI project nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

lib/ruby/jruby/ffi-1.9.0-java/README.md → lib/ruby/jruby/ffi-1.9.3-java/README.md

@@ -1,12 +1,12 @@
-# ruby-ffi http://wiki.github.com/ffi/ffi [![Build Status](https://travis-ci.org/ffi/ffi.png?branch=master)](https://travis-ci.org/ffi/ffi)
+# ruby-ffi https://wiki.github.com/ffi/ffi [![Build Status](https://travis-ci.org/ffi/ffi.png?branch=master)](https://travis-ci.org/ffi/ffi)
 
 ## Description
 
 Ruby-FFI is a ruby extension for programmatically loading dynamic
 libraries, binding functions within them, and calling those functions
 from Ruby code. Moreover, a Ruby-FFI extension works without changes
-on Ruby and JRuby. Discover why should you write your next extension
-using Ruby-FFI [here](http://wiki.github.com/ffi/ffi/why-use-ffi).
+on Ruby and JRuby. [Discover why you should write your next extension
+using Ruby-FFI](https://wiki.github.com/ffi/ffi/why-use-ffi).
 
 ## Features/problems
 
@@ -33,8 +33,8 @@ MyLib.puts 'Hello, World using libc!'
 For less minimalistic and more sane examples you may look at:
 
 * the samples/ folder
-* the examples on the [wiki](http://wiki.github.com/ffi/ffi)
-* the projects using FFI listed on this page (http://wiki.github.com/ffi/ffi/projects-using-ffi)
+* the examples on the [wiki](https://wiki.github.com/ffi/ffi)
+* the projects using FFI listed on this page (https://wiki.github.com/ffi/ffi/projects-using-ffi)
 
 ## Requirements
 
@@ -57,7 +57,7 @@ or from the git repository on github:
 
 ## License
 
-The ffi library is covered by the LGPL3 license, also see the LICENSE file.
+The ffi library is covered by the BSD license, also see the LICENSE file.
 The specs are shared with Rubyspec and are licensed by the same license
 as Rubyspec, see the LICENSE.SPECS file.
 

lib/ruby/jruby/ffi-1.9.0-java/Rakefile → lib/ruby/jruby/ffi-1.9.3-java/Rakefile

@@ -162,7 +162,7 @@ namespace 'java' do
     s.homepage = gem_spec.homepage
     s.summary = gem_spec.summary
     s.description = gem_spec.description
-    s.files = %w(History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile)
+    s.files = %w(LICENSE COPYING README.md Rakefile)
     s.has_rdoc = false
     s.license = gem_spec.license
     s.platform = 'java'

lib/ruby/jruby/rb-inotify-0.9.5/VERSION

@@ -0,0 +1 @@
+0.9.5

lib/ruby/jruby/rb-inotify-0.9.2/lib/rb-inotify.rb → lib/ruby/jruby/rb-inotify-0.9.5/lib/rb-inotify.rb

@@ -13,5 +13,5 @@ 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, 2]
+  VERSION = [0, 9, 5]
 end

lib/ruby/jruby/rb-inotify-0.9.2/lib/rb-inotify/notifier.rb → lib/ruby/jruby/rb-inotify-0.9.5/lib/rb-inotify/notifier.rb

@@ -242,7 +242,10 @@ def process
     #
     # @raise [SystemCallError] if closing the underlying file descriptor fails.
     def close
-      return if Native.close(@fd) == 0
+      if Native.close(@fd) == 0
+        @watchers.clear
+        return
+      end
 
       raise SystemCallError.new("Failed to properly close inotify socket" +
        case FFI.errno

lib/ruby/jruby/rb-inotify-0.9.2/lib/rb-inotify/watcher.rb → lib/ruby/jruby/rb-inotify-0.9.5/lib/rb-inotify/watcher.rb

@@ -45,8 +45,13 @@ def callback!(event)
     #
     # @raise [SystemCallError] if the watch fails to be disabled for some reason
     def close
-      return if Native.inotify_rm_watch(@notifier.fd, @id) == 0
-      raise SystemCallError.new("Failed to stop watching #{path.inspect}", FFI.errno)
+      if Native.inotify_rm_watch(@notifier.fd, @id) == 0
+        @notifier.watchers.delete(@id)
+        return
+      end
+
+      raise SystemCallError.new("Failed to stop watching #{path.inspect}",
+                                FFI.errno)
     end
 
     # Creates a new {Watcher}.

lib/ruby/jruby/rb-inotify-0.9.2/rb-inotify.gemspec → lib/ruby/jruby/rb-inotify-0.9.5/rb-inotify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rb-inotify"
-  s.version = "0.9.2"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Weizenbaum"]
-  s.date = "2013-09-12"
+  s.date = "2014-06-06"
   s.description = "A Ruby wrapper for Linux's inotify, using FFI"
   s.email = "[email protected]"
   s.extra_rdoc_files = [
@@ -31,11 +31,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nex3/rb-inotify"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.3"
   s.summary = "A Ruby wrapper for Linux's inotify, using FFI"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    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"])