listen 3.1.3 → 3.3.0.pre.2

data/lib/listen/queue_optimizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Listen
   class QueueOptimizer
     class Config
@@ -107,15 +109,15 @@ module Listen
     def _detect_possible_editor_save(changes)
       return unless changes.size == 2
 
-      from_type = from_change = from = nil
-      to_type = to_change = to_dir = to = nil
+      from_type = from = nil
+      to_type = to_dir = to = nil
 
       changes.each do |data|
         case data[1]
         when :moved_from
-          from_type, from_change, _, from, = data
+          from_type, _from_change, _, from, = data
         when :moved_to
-          to_type, to_change, to_dir, to, = data
+          to_type, _to_change, to_dir, to, = data
         else
           return nil
         end

data/lib/listen/record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thread'
 require 'listen/record/entry'
 require 'listen/record/symlink_detector'
@@ -45,8 +47,7 @@ module Listen
         if [nil, '', '.'].include? rel_path.to_s
           tree
         else
-          tree[rel_path.to_s] ||= _auto_hash
-          tree[rel_path.to_s]
+          _sub_tree(rel_path)
         end
 
       result = {}
@@ -57,6 +58,19 @@ module Listen
       result
     end
 
+    def _sub_tree(rel_path)
+      tree.each_with_object({}) do |(path, meta), result|
+        next unless path.start_with?(rel_path)
+
+        if path == rel_path
+          result.merge!(meta)
+        else
+          sub_path         = path.sub(%r{\A#{rel_path}/?}, '')
+          result[sub_path] = meta
+        end
+      end
+    end
+
     def build
       @tree = _auto_hash
       # TODO: test with a file name given

data/lib/listen/record/entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Listen
   # @private api
   class Record
@@ -22,7 +24,7 @@ module Listen
 
       def meta
         lstat = ::File.lstat(sys_path)
-        { mtime: lstat.mtime.to_f, mode: lstat.mode }
+        { mtime: lstat.mtime.to_f, mode: lstat.mode, size: lstat.size }
       end
 
       # record hash is e.g.

data/lib/listen/record/symlink_detector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module Listen

data/lib/listen/silencer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Listen
   class Silencer
     # The default list of directories that get ignored.
@@ -46,6 +48,9 @@ module Listen
          )
         )
 
+      # Mutagen sync temporary files
+      | \.mutagen-temporary.*
+
       # other files
       | \.DS_Store
       | \.tmp

data/lib/listen/silencer/controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Listen
   class Silencer
     class Controller

data/lib/listen/thread.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'thread'
+
+require_relative 'logger'
+
+module Listen
+  module Thread
+    class << self
+      # Creates a new thread with the given name.
+      # Any exceptions raised by the thread will be logged with the thread name and complete backtrace.
+      def new(name)
+        thread_name = "listen-#{name}"
+
+        caller_stack = caller
+        ::Thread.new do
+          begin
+            yield
+          rescue Exception => ex
+            _log_exception(ex, thread_name, caller_stack)
+            nil
+          end
+        end.tap do |thread|
+          thread.name = thread_name
+        end
+      end
+
+      private
+
+      def _log_exception(ex, thread_name, caller_stack)
+        complete_backtrace = [*ex.backtrace, "--- Thread.new ---", *caller_stack]
+        message = "Exception rescued in #{thread_name}:\n#{_exception_with_causes(ex)}\n#{complete_backtrace * "\n"}"
+        Listen.logger.error(message)
+      end
+
+      def _exception_with_causes(ex)
+        result = +"#{ex.class}: #{ex}"
+        if ex.cause
+          result << "\n"
+          result << "--- Caused by: ---\n"
+          result << _exception_with_causes(ex.cause)
+        end
+        result
+      end
+    end
+  end
+end

data/lib/listen/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Listen
-  VERSION = '3.1.3'.freeze
+  VERSION = '3.3.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.3.0.pre.2
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 0.9.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,37 +49,9 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.7
-- !ruby/object:Gem::Dependency
-  name: ruby_dep
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 0.9.10
 description: The Listen gem listens to file modifications and notifies you about the
-  changes. Works everywhere!
+  changegem. Works everywhere!
 email: thibaud@thibaud.gg
 executables:
 - listen
@@ -110,7 +82,6 @@ files:
 - lib/listen/event/queue.rb
 - lib/listen/file.rb
 - lib/listen/fsm.rb
-- lib/listen/internals/thread_pool.rb
 - lib/listen/listener.rb
 - lib/listen/listener/config.rb
 - lib/listen/logger.rb
@@ -121,33 +92,30 @@ files:
 - lib/listen/record/symlink_detector.rb
 - lib/listen/silencer.rb
 - lib/listen/silencer/controller.rb
+- lib/listen/thread.rb
 - lib/listen/version.rb
 homepage: https://github.com/guard/listen
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
-    - !ruby/object:Gem::Version
-      version: '2.2'
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Listen to file modifications
 test_files: []
-has_rdoc: 

data/lib/listen/internals/thread_pool.rb

@@ -1,29 +0,0 @@
-module Listen
-  # @private api
-  module Internals
-    module ThreadPool
-      def self.add(&block)
-        Thread.new { block.call }.tap do |th|
-          (@threads ||= Queue.new) << th
-        end
-      end
-
-      def self.stop
-        return unless @threads ||= nil
-        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?
-        until killed.empty?
-          th = killed.pop
-          th.join(*limit) unless th[:listen_blocking_read_thread]
-        end
-      end
-    end
-  end
-end