listen 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d489e80cf9d6b15f4a42482bba84e75d4994828e
-  data.tar.gz: 803c713b6ce06f2a51b5c3506324f934d4d4ed69
+  metadata.gz: b77b3524696878ca9c7e797552c9830e0173408c
+  data.tar.gz: f8d88a5651b054f14feff8f810c2182c057c6d80
 SHA512:
-  metadata.gz: 7e72f4f7c6e77871cbc17ff66b38832df74005a087197fd68ffc5bf6561bef2894fe037417d26a7ec0ca8d504eed2cbd2d518f034c64e7c47211c97d2a5059e4
-  data.tar.gz: 3b1d258b109e74f8addd4e657ac09c8ec359cfe9ee60070f19193f3d3d38e948b5d4cffd863c3afcc93b304bf0c1f194dc6ec2013ef189e8fa4b0936425a618e
+  metadata.gz: 5356a5660f3dafacf6c7f7c229339835923615c237a922368302bfe8546261ba987f8b6157994549a6e629f5cdd42564e282f6dbc13a8f0c65573d19c29f9acf
+  data.tar.gz: 153897ff1f97a4c5bb92863f8c26d90d24071ba4300f0dd8864230898d26ca5d11c2e57e1698d5c665b2fcde1967017e8b8c6f49699d4fd76ec68f179552b2da

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.3 - May 21, 2013
+
+### Bug fix
+
+- [#117][] Fix jruby error on Pathname#relative_path_from. ([@luikore][])
+
 ## 1.1.2 - May 14, 2013
 
 ### Bug fix
@@ -282,6 +288,7 @@
 [#112]: https://github.com/guard/listen/issues/112
 [#113]: https://github.com/guard/listen/issues/113
 [#115]: https://github.com/guard/listen/issues/115
+[#117]: https://github.com/guard/listen/issues/117
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@ahoward]: https://github.com/ahoward
 [@akerbos]: https://github.com/akerbos

data/lib/listen/directory_record.rb

@@ -190,9 +190,15 @@ module Listen
     # @return [String] the relative path
     #
     def relative_to_base(path)
-      path = path.force_encoding("BINARY") if path.respond_to?(:force_encoding)
-      relative_path = Pathname.new(path).relative_path_from(Pathname.new directory).to_s
-      relative_path unless relative_path.start_with?('..')
+      path = path.dup
+      regexp = "\\A#{Regexp.quote directory}(#{File::SEPARATOR}|\\z)"
+      if path.respond_to?(:force_encoding)
+        path.force_encoding("BINARY")
+        regexp.force_encoding("BINARY")
+      end
+      if path.sub!(Regexp.new(regexp), '')
+        path
+      end
     end
 
     private

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent