listen 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d761e41830d7a1ab26c12f681c86434f8f3ca8
-  data.tar.gz: bb0360cd61be2b710ca0964af23e569204ce52fa
+  metadata.gz: 617639ec10e92398c4bb2ac0ee386f9f51301b77
+  data.tar.gz: 56e366a55edf6c6f926f7d70a898ed86e02e0a76
 SHA512:
-  metadata.gz: 990bf729b6f8fc4208b3677047464665434538f2fc4c64dccdff4dd2d0da586477f61c593e3bcb1416f809072cb7a7d69045b9871a087a6365a352e1c8cb0903
-  data.tar.gz: 9f8ed8e2f7a63e68b4d59beb2414ff9818d1ae539b1e58e9fdc6214e11400fb3945a6b3a35fd4452c0e88fb702e6854a2580e38ede78f96a2cf8e69d9f18fe76
+  metadata.gz: cc5839d65676759b511acbecbaef944fb8f23d4add9f5c210392b50cfab51f4ed8f4296584131f264a6b7d30218ab27c3e0c63ec6bfed0439d382112d1a34a1b
+  data.tar.gz: 63c675e1adeae3ba7fa84e35f0729558db2eefcf3ad5a0447773bbfed7328412da623cccbea50ff00ead0f4ff9a8c205793da1b6d2609b6a90f52f27e986e8f5

data/lib/listen/adapter/base.rb

@@ -28,7 +28,7 @@ module Listen
         defaults = self.class.const_get('DEFAULTS')
         @options = Listen::Options.new(options, defaults)
       rescue
-        _log_exception 'adapter config failed: %s:%s'
+        _log_exception 'adapter config failed: %s:%s called from: %s', caller
         raise
       end
 
@@ -53,11 +53,12 @@ module Listen
 
       def start
         configure
+        calling_stack = caller.dup
         Listen::Internals::ThreadPool.add do
           begin
             _run
           rescue
-            _log_exception 'run() in thread failed: %s:%s'
+            _log_exception "run() in thread failed: %s:\n %s\n\ncalled from:\n %s", calling_stack
             raise
           end
         end
@@ -83,8 +84,8 @@ module Listen
         self.class.send(:_log, *args, &block)
       end
 
-      def _log_exception(msg)
-        _log :error, format(msg, $ERROR_INFO, $ERROR_POSITION * "\n")
+      def _log_exception(msg, caller_stack)
+        _log :error, format(msg, $ERROR_INFO, $ERROR_POSITION * "\n", caller_stack * "\n")
       end
 
       def self._log(*args, &block)

data/lib/listen/directory.rb

@@ -26,7 +26,7 @@ module Listen
       end
 
       # TODO: this is not tested properly
-      previous.reject! { |entry, _| current.include? path + entry }
+      previous = previous.reject { |entry, _| current.include? path + entry }
 
       _async_changes(dir, rel_path, queue, previous, options)
 

data/lib/listen/internals/thread_pool.rb

@@ -4,7 +4,9 @@ module Listen
     # Just a wrapper for tests to avoid interfereing with Celluloid's threads
     module ThreadPool
       def self.add(&block)
-        (@threads ||= Queue.new) << Thread.new { block.call }
+        Thread.new { block.call }.tap do |th|
+          (@threads ||= Queue.new) << th
+        end
       end
 
       def self.stop

data/lib/listen/listener.rb

@@ -188,12 +188,17 @@ module Listen
     include Internals::Logging
 
     def _init_options(options = {})
-      { debug: false,
-        latency: nil,
+      {
+        # Listener options
+        debug: false,
         wait_for_delay: 0.1,
-        force_polling: false,
         relative: false,
-        polling_fallback_message: nil }.merge(options)
+
+        # Backend selecting options
+        force_polling: false,
+        polling_fallback_message: nil,
+
+      }.merge(options)
     end
 
     def _debug_level
@@ -209,7 +214,7 @@ module Listen
     end
 
     def _init_actors
-      options = [mq: self, directories: directories]
+      adapter_options = { mq: self, directories: directories }
 
       @supervisor = Celluloid::SupervisionGroup.run!(registry)
       supervisor.add(Record, as: :record, args: self)
@@ -218,6 +223,9 @@ module Listen
       # TODO: broadcaster should be a separate plugin
       if @tcp_mode == :broadcaster
         require 'listen/tcp/broadcaster'
+
+        # TODO: pass a TCP::Config class to make sure host and port are properly
+        # passed, even when nil
         supervisor.add(TCP::Broadcaster, as: :broadcaster, args: [@host, @port])
 
         # TODO: should be auto started, because if it crashes
@@ -226,10 +234,16 @@ module Listen
         registry[:broadcaster].start
       elsif @tcp_mode == :recipient
         # TODO: adapter options should be configured in Listen.{on/to}
-        options.first.merge!(host: @host, port: @port)
+        adapter_options.merge!(host: @host, port: @port)
+      end
+
+      # TODO: refactor
+      valid_adapter_options = _adapter_class.const_get(:DEFAULTS).keys
+      valid_adapter_options.each do |key|
+        adapter_options.merge!(key => options[key]) if options.key?(key)
       end
 
-      supervisor.add(_adapter_class, as: :adapter, args: options)
+      supervisor.add(_adapter_class, as: :adapter, args: [adapter_options])
     end
 
     def _wait_for_changes

data/lib/listen/queue_optimizer.rb

@@ -12,7 +12,7 @@ module Listen
       else
         smooshed = { modified: [], added: [], removed: [] }
         changes.each do |_, change, dir, rel_path, _|
-          smooshed[change] << (dir + rel_path).to_s
+          smooshed[change] << (dir + rel_path).to_s if smooshed.key?(change)
         end
         smooshed.tap { |s| s.each { |_, v| v.uniq! } }
       end

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '2.10.0'
+  VERSION = '2.10.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Listen to file modifications