listen 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7fe2432921c30a0fc8bd2552a7bd2bac7b62b1
-  data.tar.gz: b0fab87bbb62064ab57b6ddf9c8c9e08a9fa4d6a
+  metadata.gz: 4b59a31bbecd30ab120fd1275ecf8efab7fb40b6
+  data.tar.gz: 112070345fa8127b6963b527c5f117de8913f40a
 SHA512:
-  metadata.gz: fcf5fda1fd7cd0a63652d481cf2570f724cad065fa3ff63d7fc81cf02f74f6fb3856c97625fbcbe5a067d8b4a30e15ca03d2a60f48556b7400af7e5e535e866d
-  data.tar.gz: 6bd097ccf35884c62428ee1271c4b695ba90236adde490d39d44cbf18f883026599abdd30b11059c155d468b4b04e51401cf974998d70741360119d2f6ab2605
+  metadata.gz: baa38667f71ae00c579bce1be611f463b76810ce03bc7cbb854792809edba260b1f096ab431d95de84283a2c6ee6a18b4e3218d3ed34a5ccc4b0231a23edd62c
+  data.tar.gz: 89e5dbc7c8872f97fc18227b243966dc5ec56a5fbecae1a4ee586652121abf943f74fdaf73a80a4487daf3c7d32e26659c5b7c6bcf38a1508c2b58056333fd2f

data/lib/listen/adapter/base.rb

@@ -85,12 +85,19 @@ module Listen
         end
       end
 
+      def stop
+        _stop
+      end
+
       def self.usable?
         const_get('OS_REGEXP') =~ RbConfig::CONFIG['target_os']
       end
 
       private
 
+      def _stop
+      end
+
       def _timed(title)
         start = Time.now.to_f
         yield

data/lib/listen/adapter/darwin.rb

@@ -50,7 +50,7 @@ module Listen
         _log :debug, "fsevent: running worker: #{worker.inspect}"
         worker.run
       rescue
-        _log_exception 'fsevent: running worker failed: %s: %s'
+        _log_exception 'fsevent: running worker failed: %s:%s called from: %s', caller
       end
 
       def _run_workers_in_background(workers)

data/lib/listen/adapter/linux.rb

@@ -97,6 +97,10 @@ module Listen
       def _dir_event?(event)
         event.flags.include?(:isdir)
       end
+
+      def _stop
+        @worker.close
+      end
     end
   end
 end

data/lib/listen/backend.rb

@@ -27,7 +27,7 @@ module Listen
     end
 
     def stop
-      # TODO: does nothing
+      adapter.stop
     end
 
     def min_delay_between_events

data/lib/listen/directory.rb

@@ -20,10 +20,16 @@ module Listen
                rel_path, options.inspect, previous.inspect, current.inspect)
       end
 
-      current.each do |full_path|
-        type = detect_type(full_path)
-        item_rel_path = full_path.relative_path_from(dir).to_s
-        _change(snapshot, type, item_rel_path, options)
+      begin
+        current.each do |full_path|
+          type = ::File.lstat(full_path.to_s).directory? ? :dir : :file
+          item_rel_path = full_path.relative_path_from(dir).to_s
+          _change(snapshot, type, item_rel_path, options)
+        end
+      rescue Errno::ENOENT
+        # The directory changed meanwhile, so rescan it
+        current = Set.new(path.children)
+        retry
       end
 
       # TODO: this is not tested properly
@@ -66,15 +72,5 @@ module Listen
       opts.delete(:recursive)
       snapshot.invalidate(type, path, opts)
     end
-
-    def self.detect_type(full_path)
-      # TODO: should probably check record first
-      stat = ::File.lstat(full_path.to_s)
-      stat.directory? ? :dir : :file
-    rescue Errno::ENOENT
-      # TODO: ok, it should really check the record here
-      # report as dir for scanning
-      :dir
-    end
   end
 end

data/lib/listen/record/symlink_detector.rb

@@ -11,7 +11,7 @@ module Listen
 
         Directory: %s
 
-        is already begin watched through: %s
+        is already being watched through: %s
 
         MORE INFO: #{WIKI}
       EOS

data/lib/listen/version.rb

@@ -1,3 +1,3 @@
 module Listen
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listen
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent