filewatcher 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf8702009840bc579d652246d0a0540b9ce7bcfc29ebf9d94995cf53c1343db
-  data.tar.gz: 4a2b253229620ae6ed2522a03d46105ce266161d116192615ce0bc3ecb396bf2
+  metadata.gz: e1058d188f32d31bdf63775a8ff6655e64de608669630ef775c0e4975d196421
+  data.tar.gz: 57406a8b0be947051f295de3d6208faaf4ec60e432edc22a71d1e3b22fb58415
 SHA512:
-  metadata.gz: a711c6cfce133aad2892381de2804c4c3fd4f9405d280df85c2c1a496fceb8f77055559637728560ed96afb0cd4588b66a397b331e8006f416ea630501fb27d7
-  data.tar.gz: ba768df36f5fd263645dfd5421473bd5b54d71472b808fd279ea844d76e517584123314fd1af4d246f056ec088463fccb45106e71cc80404594af9fdfbd68b06
+  metadata.gz: d930968943fd907aad26eb150de20fa8d2681223dad1f516f9a27c2c096893bacaa8decd0e4646753f529dbec38bba32dd1b6951b442e2df69f6a01f943116fc
+  data.tar.gz: cc8919f9f7036cb7599b22589e5b6abadd7b2674f502eae3e9c70c3e29b72d222356f5569244b63b1524dfd64430fc8617283b1bc0f565fffc91b5299b85980e

data/lib/filewatcher.rb

@@ -14,6 +14,15 @@ class Filewatcher
   attr_accessor :interval
   attr_reader :keep_watching
 
+  class << self
+    def print_version
+      system 'ruby -v'
+      puts "Filewatcher #{self::VERSION}"
+
+      super if defined? super
+    end
+  end
+
   def initialize(unexpanded_filenames, options = {})
     @unexpanded_filenames = unexpanded_filenames
     @unexpanded_excluded_filenames = options[:exclude]
@@ -88,19 +97,6 @@ class Filewatcher
 
   private
 
-  def expand_directories(patterns)
-    patterns = Array(patterns) unless patterns.is_a? Array
-    expanded_patterns = patterns.map do |pattern|
-      pattern = File.expand_path(pattern)
-      Dir[
-        File.directory?(pattern) ? File.join(pattern, '**', '*') : pattern
-      ]
-    end
-    expanded_patterns.flatten!
-    expanded_patterns.uniq!
-    expanded_patterns
-  end
-
   def debug(data)
     @logger.debug "Thread ##{Thread.current.object_id} #{data}"
   end

data/lib/filewatcher/snapshot.rb

@@ -25,8 +25,7 @@ class Filewatcher
         changes[filename] = :deleted unless self[filename]
       end
 
-      changes.reject! { |_filename, event| event.nil? }
-      changes
+      changes.tap(&:compact!)
     end
 
     # Class for one file from snapshot

data/lib/filewatcher/snapshots.rb

@@ -22,25 +22,26 @@ class Filewatcher
 
     private
 
-    def watching_files
-      expand_directories(@unexpanded_filenames) - expand_directories(@unexpanded_excluded_filenames)
-    end
-
     # Takes a snapshot of the current status of watched files.
     # (Allows avoidance of potential race condition during #finalize)
     def current_snapshot
-      Filewatcher::Snapshot.new(watching_files)
+      Filewatcher::Snapshot.new(
+        expand_directories(@unexpanded_filenames) -
+          expand_directories(@unexpanded_excluded_filenames)
+      )
     end
 
-    def file_mtime(filename)
-      return Time.new(0) unless File.exist?(filename)
-
-      result = File.mtime(filename)
-      if @logger.level <= Logger::DEBUG
-        debug "File.mtime = #{result.strftime('%F %T.%9N')}"
-        debug "stat #{filename}: #{self.class.system_stat(filename)}"
+    def expand_directories(patterns)
+      patterns = Array(patterns) unless patterns.is_a? Array
+      expanded_patterns = patterns.map do |pattern|
+        pattern = File.expand_path(pattern)
+        Dir[
+          File.directory?(pattern) ? File.join(pattern, '**', '*') : pattern
+        ]
       end
-      result
+      expanded_patterns.flatten!
+      expanded_patterns.uniq!
+      expanded_patterns
     end
 
     def file_system_updated?(snapshot = current_snapshot)

data/lib/filewatcher/spec_helper.rb

@@ -33,7 +33,7 @@ class Filewatcher
         seconds *= coefficient
       end
 
-      if block_given?
+      if block
         wait_with_block seconds, interval, &block
       else
         wait_without_block seconds

data/lib/filewatcher/version.rb

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

data/spec/filewatcher_spec.rb

@@ -48,6 +48,19 @@ describe Filewatcher do
 
   let(:processed_files) { watch_run.processed.flat_map(&:keys) }
 
+  describe '.print_version' do
+    subject(:method_call) { described_class.print_version }
+
+    let(:ruby_version_regexp) { 'j?ruby \d+\.\d+\.\d+.*' }
+    let(:filewatcher_version_regexp) { "Filewatcher #{Filewatcher::VERSION}" }
+
+    it do
+      expect { method_call }.to output(
+        /^#{ruby_version_regexp}\n#{filewatcher_version_regexp}$/
+      ).to_stdout_from_any_process
+    end
+  end
+
   describe '#initialize' do
     describe 'regular run' do
       before { watch_run.run }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Thomas Flemming
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-20 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,33 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: gem_toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: toys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.11.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
 description: Detect changes in file system. Works anywhere.
 email:
 - thomas.flemming@gmail.com
@@ -139,16 +153,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Lightweight filewatcher.