listen 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b027cf8c04a390cc6b96926228e2fff2eef7a47c
-  data.tar.gz: 9f3ed4ac9ac99325d33240d33284e1aaaad2c25e
+  metadata.gz: 55c535918103e5c68a1ea42d8cb360db013ea539
+  data.tar.gz: 44764113825c9c554731d7141a7bcf1adeee0a06
 SHA512:
-  metadata.gz: 153f0804b8dc9a45a257d017e13ad22b3ca480c28b574adc2ed4dd5584e81f9aaf6a0000ae7c042f1a1b80f99cb160e94a13a4c434b37745d711ff77e3d4fd67
-  data.tar.gz: 4e0f61e9594c92772e9123eef689a176ac65a9fb26539275363146b7b58a06cf47a15af8ffc577170720328b68230831536e64368416dd5618898f15829af9d1
+  metadata.gz: 7259fce77dca1a6ff722521e34680ada567d4e7a948c85b09614787ed717ada197ad1b254d44222d6002b522066220365c99832468955d1a1201fc12d24234e2
+  data.tar.gz: 1ebb8207f946f7b2544466f0543164c872fc715f4cb8535579ca7e4944eb44d332b6415d95c2a0b1aec908d1fd091a080dd276f86af3de28020da2ad27ff8941

data/lib/listen/listener.rb

@@ -43,11 +43,8 @@ module Listen
     # Terminates all Listen actors and kill the adapter.
     #
     def stop
-      thread.kill
-      Celluloid::Actor.kill(Celluloid::Actor[:listen_adapter])
-      Celluloid::Actor[:listen_silencer].terminate
-      Celluloid::Actor[:listen_change_pool].terminate
-      Celluloid::Actor[:listen_record].terminate
+      @stopping = true
+      thread.join
     end
 
     # Pauses listening callback (adapter still running)
@@ -124,20 +121,25 @@ module Listen
 
     def _signals_trap
       if Signal.list.keys.include?('INT')
-        Signal.trap('INT') { exit }
+        Signal.trap('INT') { stop }
       end
     end
 
     def _wait_for_changes
       loop do
+        break if @stopping
+
         changes = _pop_changes
         unless changes.all? { |_,v| v.empty? }
           block.call(changes[:modified], changes[:added], changes[:removed])
         end
         sleep 0.1
       end
+
+      _terminate_celluloid_actors
+      exit
     rescue => ex
-      Kernel.warn "[Listen warning]: Change block raise an execption: #{$!}"
+      Kernel.warn "[Listen warning]: Change block raised an exception: #{$!}"
       Kernel.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"
     end
 
@@ -149,5 +151,12 @@ module Listen
       end
       changes.each { |_, v| v.uniq! }
     end
+
+    def _terminate_celluloid_actors
+      Celluloid::Actor.kill(Celluloid::Actor[:listen_adapter])
+      Celluloid::Actor[:listen_silencer].terminate
+      Celluloid::Actor[:listen_change_pool].terminate
+      Celluloid::Actor[:listen_record].terminate
+    end
   end
 end

data/lib/listen/version.rb

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

data/spec/acceptance/listen_spec.rb

@@ -13,7 +13,13 @@ describe "Listen" do
     @listener = setup_listener(options, callback)
     @listener.start
   }
-  after { listener.stop }
+  after {
+    begin
+      listener.stop
+    rescue SystemExit
+      # ignore the SystemExit error from the thread
+    end
+  }
 
   context "with one listen dir" do
     let(:paths) { Pathname.new(Dir.pwd) }
@@ -23,7 +29,7 @@ describe "Listen" do
       let(:callback) { ->(x,y,z) { raise 'foo' } }
 
       it "warns the backtrace" do
-        expect(Kernel).to receive(:warn).with("[Listen warning]: Change block raise an execption: foo")
+        expect(Kernel).to receive(:warn).with("[Listen warning]: Change block raised an exception: foo")
         expect(Kernel).to receive(:warn).with(/^Backtrace:.*/)
         listen { touch 'file.rb' }
       end

data/spec/lib/listen/listener_spec.rb

@@ -126,34 +126,11 @@ describe Listen::Listener do
   end
 
   describe "#stop" do
-    let(:thread) { double(kill: true) }
-    before {
-      Celluloid::Actor.stub(:kill)
-      listener.stub(:thread) { thread }
-    }
-
-    it "kills thread" do
-      expect(thread).to receive(:kill)
-      listener.stop
-    end
-
-    it "terminates silencer" do
-      expect(silencer).to receive(:terminate)
-      listener.stop
-    end
-
-    it "kills adapter" do
-      expect(Celluloid::Actor).to receive(:kill).with(adapter)
-      listener.stop
-    end
-
-    it "terminates change_pool" do
-      expect(change_pool).to receive(:terminate)
-      listener.stop
-    end
+    let(:thread) { double(join: true) }
+    before { listener.stub(:thread) { thread } }
 
-    it "terminates record" do
-      expect(record).to receive(:terminate)
+    it "joins thread" do
+      expect(thread).to receive(:join)
       listener.stop
     end
   end

data/spec/lib/listen_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Listen do
   describe '#to' do
-    it "initalizes listner" do
+    it "initalizes listener" do
       expect(Listen::Listener).to receive(:new).with('/path')
       described_class.to('/path')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid