irb-reload 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c9e5e8c284ad8d612479af2311030ef75e3278833ed03d4496e3db4d0b812e3
-  data.tar.gz: ce198ef59ecfcc288c8d5dc6391dd7c647745a61d76942bd337fd791927e5720
+  metadata.gz: 71619300fd24b66bd53ec9266316e9678790749c14588fdd26244a1554a1975b
+  data.tar.gz: 904ea7d45579041615589de737b224832066e993343a1ede37dce3a0beea0a62
 SHA512:
-  metadata.gz: c7314d14d35c391de669282744c0779fc85a456c7fee952b86af0d4bf14535b3aa04168b95ef2d830dd0c09dc3b7f63ff8f79aa215af75c110e5cb849dd4cdbf
-  data.tar.gz: 912492fe22aa8df900b9444cd0ddcf2dce72a7afa53ca3ca8ba600831b9cc82408881a37ad1c3a37cd1f3bedb9ecabd622fb2b4ace9aa1aa56fe35e6c919ada3
+  metadata.gz: c5de731087b4c326347d636f61b807d143b92f0742e9570c813b8e1d1d7dad22dbe31ce3ff17a597058dc37e2b8d6596753cd3fb8284669658b67aafaeba3abd
+  data.tar.gz: e74904b0e2f0e6104f96403194f39711d5552f6f207fce4b1749413115414e071447e72b06c6772cbea29845803de14d677d0381ce42b41ebae2ff51199645c4

data/.ruby-version

@@ -0,0 +1 @@
+4.0.1

data/README.md

@@ -32,12 +32,9 @@ You can tweak the watcher through `IRB.conf`.
 ```ruby
 IRB.conf[:RELOAD] = {
 	paths: %w[app lib],               # directories to watch. Default is `lib`.
-	listen: { latency: 0.2 },         # options forwarded to Listen
 }
 ```
 
-Any keys under `:listen` are passed straight to `Listen.to`. Use this to change latency, polling, or ignore patterns.
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to execute the test suite. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/irb/reload/version.rb

@@ -2,6 +2,6 @@
 
 module IRB
   module Reload
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

data/lib/irb/reload.rb

@@ -1,27 +1,31 @@
 # frozen_string_literal: true
 
 require "irb"
-require "listen"
+require "set"
+require "watchcat"
 
 require_relative "reload/version"
 require_relative "reload/command"
 
 module IRB
   module Reload
-    DEFAULT_PATTERN = /\.rb\z/.freeze
     DEFAULT_PATHS = ["lib"]
+    WATCHCAT_FILTERS = {
+      ignore_remove: true,
+      ignore_access: true
+    }.freeze
 
     class << self
       def start
         @changed_files = Set.new
         normalized_paths = normalize_paths(config[:paths] || DEFAULT_PATHS)
-        listener_options = default_listen_option
 
-        @listener = Listen.to(*normalized_paths, **listener_options) do |modified, added, _removed|
-          record_changed_files(modified, added)
+        @watcher&.stop if defined?(@watcher) && @watcher
+        @watcher = Watchcat.watch(normalized_paths, filters: WATCHCAT_FILTERS) do |event|
+          record_watchcat_event(event)
         end
 
-        @listener.start
+        @watched_paths = normalized_paths
         true
       end
 
@@ -33,9 +37,7 @@ module IRB
       end
 
       def watched_paths
-        return [] unless @listener
-
-        @listener.respond_to?(:directories) ? @listener.directories : []
+        @watched_paths || []
       end
 
       def config
@@ -44,13 +46,6 @@ module IRB
 
       private
 
-      def default_listen_option
-        options = { only: DEFAULT_PATTERN }
-        config_options = config.fetch(:listen, {})
-        options.merge!(symbolize_keys(config_options))
-        options
-      end
-
       def normalize_paths(paths)
         normalized = Array(paths).map(&:to_s).reject(&:empty?)
         normalized = [Dir.pwd] if normalized.empty?
@@ -66,6 +61,24 @@ module IRB
         end
       end
 
+      def record_watchcat_event(event)
+        return unless actionable_event?(event)
+
+        paths = Array(event.paths)
+        if event.kind.create?
+          record_changed_files([], paths)
+        else
+          record_changed_files(paths, [])
+        end
+      end
+
+      def actionable_event?(event)
+        kind = event&.kind
+        return false unless kind
+
+        kind.create? || kind.modify? || kind.any?
+      end
+
       def ruby_file?(file)
         File.extname(file) == ".rb"
       end
@@ -83,12 +96,6 @@ module IRB
       ensure
         $VERBOSE = old_verbose
       end
-
-      def symbolize_keys(hash)
-        hash.each_with_object({}) do |(key, value), memo|
-          memo[key.to_sym] = value
-        end
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irb-reload
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuji Yaginuma
@@ -24,39 +24,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: watchcat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: logger
-  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'
+        version: '0.5'
 email:
 - yuuji.yaginuma@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md
@@ -85,5 +72,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.3
 specification_version: 4
-summary: Auto-reload changed Ruby files inside an IRB session.
+summary: Reload changed Ruby files inside an IRB session.
 test_files: []