filewatcher 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 9221be161e73cc2f85ea6f9706a2e558c31ff314664bc31817e9715439a31927
-  data.tar.gz: bae2bc1ba2f5b88693fe1c8093b135652885094c69adc3da51193916ada96b44
+SHA1:
+  metadata.gz: ed73f2615aeb5418438bb443abc274bc2cd8279f
+  data.tar.gz: 716e8b582f81531d486c1a281149da1702a044b7
 SHA512:
-  metadata.gz: 0aec2e10e03aad69fd0e4ccda0a6f488efc7c908abe31640319971dda6ed71ca8873588d87693f91309d13ac996bb62a952e3c7430c41b462d663e0064185e8e
-  data.tar.gz: ebf1581b4e3e56c77c4a18867ce55d2cb9a6fbf97d7804da305192dd9622a39d9b16cfe1392dd880c6dd1c43f47539a66a10f61956de7fad0202f2c43222b64d
+  metadata.gz: b37524eaae72f8eaaad40766e4e1793ec5766ebe7dd454e310eb98ba54745c59ecbc8358ea2045e335d242c84d6e48ef5bc1d0718b75546af481bd221f25c5d9
+  data.tar.gz: 50690825a35a747dce1491d7f3f77a2edf135797551ca625cdeeafb08efd31caada6e982de54fde6bdad88d4ae934b92bb66d29605a7d74e181bc5d059f9d367

data/bin/filewatcher

@@ -5,10 +5,10 @@ require_relative '../lib/filewatcher'
 require_relative '../lib/filewatcher/env'
 require_relative '../lib/filewatcher/runner'
 require_relative '../lib/filewatcher/version'
-require 'trollop'
-require 'thread'
 
-options = Trollop.options do
+require 'optimist'
+
+options = Optimist.options do
   version "filewatcher, version #{Filewatcher::VERSION} by Thomas Flemming 2016"
   banner File.read File.join(__dir__, 'banner.txt')
 
@@ -33,7 +33,7 @@ options = Trollop.options do
       short: 's', type: :boolean, default: false
 end
 
-Trollop.die Trollop.educate if ARGV.empty?
+Optimist.die Optimist.educate if ARGV.empty?
 
 files = ARGV[0..-2]
 
@@ -50,13 +50,13 @@ end
 files = split_files_void_escaped_whitespace(files)
 child_pid = nil
 
-def restart(child_pid, env, cmd)
-  raise Errno::ESRCH unless child_pid
-  Process.kill(9, child_pid)
-  Process.wait(child_pid)
-rescue Errno::ESRCH
-  nil # already killed
-ensure
+def restart(pid, env, cmd)
+  begin
+    Process.kill(9, pid)
+    Process.wait(pid)
+  rescue Errno::ESRCH
+    nil # already killed
+  end
   Process.spawn(env, cmd)
 end
 

data/lib/filewatcher.rb

@@ -29,7 +29,12 @@ class Filewatcher
   end
 
   def watch(&on_update)
-    %w[HUP INT TERM].each { |signal| trap(signal) { exit } }
+    ## The set of available signals depends on the OS
+    ## Windows doesn't support `HUP` signal, for example
+    (%w[HUP INT TERM] & Signal.list.keys).each do |signal|
+      trap(signal) { exit }
+    end
+
     @on_update = on_update
     @keep_watching = true
     yield('', '') if @immediate
@@ -105,8 +110,6 @@ class Filewatcher
   def filesystem_updated?(snapshot = mtime_snapshot)
     @changes = {}
 
-    # rubocop:disable Perfomance/HashEachMethods
-    ## https://github.com/bbatsov/rubocop/issues/4732
     (snapshot.to_a - last_snapshot.to_a).each do |file, _mtime|
       @changes[file] = last_snapshot[file] ? :updated : :created
     end

data/lib/filewatcher/version.rb

@@ -3,5 +3,5 @@
 require_relative '../filewatcher'
 
 class Filewatcher
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/test/helper.rb

@@ -20,7 +20,7 @@ class WatchRun
     action: :update
   )
     @filename =
-      filename.start_with?('/', '~') ? filename : File.join(TMP_DIR, filename)
+      filename =~ %r{^(/|~|[A-Z]:)} ? filename : File.join(TMP_DIR, filename)
     @directory = directory
     @action = action
   end
@@ -55,6 +55,8 @@ class WatchRun
 end
 
 class RubyWatchRun < WatchRun
