watchcat 0.2.1-x86_64-linux → 0.3.0-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1a3d40bdf9a9bc7f37f4d09c48696ae7d284826c245838c4c265a4f58915d51
-  data.tar.gz: edbb2fea91f315f7248a86f29f751d7f35c0664a75fb57e783a060cadd723e3c
+  metadata.gz: 1a100f98bc642f7e4f8ca785271849ff5bd7c86249aa52e915797325baaeca15
+  data.tar.gz: 7ce9498af1556b1ae7a59dcafb9e14eefe9d3e30450f01199b809166b44a7476
 SHA512:
-  metadata.gz: 7bb34a1bc339c9e865b8d5ae8eff2742c7d52c87860c0030595a2d7784d4783cf6c93b0ba0a779abd94d9f0fa14a8f1e21b92c84b1b3bdb888ee2fe8f03cd737
-  data.tar.gz: 894556bfa2fbb66362f167906639936cc7242f62212e25416c38612c09b187fa8aa899f0f44a91fa655daf6287e52fdbabfc96e07abf3b2cb4ee877970ce897b
+  metadata.gz: 21bbb0fe635899c9ed7a55857752036500bb213a297629d7148ca3192c4d7bacba497ca2c0b6c88831017f7eddef272b11669727e1f1c02c3dd759d07897807e
+  data.tar.gz: 531a6acacdddeb0b8b0c567c621191f020519babaaa2e53a34677ebdb11e599ec7da54ce528a6d3cdecdef031be46a4dcd82c363d9a27f5f6ecc68f7b5db9b61

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.3.0
+
+* Support Windows

data/Gemfile.lock

@@ -1,57 +1,71 @@
 PATH
   remote: .
   specs:
-    watchcat (0.2.1)
-      drb
+    watchcat (0.3.0)
       rb_sys
 
 GEM
   remote: https://rubygems.org/
   specs:
-    debug (1.9.2)
+    cgi (0.5.0)
+    date (3.4.1)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    drb (2.2.1)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
-    io-console (0.7.2)
-    irb (1.14.0)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x64-mingw-ucrt)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    io-console (0.8.0)
+    irb (1.15.2)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.25.2)
-    minitest-retry (0.2.3)
+    minitest (5.25.5)
+    minitest-retry (0.2.5)
       minitest (>= 5.0)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.18.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.18.1-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.18.1-x86_64-darwin)
       racc (~> 1.4)
-    psych (5.1.2)
+    nokogiri (1.18.1-x86_64-linux-gnu)
+      racc (~> 1.4)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.6)
+      date
       stringio
     racc (1.8.1)
-    rake (13.2.1)
-    rake-compiler (1.2.8)
+    rake (13.3.0)
+    rake-compiler (1.3.0)
       rake
