filewatcher 1.1.1 → 2.0.0.beta5

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start
+
+if ENV['CODECOV_TOKEN']
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+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|
+    match do |actual|
+      expected.all? { |file| actual.include? File.expand_path(file) }
+    end
+  end
+end

data/spec/spec_helper/ruby_watch_run.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+class Filewatcher
+  module SpecHelper
+    class RubyWatchRun < WatchRun
+      attr_reader :filewatcher, :thread, :watched, :processed
+
+      def initialize(filewatcher:, **args)
+        super(**args)
+        @filewatcher = filewatcher
+
+        @mutex = Mutex.new
+      end
+
+      def start
+        super
+        @thread = thread_initialize
+        # thread needs a chance to start
+        wait seconds: 1
+        wait do
+          keep_watching = filewatcher.keep_watching
+          debug "keep_watching = #{keep_watching}"
+          keep_watching
+        end
+      end
+
+      def stop
+        thread.exit
+
+        wait do
+          thread.stop?
+        end
+
+        super
+      end
+
+      def wait(seconds: 1)
+        super seconds: seconds, interval: filewatcher.interval
+      end
+
+      private
+
+      def make_changes
+        super
+
+        # Some OS, file systems and Ruby interpretators
+        # doesn't catch milliseconds of `File.mtime`
+        wait do
+          @mutex.synchronize do
+            debug "processed = #{processed}"
+            debug "processed.any? = #{processed.any?}"
+            processed.any?
+          end
+        end
+      end
+
+      def thread_initialize
+        @watched ||= 0
+        @processed = []
+        Thread.new { setup_filewatcher }
+      end
+
+      def setup_filewatcher
+        debug 'setup_filewatcher'
+        debug filewatcher.inspect
+        filewatcher.watch do |changes|
+          debug filewatcher.inspect
+          @mutex.synchronize do
+            debug "watch callback: changes = #{changes.inspect}"
+            increment_watched
+            @processed.push(changes)
+            # debug 'pushed to processed'
+          end
+        end
+      end
+
+      def increment_watched
+        @watched += 1
+      end
+    end
+  end
+end

metadata

@@ -1,98 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.beta5
 platform: ruby
 authors:
 - Thomas Flemming
-autorequire: 
+- Alexander Popov
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: optimist
+  name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: gem_toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
-description: Detect changes in filesystem. Works anywhere.
+        version: '1.3'
+- !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
+  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'
+description: Detect changes in file system. Works anywhere.
 email:
 - thomas.flemming@gmail.com
-executables:
-- filewatcher
+- alex.wayfer@gmail.com
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/banner.txt
-- bin/filewatcher
 - lib/filewatcher.rb
 - lib/filewatcher/cycles.rb
-- lib/filewatcher/env.rb
-- lib/filewatcher/runner.rb
+- lib/filewatcher/snapshot.rb
+- lib/filewatcher/snapshots.rb
+- lib/filewatcher/spec_helper.rb
+- lib/filewatcher/spec_helper/watch_run.rb
 - lib/filewatcher/version.rb
-- test/dumpers/env_dumper.rb
-- test/dumpers/watched_dumper.rb
-- test/filewatcher/test_env.rb
-- test/filewatcher/test_runner.rb
-- test/filewatcher/test_version.rb
-- test/helper.rb
-- test/test_filewatcher.rb
-homepage: http://github.com/thomasfl/filewatcher
+- 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: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,23 +169,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
-summary: Lighweight filewatcher.
-test_files:
-- test/dumpers/env_dumper.rb
-- test/dumpers/watched_dumper.rb
-- test/filewatcher/test_env.rb
-- test/filewatcher/test_runner.rb
-- test/filewatcher/test_version.rb
-- test/helper.rb
-- test/test_filewatcher.rb
+summary: Lightweight filewatcher.
+test_files: []

data/bin/banner.txt

