watchcat 0.2.0 → 0.6.0

data/lib/watchcat/cli.rb

@@ -0,0 +1,52 @@
+require "optparse"
+require_relative "cli/watcher"
+require_relative "cli/config"
+require_relative "cli/action_executor"
+
+module Watchcat
+  module CLI
+    class Error < StandardError; end
+    class << self
+      def start(argv)
+        options = parse(argv)
+
+        if options[:init]
+          Config.generate_template(options[:init])
+          return
+        end
+
+        config = Config.load(options[:config])
+        watcher = Watcher.new(config)
+        watcher.start
+      rescue => e
+        raise Error, "Failed to start Watchcat: #{e.message}"
+      end
+
+      def parse(argv)
+        options = { config: 'watchcat.yml' }
+        OptionParser.new do |opts|
+          opts.banner = "Usage: watchcat [options]"
+
+          opts.on("-C", "--config PATH", "Path to the config file. Default is 'watchcat.yml'.") do |v|
+            options[:config] = v
+          end
+
+          opts.on("--init PATH", "Generate a template config file at the specified path") do |v|
+            options[:init] = v
+          end
+
+          opts.on("-h", "--help", "Show this help message") do
+            puts opts
+            exit
+          end
+        end.parse!(argv)
+
+        if !options[:init] && options[:config].nil?
+          raise OptionParser::MissingArgument.new("-C")
+        end
+
+        options
+      end
+    end
+  end
+end

data/lib/watchcat/debouncer.rb

@@ -0,0 +1,41 @@
+module Watchcat
+  class Debouncer
+    def initialize
+      @timers = {}
+      @mutex = Mutex.new
+    end
+
+    def debounce(key, delay_ms, &block)
+      @mutex.synchronize do
+        # Cancel existing timer for this key
+        if @timers[key]
+          @timers[key].kill
+        end
+
+        # Create new timer
+        @timers[key] = Thread.new do
+          sleep(delay_ms / 1000.0)  # Convert ms to seconds
+
+          @mutex.synchronize do
+            @timers.delete(key)
+          end
+
+          block.call
+        end
+      end
+    end
+
+    def clear
+      @mutex.synchronize do
+        @timers.each_value(&:kill)
+        @timers.clear
+      end
+    end
+
+    def pending_count
+      @mutex.synchronize do
+        @timers.size
+      end
+    end
+  end
+end

data/lib/watchcat/event.rb

@@ -14,8 +14,45 @@ module Watchcat
       { paths: @paths, event: @event }
     end
 
+    def directory?
+      if kind.create?
+        kind.create.folder?
+      elsif kind.remove?
+        kind.remove.folder?
+      elsif kind.any?
+        kind.any.folder?
+      else
+        File.directory?(@paths.first)
+      end
+    rescue
+      false
+    end
+
+    def src_path
+      return nil unless rename_event?
+
+      rename = kind.modify.rename
+      return @paths[0] if rename.both? || rename.from?
+
+      nil
+    end
+
+    def dest_path
+      return nil unless rename_event?
+
+      rename = kind.modify.rename
+      return @paths[1] if rename.both?
+      return @paths[0] if rename.to?
+
+      nil
+    end
+
     private
 
+    def rename_event?
+      kind.modify? && kind.modify.rename?
+    end
+
     def build_kind(kinds)
       @kind = Watchcat::EventKind.new
       @event = kinds.shift

data/lib/watchcat/event_handler.rb

@@ -0,0 +1,29 @@
+module Watchcat
+  class EventHandler
+    def dispatch(event)
+      on_any_event(event)
+
+      kind = event.kind
+      if kind.create?
+        on_create(event)
+      elsif kind.remove?
+        on_remove(event)
+      elsif kind.modify?
+        if kind.modify.rename?
+          on_rename(event)
+        else
+          on_modify(event)
+        end
+      elsif kind.access?
+        on_access(event)
+      end
+    end
+
+    def on_any_event(event); end
+    def on_create(event); end
+    def on_modify(event); end
+    def on_remove(event); end
+    def on_rename(event); end
+    def on_access(event); end
+  end
+end

data/lib/watchcat/executor.rb

@@ -1,64 +1,114 @@
-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
+    def initialize(paths, recursive:, force_polling:, poll_interval:, filters:, debounce:, block:, patterns: [], ignore_patterns: [], ignore_directories: false)
       @paths = paths
       @recursive = recursive
       @force_polling = force_polling
       @poll_interval = poll_interval
