listen 2.8.4 → 2.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12793c4773ab97a1c6dae6b24118a9dd6cdb65c5
-  data.tar.gz: 40934da6856ee4f074b7487bbf9b733d7c352c71
+  metadata.gz: 518edf112bf9fef9d8d244170676f6fd9777ee1a
+  data.tar.gz: 9c41a94f5b5fd71820f5e3beec8e2dfa6613daf6
 SHA512:
-  metadata.gz: df21cae8514eecb194d12f3a01adb142bbc60bd8548b41821292c951607b54d73ff36b8b9590978afabbcfb0fe17f9e2d0155727cbfc8923eba7a65c177b8237
-  data.tar.gz: b10c7d7068c590686d3d2081960b2145484b9aea2ef4143b5b73df2a0bd37bdf0a403ea764963446af44a63e01b3e82de74a341df2c3123c711253829db36712
+  metadata.gz: 28e6b2b78fb6749fdc5345ee3cd9a92ba5ae30dfecdbe077941e360c4d4222007ea04f1e7ad4cfd3635f2c0093dfc624aa0736fe225312cfb3387498ce740947
+  data.tar.gz: f97fc0da2b8c2ce16af3ed209ba0cadda2546ed632e90d4e917d96e5738cdf561de8ad12ac31e894a903083b2d1d42fa275bd374b948fa6a527ea19f947d5ad2

data/README.md

@@ -16,7 +16,7 @@ Make sure you know these few basic tricks: https://github.com/guard/listen/wiki/
 
 ## Features
 