@@ -1,17 +0,0 @@
-Filewatcher scans the filesystem and executes shell commands when files changes.
-
-Usage:
-   filewatcher [--restart] '<filenames or patterns>' '<shell command>'
-Where
-   filename: filename(s) to scan.
-   shell command: shell command to execute when file changes on disk.
-
-Examples:
-   filewatcher "myfile" "echo 'myfile has changed'"
-   filewatcher '*.rb' 'ruby $FILENAME'
-   filewatcher '**/*.rb' 'ruby $FILENAME' # Watch subdirectories
-
-Other available environment variables are BASENAME, ABSOLUTE_FILENAME,
-RELATIVE_FILENAME, EVENT and DIRNAME.
-
-Options:

data/bin/filewatcher

@@ -1,106 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require_relative '../lib/filewatcher'
-require_relative '../lib/filewatcher/env'
-require_relative '../lib/filewatcher/runner'
-require_relative '../lib/filewatcher/version'
-
-require 'optimist'
-
-options = Optimist.options do
-  version "filewatcher, version #{Filewatcher::VERSION} by Thomas Flemming 2016"
-  banner File.read File.join(__dir__, 'banner.txt')
-
-  opt :immediate, 'Immediately execute a command',
-      short: 'I', type: :boolean, default: false
-  opt :every, 'Run command for every updated file in one filesystem check',
-      short: 'E', type: :boolean, default: false
-  opt :daemon, 'Run in the background as system daemon',
-      short: 'D', type: :boolean, default: false
-  opt :restart, 'Restart process when filesystem is updated',
-      short: 'r', type: :boolean, default: false
-  opt :list, 'Print name of files being watched'
-  opt :exec, 'Execute file as a script when file is updated',
-      short: 'e', type: :boolean, default: false
-  opt :include, 'Include files',
-      type: :string, default: File.join('**', '*')
-  opt :exclude, 'Exclude file(s) matching',
-      type: :string, default: nil
-  opt :interval, 'Interval to scan filesystem',
-      short: 'i', type: :float, default: 0.5
-  opt :spinner, 'Show an ascii spinner',
-      short: 's', type: :boolean, default: false
-end
-
-Optimist.die Optimist.educate if ARGV.empty?
-
-files = ARGV[0..-2]
-
-files << ARGV.first if files.empty?
-
-def split_files_void_escaped_whitespace(files)
-  files
-    .map { |name| name.gsub(/\\\s/, '_ESCAPED_WHITESPACE_').split(/\s/) }
-    .flatten
-    .uniq
-    .map { |name| name.gsub('_ESCAPED_WHITESPACE_', '\ ') }
-end
-
-files = split_files_void_escaped_whitespace(files)
-child_pid = nil
-
-def restart(pid, env, cmd)
-  begin
-    raise Errno::ESRCH unless pid
-    Process.kill(9, pid)
-    Process.wait(pid)
-  rescue Errno::ESRCH
-    nil # already killed
-  end
-  Process.spawn(env, cmd)
-end
-
-if options[:exclude].to_s != ''
-  options[:exclude] = split_files_void_escaped_whitespace(
-    options[:exclude].split(' ')
-  )
-end
-
-begin
-  fw = Filewatcher.new(files, options)
-
-  if options[:list]
-    puts 'Watching:'
-    fw.last_found_filenames.each do |filename|
-      puts " #{filename}"
-    end
-  end
-
-  Process.daemon(true, true) if options[:daemon]
-
-  fw.watch do |filename, event|
-    cmd =
-      if options[:exec] && File.exist?(filename)
-        Filewatcher::Runner.new(filename).command
-      elsif ARGV.length > 1
-        ARGV[-1]
-      end
-
-    next puts "file #{event}: #{filename}" unless cmd
-
-    env = Filewatcher::Env.new(filename, event).to_h
-    if options[:restart]
-      child_pid = restart(child_pid, env, cmd)
-    else
-      begin
-        Process.spawn(env, cmd)
-        Process.wait
-      rescue SystemExit, Interrupt
-        exit(0)
-      end
-    end
-  end
-rescue SystemExit, Interrupt
-  fw.finalize
-end