dotsmack 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dffb1c482c853c56be3b48b344e5dcd3f45347c
-  data.tar.gz: 8e641d9d1d463b9a92d00aac08e97020011b3e58
+  metadata.gz: e263deb6fb148aafc0d1636033ae942d4d632c52
+  data.tar.gz: 68a420a6cf107c964849f8948bca215f0432d6ea
 SHA512:
-  metadata.gz: 6437eb61b4b3e1828b8a940f89d82e2a34a2a0dc501d6d5c65ea604d66ca5ce0d483f33229605176a84ec351fac2364877f35e3bddd9885f0ed5b9c71faa8db0
-  data.tar.gz: 7f734c28a591e72dd53e091e0c85f322e70a730af83d8e95c1fbfc166ef7866249c03b4c8f3b7de0dd6d12b2e282f37ce75587ff431bd2ae12ad95baf3e49bda
+  metadata.gz: 1759ca7590e2c7fabac77bb5a3fde7684f052ff686549e1420cbccacb2de1db67eb5d998e2eeeb92525be764c29555b46aacfd4533c645471691f466d92ab28e
+  data.tar.gz: 817b3ab244e5de51622ba53aced87d20e298d23b47d4233e42e24046b3e307a8bde3436580be26a5aaee721edb04c40842ab19d523c04cc726b89bb72f650688

data/lib/dotsmack.rb

@@ -27,10 +27,22 @@ module Dotsmack
   # More intuitive behavior for fnmatch
   #
   def self.fnmatch?(pattern, path)
-    File.fnmatch(pattern, path, FNMATCH_FLAGS) ||
-      File.fnmatch("**/#{pattern}", path, FNMATCH_FLAGS) ||
-      ((pattern.end_with?('/') || pattern.end_with?('\\')) &&
-        File.fnmatch("**/#{pattern}*", path, FNMATCH_FLAGS))
+    # Assume non-directory path
+    if File.fnmatch(pattern, path, FNMATCH_FLAGS) ||
+        File.fnmatch("**#{File::SEPARATOR}#{pattern}", path, FNMATCH_FLAGS)
+      true
+    # Consider path as directory
+    else
+      path =
+        if path.end_with?(File::SEPARATOR)
+          path
+        else
+          "#{path}#{File::SEPARATOR}"
+        end
+
+      File.fnmatch("#{pattern}*", path, FNMATCH_FLAGS) ||
+        File.fnmatch("**#{File::SEPARATOR}#{pattern}*", path, FNMATCH_FLAGS)
+    end
   end
 
   #

data/lib/version.rb

@@ -2,5 +2,5 @@
 # Dotsmack
 #
 module Dotsmack
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotsmack
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Andrew Pennebaker