listen 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac6fd4b57871600c33db9f04c53928b0aa538ab0
-  data.tar.gz: dc7c7574fc2d091abfc188e8de6407f3cdb1b39c
+  metadata.gz: 15c303b4292e7a0d6c1406f08354026a6afce90d
+  data.tar.gz: 72470e17d6c39b4c72b46685eec317db75d2478a
 SHA512:
-  metadata.gz: 1cff1bc85b3d9c2e0d65be6b943d4ef5adf5359657db919572f4bfcc256a9cc2b6cd9570eb3f983c284ba6f5381362ca5c681d92fc3666180041102393dc4c04
-  data.tar.gz: eeee4abe91aee56f1df5d9c069512822e313f39fbd7ac7312fdf83be1c966dc1acc52792992727e3a6055a193abd81ec035f31abb44cd66d42e3e86e44cffabf
+  metadata.gz: 69afc0f874fe99bcb8c43ba6c42264219484ef59802f6a1daa8ebf84d5b2134b5b3ed29a5570a07358de710d343d3b0b2ff0420d76adc9c5b2987f4e0fc99d84
+  data.tar.gz: d63742fbc8b428ca7837a5d9549545d061ea1d0351b89e475be9614c7eb67872247b187e1b777eda93ce16a979905350a54d23fa0032f5f751c7cfe8fc316340

data/.gitignore

@@ -25,3 +25,4 @@ test.txt
 Desktop DB
 Desktop DF
 
+.idea

data/lib/listen/listener.rb

@@ -138,11 +138,16 @@ module Listen
       loop do
         break if @stopping
 
-        changes = _pop_changes
-        unless changes.all? { |_,v| v.empty? }
-          block.call(changes[:modified], changes[:added], changes[:removed])
+        changes = []
+        begin
+          sleep options[:wait_for_delay] # wait for changes to accumulate
+          new_changes = _pop_changes
+          changes += new_changes
+        end until new_changes.empty?
+        unless changes.empty?
+          hash = _smoosh_changes(changes)
+          block.call(hash[:modified], hash[:added], hash[:removed])
         end
-        sleep options[:wait_for_delay]
       end
     rescue => ex
       Kernel.warn "[Listen warning]: Change block raised an exception: #{$!}"
@@ -150,12 +155,16 @@ module Listen
     end
 
     def _pop_changes
-      changes = { modified: [], added: [], removed: [] }
-      until @changes.empty?
-        change = @changes.pop
-        change.each { |k, v| changes[k] << v.to_s }
-      end
-      changes.each { |_, v| v.uniq! }
+      popped = []
+      popped << @changes.pop until @changes.empty?
+      popped
+    end
+
+    def _smoosh_changes(changes)
+      smooshed = { modified: [], added: [], removed: [] }
+      changes.each { |h| type = h.keys.first; smooshed[type] << h[type].to_s }
+      smooshed.each { |_, v| v.uniq! }
+      smooshed
     end
   end
 end

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 end

data/spec/acceptance/tcp_spec.rb

@@ -86,7 +86,7 @@ describe Listen::TCP do
     end
 
     it 'receives changes over TCP' do
-      expect(listen {
+      expect(listen(1) {
         touch 'file.rb'
       }).to eq(
         modified: [],
@@ -98,7 +98,7 @@ describe Listen::TCP do
     it 'may be paused and unpaused' do
       recipient.pause
 
-      expect(listen {
+      expect(listen(1) {
         touch 'file.rb'
       }).to eq(
         modified: [],
@@ -108,7 +108,7 @@ describe Listen::TCP do
 
       recipient.unpause
 
-      expect(listen {
+      expect(listen(1) {
         touch 'file.rb'
       }).to eq(
         modified: ['file.rb'],
@@ -120,7 +120,7 @@ describe Listen::TCP do
     it 'may be stopped and restarted' do
       recipient.stop
 
-      expect(listen {
+      expect(listen(1) {
         touch 'file.rb'
       }).to eq(
         modified: [],
@@ -130,7 +130,7 @@ describe Listen::TCP do
 
       recipient.start
 
-      expect(listen {
+      expect(listen(1) {
         touch 'file.rb'
       }).to eq(
         modified: ['file.rb'],

data/spec/lib/listen/adapter/polling_spec.rb

@@ -27,7 +27,7 @@ describe Listen::Adapter::Polling do
     it "notifies change on every listener directories path" do
       expect(change_pool_async).to receive(:change).with('directory_path', type: 'Dir', recursive: true)
       t = Thread.new { adapter.start }
-      sleep 0.01
+      sleep 0.25
       t.kill
     end
   end

data/spec/lib/listen/listener_spec.rb

@@ -114,7 +114,7 @@ describe Listen::Listener do
       listener.block = block_stub
       expect(block_stub).to receive(:call).with(['foo'], [], [])
       listener.start
-      sleep 0.01
+      sleep 0.25
     end
   end
 
@@ -268,4 +268,34 @@ describe Listen::Listener do
     end
   end
 
+  describe '_wait_for_changes' do
+    it 'gets two changes and calls the block once' do
+
+      fake_time = 0
+      listener.stub(:sleep) { |sec| fake_time += sec; listener.stopping = true if fake_time > 1 }
+
+      listener.block = proc { |modified, added, removed|
+        expect(modified).to eql(['foo.txt'])
+        expect(added).to eql(['bar.txt'])
+      }
+
+      i = 0
+      listener.stub(:_pop_changes) do
+        i+=1
+        case i
+          when 1
+            []
+          when 2
+            [{modified: 'foo.txt'}]
+          when 3
+            [{added: 'bar.txt'}]
+          else
+            []
+        end
+      end
+
+      listener.send :_wait_for_changes
+    end
+  end
+
 end

data/spec/support/acceptance_helper.rb

@@ -1,9 +1,9 @@
-def listen
-  sleep 0.5 # wait for changes
+def listen(lag = 0.5)
+  sleep lag # wait for changes
   sleep_until_next_second
   reset_changes
   yield
-  sleep 0.5 # wait for changes
+  sleep lag # wait for changes
   @changes
 end
 

metadata

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