-      @wait_until_startup = wait_until_startup
-      @ignore_remove = ignore_remove
+      @filters = filters || {}
       @debounce = debounce
+      @debouncer = Debouncer.new if @debounce > 0
+      @patterns = Array(patterns)
+      @ignore_patterns = Array(ignore_patterns)
+      @ignore_directories = ignore_directories
       @block = block
+      @watcher = Watchcat::Watcher.new
+      @watch_thread = nil
+      @stop_requested = false
+      @owner_pid = nil
+      @stopped = false
     end
 
     def start
-      server = Server.new(@block)
-      @service = DRb.start_service("drbunix:", server)
-      client = nil
-      client = build_client if @wait_until_startup
-
-      @child_pid = fork do
-        client = build_client unless @wait_until_startup
-        Process.setproctitle("watchcat: watcher")
-        client.run
+      @owner_pid = Process.pid
+
+      # Always start watching in a background thread to avoid blocking
+      @watch_thread = Thread.new do
+        Thread.current.name = "watchcat-watcher"
+        start_watching
       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
-        Process.kill(:KILL, @child_pid)
-      rescue Errno::ESRCH
-        # NOTE: We can ignore this error because there process is already dead.
+      # A forked child inherits the at_exit hook without inheriting the watcher
+      # thread, so it would call #close -- which sends on a channel, and a send
+      # can allocate. If the watcher thread held the allocator lock at fork
+      # time, that lock is never released in the child.
+      return if @owner_pid != Process.pid
+
+      return if @stopped
+      @stopped = true
+
+      @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
+
+    def watch(paths, recursive: @recursive)
+      paths = Array(paths)
+      paths.each { |p| raise ArgumentError, "path does not exist: #{p}" unless File.exist?(p) }
+      @watcher.add(paths, recursive: recursive)
+      @paths |= paths
+      self
+    end
+
+    def unwatch(paths)
+      paths = Array(paths)
+      @watcher.unwatch(paths)
+      @paths -= paths
+      self
+    end
+
+    def watched
+      @paths.dup
     end
 
     private
 
-    def build_client
-      Client.new(
-        @service.uri,
-        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: @filters[:ignore_remove],
+        ignore_access: @filters[:ignore_access],
+        ignore_create: @filters[:ignore_create],
+        ignore_modify: @filters[:ignore_modify]
+      ) do |kind, paths, raw_kind|
+        next if @stop_requested
+
+        event = Watchcat::Event.new(kind, paths, raw_kind)
+        next unless dispatch?(event)
+
+        if @debounce > 0 && paths.size == 1
+          @debouncer.debounce(paths[0], @debounce) { @block.call(event) }
+        else
+          @block.call(event)
+        end
+      end
+    end
+
+    def dispatch?(event)
+      return false if @ignore_directories && event.directory?
+      return false if @patterns.any? && !matches_any_pattern?(event.paths, @patterns)
+      return false if @ignore_patterns.any? && matches_any_pattern?(event.paths, @ignore_patterns)
+
+      true
+    end
+
+    def matches_any_pattern?(paths, patterns)
+      paths.any? do |path|
+        patterns.any? { |pattern| File.fnmatch?(pattern, File.basename(path)) || File.fnmatch?(pattern, path) }
+      end
     end
   end
 end

data/lib/watchcat/kind.rb

@@ -27,6 +27,14 @@ module Watchcat
     def any?
       !@any.nil?
     end
+
+    def event_type
+      return "create" if create?
+      return "modify" if modify?
+      return "remove" if remove?
+      return "access" if access?
+      "unknown"
+    end
   end
 
   class AccessKind

data/lib/watchcat/version.rb

@@ -1,3 +1,3 @@
 module Watchcat
-  VERSION = "0.2.0"
+  VERSION = "0.6.0"
 end

data/lib/watchcat.rb

@@ -1,5 +1,7 @@
 require_relative "watchcat/version"
 require_relative "watchcat/executor"
+require_relative "watchcat/debouncer"
+require_relative "watchcat/event_handler"
 
 begin
   require "watchcat/#{RUBY_VERSION.to_f}/watchcat"
@@ -14,21 +16,29 @@ module Watchcat
       recursive: true,
       force_polling: false,
       poll_interval: nil,
-      wait_until_startup: false,
-      ignore_remove: false,
+      filters: {},
       debounce: -1,
+      patterns: [],
+      ignore_patterns: [],
+      ignore_directories: false,
+      handler: nil,
       &block
     )
