filewatcher 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f152abad4db37d701c171c006aa348be75d484a57b5dad570fdb7f9fa9f8e613
-  data.tar.gz: 3ac3b63272cee0295bac2eaefbf131a0933aeea5d0749d61cd8b3d214786a2ee
+  metadata.gz: 25f23553b187f2173b966b5a278bf7948f855390b5184196626b417b5ac1b190
+  data.tar.gz: 469558d39224bf9116d9b54a99ac962de9f6a22db295f28b5fae65c2f3808672
 SHA512:
-  metadata.gz: 944582ed2ecdc9ccd42d562be7ea38a8a242bef6e9798b14d1b93f900926c7ceb0014afabbe39ea41af4d398fd5331ccc378bcb5d0d910aecbe68af60d4b0226
-  data.tar.gz: f772e16b48e71a6e0dfc433cb9b50286e742c753dfc7564fe6eaf367d17b03542e3377acd4943fe5ae440d6079053de5b964f5e6224d5f5ff9124925e1dc9af5
+  metadata.gz: b044368afdc3d968e9ec27d726133e7fb64508411a2e15dba47c0492c059dc95bac3c6d3844c957d97f4dee815582efd5ca8dc75b535ad0040860600aadc1449
+  data.tar.gz: 1fd293c552bc6dfc32a3dbca59aae016b5b294a8012174b15a11ee44ca16e0cd1d0666ddd38b1449981b29c080531656865e19cde089d026b905c7d238f2797f

data/lib/filewatcher/snapshot.rb

@@ -6,7 +6,8 @@ class Filewatcher
   # Class for snapshots of file system
   class Snapshot
     extend Forwardable
-    def_delegators :@data, :[], :each, :keys
+
+    def_delegators :@data, :[], :each, :each_key, :keys
 
     def initialize(filenames)
       @data = filenames.each_with_object({}) do |filename, data|
@@ -21,7 +22,7 @@ class Filewatcher
         changes[filename] = snapshot_file - other[filename]
       end
 
-      other.each do |filename, _snapshot_file|
+      other.each_key do |filename|
         changes[filename] = :deleted unless self[filename]
       end
 
@@ -36,18 +37,18 @@ class Filewatcher
         end
 
         def populate_stats(stats)
-          defined?(super) ? super(stats) : stats
+          defined?(super) ? super : stats
         end
 
         def subtractions
           @subtractions ||= populate_subtractions(
-            created: ->(other) { other.nil? },
+            created: lambda(&:nil?),
             updated: ->(other) { mtime && mtime > other.mtime }
           )
         end
 
         def populate_subtractions(hash)
-          hash = super(hash) if defined?(super)
+          hash = super if defined?(super)
           hash
         end
       end

data/lib/filewatcher/spec_helper/ruby_watch_run.rb

@@ -40,7 +40,7 @@ class Filewatcher
       end
 
       def wait(seconds: 1)
-        super seconds: seconds, interval: filewatcher.interval
+        super(seconds: seconds, interval: filewatcher.interval)
       end
 
       private

data/lib/filewatcher/spec_helper/watch_run.rb

@@ -12,7 +12,26 @@ class Filewatcher
 
       TMP_DIR = 'spec/tmp'
       ## It's requried to split modifying files from result files like CLI dumpers
-      TMP_FILES_DIR = "#{TMP_DIR}/files"
+      TMP_FILES_DIR = "#{TMP_DIR}/files".freeze
+
+      create_update_action = lambda do |change_file, change_data|
+        new_content = change_data.fetch(:content, 'content2')
+
+        FileUtils.mkdir_p File.dirname(change_file)
+
+        ## There is no `File.write` because of strange difference in parallel `File.mtime`
+        ## https://cirrus-ci.com/task/6107605053472768?command=test#L497-L511
+        system "echo '#{new_content}' > #{change_file}"
+
+        debug_file_mtime(change_file)
+      end.freeze
+
+      CHANGES = {
+        create: create_update_action,
+        update: create_update_action,
+        create_dir: ->(change_file, *_args) { FileUtils.mkdir_p(change_file) },
+        delete: ->(change_file, *_args) { FileUtils.remove(change_file) }
+      }.freeze
 
       attr_reader :initial_files
 
@@ -73,25 +92,6 @@ class Filewatcher
 
       private
 
-      create_update_action = lambda do |change_file, change_data|
-        new_content = change_data.fetch(:content, 'content2')
-
-        FileUtils.mkdir_p File.dirname(change_file)
-
-        ## There is no `File.write` because of strange difference in parallel `File.mtime`
-        ## https://cirrus-ci.com/task/6107605053472768?command=test#L497-L511
-        system "echo '#{new_content}' > #{change_file}"
-
-        debug_file_mtime(change_file)
-      end.freeze
-
-      CHANGES = {
-        create: create_update_action,
-        update: create_update_action,
-        create_dir: ->(change_file, *_args) { FileUtils.mkdir_p(change_file) },
-        delete: ->(change_file, *_args) { FileUtils.remove(change_file) }
-      }.freeze
-
       def make_changes
         @changes.each do |change_file, change_data|
           debug "make changes, change_file = #{change_file}, change_data = #{change_data}"

data/lib/filewatcher/spec_helper.rb

@@ -43,7 +43,7 @@ class Filewatcher
       end
     end
 
-    def wait_with_block(seconds, interval, &_block)
+    def wait_with_block(seconds, interval, &)
       (seconds / interval).ceil.times do
         break if yield
 

data/lib/filewatcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Filewatcher
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

data/spec/examples.txt

@@ -1,10 +1,10 @@
 example_id                                 | status | run_time        |
 ------------------------------------------ | ------ | --------------- |
-./spec/filewatcher/snapshot_spec.rb[1:1:1] | passed | 0.00075 seconds |
+./spec/filewatcher/snapshot_spec.rb[1:1:1] | passed | 0.00101 seconds |
 ./spec/filewatcher/snapshot_spec.rb[1:2:1] | passed | 1 second        |
-./spec/filewatcher/version_spec.rb[1:1]    | passed | 0.00079 seconds |
-./spec/filewatcher_spec.rb[1:1:1]          | passed | 0.01153 seconds |
-./spec/filewatcher_spec.rb[1:2:1:1:1]      | passed | 6.02 seconds    |
+./spec/filewatcher/version_spec.rb[1:1]    | passed | 0.00075 seconds |
+./spec/filewatcher_spec.rb[1:1:1]          | passed | 0.01465 seconds |
+./spec/filewatcher_spec.rb[1:2:1:1:1]      | passed | 6.01 seconds    |
 ./spec/filewatcher_spec.rb[1:2:1:2:1]      | passed | 5.01 seconds    |
 ./spec/filewatcher_spec.rb[1:2:1:3:1]      | passed | 5.01 seconds    |
 ./spec/filewatcher_spec.rb[1:2:1:4:1]      | passed | 5.01 seconds    |
@@ -16,13 +16,13 @@ example_id                                 | status | run_time        |
 ./spec/filewatcher_spec.rb[1:2:2:2:1]      | passed | 2 seconds       |
 ./spec/filewatcher_spec.rb[1:2:2:2:2:1]    | passed | 2 seconds       |
 ./spec/filewatcher_spec.rb[1:3:1:1:1]      | passed | 5.01 seconds    |
-./spec/filewatcher_spec.rb[1:3:1:2:1]      | passed | 5.02 seconds    |
+./spec/filewatcher_spec.rb[1:3:1:2:1]      | passed | 5.01 seconds    |
 ./spec/filewatcher_spec.rb[1:3:1:3:1]      | passed | 5.01 seconds    |
 ./spec/filewatcher_spec.rb[1:3:1:4:1]      | passed | 5.01 seconds    |
 ./spec/filewatcher_spec.rb[1:3:1:5:1]      | passed | 5.01 seconds    |
-./spec/filewatcher_spec.rb[1:3:2:1]        | passed | 2.01 seconds    |
+./spec/filewatcher_spec.rb[1:3:2:1]        | passed | 2 seconds       |
 ./spec/filewatcher_spec.rb[1:4:1]          | passed | 2 seconds       |
 ./spec/filewatcher_spec.rb[1:5:1]          | passed | 7.21 seconds    |
 ./spec/filewatcher_spec.rb[1:6:1:1]        | passed | 7.41 seconds    |
-./spec/filewatcher_spec.rb[1:6:2:1]        | passed | 11.41 seconds   |
+./spec/filewatcher_spec.rb[1:6:2:1]        | passed | 11.61 seconds   |
 ./spec/filewatcher_spec.rb[1:7:1]          | passed | 6.01 seconds    |

