spring-watcher-listen 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fa26b896b479001b9aae68a5d14ecc0812791f0
-  data.tar.gz: 5b63d1853eb63117b8cac9deedfc9359138f367a
+  metadata.gz: 561c71a39a3fed50f39fa8342ff3433a7fd38850
+  data.tar.gz: 6e7968fb40f74c0aa54f97f2890c925a3f8c7614
 SHA512:
-  metadata.gz: ced8ae4e65b28c9c9a19fc414402dfda9d0a5c20e9216f40a008fa1146269f55d3fc86c4676b9065f92f9b7f2c4d8617159dc43ebaeaea66526f6b9c6043907c
-  data.tar.gz: e3f21954701269628b287880700ceb4e5ebb9b426f6cbe0ce84dd9f46572f728a9596d6a65e1c5ee28ebc3c4d41ceb06a9f2aa209b82cf28c676d1f1f5e699af
+  metadata.gz: 2bae5dcf527456279dc77d878a1b0d9e63ef93a182158add2acd673ba40999697adcf245af75a6b66da8a96a11a0fb82ccb980c30c164381e2658dc3ddfc1a28
+  data.tar.gz: 3748230009113fcee8f0cdbbcaf9e06f88785c9899fbbf7e2af80b778138532784db7d1703922240316913bfda7e0e209cad219f54633b62b3d7054405a22509

data/.travis.yml

@@ -1 +1,3 @@
 language: ruby
+rvm:
+  - 2.2.2

data/lib/spring/watcher/listen.rb

@@ -4,6 +4,16 @@ require "spring/watcher/abstract"
 require "listen"
 require "listen/version"
 
+if defined?(Celluloid)
+  # fork() doesn't preserve threads, so a clean
+  # Celluloid shutdown isn't possible, but we can
+  # reduce the 10 second timeout
+
+  # There's a patch for Celluloid to avoid this (search for 'fork' in Celluloid
+  # issues)
+  Celluloid.shutdown_timeout = 2
+end
+
 module Spring
   module Watcher
     class Listen < Abstract
@@ -13,9 +23,7 @@ module Spring
 
       def start
         unless @listener
-          @listener = ::Listen.to(*base_directories, relative_paths: false)
-          @listener.latency(latency)
-          @listener.change(&method(:changed))
+          @listener = ::Listen.to(*base_directories, latency: latency, &method(:changed))
           @listener.start
         end
       end
@@ -28,9 +36,10 @@ module Spring
       end
 
       def subjects_changed
-        if @listener && @listener.directories.sort != base_directories.sort
-          restart
-        end
+        return unless @listener
+        return unless @listener.respond_to?(:directories)
+        return unless @listener.directories.sort != base_directories.sort
+        restart
       end
 
       def watching?(file)
@@ -49,7 +58,7 @@ module Spring
         ([root] +
           files.reject       { |f| f.start_with? "#{root}/" }.map { |f| File.expand_path("#{f}/..") } +
           directories.reject { |d| d.start_with? "#{root}/" }
-        ).uniq
+        ).uniq.map { |path| Pathname.new(path) }
       end
     end
   end

data/spring-watcher-listen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "spring-watcher-listen"
-  spec.version       = "1.0.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Jon Leighton"]
   spec.email         = ["j@jonathanleighton.com"]
   spec.summary       = %q{Makes spring watch files using the listen gem.}
@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activesupport"
 
   spec.add_dependency "spring", "~> 1.2"
-  spec.add_dependency "listen", "~> 1.0"
+  spec.add_dependency "listen", ">= 2.7", '< 4.0'
 end

data/test/helper.rb

@@ -4,4 +4,9 @@ require "bundler/setup"
 require "spring/test"
 require "minitest/autorun"
 
+if defined?(Celluloid)
+  require "celluloid/test"
+  Celluloid.logger.level = Logger::WARN
+end
+
 Spring::Test.root = File.expand_path('..', __FILE__)

data/test/unit_test.rb

@@ -7,6 +7,12 @@ class ListenWatcherTest < Spring::Test::WatcherTest
     Spring::Watcher::Listen
   end
 
+  setup do
+    Celluloid.boot if defined?(Celluloid)
+  end
+
+  teardown { Listen.stop }
+
   test "root directories" do
     begin
       other_dir_1 = File.realpath(Dir.mktmpdir)
@@ -18,7 +24,8 @@ class ListenWatcherTest < Spring::Test::WatcherTest
       watcher.add other_dir_2
       watcher.add "#{dir}/foo"
 
-      assert_equal [dir, other_dir_1, other_dir_2].sort, watcher.base_directories.sort
+      dirs = [dir, other_dir_1, other_dir_2].sort.map { |path| Pathname.new(path) }
+      assert_equal dirs, watcher.base_directories.sort
     ensure
       FileUtils.rmdir other_dir_1
       FileUtils.rmdir other_dir_2
@@ -39,7 +46,8 @@ class ListenWatcherTest < Spring::Test::WatcherTest
       watcher.add "#{other_dir_1}/foo"
       watcher.add other_dir_2
 
-      assert_equal [dir, other_dir_1, other_dir_2].sort, watcher.base_directories.sort
+      dirs = [dir, other_dir_1, other_dir_2].sort.map { |path| Pathname.new(path) }
+      assert_equal dirs, watcher.base_directories.sort
     ensure
       FileUtils.rmdir other_dir_1
       FileUtils.rmdir other_dir_2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spring-watcher-listen
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,22 @@ dependencies:
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
 description: 
 email:
 - j@jonathanleighton.com
@@ -118,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Makes spring watch files using the listen gem.