listen 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c535918103e5c68a1ea42d8cb360db013ea539
-  data.tar.gz: 44764113825c9c554731d7141a7bcf1adeee0a06
+  metadata.gz: b358ff4d6b7a68de70fe803dfc173fe5b8c52ed8
+  data.tar.gz: 59d00886af43fd6d7ee5c72d9cbdd865713ee041
 SHA512:
-  metadata.gz: 7259fce77dca1a6ff722521e34680ada567d4e7a948c85b09614787ed717ada197ad1b254d44222d6002b522066220365c99832468955d1a1201fc12d24234e2
-  data.tar.gz: 1ebb8207f946f7b2544466f0543164c872fc715f4cb8535579ca7e4944eb44d332b6415d95c2a0b1aec908d1fd091a080dd276f86af3de28020da2ad27ff8941
+  metadata.gz: 36e89ba4d2df71211e6ece83b8f27384273a4c68b8efa85a0adf751d486f0a2579a5d0480c2e0022a0534ae44f52361d09477cce0619daf7e58e1d8fad8e8ad6
+  data.tar.gz: b1414149c17f0cd68af1d9c5ed181d0d477095cb6cf6719c3cbd0f2e1d32221fd2729df3c171cbe3340188eb3f2b42d8d68ed3aa22199945651678b5d4a3a16c

data/.travis.yml

@@ -4,14 +4,16 @@ rvm:
   - 1.9.3
   - 2.0.0
   - jruby-19mode
+  - jruby-head
   - rbx-19mode
+  - rbx-head
 matrix:
   allow_failures:
     - rvm: jruby-19mode
+    - rvm: jruby-head
     - rvm: rbx-19mode
+    - rvm: rbx-head
 notifications:
   recipients:
     - thibaud@thibaud.me
     - remy@rymai.me
-    - michi@netzpiraten.ch
-    - maher@sallam.me

data/README.md

