filewatcher-cli 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc2b0f16f8b65900310497d4ba3ed44681a24955cbba174bb49bd46816096a1
-  data.tar.gz: b4a02f994d6c7f25c2c390baac9ec4593bfd21e98a42b1217932eb251de3f486
+  metadata.gz: b6f941a4729f6f4fd84d8343acf978073fc733d55420a8f11b133209ff627eb3
+  data.tar.gz: 4992a109feae47f97992af65ebbdc790bcfa0261fc9c46e6f1898ccd85dcf7b9
 SHA512:
-  metadata.gz: a0b6b45cac67c1ca798bf95ce79cb27af25f46d0005c27594477e5ea9ff8b26bbda2e8e69c8d87de6f85aeff1b5dc2626a2e902b071727613daa767500fc8e99
-  data.tar.gz: 99ef03d27a90356182d01e5871830894a06a7ceaf30c378383d173f6b015e576bf5c536ab9aa3277f76ebe5948c171fb5ec846fad068a88b604746e393cf85e8
+  metadata.gz: aea329b7ee4998092192c617a413b05836ecbc8ae3e72cb524be8f6b73e518e9e1e80242c2ba3cdb3a8aa9283cf1a016bcfb501e57806d64f35403c9c7621972
+  data.tar.gz: 54f9a98af365f1425bb49709204649e13719e96eaf844face8f7e4d6d190c066e511d391e38529102e9e0d21cea0ab0ce02fdb163eed00910de1ade22a0ead3c

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 1.1.0 (2022-11-19)
+
+*   Return the ability to pass paths separated by spaces.
+*   Update development dependencies.
+*   Resolve new RuboCop offenses.
+
 ## 1.0.0 (2022-09-09)
 
 *   Initial release.

data/lib/filewatcher/cli/command.rb

@@ -18,7 +18,9 @@ class Filewatcher
 
       require_relative 'command/options'
 
-      parameter 'FILES', 'file names to scan'
+      parameter 'FILES', 'file names to scan' do |string|
+        split_files_void_escaped_whitespace string.split unless string.to_s.empty?
+      end
 
       parameter '[COMMAND]', 'shell command to execute when file changes'
 

data/lib/filewatcher/cli/constants.rb

@@ -4,6 +4,6 @@ class Filewatcher
   module CLI
     BINDIR = 'exe'
 
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/filewatcher/cli/spec_helper/dump_to_file.rb

@@ -3,5 +3,11 @@
 require_relative 'shell_watch_run'
 
 def dump_to_file(content)
-  File.write File.join(Filewatcher::CLI::SpecHelper::ShellWatchRun::DUMP_FILE), content
+  Filewatcher::CLI::SpecHelper.debug "#{__method__} #{content.inspect}"
+
+  File.write(
+    File.join(Filewatcher::CLI::SpecHelper::ShellWatchRun::DUMP_FILE),
+    "#{content}\n",
+    mode: 'a+'
+  )
 end

data/lib/filewatcher/cli/spec_helper/dumpers/env_dumper.rb

@@ -5,5 +5,5 @@ require_relative '../dump_to_file'
 dump_to_file(
   %w[
     FILENAME BASENAME EVENT DIRNAME ABSOLUTE_FILENAME RELATIVE_FILENAME
-  ].map { |var| ENV.fetch(var) }.join(', ')
+  ].map { |var| ENV.fetch(var) }.join("\n")
 )

data/lib/filewatcher/cli/spec_helper/shell_watch_run.rb

@@ -16,8 +16,10 @@ class Filewatcher
 
         DUMP_FILE = File.join(TMP_DIR, 'dump')
 
-        def initialize(options:, dumper:, dumper_args:, **rest_args)
+        def initialize(watch_path, options:, dumper:, dumper_args:, **rest_args)
           super(**rest_args)
+
+          @watch_path = watch_path
           @options = options
           @options[:interval] ||= 0.2
           debug "options = #{options_string}"
@@ -69,7 +71,7 @@ class Filewatcher
         def spawn_filewatcher
           dumper_full_command = "#{__dir__}/dumpers/#{@dumper}_dumper.rb #{@dumper_args}"
           spawn_command =
-            "#{EXECUTABLE} #{options_string} \"#{@filename}\" \"ruby #{dumper_full_command}\""
+            "#{EXECUTABLE} #{options_string} \"#{@watch_path}\" \"ruby #{dumper_full_command}\""
           debug "spawn_command = #{spawn_command}"
           @pid = spawn spawn_command, **SPAWN_OPTIONS
 
@@ -81,7 +83,7 @@ class Filewatcher
         def make_changes
           super
 
-          wait seconds: 3 do
+          wait seconds: 3, interval: 0.5 do
             dump_file_exists = File.exist?(DUMP_FILE)
             debug "#{__method__}: File.exist?(DUMP_FILE) = #{dump_file_exists}"
             debug "#{__method__}: DUMP_FILE content = #{File.read(DUMP_FILE)}" if dump_file_exists
@@ -90,14 +92,12 @@ class Filewatcher
         end
 
         def kill_filewatcher
-          # debug __method__
+          debug __method__
+
           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
+            unix_kill_filewatcher
           end
         rescue Errno::ESRCH
           nil ## already killed
@@ -105,6 +105,15 @@ class Filewatcher
           wait
         end
 
+        def unix_kill_filewatcher
+          ## Problems: https://github.com/thomasfl/filewatcher/pull/83
+          ## Solution: https://stackoverflow.com/a/45032252/2630849
+          debug 'Process KILL'
+          Process.kill('KILL', -Process.getpgid(@pid))
+          debug 'Process waitall'
+          Process.waitall
+        end
+
         def pid_state
           if Gem.win_platform?
             match = `tasklist /FI "PID eq #{@pid}" /FO "LIST" /V`.match(/Status:\s+(\w+)/)
@@ -128,8 +137,8 @@ class Filewatcher
           ps == (Gem.win_platform? ? 'Running' : 'S')
         end
 
-        def wait(seconds: 1)
-          super seconds: seconds, interval: @options[:interval]
+        def wait(seconds: 1, interval: @options[:interval])
+          super seconds: seconds, interval: interval
         end
       end
     end

data/lib/filewatcher/cli/spec_helper.rb

@@ -2,8 +2,6 @@
 
 require 'filewatcher/spec_helper'
 
-require_relative 'spec_helper/dump_to_file'
-
 class Filewatcher
   module CLI
     ## Helper for CLI specs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Flemming
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.36.0
+        version: 1.39.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -185,14 +185,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.15.0
 description: 'CLI for Filewatcher.
 
   '
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: CLI for Filewatcher