+    rake-compiler-dock (1.9.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rb_sys (0.9.103)
-    rdoc (6.7.0)
+    rb_sys (0.9.117)
+      rake-compiler-dock (= 1.9.1)
+    rdoc (6.14.1)
+      erb
       psych (>= 4.0.0)
-    reline (0.5.10)
+    reline (0.6.1)
       io-console (~> 0.5)
-    ruby_memcheck (3.0.0)
+    ruby_memcheck (3.0.1)
       nokogiri
-    stringio (3.1.1)
+    stringio (3.1.7)
 
 PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
+  x64-mingw-ucrt
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-linux
@@ -67,4 +81,4 @@ DEPENDENCIES
   watchcat!
 
 BUNDLED WITH
-   2.5.4
+   2.6.2

data/README.md

@@ -27,7 +27,7 @@ Please specify a filename or directory and callback block to `Watchcat.watch`. T
 ```ruby
 require "watchcat"
 
-w = Watchcat.watch("/tmp/test") do |e|
+Watchcat.watch("/tmp/test") do |e|
   pp e.paths, e.kind
 end
 
@@ -58,7 +58,7 @@ You can know what event is happened with `Watchcat::EventKind`. For example, wha
 ```ruby
 require "watchcat"
 
-w = Watchcat.watch("/tmp/target") do |e|
+Watchcat.watch("/tmp/target") do |e|
   if e.kind.create?
     if e.kind.create.file?
       puts "'#{e.paths[0]}'(File) is added."

data/lib/watchcat/executor.rb

@@ -1,13 +1,8 @@
-require "drb"
-require "drb/unix"
-require_relative "server"
-require_relative "client"
+require_relative "event"
 
 module Watchcat
   class Executor
     def initialize(paths, recursive:, force_polling:, poll_interval:, wait_until_startup:, ignore_remove:, debounce:, block:)
-      @service = nil
-      @child_pid = nil
       @paths = paths
       @recursive = recursive
       @force_polling = force_polling
@@ -17,51 +12,52 @@ module Watchcat
       @debounce = debounce
       @block = block
       @watcher = Watchcat::Watcher.new
+      @watch_thread = nil
+      @stop_requested = false
     end
 
     def start
-      server = Server.new(@block)
-      @service = DRb.start_service("drbunix:", server)
-      client = nil
-      client = build_client if @wait_until_startup
+      # Always start watching in a background thread to avoid blocking
+      @watch_thread = Thread.new do
+        Thread.current.name = "watchcat-watcher"
+        start_watching
+      end
 
-      @child_pid = fork do
-        client = build_client unless @wait_until_startup
-        Process.setproctitle("watchcat: watcher")
-        client.run
+      # If wait_until_startup is true, give the thread a moment to start
+      if @wait_until_startup
+        sleep 0.1
       end
 
-      main = Process.pid
       at_exit do
-        @exit_status = $!.status if $!.is_a?(SystemExit)
-        stop if Process.pid == main
-        exit @exit_status if @exit_status
+        stop
       end
     end
 
     def stop
-      begin
-        @watcher.close
-        Process.kill(:KILL, @child_pid)
-      rescue Errno::ESRCH
-        # NOTE: We can ignore this error because there process is already dead.
+      @stop_requested = true
+      @watcher.close
+      if @watch_thread && @watch_thread.alive?
+        @watch_thread.join(1) # Wait up to 1 second for thread to finish
       end
-      @service.stop_service
     end
 
     private
 
-    def build_client
-      Client.new(
-        @service.uri,
-        watcher: @watcher,
-        paths: @paths,
+    def start_watching
+      @watcher.watch(
+        @paths,
         recursive: @recursive,
         force_polling: @force_polling,
         poll_interval: @poll_interval,
-        debounce: @debounce,
-        ignore_remove: @ignore_remove
-      )
+        ignore_remove: @ignore_remove,
+        debounce: @debounce
+      ) do |kind, paths, raw_kind|
+        break if @stop_requested
+
+        # Create an event object and call the block
+        event = Watchcat::Event.new(kind, paths, raw_kind)
+        @block.call(event)
+      end
     end
   end
 end

data/lib/watchcat/version.rb

@@ -1,3 +1,3 @@
 module Watchcat
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: watchcat
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: x86_64-linux
 authors:
 - Yuji Yaginuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-08 00:00:00.000000000 Z
+date: 2025-08-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: drb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -136,15 +123,13 @@ files:
 - Rakefile
 - ext/watchcat/.gitignore
 - lib/watchcat.rb
-- lib/watchcat/3.0/watchcat.so
 - lib/watchcat/3.1/watchcat.so
 - lib/watchcat/3.2/watchcat.so
 - lib/watchcat/3.3/watchcat.so
-- lib/watchcat/client.rb
+- lib/watchcat/3.4/watchcat.so
 - lib/watchcat/event.rb
 - lib/watchcat/executor.rb
 - lib/watchcat/kind.rb
-- lib/watchcat/server.rb
 - lib/watchcat/version.rb
 homepage: https://github.com/y-yagi/watchcat
 licenses:
@@ -160,17 +145,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.4.dev
+      version: 3.5.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
 summary: Simple filesystem notification library for Ruby.

data/lib/watchcat/client.rb

@@ -1,26 +0,0 @@
-module Watchcat
-  class Client
-    def initialize(uri, watcher:, paths:, recursive:, force_polling:, poll_interval:, ignore_remove:, debounce:)
-      DRb.start_service
-      @watcher = watcher
-      @server = DRbObject.new_with_uri(uri)
-      @paths = paths
-      @recursive = recursive
-      @force_polling = force_polling
-      @poll_interval = poll_interval
-      @ignore_remove = ignore_remove
-      @debounce = debounce
-    end
-
-    def run
-      @watcher.watch(
-        @paths,
-        recursive: @recursive,
-        force_polling: @force_polling,
-        poll_interval: @poll_interval,
-        ignore_remove: @ignore_remove,
-        debounce: @debounce
-      ) { |notification| @server.execute(notification) }
-    end
-  end
-end

data/lib/watchcat/server.rb

@@ -1,14 +0,0 @@
-require "watchcat/event"
-
-module Watchcat
-  class Server
-    def initialize(block)
-      @block = block
-    end
-
-    def execute(notification)
-      event = Watchcat::Event.new(notification[0], notification[1], notification[2])
-      @block.call(event)
-    end
-  end
-end