filewatcher 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c559395f1c1457f19ee303e83605956596ebac4
-  data.tar.gz: 24e7685882c3861de55f9bfc17db9befdb545d14
+  metadata.gz: 8ce65dd1aeaf7054fd9a91b6787778569bccf8a8
+  data.tar.gz: 55cd4d125598d649b22f44c7225183c7163bf3f5
 SHA512:
-  metadata.gz: ac444120cc0219f01225a064476c8a6af0a15fccb55cc3e50f632befe545550ba70048e1419257e20bfdf32805ffb11bbfbc4a2ae9b993398b152ff7e9a4ea1d
-  data.tar.gz: 2212e58fcb3605ac6ea7b3103823ea7593abc94f6344a6208cce9aa58039017a755e3845dde5e8fd1a4c033a0a21d696dec6d69b4b7e682fe9b26e26b2d6b357
+  metadata.gz: 4c8b05df1ad574ce4a7c47d2b462c052d6c5e722b01f9b2da86c030af313170a2fd650988f2849ef32ad53e07c1217ac7ca72ed3b1b4b0c78a94af2357beb800
+  data.tar.gz: ad255b8e5655655f974dcd2e43623c9b0eefb660c6f5c99c50c174f8425eb6d4f6e80b477e0b954bbfb1a349dd7be013613caad4f3e90698610b4d84cacf4a82

data/README.rdoc

@@ -1,6 +1,6 @@
 = Filewatcher
 
-Simple file watcher. Monitors changes in filesystem by polling. No dependencies.
+Simple file watcher. Monitors changes in filesystem by polling. API has no dependencies.
 
 = Install
 
@@ -46,7 +46,7 @@ Print a list of all files matching *.css first and the print filename when a fil
 = Available enviroment variables
 
 The environment variable $FILENAME is available in the command. On unix like systems the command
-has to be enclosed in single quotes. To run node whenever a javascript file is update:
+has to be enclosed in single quotes. To run node whenever a javascript file is updated:
 
    $ filewatcher *.js 'node $FILENAME'
 
@@ -75,20 +75,6 @@ Watch a list of files and directories:
     puts "Updated " + filename
   end
 
-Print the names of files beeing watched before we begin:
-
-  FileWatcher.new(["lib/"],"Watching files:").watch do |filename|
-    puts "Updated " + filename
-  end
-  => Watching files:
-  lib/filewatcher.rb
-
-To check for changes more often than the default once every second:
-
-  FileWatcher.new(["README.rdoc"]).watch(0.5) do |filename|
-    puts "Updated " + filename
-  end
-
 To detect if a file is updated or deleted:
 
   FileWatcher.new(["README.rdoc"]).watch() do |filename, event|
@@ -103,6 +89,26 @@ To detect if a file is updated or deleted:
     end
   end
 
+To check for changes more often than the default once every second:
+
+  FileWatcher.new(["README.rdoc"]).watch(0.5) do |filename|
+    puts "Updated " + filename
+  end
+
+Print the names of files beeing watched before we begin:
+
+  FileWatcher.new(["lib/"],true).watch do |filename|
+    puts "Updated " + filename
+  end
+  => 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.
+
+  FileWatcher.new(["*.rb", "*.xml"]).watch do |filename|
+    puts "Updated " + filename
+  end
+
 = TODO
 
 The Ruby API is fairly well tested but the command line program is buggy at the time beeing.

data/Rakefile

@@ -11,21 +11,14 @@ begin
     gem.homepage = "http://github.com/thomasfl/filewatcher"
     gem.executables = ["filewatcher"]
     gem.authors = ["Thomas Flemming"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency "trollop", ">= 1.16.2"
+    # gem.add_dependency "trollop", ">= 1.16.2"
+    gem.add_dependency 'trollop', '~> 2.0'
     gem.licenses = ["MIT"]
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/filewatcher.rb

@@ -4,7 +4,7 @@
 class FileWatcher
 
   def self.VERSION
-    return "0.3.2"
+    return "0.3.3"
   end
 
   def initialize(unexpanded_filenames, print_filelist=false)
@@ -73,20 +73,20 @@ class FileWatcher
     return false
   end
 
-  def expand_directories(filenames)
-    if(filenames.kind_of?String)
-      filenames = [filenames]
+  def expand_directories(patterns)
+    if(!patterns.kind_of?Array)
+      patterns = [patterns]
     end
-    files = []
-    filenames.each do |filename|
+    filenames = []
+    patterns.each do |filename|
       if(File.directory?(filename))
-        files = files + find(filename)
-      end
-      if(File.file?(filename))
-        files << filename
+        filenames = filenames + find(filename)
+      else
+        filenames = filenames + find(".", filename, true)
       end
     end
-    filenames = files
+
+    return filenames.uniq
   end
 
   def find(dir, filename="*.*", subdirs=true)

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: filewatcher
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Thomas Flemming
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thoughtbot-shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: '2.0'
 description: Detect changes in filesystem.
 email: thomas.flemming@gmail.com
 executables:
@@ -53,8 +39,6 @@ files:
 - VERSION
 - bin/filewatcher
 - lib/filewatcher.rb
-- test/helper.rb
-- test/test_filewatcher.rb
 homepage: http://github.com/thomasfl/filewatcher
 licenses:
 - MIT
@@ -75,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple filewatcher.

data/test/helper.rb

@@ -1,4 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require_relative '../lib/filewatcher.rb'

data/test/test_filewatcher.rb

@@ -1,34 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '.'))
-require 'helper'
-
-class TestFilewatcher < Test::Unit::TestCase
-
-  should "should detect directories and extract filenames" do
-
-    FileWatcher.new(["test/"],"Watching files. Ctrl-C to abort.").watch(0.1) do |filename, event|
-      puts "updated: '#{filename.to_s} event:'#{event.to_s}'"
-    end
-
-  end
-
-#   should "should detect changes in files" do
-
-#     @pid = fork do
-
-#       trap("SIGINT") do
-#         exit
-#       end
-
-#       FileWatcher.new(["test/helper.rb"]).watch(0.1) do |filename|
-#         puts "updated: " + filename
-#       end
-
-#     end
-#     sleep(1)
-#     FileUtils.touch("test/helper.rb")
-#     sleep(1)
-#     Process.kill('SIGINT', @pid) rescue nil
-
-#   end
-
-end