+  SLEEP_MULTIPLIER = Gem::Platform.local.os == 'darwin' ? 5 : 1
+
   attr_reader :filewatcher, :thread, :watched, :processed
 
   def initialize(
@@ -72,18 +74,24 @@ class RubyWatchRun < WatchRun
     super
     @thread = thread_initialize
     # thread needs a chance to start
-    wait 3 do
+    wait 12 do
       filewatcher.keep_watching
     end
+
+    # a little more time
+    sleep 1 * SLEEP_MULTIPLIER
   end
 
   def stop
     thread.exit
 
-    wait 3 do
+    wait 12 do
       thread.stop?
     end
 
+    # a little more time
+    sleep 1 * SLEEP_MULTIPLIER
+
     super
   end
 
@@ -94,7 +102,7 @@ class RubyWatchRun < WatchRun
 
     # Some OS, filesystems and Ruby interpretators
     # doesn't catch milliseconds of `File.mtime`
-    wait 3 do
+    wait 12 do
       processed.any?
     end
   end
@@ -149,11 +157,7 @@ class ShellWatchRun < WatchRun
   def start
     super
 
-    @pid = spawn(
-      "#{EXECUTABLE} #{@options_string} \"#{@filename}\"" \
-        " \"ruby #{File.join(__dir__, 'dumpers', "#{@dumper}_dumper.rb")}\"",
-      pgroup: true
-    )
+    @pid = spawn_filewatcher
 
     Process.detach(@pid)
 
@@ -166,10 +170,7 @@ class ShellWatchRun < WatchRun
   end
 
   def stop
-    ## Problems: https://github.com/thomasfl/filewatcher/pull/83
-    ## Solution: https://stackoverflow.com/a/45032252/2630849
-    Process.kill('TERM', -Process.getpgid(@pid))
-    Process.waitall
+    kill_filewatcher
 
     wait 12 do
       pid_state.empty?
@@ -183,6 +184,16 @@ class ShellWatchRun < WatchRun
 
   private
 
+  SPAWN_OPTIONS = Gem.win_platform? ? {} : { pgroup: true }
+
+  def spawn_filewatcher
+    spawn(
+      "#{EXECUTABLE} #{@options_string} \"#{@filename}\"" \
+        " \"ruby #{File.join(__dir__, "dumpers/#{@dumper}_dumper.rb")}\"",
+      **SPAWN_OPTIONS
+    )
+  end
+
   def make_changes
     super
 
@@ -191,6 +202,17 @@ class ShellWatchRun < WatchRun
     end
   end
 
+  def kill_filewatcher
+    if Gem.win_platform?
+      Process.kill('KILL', @pid)
+    else
+      ## Problems: https://github.com/thomasfl/filewatcher/pull/83
+      ## Solution: https://stackoverflow.com/a/45032252/2630849
+      Process.kill('TERM', -Process.getpgid(@pid))
+      Process.waitall
+    end
+  end
+
   def pid_state
     ## For macOS output:
     ## https://travis-ci.org/thomasfl/filewatcher/jobs/304433538

data/test/test_filewatcher.rb

@@ -212,13 +212,15 @@ describe Filewatcher do
       (1..4).each do |n|
         File.write("test/tmp/file#{n}.txt", "content#{n}")
       end
-      sleep 0.2 # Give filewatcher time to respond
+      # Give filewatcher time to respond
+      sleep 1 * RubyWatchRun::SLEEP_MULTIPLIER
 
       # update block should not have been called
       wr.processed.should.be.empty
 
       wr.filewatcher.resume
-      sleep 0.2 # Give filewatcher time to respond
+      # Give filewatcher time to respond
+      sleep 1 * RubyWatchRun::SLEEP_MULTIPLIER
 
       # update block still should not have been called
       wr.processed.should.be.empty
@@ -227,7 +229,8 @@ describe Filewatcher do
         File.write(file = "test/tmp/file#{n}.txt", "content#{n}")
         file
       end
-      sleep 0.2 # Give filewatcher time to respond
+      # Give filewatcher time to respond
+      sleep 1 * RubyWatchRun::SLEEP_MULTIPLIER
 
       wr.filewatcher.stop
       wr.stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Flemming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -25,25 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.57'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.57'
 description: Detect changes in filesystem. Works anywhere.
 email:
 - thomas.flemming@gmail.com
@@ -114,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Lighweight filewatcher.