listen 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a975f7ef6b99aac535ba9cd1d8889b3576039d
-  data.tar.gz: 0dae5d3ca08ece9bcc92895c370cdffc45397868
+  metadata.gz: f18e337415a04b4714aa6a4b52bbf21a7c8a3d01
+  data.tar.gz: e70d968dd1f9d350a35d319bd932c521d15e0b75
 SHA512:
-  metadata.gz: 366af3ba431e4a21473035a7c3a8e9431da5a5d6b440283edd3185f05fd53d616496fcbf0898f5888924d04d12c8fb95f14a6bb3ee907e5132ca3ab9e1da9d67
-  data.tar.gz: f57d099f93115b1de4c42b6e7abb4b0d6ec96075b4f9731736f84dbb41b0217975164d48547803cf0c974cdbf39156df5621472dd503a07b37c1cadbdedb379e
+  metadata.gz: 3a84d19f4ecc7131d6ccfddf937c77f8d05b786a4b84d05bbf0808efd16d3066ecff5b2d25c511b3ac7fe70d73ad208f748a1236edc92ccb7bd8ec9f82b832b0
+  data.tar.gz: 5bbab04e17fa7e957343cad614936a59ea822af8e4a77657317b40a854f6fa3b8c0b2c26e7480b3fcd8e71129cdcdc0e66219c412a9e27f94e66df04b4792fc9

data/lib/listen/adapter/darwin.rb

@@ -6,17 +6,34 @@ module Listen
     # Adapter implementation for Mac OS X `FSEvents`.
     #
     class Darwin < Base
-      OS_REGEXP = /darwin(1.+)?$/i
+      OS_REGEXP = /darwin(?<major_version>1\d+)/i
 
       # The default delay between checking for changes.
       DEFAULTS = { latency: 0.1 }
 
+      INCOMPATIBLE_GEM_VERSION = <<-EOS.gsub(/^ {8}/, '')
+        rb-fsevent > 0.9.4 no longer supports OS X 10.6 through 10.8.
+
+        Please add the following to your Gemfile to avoid polling for changes:
+          require 'rbconfig'
+          if RbConfig::CONFIG['target_os'] =~ /darwin(1[0-3])/i
+            gem 'rb-fsevent', '<= 0.9.4'
+          end
+      EOS
+
+      def self.usable?
+        require 'rb-fsevent'
+        darwin_version = RbConfig::CONFIG['target_os'][OS_REGEXP, :major_version] or return false
+        return true if darwin_version.to_i >= 13 # darwin13 is OS X 10.9
+        return true if Gem::Version.new(FSEvent::VERSION) <= Gem::Version.new('0.9.4')
+        Kernel.warn INCOMPATIBLE_GEM_VERSION
+        false
+      end
+
       private
 
       # NOTE: each directory gets a DIFFERENT callback!
       def _configure(dir, &callback)
-        require 'rb-fsevent'
-
         opts = { latency: options.latency }
 
         @workers ||= ::Queue.new

data/lib/listen/adapter/linux.rb

@@ -35,7 +35,9 @@ module Listen
       end
 
       def _run
+        Thread.current[:listen_blocking_read_thread] = true
         @worker.run
+        Thread.current[:listen_blocking_read_thread] = false
       end
 
       def _process_event(dir, event)
@@ -99,7 +101,7 @@ module Listen
       end
 
       def _stop
-        @worker.close
+        @worker && @worker.close
       end
     end
   end

data/lib/listen/backend.rb

@@ -2,6 +2,8 @@ require 'listen/adapter'
 require 'listen/adapter/base'
 require 'listen/adapter/config'
 
+require 'forwardable'
+
 # This class just aggregates configuration object to avoid Listener specs
 # from exploding with huge test setup blocks
 module Listen

data/lib/listen/directory.rb

@@ -12,7 +12,7 @@ module Listen
 
       # TODO: use children(with_directory: false)
       path = dir + rel_path
-      current = Set.new(path.children)
+      current = Set.new(_children(path))
 
       Listen::Logger.debug do
         format('%s: %s(%s): %s -> %s',
@@ -28,7 +28,7 @@ module Listen
         end
       rescue Errno::ENOENT
         # The directory changed meanwhile, so rescan it
-        current = Set.new(path.children)
+        current = Set.new(_children(path))
         retry
       end
 
@@ -72,5 +72,16 @@ module Listen
       opts.delete(:recursive)
       snapshot.invalidate(type, path, opts)
     end
+
+    def self._children(path)
+      return path.children unless RUBY_ENGINE == 'jruby'
+
+      # JRuby inconsistency workaround, see:
+      # https://github.com/jruby/jruby/issues/3840
+      exists = path.exist?
+      directory = path.directory?
+      return path.children unless (exists && !directory)
+      raise Errno::ENOTDIR, path.to_s
+    end
   end
 end

data/lib/listen/event/queue.rb

@@ -1,5 +1,7 @@
 require 'thread'
 
+require 'forwardable'
+
 module Listen
   module Event
     class Queue

data/lib/listen/internals/thread_pool.rb

@@ -13,8 +13,16 @@ module Listen
         return if @threads.empty? # return to avoid using possibly stubbed Queue
 
         killed = Queue.new
+        # You can't kill a read on a descriptor in JRuby, so let's just
+        # ignore running threads (listen rb-inotify waiting for disk activity
+        # before closing)  pray threads die faster than they are created...
+        limit = RUBY_ENGINE == 'jruby' ? [1] : []
+
         killed << @threads.pop.kill until @threads.empty?
-        killed.pop.join until killed.empty?
+        until killed.empty?
+          th = killed.pop
+          th.join(*limit) unless th[:listen_blocking_read_thread]
+        end
       end
     end
   end

data/lib/listen/listener.rb

@@ -61,7 +61,7 @@ module Listen
 
     default_state :initializing
 
-    state :initializing, to: :backend_started
+    state :initializing, to: [:backend_started, :stopped]
 
     state :backend_started, to: [:frontend_ready, :stopped] do
       backend.start

data/lib/listen/record/entry.rb

@@ -13,7 +13,7 @@ module Listen
 
       def children
         child_relative = _join
-        (Dir.entries(sys_path) - %w(. ..)).map do |name|
+        (_entries(sys_path) - %w(. ..)).map do |name|
           Entry.new(@root, child_relative, name)
         end
       end
@@ -46,6 +46,17 @@ module Listen
         args = [@relative, @name].compact
         args.empty? ? nil : ::File.join(*args)
       end
+
+      def _entries(dir)
+        return Dir.entries(dir) unless RUBY_ENGINE == 'jruby'
+
+        # JRuby inconsistency workaround, see:
+        # https://github.com/jruby/jruby/issues/3840
+        exists = ::File.exist?(dir)
+        directory = ::File.directory?(dir)
+        return Dir.entries(dir) unless (exists && !directory)
+        raise Errno::ENOTDIR, dir
+      end
     end
   end
 end

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '3.0.7'
+  VERSION = '3.0.8'
 end

metadata

@@ -1,33 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.7
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.7
@@ -116,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Listen to file modifications