filewatcher 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e284fa33515d0d74bc7cf8ddc014678e14f3700
-  data.tar.gz: 55d15b651a1246f50f1982ceab55a51afb5c5477
+  metadata.gz: 1530083e28860bdfe9ffd4cc1c754b6026e25814
+  data.tar.gz: d9fad06f13778bb85fbc6206e9975885cb83a874
 SHA512:
-  metadata.gz: 623df61d04ce2ab7b920d1718ddfbf7ac1791f617b17bac3e740a9b72235c9dabb0ea3824afe16cf07ac6d5e5391b4e41663c58701dcf465811c1e7c98044d4c
-  data.tar.gz: 4564616b0ecc6d8cdb781ea9d84790c2a60c3c89cb63f5cf915cefaf5810369b00e13c78fc3c2fee532a0d69b576d56666f252a19e542a11a129ae98dbe1d9c2
+  metadata.gz: 3f3044ce20143591b8c257ab09eab7c0a14b1058784020abea5653fb114ef61fa4f98e6813f61a1d7c825a54a3787b9d20416cd1086a9179524068550fbfcefa
+  data.tar.gz: c1409c73a378c5c0debc73725904a5f8260de6e828e5e93863f8f8018eeafbb907e3aa2d735fdc423818c80aec8a8207bd76857f088106d74162d9f877bb86eb

data/README.md

@@ -221,7 +221,7 @@ over the network)
     filewatcher.finalize   # Ensure all filesystem changes made prior to
                            # ending the watch are handled.
 
-If basename, relative filename or absolute filename is necessay use the stanard lib 'pathname' like this:
+If basename, relative filename or absolute filename is necessary use the standard lib 'pathname' like this:
 
     require 'pathname'
 
@@ -237,9 +237,9 @@ with no dependencies.
 
 Changelog
 ---------
-0.5.3 Exclude files. More environment variables. Options in ruby api.
-0.5.2 Start, stop and finalize API.
-0.5.1 Kill and restart long running command with --restart option.
+ * 0.5.3 Exclude files. More environment variables. Options in ruby api.
+ * 0.5.2 Start, stop and finalize API.
+ * 0.5.1 Kill and restart long running command with --restart option.
 
 Credits
 -------

data/bin/filewatcher

@@ -6,7 +6,7 @@ require 'pathname'
 require 'thread'
 
 options = Trollop::options do
-  version "filewatcher, version #{FileWatcher.VERSION} by Thomas Flemming 2015"
+  version "filewatcher, version #{FileWatcher.VERSION} by Thomas Flemming 2016"
   banner <<-EOS
 Filewatcher scans the filesystem and executes shell commands when files changes.
 
@@ -21,13 +21,14 @@ Examples:
    filewatcher '*.rb' 'ruby $FILENAME'
    filewatcher '**/*.rb' 'ruby $FILENAME' # Watch subdirectories
 
-Other available environment variables are BASENAME, ABSOLUTE_FILENAME, 
+Other available environment variables are BASENAME, ABSOLUTE_FILENAME,
 RELATIVE_FILENAME, EVENT and DIRNAME.
 
 Options:
 EOS
 
   opt :dontwait, "Do not wait for filesystem updates before running", :short => 'd', :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
@@ -63,23 +64,19 @@ def split_files_void_escaped_whitespace(files)
 end
 
 files = split_files_void_escaped_whitespace(files)
+child_pid = nil
 
 def restart(child_pid, env, cmd)
-  Process.kill(9,child_pid)
+  Process.kill(9, child_pid)
   Process.wait(child_pid)
 rescue Errno::ESRCH
   # already killed
 ensure
-  child_pid = Process.spawn(env, cmd)
-end
-
-if(options[:restart])
-  rd, wr = IO.pipe
-  child_pid = nil
+  return Process.spawn(env, cmd)
 end
 
 if(options[:exclude] != "")
-  options[:exclude] = split_files_void_escaped_whitespace(options[:exclude].split(" "))  
+  options[:exclude] = split_files_void_escaped_whitespace(options[:exclude].split(" "))
 end
 
 begin
@@ -91,7 +88,9 @@ begin
       puts " #{filename}"
     end
   end
-  
+
+  Process.daemon(true, true) if options[:daemon]
+
   fw.watch(options[:interval]) do |filename, event|
     cmd = nil
     if(options[:exec] and File.exist?(filename))
@@ -135,10 +134,10 @@ begin
       end
 
       if(options[:restart])
-        if(child_pid == nil)
+        if child_pid.nil?
           child_pid = Process.spawn(env, cmd)
         else
-          child_id = restart(child_pid, env, cmd)
+          child_pid = restart(child_pid, env, cmd)
         end
       else
         begin

data/lib/filewatcher.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # Simple file watcher. Detect changes in files and directories.
 #
 # Issues: Currently doesn't monitor changes in directorynames
@@ -6,7 +7,7 @@ class FileWatcher
   attr_accessor :filenames
 
   def self.VERSION
-    return '0.5.3'
+    return '0.5.4'
   end
 
   def update_spinner(label)
@@ -39,7 +40,7 @@ class FileWatcher
     @sleep = sleep
     if(@interval and @interval > 0)
       @sleep = @interval
-    end    
+    end
     @stored_update = on_update
     @keep_watching = true
     if(@dontwait)
@@ -119,7 +120,7 @@ class FileWatcher
       end
       @filenames = @filtered_filenames
     end
-    
+
     @filenames.each do |filename|
       mtime = File.exist?(filename) ? File.stat(filename).mtime : Time.new(0)
       snapshot[filename] = mtime
@@ -164,7 +165,7 @@ class FileWatcher
     if(!patterns.kind_of?Array)
       patterns = [patterns]
     end
-    patterns.map { |it| Dir[fulldepth(it)] }.flatten.uniq
+    patterns.map { |it| Dir[fulldepth(expand_path(it))] }.flatten.uniq
   end
 
   private
@@ -177,4 +178,12 @@ class FileWatcher
     end
   end
 
+  def expand_path(pattern)
+    if pattern.start_with?('~')
+      File.expand_path(pattern)
+    else
+      pattern
+    end
+  end
+
 end

data/test/test_filewatcher.rb

@@ -28,7 +28,7 @@ describe FileWatcher do
   end
 
   it "should exclude selected file patterns" do
-    filewatcher = FileWatcher.new(File.expand_path('test/fixtures/**/*'), exclude: [File.expand_path("test/fixtures/**/*.txt")])
+    filewatcher = FileWatcher.new(File.expand_path('test/fixtures/**/*'), :exclude => [File.expand_path("test/fixtures/**/*.txt")])
     filtered_fixtures =
       %w(test/fixtures/file4.rb
          test/fixtures/subdir/file6.rb
@@ -62,6 +62,19 @@ describe FileWatcher do
     filewatcher.filenames.should.satisfy &includes_all(explicit_relative_fixtures)
   end
 
+  it "should handle tilde expansion" do
+    filename = File.expand_path('~/file_watcher_1.txt')
+    open(filename, 'w') { |f| f.puts 'content1' }
+
+    filewatcher = FileWatcher.new('~/file_watcher_1.txt')
+
+    begin
+      filewatcher.filenames.should == [filename]
+    ensure
+      FileUtils.rm(filename)
+    end
+  end
+
   it "should detect file deletions" do
     filename = "test/fixtures/file1.txt"
     open(filename,"w") { |f| f.puts "content1" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Thomas Flemming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop