filewatcher 2.0.0.beta5 → 2.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4552a19cac521012fb0cca2c232a14f501530262e02639ed017c0897e5f985f
-  data.tar.gz: f3d98c14badcbd439a9dca5ce289b40cc80aecb1c377d8ec08f80e76c398aaf5
+  metadata.gz: 2db0cc5cc4a588900541eef784783e1548a596b29f7359108ff2f2fc9f6c6149
+  data.tar.gz: ac81956d8882c15525de3e3f4747b8e9b62631fa092e19441e925e16814a7a72
 SHA512:
-  metadata.gz: 85e030c3e12237aff4dffddfb80fdf4b288b462a35e21a63d254e1aea4ca40cd2d5ba27cb21e39e3847f16936d4291398a106bd55a3ef40205f35d75c401603c
-  data.tar.gz: 7cec237639d7c760b963fe42b7c7d6ef40b989dde617308434e7d29037f73aad3f6fc87f971f60b4e47f420aec779e36ab76e5a6a2f27cf4f1c0849719b0b286
+  metadata.gz: 1fdefea6d108c43026ee922706b8259bf6a7df32019a48c8bf88aa7cf06fb7dcf2942a7ca308c80d834201159af25d804948ca0d5b5b22155140ee0e15bc4305
+  data.tar.gz: 86bb17e7dd94046f4c357b80c264d9c4a9a720933ed1437e37e1a9547a4884ed0a5ae97f54ef6ca26cedfe76288212fa5053b1e8a5825cfdec6393981fbf155a

data/lib/filewatcher/snapshot.rb

@@ -30,30 +30,53 @@ class Filewatcher
 
     # Class for one file from snapshot
     class SnapshotFile
-      STATS = %i[mtime].freeze
+      class << self
+        def stats
+          @stats ||= populate_stats %i[mtime]
+        end
+
+        def populate_stats(stats)
+          defined?(super) ? super(stats) : stats
+        end
+
+        def subtractions
+          @subtractions ||= populate_subtractions(
+            created: ->(other) { other.nil? },
+            updated: ->(other) { mtime && mtime > other.mtime }
+          )
+        end
 
-      attr_reader(*STATS)
+        def populate_subtractions(hash)
+          hash = super(hash) if defined?(super)
+          hash
+        end
+      end
+
+      attr_reader :mtime
 
       def initialize(filename)
         @filename = filename
-        STATS.each do |stat|
+        self.class.stats.each do |stat|
           time = File.public_send(stat, filename) if File.exist?(filename)
           instance_variable_set :"@#{stat}", time || Time.new(0)
         end
       end
 
       def -(other)
-        if other.nil?
-          :created
-        elsif other.mtime < mtime
-          :updated
-        end
+        self.class.subtractions.find do |_event, block|
+          instance_exec(other, &block)
+        end&.first
       end
 
       def inspect
+        stats_string =
+          self.class.stats
+            .map { |stat| "#{stat}=#{public_send(stat)&.strftime('%F %T.%9N')&.inspect}" }
+            .join(', ')
+
         <<~OUTPUT
           #<Filewatcher::Snapshot::SnapshotFile:#{object_id}
-            @filename=#{@filename.inspect}, mtime=#{mtime.strftime('%F %T.%9N').inspect}
+            @filename=#{@filename.inspect}, #{stats_string}
           >
         OUTPUT
       end

data/{spec → lib/filewatcher}/spec_helper/ruby_watch_run.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'watch_run'
+
 class Filewatcher
   module SpecHelper
-    class RubyWatchRun < WatchRun
+    ## Ruby API watcher for specs
+    class RubyWatchRun
+      include WatchRun
+
       attr_reader :filewatcher, :thread, :watched, :processed
 
       def initialize(filewatcher:, **args)

data/lib/filewatcher/spec_helper/watch_run.rb

@@ -2,27 +2,23 @@
 
 class Filewatcher
   module SpecHelper
-    ## Base class for Filewatcher runners in specs
-    class WatchRun
+    ## Base module for Filewatcher runners in specs
+    module WatchRun
       include Filewatcher::SpecHelper
 
       TMP_DIR = "#{Dir.getwd}/spec/tmp"
 
       attr_reader :filename
 
-      def initialize(filename:, action:, directory:)
-        @filename =
-          if filename.match? %r{^(/|~|[A-Z]:)} then filename
-          else File.join(TMP_DIR, filename)
-          end
-        @directory = directory
+      def initialize(filename:, action:)
+        @filename = filename.match?(%r{^(/|~|[A-Z]:)}) ? filename : File.join(TMP_DIR, filename)
         @action = action
         debug "action = #{action}"
       end
 
       def start
         debug 'start'
-        File.write(@filename, 'content1') unless @action == :create
+        File.write(@filename, 'content1') unless %i[create create_dir].include? @action
 
         wait seconds: 1
       end
@@ -46,19 +42,26 @@ class Filewatcher
 
       private
 
+      create_update_action = lambda do
+        ## 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 'content2' > #{@filename}"
+        debug_file_mtime
+      end.freeze
+
+      ACTIONS = {
+        create: create_update_action,
+        update: create_update_action,
+        create_dir: -> { FileUtils.mkdir_p(@filename) },
+        delete: -> { FileUtils.remove(@filename) }
+      }.freeze
+
       def make_changes
         debug "make changes, @action = #{@action}, @filename = #{@filename}"
 
-        if @action == :delete
-          FileUtils.remove(@filename)
-        elsif @directory
-          FileUtils.mkdir_p(@filename)
-        else
-          ## 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 'content2' > #{@filename}"
-          debug_file_mtime
-        end
+        action = self.class::ACTIONS.fetch(@action) { raise "Unknown action `#{@action}`" }
+
+        instance_exec(&action)
 
         wait seconds: 1
       end

