ffilewatch 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f676a022d59f3b2eaff4b98f1009235c30415b76
-  data.tar.gz: 4eb6b4ae97db37102500968a429365b25ad6523e
+  metadata.gz: e4f2b8df761168ebf67eee7cef93d3f9aa4ee8bc
+  data.tar.gz: 2c5cc2a05ee5ca432fe7fbe6e3f25ae11897fa78
 SHA512:
-  metadata.gz: 37db768459c9fdeca113bd204688b1d19fbe22e92aa573cc3750def2724db7ff849db9809e62de53d80faf367ad92ae664a98d34a5338d9f3af0755030818bd2
-  data.tar.gz: 795ab6d6a1c79d55f71dc3cb104357caebf81bd038c29bce2bafff8b6cc410e316e0c456dac8ee5b04c1b88166160899ee87bbfc7cea1db3639c2bac0870c125
+  metadata.gz: a50d0e9fca7d1b86bc376b09c552fea749fc128db180556160cbe68f65bf195862373849616018fb855f001accffecdf871ec838d4bdbf00726109969ab29847
+  data.tar.gz: 9cf98aa71dd6edd08ed3eda7c1f3809a947ee14536c2b670e450dd81878a1fdf5e4c7cbff49e53ee850e9b30ff353f1447518b2fcabe7fef4eb7a7764de9b2dd

data/lib/filewatch/watch.rb

@@ -138,13 +138,7 @@ module FileWatch
 
     private
     def _discover_file(path, initial=false)
-      globbed_dirs = Dir.glob(path)
-      @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs}")
-      if globbed_dirs.empty? && File.file?(path)
-        globbed_dirs = [path]
-        @logger.debug("_discover_file_glob: #{path}: glob is: #{globbed_dirs} because glob did not work")
-      end
-      globbed_dirs.each do |file|
+      expand_glob(path).each do |file|
         next if @files.member?(file)
         next unless File.file?(file)
 
@@ -181,6 +175,21 @@ module FileWatch
       end
     end # def _discover_file
 
+
+    def expand_glob glob
+      dir_glob = File.dirname(glob)
+      file_glob = File.basename(glob)
+      files = []
+      Dir.glob(dir_glob).each do |dir|
+        Dir.foreach(dir) do |fname|
+          next if fname == '.' || fname == '..'
+          next unless File.fnmatch?(file_glob, fname)
+          files << File.join(dir, fname)
+        end
+      end
+      files
+    end
+
     public
     def quit
       @quit = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffilewatch
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Jordan Sissel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buftok