filewatcher 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ce65dd1aeaf7054fd9a91b6787778569bccf8a8
-  data.tar.gz: 55cd4d125598d649b22f44c7225183c7163bf3f5
+  metadata.gz: 24a9b40e9d109eadc83d2299a577b701c376a5c8
+  data.tar.gz: 159e4cf47ace11192f7ccae447008d2af2343a6a
 SHA512:
-  metadata.gz: 4c8b05df1ad574ce4a7c47d2b462c052d6c5e722b01f9b2da86c030af313170a2fd650988f2849ef32ad53e07c1217ac7ca72ed3b1b4b0c78a94af2357beb800
-  data.tar.gz: ad255b8e5655655f974dcd2e43623c9b0eefb660c6f5c99c50c174f8425eb6d4f6e80b477e0b954bbfb1a349dd7be013613caad4f3e90698610b4d84cacf4a82
+  metadata.gz: badd71331331d31b5e2bcd5db3654794332fa629fac3cdf46ae82db47d31f790e8e3952411b347816952433c8aa56864d64154ee1eac1c76feb3a302e27e7844
+  data.tar.gz: fcd7f82251d8dcc1625f9e8e74b5e9c171e3b1d0da493ad5551f3c36f9154fbb98c33f341cdf1656cf2d3c0bac44877bfde2ecc44401768ee1e75c1db32b57a5

data/README.rdoc

@@ -24,25 +24,35 @@ Run the echo command when the file myfile is changed:
 
    $ filewatcher "myfile" "echo 'myfile has changed'"
 
-Run any javascript in the current folder when it is updated in Windows Powershell:
+Run any javascript in the current directory when it is updated in Windows Powershell:
 
    > filewatcher *.js "node %FILENAME%"
 
 In Linux/OSX:
 
-   $ filewatcher *.js "node $FILENAME"
+   $ filewatcher *.js 'node $FILENAME'
+
+Place filenames or filenames in quotes to use ruby filename globbing instead of shell filename globbing. This will make filewatcher look for files in subdirectories too.
+
+   > filewatcher "*.js" "node %FILENAME%"
 
+In Linux/OSX:
 
-Run the ruby script when it is changed:
+   > filewatcher '*.js' 'node $FILENAME'
 
-   $ filewatcher -e ruby-script.rb
+Try to run the updated file as a script when it is updated by using the --exec/-e option. Works with files with file extensions that looks like a python, ruby, perl, php,
+javascript or awk script.
 
-Works with ruby, perl, python and awk by detecting file extensions.
+   $ filewatcher -e *.rb
 
-Print a list of all files matching *.css first and the print filename when a file is beeing updated:
+Print a list of all files matching *.css first and then output the filename when a file is beeing updated by using the --list/-l option:
 
    $ filewatcher -l *.css 'echo file: $FILENAME'
 
+Watch the "src" and "test" folders recursively, and run test when the filesystem gets updated:
+
+   $ filewatcher "src test" "ruby test/test_suite.rb"
+
 = Available enviroment variables
 
 The environment variable $FILENAME is available in the command. On unix like systems the command
@@ -50,7 +60,7 @@ has to be enclosed in single quotes. To run node whenever a javascript file is u
 
    $ filewatcher *.js 'node $FILENAME'
 
-The environment variables $FILEPATH and $FILEDIR is also available.
+The environment variables $FILEPATH, $FILEDIR and $FSEVENT is also available.
 
 = Command line options
 
@@ -75,7 +85,7 @@ Watch a list of files and directories:
     puts "Updated " + filename
   end
 
-To detect if a file is updated or deleted:
+To detect if a file is updated, added or deleted:
 
   FileWatcher.new(["README.rdoc"]).watch() do |filename, event|
     if(event == :changed)
@@ -85,7 +95,7 @@ To detect if a file is updated or deleted:
       puts "File deleted: " + filename
     end
     if(event == :new)
-      puts "New file: " + filename
+      puts "Added file: " + filename
     end
   end
 
@@ -95,7 +105,7 @@ To check for changes more often than the default once every second:
     puts "Updated " + filename
   end
 
-Print the names of files beeing watched before we begin:
+Print the names of the files found before watching files and folders:
 
   FileWatcher.new(["lib/"],true).watch do |filename|
     puts "Updated " + filename
@@ -103,7 +113,7 @@ Print the names of files beeing watched before we begin:
   => Watching files:
   lib/filewatcher.rb
 