@@ -70,6 +70,8 @@ listener.ignore /\.rb/    # ignore rb extension in addition of pkg.
 sleep
 ```
 
+  Note: Ignoring regexp patterns are evaluated against relative paths.
+
 ## Changes callback
 
 Changes to the listened-to directories gets reported back to the user in a callback.

data/lib/listen/adapter.rb

@@ -18,7 +18,7 @@ module Listen
     private
 
     def self._select(options)
-      return Polling if options[:force_polling] || not_mri?
+      return Polling if options[:force_polling]
       return _usable_adapter_class if _usable_adapter_class
 
       _warn_polling_fallback(options)
@@ -36,9 +36,5 @@ module Listen
       warning = options.fetch(:polling_fallback_message, POLLING_FALLBACK_MESSAGE)
       Kernel.warn "[Listen warning]:\n#{warning.gsub(/^(.*)/, '  \1')}"
     end
-
-    def self.not_mri?
-      RUBY_ENGINE != 'ruby'
-    end
   end
 end

data/lib/listen/adapter/bsd.rb

@@ -25,8 +25,9 @@ module Listen
           require 'find'
           true
         end
-      rescue Gem::LoadError
+      rescue LoadError
         Kernel.warn BUNDLER_DECLARE_GEM
+        false
       end
 
       def start

data/lib/listen/adapter/windows.rb

@@ -18,8 +18,9 @@ module Listen
           require 'wdm'
           true
         end
-      rescue Gem::LoadError
+      rescue LoadError
         Kernel.warn BUNDLER_DECLARE_GEM
+        false
       end
 
       def start

data/lib/listen/listener.rb

@@ -81,8 +81,8 @@ module Listen
     # @param [Regexp, Hash<Regexp>] new ignoring patterns.
     #
     def ignore(regexps)
-      options[:ignore] = [options[:ignore], regexps]
-      Celluloid::Actor[:listen_silencer] = Silencer.new(options)
+      @options[:ignore] = [options[:ignore], regexps]
+      Celluloid::Actor[:listen_silencer] = Silencer.new(self)
     end
 
     # Overwrites ignore patterns (See DEFAULT_IGNORED_DIRECTORIES and DEFAULT_IGNORED_EXTENSIONS in Listen::Silencer)
@@ -90,9 +90,9 @@ module Listen
     # @param [Regexp, Hash<Regexp>] new ignoring patterns.
     #
     def ignore!(regexps)
-      options.delete(:ignore)
-      options[:ignore!] = regexps
-      Celluloid::Actor[:listen_silencer] = Silencer.new(options)
+      @options.delete(:ignore)
+      @options[:ignore!] = regexps
+      Celluloid::Actor[:listen_silencer] = Silencer.new(self)
     end
 
     private
@@ -113,13 +113,14 @@ module Listen
     end
 
     def _init_actors
-      Celluloid::Actor[:listen_silencer]    = Silencer.new(options)
+      Celluloid::Actor[:listen_silencer]    = Silencer.new(self)
       Celluloid::Actor[:listen_change_pool] = Change.pool(args: self)
       Celluloid::Actor[:listen_adapter]     = Adapter.new(self)
       Celluloid::Actor[:listen_record]      = Record.new(self)
     end
 
     def _signals_trap
+      return if defined?(JRUBY_VERSION)
       if Signal.list.keys.include?('INT')
         Signal.trap('INT') { stop }
       end

data/lib/listen/silencer.rb

@@ -8,23 +8,23 @@ module Listen
     # The default list of files that get ignored.
     DEFAULT_IGNORED_EXTENSIONS  = %w[.DS_Store]
 
-    attr_accessor :options, :patterns
+    attr_accessor :listener, :patterns
 
-    def initialize(options = {})
-      @options = options
+    def initialize(listener)
+      @listener = listener
       _init_patterns
     end
 
     def silenced?(path)
-      patterns.any? { |pattern| path.to_s =~ pattern }
+      patterns.any? { |pattern| _relative_path(path) =~ pattern }
     end
 
     private
 
     def _init_patterns
       @patterns = []
-      @patterns << _default_patterns unless options[:ignore!]
-      @patterns << options[:ignore] << options[:ignore!]
+      @patterns << _default_patterns unless listener.options[:ignore!]
+      @patterns << listener.options[:ignore] << listener.options[:ignore!]
       @patterns.compact!
       @patterns.flatten!
     end
@@ -35,12 +35,17 @@ module Listen
 
     def _default_ignored_directories_patterns
       ignored_directories = DEFAULT_IGNORED_DIRECTORIES.map { |d| Regexp.escape(d) }
-      %r{/(?:#{ignored_directories.join('|')})(/|$)}
+      %r{^(?:#{ignored_directories.join('|')})(/|$)}
     end
 
     def _default_ignored_extensions_patterns
       ignored_extensions = DEFAULT_IGNORED_EXTENSIONS.map { |e| Regexp.escape(e) }
       %r{(?:#{ignored_extensions.join('|')})$}
     end
+
+    def _relative_path(path)
+      relative_paths = listener.directories.map { |dir| path.relative_path_from(dir).to_s }
+      relative_paths.detect { |path| !path.start_with?('../') }
+    end
   end
 end

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = "2.0.4"
+  VERSION = '2.1.0'
 end

data/spec/lib/listen/adapter_spec.rb

@@ -16,62 +16,54 @@ describe Listen::Adapter do
       expect(adapter).to be_kind_of Listen::Adapter::Polling
     end
 
-    it "returns Polling adapter if not on MRI" do
-      stub_const("RUBY_ENGINE", 'foo')
+    it "returns BSD adapter when usable" do
+      Listen::Adapter::BSD.stub(:usable?) { true }
+      expect(Listen::Adapter::BSD).to receive(:new)
+      adapter
+    end
+
+    it "returns Darwin adapter when usable" do
+      Listen::Adapter::Darwin.stub(:usable?) { true }
+      expect(Listen::Adapter::Darwin).to receive(:new)
+      adapter
+    end
+
+    it "returns Linux adapter when usable" do
       Listen::Adapter::Linux.stub(:usable?) { true }
-      expect(adapter).to be_kind_of Listen::Adapter::Polling
+      expect(Listen::Adapter::Linux).to receive(:new)
+      adapter
     end
 
-    if RUBY_ENGINE == 'ruby'
-      it "returns BSD adapter when usable" do
-        Listen::Adapter::BSD.stub(:usable?) { true }
-        expect(Listen::Adapter::BSD).to receive(:new)
-        adapter
-      end
+    it "returns Windows adapter when usable" do
+      Listen::Adapter::Windows.stub(:usable?) { true }
+      expect(Listen::Adapter::Windows).to receive(:new)
+      adapter
+    end
 
-      it "returns Darwin adapter when usable" do
-        Listen::Adapter::Darwin.stub(:usable?) { true }
-        expect(Listen::Adapter::Darwin).to receive(:new)
-        adapter
+    context "no usable adapters" do
+      before { Kernel.stub(:warn) }
+
+      it "returns Polling adapter" do
+        expect(adapter).to be_kind_of Listen::Adapter::Polling
       end
 
-      it "returns Linux adapter when usable" do
-        Listen::Adapter::Linux.stub(:usable?) { true }
-        expect(Listen::Adapter::Linux).to receive(:new)
+      it "warns polling fallback with default message" do
+        expect(Kernel).to receive(:warn).with("[Listen warning]:\n  #{described_class::POLLING_FALLBACK_MESSAGE}")
         adapter
       end
 
-      it "returns Windows adapter when usable" do
-        Listen::Adapter::Windows.stub(:usable?) { true }
-        expect(Listen::Adapter::Windows).to receive(:new)
+      it "doesn't warn if polling_fallback_message is false" do
+        listener.stub(:options) { { polling_fallback_message: false } }
+        expect(Kernel).to_not receive(:warn)
         adapter
       end
 
-      context "no usable adapters" do
-        before { Kernel.stub(:warn) }
-
-        it "returns Polling adapter" do
-          expect(adapter).to be_kind_of Listen::Adapter::Polling
-        end
-
-        it "warns polling fallback with default message" do
-          expect(Kernel).to receive(:warn).with("[Listen warning]:\n  #{described_class::POLLING_FALLBACK_MESSAGE}")
-          adapter
-        end
-
-        it "doesn't warn if polling_fallback_message is false" do
-          listener.stub(:options) { { polling_fallback_message: false } }
-          expect(Kernel).to_not receive(:warn)
-          adapter
-        end
-
-        it "warns polling fallback with custom message if set" do
-          listener.stub(:options) { { polling_fallback_message: 'custom fallback message' } }
-          expect(Kernel).to receive(:warn).with("[Listen warning]:\n  custom fallback message")
-          adapter
-        end
+      it "warns polling fallback with custom message if set" do
+        listener.stub(:options) { { polling_fallback_message: 'custom fallback message' } }
+        expect(Kernel).to receive(:warn).with("[Listen warning]:\n  custom fallback message")
+        adapter
       end
     end
-  end
+end
 
 end

data/spec/lib/listen/listener_spec.rb

@@ -68,7 +68,7 @@ describe Listen::Listener do
     end
 
     it "registers silencer" do
-      expect(Listen::Silencer).to receive(:new).with(listener.options) { silencer }
+      expect(Listen::Silencer).to receive(:new).with(listener) { silencer }
       expect(Celluloid::Actor).to receive(:[]=).with(:listen_silencer, silencer)
       listener.start
     end
@@ -190,7 +190,7 @@ describe Listen::Listener do
     before { Celluloid::Actor.stub(:[]=) }
 
     it "resets silencer actor with new pattern" do
-      expect(Listen::Silencer).to receive(:new).with(hash_including(ignore: [nil, /foo/])) { new_silencer }
+      expect(Listen::Silencer).to receive(:new).with(listener) { new_silencer }
       expect(Celluloid::Actor).to receive(:[]=).with(:listen_silencer, new_silencer)
       listener.ignore(/foo/)
     end
@@ -199,8 +199,9 @@ describe Listen::Listener do
       let(:options) { { ignore: /bar/ } }
 
       it "adds up to existing ignore options" do
-        expect(Listen::Silencer).to receive(:new).with(hash_including(ignore: [/bar/, /foo/]))
+        expect(Listen::Silencer).to receive(:new).with(listener)
         listener.ignore(/foo/)
+        expect(listener.options).to include(ignore: [/bar/, /foo/])
       end
     end
 
@@ -208,8 +209,9 @@ describe Listen::Listener do
       let(:options) { { ignore: [/bar/] } }
 
       it "adds up to existing ignore options" do
-        expect(Listen::Silencer).to receive(:new).with(hash_including(ignore: [[/bar/], /foo/]))
+        expect(Listen::Silencer).to receive(:new).with(listener)
         listener.ignore(/foo/)
+        expect(listener.options).to include(ignore: [[/bar/], /foo/])
       end
     end
   end
@@ -219,17 +221,19 @@ describe Listen::Listener do
     before { Celluloid::Actor.stub(:[]=) }
 
     it "resets silencer actor with new pattern" do
-      expect(Listen::Silencer).to receive(:new).with(hash_including(ignore!: /foo/)) { new_silencer }
+      expect(Listen::Silencer).to receive(:new).with(listener) { new_silencer }
       expect(Celluloid::Actor).to receive(:[]=).with(:listen_silencer, new_silencer)
       listener.ignore!(/foo/)
+      expect(listener.options).to include(ignore!: /foo/)
     end
 
     context "with existing ignore! options" do
       let(:options) { { ignore!: /bar/ } }
 
       it "overwrites existing ignore options" do
-        expect(Listen::Silencer).to receive(:new).with(hash_including(ignore!: [/foo/]))
+        expect(Listen::Silencer).to receive(:new).with(listener)
         listener.ignore!([/foo/])
+        expect(listener.options).to include(ignore!: [/foo/])
       end
     end
 
@@ -237,8 +241,9 @@ describe Listen::Listener do
       let(:options) { { ignore: /bar/ } }
 
       it "deletes ignore options" do
-        expect(Listen::Silencer).to receive(:new).with(hash_not_including(ignore: /bar/))
+        expect(Listen::Silencer).to receive(:new).with(listener)
         listener.ignore!([/foo/])
+        expect(listener.options).to_not include(ignore: /bar/)
       end
     end
   end

data/spec/lib/listen/silencer_spec.rb

@@ -1,10 +1,14 @@
 require 'spec_helper'
 
 describe Listen::Silencer do
-  let(:silencer) { Listen::Silencer.new(options) }
+  let(:options) { {} }
+  let(:listener) { double(Listen::Listener,
+    directories: [Pathname.new(Dir.pwd), Pathname.new("/Users/Shared/")],
+    options: options
+  ) }
+  let(:silencer) { Listen::Silencer.new(listener) }
 
   describe "#silenced?" do
-    let(:options) { {} }
     let(:pwd) { Pathname.new(Dir.pwd) }
 
     context "default ignore" do
@@ -46,7 +50,7 @@ describe Listen::Silencer do
     end
 
     context "with ignore options" do
-      let(:options) { { ignore: [%r{foo/bar}, /\.pid$/] } }
+      let(:options) { { ignore: [%r{^foo/bar}, /\.pid$/] } }
 
       it "silences custom ignored directory" do
         path = pwd.join('foo', 'bar')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Listen to file modifications