listen 2.7.9 → 2.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3cee3bca315051931b8206499fded313985faf4
-  data.tar.gz: e2893da22d2bce0400f381d86d4b62f93220219c
+  metadata.gz: 50a3ac06e4268a2cd6b85ceae0dbf31f8683ab6f
+  data.tar.gz: 640a42142e94ab28e6d7414bedd864d5e7bf4d71
 SHA512:
-  metadata.gz: 9574e5f1138f0a6fd05cb0a203564ff96f500892c0b4b8a5a4b8bf6f53163e6d7f16882f09a93047f8c65155018dad8ec1d0989203c9bc15728b7e3d2346b7f9
-  data.tar.gz: 487371b7585da0c36c658b9aa0bc96243f0d7010bfcc881cbe28bdd0374ab796dc1149c1180c3ef923b430720a37bd9da8aa998d6aba46d283525d696b027014
+  metadata.gz: 2dc86cec1578b84961649ad4a1f685fc33bbc243397884c46cb3e047f3221e7b5f529c5940d5bf4be950f280dd0927899c7b4ba91e9844f8a77a736614905358
+  data.tar.gz: 1467477d54aa38100d861d73e3f1714906c2e7cddc9ae0917468934ab5a69ba13c0eeeabda7af3c89dcb5032938128406bcbbe50489ca5deb2b8de848058425f

data/README.md