+      callback = block || (handler && handler.method(:dispatch))
+      raise ArgumentError, "must provide a block or a handler:" unless callback
+
       w =
         Watchcat::Executor.new(
           Array(paths),
           recursive: recursive,
           force_polling: force_polling,
           poll_interval: poll_interval,
-          wait_until_startup: wait_until_startup,
-          ignore_remove: ignore_remove,
+          filters: filters,
           debounce: debounce,
-          block: block
+          patterns: patterns,
+          ignore_patterns: ignore_patterns,
+          ignore_directories: ignore_directories,
+          block: callback
         )
       w.start
       w

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchcat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Yuji Yaginuma
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 2026-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: drb
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-fail-fast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,42 +150,49 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - yuuji.yaginuma@gmail.com
-executables: []
+executables:
+- watchcat
 extensions:
 - ext/watchcat/extconf.rb
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Cargo.lock
 - Cargo.toml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- cli_example.yml
+- exe/watchcat
 - ext/watchcat/.gitignore
 - ext/watchcat/Cargo.lock
 - ext/watchcat/Cargo.toml
 - ext/watchcat/extconf.rb
 - ext/watchcat/src/event.rs
+- ext/watchcat/src/gvl_helpers.rs
 - ext/watchcat/src/lib.rs
 - lib/watchcat.rb
-- lib/watchcat/client.rb
+- lib/watchcat/cli.rb
+- lib/watchcat/cli/action_executor.rb
+- lib/watchcat/cli/config.rb
+- lib/watchcat/cli/watcher.rb
+- lib/watchcat/debouncer.rb
 - lib/watchcat/event.rb
+- lib/watchcat/event_handler.rb
 - lib/watchcat/executor.rb
 - lib/watchcat/kind.rb
-- lib/watchcat/server.rb
 - lib/watchcat/version.rb
-- watchcat.gemspec
 homepage: https://github.com/y-yagi/watchcat
 licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/y-yagi/watchcat
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,15 +200,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.19
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Simple filesystem notification library for Ruby.
 test_files: []

data/Gemfile.lock

@@ -1,70 +0,0 @@
-PATH
-  remote: .
-  specs:
-    watchcat (0.2.0)
-      drb
-      rb_sys
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    debug (1.9.2)
-      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)
-      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.1)
-    minitest-retry (0.2.3)
-      minitest (>= 5.0)
-    nokogiri (1.16.7-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
-      racc (~> 1.4)
-    psych (5.1.2)
-      stringio
-    racc (1.8.1)
-    rake (13.2.1)
-    rake-compiler (1.2.8)
-      rake
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    rb_sys (0.9.102)
-    rdoc (6.7.0)
-      psych (>= 4.0.0)
-    reline (0.5.10)
-      io-console (~> 0.5)
-    ruby_memcheck (3.0.0)
-      nokogiri
-    stringio (3.1.1)
-
-PLATFORMS
-  arm64-darwin-22
-  arm64-darwin-23
-  x86_64-darwin-19
-  x86_64-darwin-20
-  x86_64-linux
-
-DEPENDENCIES
-  debug
-  listen
-  minitest
-  minitest-retry
-  rake
-  rake-compiler
-  ruby_memcheck
-  watchcat!
-
-BUNDLED WITH
-   2.5.4

data/lib/watchcat/client.rb

@@ -1,26 +0,0 @@
-module Watchcat
-  class Client
-    def initialize(uri, paths:, recursive:, force_polling:, poll_interval:, ignore_remove:, debounce:)
-      DRb.start_service
-      @watcher = Watchcat::Watcher.new
-      @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

data/watchcat.gemspec

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/watchcat/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "watchcat"
-  spec.version = Watchcat::VERSION
-  spec.authors = ["Yuji Yaginuma"]
-  spec.email = ["yuuji.yaginuma@gmail.com"]
-
-  spec.summary = "Simple filesystem notification library for Ruby. "
-  spec.homepage = "https://github.com/y-yagi/watchcat"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["rubygems_mfa_required"] = "true"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features|benchmark)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.require_paths = ["lib"]
-  spec.extensions = ["ext/watchcat/extconf.rb"]
-
-  spec.add_dependency "rb_sys"
-  spec.add_dependency "drb"
-  spec.add_development_dependency "debug"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "minitest-retry"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake-compiler"
-  spec.add_development_dependency "ruby_memcheck"
-  spec.add_development_dependency "listen"
-end