listen 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 812276687dc4c17d96ced0f45548a4e57cc955bd
-  data.tar.gz: 5b56ff60f6ec54a18472406df7e254305efe6017
+  metadata.gz: ac6fd4b57871600c33db9f04c53928b0aa538ab0
+  data.tar.gz: dc7c7574fc2d091abfc188e8de6407f3cdb1b39c
 SHA512:
-  metadata.gz: aa9b862960d220fa996af84fc890514289683f81d4852c08a6b3f2ec2843c0c3044c87a65a38486a4d47d823e874768f51b8c6ceede7cf080e12ef353e8be09d
-  data.tar.gz: 67bf684c0d85aa8a5278199f46a950b3c2149f3a4e912db8987cf143eb1e269cbf7c40440849830f28bbb17e61a0c90a9b99aef3398d3445933012c0897a8a53
+  metadata.gz: 1cff1bc85b3d9c2e0d65be6b943d4ef5adf5359657db919572f4bfcc256a9cc2b6cd9570eb3f983c284ba6f5381362ca5c681d92fc3666180041102393dc4c04
+  data.tar.gz: eeee4abe91aee56f1df5d9c069512822e313f39fbd7ac7312fdf83be1c966dc1acc52792992727e3a6055a193abd81ec035f31abb44cd66d42e3e86e44cffabf

data/README.md

@@ -30,7 +30,7 @@ Pull request or help is very welcome for these.
 The simplest way to install Listen is to use [Bundler](http://bundler.io).
 
 ```ruby
-  gem 'listen', '~> 2.0'
+gem 'listen', '~> 2.0'
 ```
 
 ## Usage
@@ -61,6 +61,8 @@ listener.unpause # start listening to changes again
 listener.stop    # stop completely the listener
 ```
 
+  Note: You should keep track of all started listeners and stop them properly on finish.
+
 ### Ignore / ignore!
 
 Listen ignores some directories and extensions by default (See DEFAULT_IGNORED_DIRECTORIES and DEFAULT_IGNORED_EXTENSIONS in Listen::Silencer), you can add ignoring patterns with the `ignore` option/method or overwrite default with `ignore!` option/method.
@@ -73,7 +75,7 @@ listener.ignore /\.rb/   # ignore rb extension in addition of pkg.
 sleep
 ```
 
-  Note: Ignoring regexp patterns are evaluated against relative paths.
+Note: Ignoring regexp patterns are evaluated against relative paths.
 
 ### Only
 
@@ -86,7 +88,7 @@ listener.only /_spec\.rb$/ # overwrite all existing only patterns.
 sleep
 ```
 
-  Note: Only regexp patterns are evaluated only against relative **file** paths.
+Note: Only regexp patterns are evaluated only against relative **file** paths.
 
 ## Changes callback
 

data/bin/listen

@@ -3,5 +3,10 @@
 require 'listen'
 require 'listen/cli'
 
-Listen::CLI.start
+unless defined?(JRUBY_VERSION)
+  if Signal.list.keys.include?('INT')
+    Signal.trap('INT') { Listen.stop }
+  end
+end
 
+Listen::CLI.start

data/lib/listen.rb

@@ -30,10 +30,10 @@ module Listen
       end
     end
 
-    # Stop all listeners
+    # Stop all listeners & Celluloid
+    # Use it for testing purpose or when you are sure that Celluloid could be ended.
     #
     def stop
-      @stopping = true
       Celluloid.shutdown
     end
 
@@ -58,10 +58,4 @@ module Listen
       Celluloid.boot unless Celluloid.running?
     end
   end
-  
-  unless defined?(JRUBY_VERSION)
-    if Signal.list.keys.include?('INT')
-      Signal.trap('INT') { Listen.stop }
-    end
-  end
 end

data/lib/listen/listener.rb

@@ -6,7 +6,7 @@ require 'listen/silencer'
 
 module Listen
   class Listener
-    attr_accessor :options, :directories, :paused, :changes, :block, :thread, :stopping
+    attr_accessor :options, :directories, :paused, :changes, :block, :stopping
     attr_accessor :registry, :supervisor
 
     RELATIVE_PATHS_WITH_MULTIPLE_DIRECTORIES_WARNING_MESSAGE = "The relative_paths option doesn't work when listening to multiple diretories."
@@ -27,7 +27,6 @@ module Listen
       @changes     = []
       @block       = block
       @registry    = Celluloid::Registry.new
-      @supervisor  = Celluloid::SupervisionGroup.run!(@registry)
       _init_debug
     end
 
@@ -40,14 +39,14 @@ module Listen
       unpause
       @stopping = false
       registry[:adapter].async.start
-      @thread = Thread.new { _wait_for_changes }
+      Thread.new { _wait_for_changes }
     end
 
     # Terminates all Listen actors and kill the adapter.
     #
     def stop
       @stopping = true
-      thread.join
+      supervisor.terminate
     end
 
     # Pauses listening callback (adapter still running)
@@ -126,6 +125,7 @@ module Listen
     end
 
     def _init_actors
+      @supervisor = Celluloid::SupervisionGroup.run!(registry)
       supervisor.add(Silencer, as: :silencer, args: self)
       supervisor.add(Record, as: :record, args: self)
       supervisor.pool(Change, as: :change_pool, args: self)
@@ -136,7 +136,7 @@ module Listen
 
     def _wait_for_changes
       loop do
-        break if @stopping || Listen.stopping
+        break if @stopping
 
         changes = _pop_changes
         unless changes.all? { |_,v| v.empty? }
@@ -144,8 +144,6 @@ module Listen
         end
         sleep options[:wait_for_delay]
       end
-
-      supervisor.finalize
     rescue => ex
       Kernel.warn "[Listen warning]: Change block raised an exception: #{$!}"
       Kernel.warn "Backtrace:\n\t#{ex.backtrace.join("\n\t")}"

data/lib/listen/version.rb

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

data/spec/lib/listen/listener_spec.rb

@@ -63,11 +63,6 @@ describe Listen::Listener do
       adapter.stub_chain(:async, :start)
     }
 
-    it "traps INT signal" do
-      expect(Signal).to receive(:trap).with('INT')
-      listener.start
-    end
-
     it "registers silencer" do
       expect(supervisor).to receive(:add).with(Listen::Silencer, as: :silencer, args: listener)
       listener.start
@@ -124,11 +119,9 @@ describe Listen::Listener do
   end
 
   describe "#stop" do
-    let(:thread) { double(join: true) }
-    before { listener.stub(:thread) { thread } }
-
-    it "joins thread" do
-      expect(thread).to receive(:join)
+    it "terminates supervisor" do
+      listener.supervisor = supervisor
+      expect(supervisor).to receive(:terminate)
       listener.stop
     end
   end

data/spec/lib/listen/tcp/listener_spec.rb

@@ -100,12 +100,8 @@ describe Listen::TCP::Listener do
       end
 
       context 'when stopped' do
-        let(:thread) { double(join: true) }
-        before do
-          subject.stub(:thread) { thread }
-        end
-
         it 'honours stopped state and does nothing' do
+          allow(subject).to receive(:supervisor) { double('SupervisionGroup', terminate: true) }
           subject.stop
           expect(broadcaster).not_to receive(:async)
           expect(callback).not_to receive(:call)

data/spec/lib/listen_spec.rb

@@ -22,9 +22,9 @@ describe Listen do
   end
 
   describe '.stop' do
-    it "stops all listeners" do
+    it "stops all listeners & Celluloid" do
       Listen.stop
-      expect(Listen.stopping).to be_true
+      expect(Celluloid.internal_pool.running?).to be_false
     end
   end
 

data/spec/spec_helper.rb

@@ -34,6 +34,9 @@ Celluloid.logger.level = Logger::ERROR
 
 RSpec.configuration.before(:each) do
   Listen.stopping = false
-  Celluloid.shutdown
   Celluloid.boot
 end
+
+RSpec.configuration.after(:each) do
+  Celluloid.shutdown
+end

metadata

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