@@ -1,3 +1,5 @@
+### :warning: Listen is [looking for new maintainers](https://groups.google.com/forum/#!topic/guard-dev/2Td0QTvTIsE). Please [contact me](mailto:thibaud@thibaud.gg) if you're interested.
+
 # Listen
 
 [![Gem Version](https://badge.fury.io/rb/listen.png)](http://badge.fury.io/rb/listen) [![Build Status](https://travis-ci.org/guard/listen.png)](https://travis-ci.org/guard/listen) [![Dependency Status](https://gemnasium.com/guard/listen.png)](https://gemnasium.com/guard/listen) [![Code Climate](https://codeclimate.com/github/guard/listen.png)](https://codeclimate.com/github/guard/listen) [![Coverage Status](https://coveralls.io/repos/guard/listen/badge.png?branch=master)](https://coveralls.io/r/guard/listen)

data/lib/listen/adapter.rb

@@ -38,7 +38,7 @@ module Listen
     end
 
     def self._log(type, message)
-      Celluloid.logger.send(type, message)
+      Celluloid::Logger.send(type, message)
     end
   end
 end

data/lib/listen/adapter/base.rb

@@ -84,7 +84,7 @@ module Listen
       end
 
       def self._log(*args)
-        Celluloid.logger.send(*args)
+        Celluloid::Logger.send(*args)
       end
     end
   end

data/lib/listen/adapter/darwin.rb

@@ -12,13 +12,16 @@ module Listen
 
       def _configure(dir, &callback)
         require 'rb-fsevent'
-        @worker ||= FSEvent.new
         opts = { latency: options.latency }
-        @worker.watch(dir.to_s, opts, &callback)
+
+        @workers ||= Queue.new
+        @workers << FSEvent.new.tap do |worker|
+          worker.watch(dir.to_s, opts, &callback)
+        end
       end
 
       def _run
-        @worker.run
+        @workers.pop.run while !@workers.empty?
       end
 
       def _process_event(dir, event)

data/lib/listen/adapter/tcp.rb

@@ -20,7 +20,8 @@ module Listen
 
       # Initializes and starts a Celluloid::IO-powered TCP-recipient
       def start
-        attempts = 3
+        attempts ||= 3
+        _log :info, "TCP: opening socket #{options.host}:#{options.port}"
         @socket = TCPSocket.new(options.host, options.port)
         @buffer = ''
         async.run
@@ -30,7 +31,7 @@ module Listen
         sleep 1
         attempts -= 1
         _log :warn, "TCP.start: #{$!.inspect}"
-        retry if retries > 0
+        retry if attempts > 0
         _log :error, "TCP.start: #{$!.inspect}:#{$@.join("\n")}"
         raise
       rescue

data/lib/listen/change.rb

@@ -52,7 +52,7 @@ module Listen
     private
 
     def _log(type, message)
-      Celluloid.logger.send(type, message)
+      Celluloid::Logger.send(type, message)
     end
   end
 end

data/lib/listen/directory.rb

@@ -14,11 +14,15 @@ module Listen
       current = Set.new(path.children)
 
       if options[:silence]
-        _log :debug, "Recording: #{rel_path}: #{options.inspect}"\
-          " [#{previous.inspect}] -> (#{current.inspect})"
+        _log(:debug) do
+          "Recording: #{rel_path}: #{options.inspect}"\
+            " [#{previous.inspect}] -> (#{current.inspect})"
+        end
       else
-        _log :debug, "Scanning: #{rel_path}: #{options.inspect}"\
+        _log(:debug) do
+          "Scanning: #{rel_path}: #{options.inspect}"\
           " [#{previous.inspect}] -> (#{current.inspect})"
+        end
       end
 
       current.each do |full_path|
@@ -42,7 +46,7 @@ module Listen
       _async_changes(dir, path, queue, previous, options)
       _change(queue, :file, dir, rel_path, options)
     rescue
-      _log :warn, "scanning DIED: #{$!}:#{$@.join("\n")}"
+      _log(:warn) { "scanning DIED: #{$!}:#{$@.join("\n")}" }
       raise
     end
 
@@ -68,8 +72,11 @@ module Listen
       end
     end
 
-    def self._log(type, message)
-      Celluloid.logger.send(type, message)
+    def self._log(type, &block)
+      return unless Celluloid.logger
+      Celluloid.logger.send(type) do
+        block.call
+      end
     end
   end
 end

data/lib/listen/listener.rb

@@ -18,6 +18,9 @@ module Listen
     # TODO: deprecate
     attr_reader :options, :directories
     attr_reader :registry, :supervisor
+
+    # TODO: deprecate
+    # NOTE: these are VERY confusing (broadcast + recipient modes)
     attr_reader :host, :port
 
     # Initializes the directories listener.
@@ -34,8 +37,10 @@ module Listen
       @options = _init_options(args.last.is_a?(Hash) ? args.pop : {})
 
       # Setup logging first
-      Celluloid.logger.level = _debug_level
-      _log :info, "Celluloid loglevel set to: #{Celluloid.logger.level}"
+      if Celluloid.logger
+        Celluloid.logger.level = _debug_level
+        _log :info, "Celluloid loglevel set to: #{Celluloid.logger.level}"
+      end
 
       @silencer = Silencer.new
       _reconfigure_silencer({})
@@ -176,10 +181,6 @@ module Listen
     end
 
     def _debug_level
-      # TODO: remove? (since there are BSD warnings anyway)
-      bsd = RbConfig::CONFIG['host_os'] =~ /bsd|dragonfly/
-      return Logger::DEBUG if bsd
-
       debugging = ENV['LISTEN_GEM_DEBUGGING'] || options[:debug]
       case debugging.to_s
       when /2/
@@ -192,10 +193,13 @@ module Listen
     end
 
     def _init_actors
+      options = [mq: self, directories: directories]
+
       @supervisor = Celluloid::SupervisionGroup.run!(registry)
       supervisor.add(Record, as: :record, args: self)
       supervisor.pool(Change, as: :change_pool, args: self)
 
+      # TODO: broadcaster should be a separate plugin
       if @tcp_mode == :broadcaster
         require 'listen/tcp/broadcaster'
         supervisor.add(TCP::Broadcaster, as: :broadcaster, args: [@host, @port])
@@ -204,9 +208,11 @@ module Listen
         # a new instance is spawned by supervisor, but it's 'start' isn't
         # called
         registry[:broadcaster].start
+      elsif @tcp_mode == :recipient
+        # TODO: adapter options should be configured in Listen.{on/to}
+        options.first.merge!(host: @host, port: @port)
       end
 
-      options = [mq: self, directories: directories]
       supervisor.add(_adapter_class, as: :adapter, args: options)
     end
 
@@ -248,7 +254,7 @@ module Listen
     end
 
     def _log(type, message)
-      Celluloid.logger.send(type, message)
+      Celluloid::Logger.send(type, message)
     end
 
     def _adapter_class

data/lib/listen/record.rb

@@ -65,9 +65,9 @@ module Listen
         _fast_build(directory.to_s)
       end
 
-      Celluloid.logger.info "Record.build took #{Time.now.to_f - start} seconds"
+      Celluloid::Logger.info "Record.build(): #{Time.now.to_f - start} seconds"
     rescue
-      Celluloid.logger.warn "build crashed: #{$!.inspect}"
+      Celluloid::Logger.warn "build crashed: #{$!.inspect}"
       raise
     end
 

data/lib/listen/tcp/broadcaster.rb

@@ -16,6 +16,7 @@ module Listen
       #
       def initialize(host, port)
         @sockets = []
+        _log :debug, "Broadcaster: starting tcp server: #{host}:#{port}"
         @server = TCPServer.new(host, port)
       rescue
         _log :error, "Broadcaster.initialize: #{$!.inspect}:#{$@.join("\n")}"
@@ -60,7 +61,7 @@ module Listen
       private
 
       def _log(type, message)
-        Celluloid.logger.send(type, message)
+        Celluloid::Logger.send(type, message)
       end
 
       def _unicast(socket, payload)

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '2.7.9'
+  VERSION = '2.7.11'
 end

data/spec/lib/listen/listener_spec.rb

@@ -86,7 +86,7 @@ describe Listener do
       subject.start
     end
 
-    it 'supervises adaper' do
+    it 'supervises adapter' do
       allow(Adapter).to receive(:select) { Adapter::Polling }
       options = [mq: subject, directories: []]
       expect(supervisor).to receive(:add).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 2.7.9
+  version: 2.7.11
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid