listen 2.7.8 → 2.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75b73ca8c3df5774760e1a9e9cd4281a4fb91f7b
-  data.tar.gz: f09049b304ca5bf11a288ee36cc81ff7f0f4d624
+  metadata.gz: b3cee3bca315051931b8206499fded313985faf4
+  data.tar.gz: e2893da22d2bce0400f381d86d4b62f93220219c
 SHA512:
-  metadata.gz: beb3b0ff8fd1e133ea01b700a147f4aeac44bf670fdb3c16f4e66da5fc24545645a51899cbd241add9be9887091a5312dd196606b23229c3d574f9e4f9db390a
-  data.tar.gz: c5f4d09de7c8f336aee3f4c8c69e8707e174de4692c83beb7640213bae9254dcffaa07642ea212c632eb38c4ed5fd75ca2871af859589c06fff0e86179f8f516
+  metadata.gz: 9574e5f1138f0a6fd05cb0a203564ff96f500892c0b4b8a5a4b8bf6f53163e6d7f16882f09a93047f8c65155018dad8ec1d0989203c9bc15728b7e3d2346b7f9
+  data.tar.gz: 487371b7585da0c36c658b9aa0bc96243f0d7010bfcc881cbe28bdd0374ab796dc1149c1180c3ef923b430720a37bd9da8aa998d6aba46d283525d696b027014

data/bin/listen

@@ -5,7 +5,7 @@ require 'listen/cli'
 
 unless defined?(JRUBY_VERSION)
   if Signal.list.keys.include?('INT')
-    Signal.trap('INT') { Listen.stop }
+    Signal.trap('INT') { Thread.new { Listen.stop } }
   end
 end
 

data/lib/listen.rb

@@ -37,10 +37,13 @@ module Listen
     #
     def stop
       @listeners ||= []
+
+      # TODO: should use a mutex for this
       @listeners.each do |listener|
         # call stop to halt the main loop
         listener.stop
       end
+      @listeners = nil
 
       Celluloid.shutdown
     end

data/lib/listen/adapter/linux.rb

@@ -51,7 +51,8 @@ module Listen
 
         if /1|true/ =~ ENV['LISTEN_GEM_SIMULATE_FSEVENT']
           if (event.flags & [:moved_to, :moved_from]) || _dir_event?(event)
-            _queue_change(:dir, dir, Pathname(rel_path).dirname, {})
+            rel_path = path.dirname.relative_path_from(dir).to_s
+            _queue_change(:dir, dir, rel_path, {})
           else
             _queue_change(:dir, dir, rel_path, {})
           end

data/lib/listen/listener.rb

@@ -271,8 +271,10 @@ module Listen
       hash = _smoosh_changes(changes)
       result = [hash[:modified], hash[:added], hash[:removed]]
 
+      block_start = Time.now.to_f
       # TODO: condition not tested, but too complex to test ATM
       block.call(*result) unless result.all?(&:empty?)
+      _log :debug, "Callback took #{Time.now.to_f - block_start} seconds"
     end
 
     attr_reader :wait_thread

data/lib/listen/record.rb

@@ -24,8 +24,6 @@ module Listen
 
     def unset_path(dir, rel_path)
       dirname, basename = Pathname(rel_path).split.map(&:to_s)
-
-      @paths[dir.to_s][dirname] ||= {}
       _fast_unset_path(dir, dirname, basename)
     end
 
@@ -93,8 +91,13 @@ module Listen
       root = @paths[dir.to_s]
       # this may need to be reworked to properly remove
       # entries from a tree, without adding non-existing dirs to the record
-      return unless root.key?(dirname)
-      root[dirname].delete(basename)
+      if [nil, '', '.'].include? dirname
+        return unless root.key?(basename)
+        root.delete(basename)
+      else
+        return unless root.key?(dirname)
+        root[dirname].delete(basename)
+      end
     end
 
     def _fast_build(root)

data/lib/listen/version.rb

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

data/spec/lib/listen/record_spec.rb

@@ -79,19 +79,39 @@ describe Listen::Record do
   end
 
   describe '#unset_path' do
-    context 'path is present' do
-      before { record.update_file(dir, 'path/file.rb', mtime: 1.1) }
+    context 'within watched dir' do
+      context 'when path is present' do
+        before { record.update_file(dir, 'file.rb', mtime: 1.1) }
 
-      it 'unsets path' do
-        record.unset_path(dir, 'path/file.rb')
-        expect(record.paths).to eq('/dir' => { 'path' => {} })
+        it 'unsets path' do
+          record.unset_path(dir, 'file.rb')
+          expect(record.paths).to eq('/dir' => {})
+        end
+      end
+
+      context 'when path not present' do
+        it 'unsets path' do
+          record.unset_path(dir, 'file.rb')
+          expect(record.paths).to eq('/dir' => {})
+        end
       end
     end
 
-    context 'path not present' do
-      it 'unsets path' do
-        record.unset_path(dir, 'path/file.rb')
-        expect(record.paths).to eq('/dir' => { 'path' => {} })
+    context 'within subdir' do
+      context 'when path is present' do
+        before { record.update_file(dir, 'path/file.rb', mtime: 1.1) }
+
+        it 'unsets path' do
+          record.unset_path(dir, 'path/file.rb')
+          expect(record.paths).to eq('/dir' => { 'path' => {} })
+        end
+      end
+
+      context 'when path not present' do
+        it 'unsets path' do
+          record.unset_path(dir, 'path/file.rb')
+          expect(record.paths).to eq('/dir' => {})
+        end
       end
     end
   end
@@ -142,9 +162,6 @@ describe Listen::Record do
       context 'with file.rb in record' do
         before { record.update_file(dir, 'file.rb', mtime: 1.1) }
         it { should eq('file.rb' => { mtime: 1.1 }) }
-        context 'when file is removed' do
-          before { record.update_file(dir, 'file.rb', mtime: 1.1) }
-        end
       end
 
       context 'with subdir/file.rb in record' do

data/spec/lib/listen_spec.rb

@@ -1,16 +1,22 @@
 require 'spec_helper'
 
 describe Listen do
+  let(:listener) { instance_double(Listen::Listener, stop: nil) }
+
+  after do
+    Listen.stop
+  end
+
   describe '.to' do
     it 'initalizes listener' do
-      expect(Listen::Listener).to receive(:new).with('/path')
+      expect(Listen::Listener).to receive(:new).with('/path') { listener }
       described_class.to('/path')
     end
 
     context 'when using :forward_to option' do
       it 'initializes TCP-listener in broadcast-mode' do
         expect(Listen::Listener).to receive(:new).
-          with(4000, :broadcaster, '/path', {})
+          with(4000, :broadcaster, '/path', {}) { listener }
         described_class.to('/path', forward_to: 4000)
       end
     end
@@ -18,6 +24,9 @@ describe Listen do
 
   describe '.stop' do
     it 'stops all listeners & Celluloid' do
+      allow(Listen::Listener).to receive(:new).with('/path') { listener }
+      expect(listener).to receive(:stop)
+      described_class.to('/path')
       Listen.stop
 
       # TODO: running? returns internal_pool on 0.15.2
@@ -36,7 +45,7 @@ describe Listen do
   describe '.on' do
     it 'initializes TCP-listener in recipient-mode' do
       expect(Listen::Listener).to receive(:new).
-        with(4000, :recipient, '/path')
+        with(4000, :recipient, '/path') { listener }
       described_class.on(4000, '/path')
     end
   end

metadata

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