data/lib/filewatcher/spec_helper.rb

@@ -9,12 +9,13 @@ rescue LoadError
 end
 
 require_relative 'spec_helper/watch_run'
+require_relative 'spec_helper/ruby_watch_run'
 
 class Filewatcher
   ## Helper for common spec features between plugins
   module SpecHelper
     ENVIRONMENT_SPECS_COEFFICIENTS = {
-      -> { ENV['CI'] } => 1,
+      -> { ENV.fetch('CI', false) } => 1,
       -> { RUBY_PLATFORM == 'java' } => 1,
       -> { Gem::Platform.local.os == 'darwin' } => 1
     }.freeze

data/lib/filewatcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Filewatcher
-  VERSION = '2.0.0.beta5'
+  VERSION = '2.0.0.beta6'
 end

data/spec/filewatcher_spec.rb

@@ -28,7 +28,6 @@ describe Filewatcher do
 
   let(:filename) { 'tmp_file.txt' }
   let(:action) { :update }
-  let(:directory) { false }
   ## TODO: Check its needless
   let(:every) { false }
   let(:immediate) { false }
@@ -41,8 +40,7 @@ describe Filewatcher do
 
   let(:watch_run) do
     Filewatcher::SpecHelper::RubyWatchRun.new(
-      filename: filename, filewatcher: filewatcher, action: action,
-      directory: directory
+      filename: filename, filewatcher: filewatcher, action: action
     )
   end
 
@@ -146,52 +144,59 @@ describe Filewatcher do
   end
 
   describe '#watch' do
-    before do
-      FileUtils.mkdir_p subdirectory if defined? subdirectory
+    context 'when action is known' do
+      before do
+        FileUtils.mkdir_p subdirectory if defined? subdirectory
 
-      watch_run.run
-    end
+        watch_run.run
+      end
 
-    describe 'detecting file deletions' do
-      let(:action) { :delete }
+      context 'when there are file deletions' do
+        let(:action) { :delete }
 
-      it { is_expected.to eq [{ watch_run.filename => :deleted }] }
-    end
+        it { is_expected.to eq [{ watch_run.filename => :deleted }] }
+      end
 
-    context 'when there are file additions' do
-      let(:action) { :create }
+      context 'when there are file additions' do
+        let(:action) { :create }
 
-      it { is_expected.to eq [{ watch_run.filename => :created }] }
-    end
+        it { is_expected.to eq [{ watch_run.filename => :created }] }
+      end
 
-    context 'when there are file updates' do
-      let(:action) { :update }
+      context 'when there are file updates' do
+        let(:action) { :update }
 
-      it { is_expected.to eq [{ watch_run.filename => :updated }] }
-    end
+        it { is_expected.to eq [{ watch_run.filename => :updated }] }
+      end
+
+      context 'when there are new files in subdirectories' do
+        let(:subdirectory) { File.expand_path('spec/tmp/new_sub_directory') }
 
-    context 'when there are new files in subdirectories' do
-      let(:subdirectory) { File.expand_path('spec/tmp/new_sub_directory') }
+        let(:filename) { File.join(subdirectory, 'file.txt') }
+        let(:action) { :create }
+        let(:every) { true }
+        ## https://github.com/filewatcher/filewatcher/pull/115#issuecomment-674581595
+        let(:interval) { 0.4 }
+
+        it do
+          expect(processed).to eq [
+            { subdirectory => :updated, watch_run.filename => :created }
+          ]
+        end
+      end
 
-      let(:filename) { File.join(subdirectory, 'file.txt') }
-      let(:action) { :create }
-      let(:every) { true }
-      ## https://github.com/filewatcher/filewatcher/pull/115#issuecomment-674581595
-      let(:interval) { 0.4 }
+      context 'when there are new subdirectories' do
+        let(:filename) { 'new_sub_directory' }
+        let(:action) { :create_dir }
 
-      it do
-        expect(processed).to eq [
-          { subdirectory => :updated, watch_run.filename => :created }
-        ]
+        it { is_expected.to eq [{ watch_run.filename => :created }] }
       end
     end
 
-    context 'when there are new subdirectories' do
-      let(:filename) { 'new_sub_directory' }
-      let(:directory) { true }
-      let(:action) { :create }
+    context 'when action is unknown' do
+      let(:action) { :foo }
 
-      it { is_expected.to eq [{ watch_run.filename => :created }] }
+      specify { expect { watch_run.run }.to raise_error(RuntimeError, 'Unknown action `foo`') }
     end
   end
 

data/spec/spec_helper.rb

@@ -10,8 +10,6 @@ end
 
 require_relative '../lib/filewatcher/spec_helper'
 
-require_relative 'spec_helper/ruby_watch_run'
-
 ## For case when required from dumpers
 if Object.const_defined?(:RSpec)
   RSpec::Matchers.define :include_all_files do |expected|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta5
+  version: 2.0.0.beta6
 platform: ruby
 authors:
 - Thomas Flemming
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,56 +31,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: gem_toys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: toys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.32.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -150,17 +150,18 @@ files:
 - lib/filewatcher/snapshot.rb
 - lib/filewatcher/snapshots.rb
 - lib/filewatcher/spec_helper.rb
+- lib/filewatcher/spec_helper/ruby_watch_run.rb
 - lib/filewatcher/spec_helper/watch_run.rb
 - lib/filewatcher/version.rb
 - spec/filewatcher/snapshot_spec.rb
 - spec/filewatcher/version_spec.rb
 - spec/filewatcher_spec.rb
 - spec/spec_helper.rb
-- spec/spec_helper/ruby_watch_run.rb
 homepage: http://github.com/filewatcher/filewatcher
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -169,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -179,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Lightweight filewatcher.