-* OS-optimized adapters on MRI for Mac OS X 10.6+, Linux, ~~\*BSD~~ and Windows, [more info](#listen-adapters) below.
+* OS-optimized adapters on MRI for Mac OS X 10.6+, Linux, \*BSD and Windows, [more info](#listen-adapters) below.
 * Detects file modification, addition and removal.
 * You can watch multiple directories.
 * Regexp-patterns for ignoring paths for more accuracy and speed
@@ -28,7 +28,6 @@ Please note that:
 - Some filesystems won't work without polling (VM/Vagrant Shared folders, NFS, Samba, sshfs, etc.)
 - Specs suite on JRuby and Rubinius aren't reliable on Travis CI, but should work.
 - Windows and \*BSD adapter aren't continuously and automaticaly tested.
-- \*BSD is broken and not supported any more, see: [#220](https://github.com/guard/listen/issues/220)
 
 ## Pending features / issues
 
@@ -178,7 +177,7 @@ Also, setting the environment variable `LISTEN_GEM_DEBUGGING=1` does the same as
 
 The Listen gem has a set of adapters to notify it when there are changes.
 
-There are 4 OS-specific adapters to support Darwin, Linux, ~~\*BSD~~ and Windows.
+There are 4 OS-specific adapters to support Darwin, Linux, \*BSD and Windows.
 These adapters are fast as they use some system-calls to implement the notifying function.
 
 There is also a polling adapter - although it's much slower than other adapters,
@@ -202,22 +201,14 @@ gem 'wdm', '>= 0.1.0' if Gem.win_platform?
 
 ### On \*BSD
 
-**NOTE: \*BSD currently is BROKEN with no plans to fix it or support it (see: [#220](https://github.com/guard/listen/issues/220))**
-
 If your are on \*BSD you can try to use the [`rb-kqueue`](https://github.com/mat813/rb-kqueue) instead of polling.
 
 Please add the following to your Gemfile:
 
 ```ruby
 require 'rbconfig'
-gem 'rb-kqueue', '>= 0.2'
 if RbConfig::CONFIG['target_os'] =~ /bsd|dragonfly/i
   gem 'rb-kqueue', '>= 0.2'
-
-  # Base versions have known conflicts/bugs
-  # Even master branches may not work...
-  gem 'ffi', github: 'carpetsmoker/ffi', ref: 'ac63e07f7'
-  gem 'celluloid', github: 'celluloid/celluloid', ref: '7fdef04'
 end
 
 ```

data/lib/listen/adapter/base.rb

@@ -79,16 +79,20 @@ module Listen
         @mq.send(:_queue_raw_change, type, dir, rel_path, options)
       end
 
-      def _log(*args)
-        self.class.send(:_log, *args)
+      def _log(*args, &block)
+        self.class.send(:_log, *args, &block)
       end
 
       def _log_exception(msg)
         _log :error, format(msg, $ERROR_INFO, $ERROR_POSITION * "\n")
       end
 
-      def self._log(*args)
-        Celluloid::Logger.send(*args)
+      def self._log(*args, &block)
+        if block
+          Celluloid::Logger.send(*args, block.call)
+        else
+          Celluloid::Logger.send(*args)
+        end
       end
     end
   end

data/lib/listen/adapter/bsd.rb

@@ -21,31 +21,13 @@ module Listen
       BUNDLER_DECLARE_GEM = <<-EOS.gsub(/^ {6}/, '')
         Please add the following to your Gemfile to avoid polling for changes:
           require 'rbconfig'
-          if RbConfig::CONFIG['target_os'] =~ #{OS_REGEXP}
+          if RbConfig::CONFIG['target_os'] =~ /#{OS_REGEXP}/
             gem 'rb-kqueue', '>= 0.2'
-
-            # Base versions have known conflicts/bugs
-            # Even master branches may not work...
-            gem 'ffi', github: 'carpetsmoker/ffi', ref: 'ac63e07f7'
-            gem 'celluloid', github: 'celluloid/celluloid', ref: '7fdef04'
           end
       EOS
 
-      BSD_EXPERIMENTAL = <<-EOS.gsub(/^ {6}/, '')
-        NOTE *BSD SUPPORT IS EXPERIMENTAL!
-
-        In fact, it likely WONT WORK!!!!
-
-        (see: https://github.com/guard/listen/issues/220)
-
-        If you're brave enough, feel free to suggest pull requests and
-        experiment on your own. For help, browse existing issues marked 'bsd'
-        for clues, tips and workaround.
-      EOS
-
       def self.usable?
         return false unless super
-        Kernel.warn BSD_EXPERIMENTAL
         require 'rb-kqueue'
         require 'find'
         true
@@ -58,6 +40,7 @@ module Listen
 
       def _configure(directory, &_callback)
         @worker ||= KQueue::Queue.new
+        @callback = _callback
         # use Record to make a snapshot of dir, so we
         # can detect new files
         _find(directory.to_s) { |path| _watch_file(path, @worker) }
@@ -73,16 +56,16 @@ module Listen
           # Force dir content tracking to kick in, or we won't have
           # names of added files
           _queue_change(:dir, dir, '.', recursive: true)
-        else
+        elsif full_path.exist?
           path = full_path.relative_path_from(dir)
-          _queue_change(:file, dir, path, change: _change(event.flags))
+          _queue_change(:file, dir, path.to_s, change: _change(event.flags))
         end
 
         # If it is a directory, and it has a write flag, it means a
         # file has been added so find out which and deal with it.
         # No need to check for removed files, kqueue will forget them
         # when the vfs does.
-        _watch_for_new_file(event) if path.directory?
+        _watch_for_new_file(event) if full_path.directory?
       end
 
       def _change(event_flags)
@@ -109,12 +92,12 @@ module Listen
       end
 
       def _watch_file(path, queue)
-        queue.watch_file(path, *options.events, &_worker_callback)
+        queue.watch_file(path, *options.events, &@callback)
       end
 
       # Quick rubocop workaround
-      def _find(*paths)
-        Find.send(:find, *paths)
+      def _find(*paths, &block)
+        Find.send(:find, *paths, &block)
       end
     end
   end

data/lib/listen/adapter/tcp.rb

@@ -75,7 +75,8 @@ module Listen
       # Handles incoming message by notifying of path changes
       def handle_message(message)
         type, change, dir, path, _ = message.object
-        _log :debug, "TCP message: #{[type, change, dir, path].inspect}"
+        _log(:debug) { "TCP message: #{[type, change, dir, path].inspect}" }
+
         _queue_change(type.to_sym, Pathname(dir), path, change: change.to_sym)
       end
 

data/lib/listen/internals/logging.rb

@@ -3,20 +3,24 @@ require 'celluloid/logger'
 module Listen
   module Internals
     module Logging
-      def _info(*args)
-        _log(:info, *args)
+      def _info(*args, &block)
+        _log(:info, *args, &block)
       end
 
-      def _warn(*args)
-        _log(:warn, *args)
+      def _warn(*args, &block)
+        _log(:warn, *args, &block)
       end
 
-      def _debug(*args)
-        _log(:debug, *args)
+      def _debug(*args, &block)
+        _log(:debug, *args, &block)
       end
 
-      def _log(*args)
-        Celluloid::Logger.send(*args)
+      def _log(*args, &block)
+        if block
+          Celluloid::Logger.send(*args, block.call)
+        else
+          Celluloid::Logger.send(*args)
+        end
       end
 
       def _format_error(fmt)

data/lib/listen/listener.rb

@@ -332,7 +332,7 @@ module Listen
     end
 
     def _queue_raw_change(type, dir, rel_path, options)
-      _debug "raw queue: #{[type, dir, rel_path, options].inspect}"
+      _debug { "raw queue: #{[type, dir, rel_path, options].inspect}" }
 
       unless (worker = async(:change_pool))
         _warn 'Failed to allocate worker from change pool'

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '2.8.4'
+  VERSION = '2.8.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 2.8.4
+  version: 2.8.5
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -66,62 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0rc1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0rc1
-- !ruby/object:Gem::Dependency
-  name: rspec-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The Listen gem listens to file modifications and notifies you about the
   changes. Works everywhere!
 email: thibaud@thibaud.gg
@@ -130,21 +74,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- TROUBLESHOOTING.md
 - bin/listen
 - lib/listen.rb
 - lib/listen/adapter.rb
@@ -172,32 +105,6 @@ files:
 - lib/listen/tcp/broadcaster.rb
 - lib/listen/tcp/message.rb
 - lib/listen/version.rb
-- listen.gemspec
-- spec/acceptance/listen_spec.rb
-- spec/acceptance/tcp_spec.rb
-- spec/lib/listen/adapter/base_spec.rb
-- spec/lib/listen/adapter/bsd_spec.rb
-- spec/lib/listen/adapter/darwin_spec.rb
-- spec/lib/listen/adapter/linux_spec.rb
-- spec/lib/listen/adapter/polling_spec.rb
-- spec/lib/listen/adapter/tcp_spec.rb
-- spec/lib/listen/adapter/windows_spec.rb
-- spec/lib/listen/adapter_spec.rb
-- spec/lib/listen/change_spec.rb
-- spec/lib/listen/directory_spec.rb
-- spec/lib/listen/file_spec.rb
-- spec/lib/listen/listener_spec.rb
-- spec/lib/listen/record_spec.rb
-- spec/lib/listen/silencer_spec.rb
-- spec/lib/listen/tcp/broadcaster_spec.rb
-- spec/lib/listen/tcp/listener_spec.rb
-- spec/lib/listen/tcp/message_spec.rb
-- spec/lib/listen_spec.rb
-- spec/spec_helper.rb
-- spec/support/acceptance_helper.rb
-- spec/support/fixtures_helper.rb
-- spec/support/platform_helper.rb
-- vendor/hound/config/style_guides/ruby.yml
 homepage: https://github.com/guard/listen
 licenses:
 - MIT
@@ -218,33 +125,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Listen to file modifications
-test_files:
-- spec/acceptance/listen_spec.rb
-- spec/acceptance/tcp_spec.rb
-- spec/lib/listen/adapter/base_spec.rb
-- spec/lib/listen/adapter/bsd_spec.rb
-- spec/lib/listen/adapter/darwin_spec.rb
-- spec/lib/listen/adapter/linux_spec.rb
-- spec/lib/listen/adapter/polling_spec.rb
-- spec/lib/listen/adapter/tcp_spec.rb
-- spec/lib/listen/adapter/windows_spec.rb
-- spec/lib/listen/adapter_spec.rb
-- spec/lib/listen/change_spec.rb
-- spec/lib/listen/directory_spec.rb
-- spec/lib/listen/file_spec.rb
-- spec/lib/listen/listener_spec.rb
-- spec/lib/listen/record_spec.rb
-- spec/lib/listen/silencer_spec.rb
-- spec/lib/listen/tcp/broadcaster_spec.rb
-- spec/lib/listen/tcp/listener_spec.rb
-- spec/lib/listen/tcp/message_spec.rb
-- spec/lib/listen_spec.rb
-- spec/spec_helper.rb
-- spec/support/acceptance_helper.rb
-- spec/support/fixtures_helper.rb
-- spec/support/platform_helper.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,28 +0,0 @@
-pkg/*
-doc/*
-*.gem
-*.rbc
-.*.swp
-*.bak
-bundle
-.bundle
-.yardoc
-.rbx
-.rvmrc
-.vagrant
-Gemfile.lock
-spec/.fixtures
-coverage
-.ruby-version
-example*
-test.txt
-
-## MAC OS
-.DS_Store
-.Trashes
-.com.apple.timemachine.supported
-.fseventsd
-Desktop DB
-Desktop DF
-
-.idea

data/.hound.yml

@@ -1,3 +0,0 @@
-ruby:
-  enabled: true
-  config_file: .rubocop.yml

data/.rspec

@@ -1,2 +0,0 @@
---color
---format documentation

data/.rubocop.yml

@@ -1,20 +0,0 @@
-inherit_from:
-  - vendor/hound/config/style_guides/ruby.yml
-  - .rubocop_todo.yml
-
-# Rails cops
-AllCops:
-  RunRailsCops: true
-
-# Files you want to exclude
-AllCops:
-  Exclude:
-    - db/schema.rb
-    - Gemfile
-    - Guardfile
-    - Rakefile
-
-# TODO: put your overrides here:
-Style/StringLiterals:
-  EnforcedStyle: single_quotes
-  Enabled: true