data/spec/filewatcher_spec.rb

@@ -10,7 +10,7 @@ describe Filewatcher do
     logger.debug "FileUtils.rm_r #{tmp_dir}"
     FileUtils.rm_r tmp_dir if File.exist?(tmp_dir)
 
-    Filewatcher::SpecHelper.wait seconds: 5, interval: 0.2 do
+    described_class::SpecHelper.wait seconds: 5, interval: 0.2 do
       !File.exist?(tmp_dir)
     end
   end
@@ -23,11 +23,11 @@ describe Filewatcher do
     ruby_watch_run_class.transform_spec_files(file)
   end
 
-  let(:ruby_watch_run_class) { Filewatcher::SpecHelper::RubyWatchRun }
+  let(:ruby_watch_run_class) { described_class::SpecHelper::RubyWatchRun }
 
   let(:tmp_dir) { ruby_watch_run_class::TMP_DIR }
   let(:tmp_files_dir) { ruby_watch_run_class::TMP_FILES_DIR }
-  let(:logger) { Filewatcher::SpecHelper.logger }
+  let(:logger) { described_class::SpecHelper.logger }
 
   let(:raw_file_name) { 'tmp_file.txt' }
   let(:initial_files) { { raw_file_name => {} } }
@@ -68,7 +68,7 @@ describe Filewatcher do
     subject(:method_call) { described_class.print_version }
 
     let(:ruby_version_regexp) { '(j|truffle)?ruby \d+\.\d+\.\d+.*' }
-    let(:filewatcher_version_regexp) { "Filewatcher #{Filewatcher::VERSION}" }
+    let(:filewatcher_version_regexp) { "Filewatcher #{described_class::VERSION}" }
 
     it do
       expect { method_call }.to output(
@@ -124,22 +124,24 @@ describe Filewatcher do
       end
 
       context 'with Array of paths' do
-        let(:file_1) { 'tmp_file_1.txt' }
+        let(:initial_file) { 'tmp_initial_file.txt' }
         let(:subdir) { 'subdir' }
-        let(:file_2) { "#{subdir}/tmp_file_2.txt" }
+        let(:new_file) { "#{subdir}/tmp_new_file.txt" }
 
-        let(:filewatcher_files) { ["#{tmp_files_dir}/#{file_1}", "#{tmp_files_dir}/#{subdir}"] }
+        let(:filewatcher_files) do
+          ["#{tmp_files_dir}/#{initial_file}", "#{tmp_files_dir}/#{subdir}"]
+        end
 
         let(:initial_files) do
           {
-            file_1 => {}
+            initial_file => {}
           }
         end
 
         let(:changes) do
           initial_files.to_h { |key, _value| [transform_spec_files(key), { event: :update }] }
             .merge(
-              transform_spec_files(file_2) => { event: :create }
+              transform_spec_files(new_file) => { event: :create }
             )
         end
 
@@ -147,14 +149,14 @@ describe Filewatcher do
           [
             initial_files.to_h { |key, _value| [transform_spec_files(key), :updated] }
               .merge(
-                expected_file_2_change
+                expected_new_file_change
               )
           ]
         end
 
-        let(:expected_file_2_change) do
+        let(:expected_new_file_change) do
           {
-            transform_spec_files(file_2) => :created
+            transform_spec_files(new_file) => :created
           }
         end
 
@@ -163,7 +165,7 @@ describe Filewatcher do
           expect(processed).to eq(expected_changes)
             .or contain_exactly(
               *initial_files.map { |key, _value| { transform_spec_files(key) => :updated } },
-              expected_file_2_change
+              expected_new_file_change
             )
         end
       end
@@ -298,7 +300,7 @@ describe Filewatcher do
       logger.debug 'filewatcher.pause'
       watch_run.filewatcher.pause
 
-      Filewatcher::SpecHelper.wait seconds: 1
+      described_class::SpecHelper.wait seconds: 1
 
       write_tmp_files 1..4
     end

metadata

@@ -1,184 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Thomas Flemming
 - Alexander Popov
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2026-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: module_methods
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
-- !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
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: toys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.2
-- !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.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-- !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.39.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.39.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: module_methods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: 0.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.1.0
 description: Detect changes in file system. Works anywhere.
 email:
 - thomas.flemming@gmail.com
@@ -205,7 +64,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -213,18 +71,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.0.3.1
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Lightweight filewatcher.
 test_files: []