filewatcher-cli 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecc2b0f16f8b65900310497d4ba3ed44681a24955cbba174bb49bd46816096a1
-  data.tar.gz: b4a02f994d6c7f25c2c390baac9ec4593bfd21e98a42b1217932eb251de3f486
+  metadata.gz: 35d0c06bd0f80ce0a6ad8df173029d074fb4e6fff7c71e479c86ef4b9e27144a
+  data.tar.gz: a4484b0e762361f0dc4975c3511f366f5ab776c33b7180fefbd38c8e3d288acb
 SHA512:
-  metadata.gz: a0b6b45cac67c1ca798bf95ce79cb27af25f46d0005c27594477e5ea9ff8b26bbda2e8e69c8d87de6f85aeff1b5dc2626a2e902b071727613daa767500fc8e99
-  data.tar.gz: 99ef03d27a90356182d01e5871830894a06a7ceaf30c378383d173f6b015e576bf5c536ab9aa3277f76ebe5948c171fb5ec846fad068a88b604746e393cf85e8
+  metadata.gz: 5d69b7f69c4489a76a57a29b2f33d19a77b4b37df6ea832f0b36b1c4021f4583fc4592772d9b51205924269f61efc68af58d9fedc4e964086bbb1f0204e14ed0
+  data.tar.gz: 05a0a3f4a65a51233cb67cc80032615c8dce81d2fff35717108d547a8bc181f924b3e228a6514edb35a76bbebe44d28fc4cf5949642e804d518481bef6be7d83

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## 2.0.0 (2026-02-05)
+
+*   Drop Ruby 2.6, 2.7, 3.0 and 3.1 support.
+*   Add Ruby 3.2, 3.3, 3.4 and 4.0 support.
+*   Update Filewatcher dependency.
+*   Update development dependencies.
+*   Resolve new RuboCop offenses.
+*   Improve CI config.
+
+## 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'
 
@@ -64,7 +66,7 @@ class Filewatcher
 
       def watch
         @filewatcher.watch do |changes|
-          changes = every? ? changes : changes.first(1)
+          changes = changes.first(1) unless every?
 
           changes.each do |filename, event|
             command = command_for_file filename

data/lib/filewatcher/cli/constants.rb

@@ -4,6 +4,6 @@ class Filewatcher
   module CLI
     BINDIR = 'exe'
 
-    VERSION = '1.0.0'
+    VERSION = '2.0.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

@@ -12,12 +12,14 @@ class Filewatcher
         include CLI::SpecHelper
 
         executable_path = File.realpath "#{__dir__}/../../../../#{CLI::BINDIR}/filewatcher"
-        EXECUTABLE = "#{'ruby ' if Gem.win_platform?}#{executable_path}" \
+        EXECUTABLE = "#{'ruby ' if Gem.win_platform?}#{executable_path}".freeze
 
         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}"
@@ -65,11 +67,12 @@ class Filewatcher
         end
 
         SPAWN_OPTIONS = Gem.win_platform? ? {} : { pgroup: true }
+        private_constant :SPAWN_OPTIONS
 
         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 +84,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 +93,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 +106,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+)/)
@@ -123,13 +133,13 @@ class Filewatcher
         def pid_ready?
           ps = pid_state
 
-          return if ps.nil?
+          return false if ps.nil?
 
           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
         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,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Thomas Flemming
 - Alexander Popov
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -31,168 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: gem_toys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.1
-- !ruby/object:Gem::Dependency
-  name: toys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.36.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.36.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: 'CLI for Filewatcher.
 
   '
@@ -228,7 +73,6 @@ metadata:
   homepage_uri: https://github.com/filewatcher/filewatcher-cli
   changelog_uri: https://github.com/filewatcher/filewatcher-cli/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -236,18 +80,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.2'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '4'
+      version: '5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: CLI for Filewatcher
 test_files: []