-Use patterns to match filenames. The pattern is not a regular expression; instead it follows rules similar to shell filename globbing. Se Ruby documentation[http://www.ruby-doc.org/core-2.1.1/File.html#method-c-fnmatch] for syntax.
+Use patterns to match filenames in current directory and subdirectories. The pattern is not a regular expression; instead it follows rules similar to shell filename globbing. Se Ruby documentation[http://www.ruby-doc.org/core-2.1.1/File.html#method-c-fnmatch] for syntax.
 
   FileWatcher.new(["*.rb", "*.xml"]).watch do |filename|
     puts "Updated " + filename

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/thomasfl/filewatcher"
     gem.executables = ["filewatcher"]
     gem.authors = ["Thomas Flemming"]
-    # gem.add_dependency "trollop", ">= 1.16.2"
     gem.add_dependency 'trollop', '~> 2.0'
     gem.licenses = ["MIT"]
   end

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/bin/filewatcher

@@ -17,7 +17,7 @@ Where
 
 Examples:
    filewatcher "myfile" "echo 'myfile has changed'"
-   filewatcher -i 2 "*.rb ../src/*.rb" "ruby run_tests.rb"
+   filewatcher '*.rb' 'ruby $FILENAME'
 
 Options:
 EOS
@@ -48,19 +48,53 @@ if(options[:recurse])
   files = inc - exc
 end
 
-runners = {".py" => "python", ".rb" => "ruby", ".pl" => "perl", ".awk" => "awk"}
+def split_files_void_escaped_whitespace(files)
+  splitted_filenames = []
+  files.each do |name|
+    name = name.gsub(/\\\s/,'_ESCAPED_WHITESPACE_')
+    splitted_filenames << name.split(/\s/)
+  end
+  files = splitted_filenames.flatten.uniq
+  splitted_filenames = []
+  files.each do |name|
+    splitted_filenames << name.gsub('_ESCAPED_WHITESPACE_','\ ')
+  end
+  files = splitted_filenames
+end
+
+files = split_files_void_escaped_whitespace(files)
 
 FileWatcher.new(files, options[:list]).watch(options[:interval]) do |filename, event|
-  if(options[:exec])
-    extension = filename[/(\.[^\.]*)/,0]
-    runner = runners[extension].to_s
-    system(runner + " " + filename)
-  elsif(ARGV[-1])then
-    path = Pathname.new(filename)
+  cmd = nil
+  if(options[:exec] and File.exist?(filename))
+    extension = filename[/(\.[^\.]*)$/,0]
+    runners = {
+      ".py" => "python",
+      ".js" => "node",
+      ".rb" => "ruby",
+      ".pl" => "perl",
+      ".awk" => "awk",
+      ".php" => "php",
+      ".phtml" => "php",
+      ".php4" => "php",
+      ".php3" => "php",
+      ".php5" => "php",
+      ".phps" => "php"
+    }
+    runner = runners[extension]
+    if(runner)
+      cmd = "env #{runner.to_s} #{filename}"
+    end
+  elsif(ARGV.length > 1)
     cmd = ARGV[-1]
+  end
+
+  if(cmd)
+    path = Pathname.new(filename)
     env = {
       'FILENAME'=> path.to_s,
-      'FILEDIR' => path.parent.realpath.to_s
+      'FILEDIR' => path.parent.realpath.to_s,
+      'FSEVENT' => event.to_s
     }
     if(event != :delete)
       ENV['FILEPATH'] = path.realpath.to_s
@@ -80,4 +114,5 @@ FileWatcher.new(files, options[:list]).watch(options[:interval]) do |filename, e
     end
     puts ": " + filename
   end
+
 end

data/lib/filewatcher.rb

@@ -4,7 +4,7 @@
 class FileWatcher
 
   def self.VERSION
-    return "0.3.3"
+    return "0.3.4"
   end
 
   def initialize(unexpanded_filenames, print_filelist=false)

data/test/filewatcher_spec.rb

@@ -0,0 +1,28 @@
+require 'rubygems'
+require 'minitest/autorun'
+require_relative '../lib/filewatcher'
+
+describe FileWatcher do
+
+  filewatcher = FileWatcher.new([])
+
+  it "can find single files" do
+    files = filewatcher.expand_directories(["fixtures/file1.txt"])
+    assert files.size == 1
+  end
+
+  it "can expand directories recursively" do
+    files = filewatcher.expand_directories(["fixtures/"])
+    assert files.size == 6
+    files = filewatcher.expand_directories(["fixtures"])
+    assert files.size == 6
+    files = filewatcher.expand_directories(["./fixtures"])
+    assert files.size == 6
+  end
+
+  it "can use filename globbing to filter names" do
+    files = filewatcher.expand_directories(["fixtures/*.rb"])
+    assert files.size == 2
+  end
+
+end

data/test/fixtures/file1.txt

@@ -0,0 +1 @@
+

data/test/fixtures/file2.txt

@@ -0,0 +1 @@
+

data/test/fixtures/file3.rb

@@ -0,0 +1 @@
+

data/test/fixtures/file4.rb

@@ -0,0 +1 @@
+puts "Hello world from Ruby!!!"

data/test/fixtures/subdir/file5.rb

@@ -0,0 +1 @@
+

data/test/fixtures/subdir/file6.rb

@@ -0,0 +1 @@
+puts "This is file6.rb executing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Thomas Flemming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -39,6 +39,13 @@ files:
 - VERSION
 - bin/filewatcher
 - lib/filewatcher.rb
+- test/filewatcher_spec.rb
+- test/fixtures/file1.txt
+- test/fixtures/file2.txt
+- test/fixtures/file3.rb
+- test/fixtures/file4.rb
+- test/fixtures/subdir/file5.rb
+- test/fixtures/subdir/file6.rb
 homepage: http://github.com/thomasfl/filewatcher
 licenses:
 - MIT