Merge pull request #453 from bower/junk

Replace util/osJunk with junk module

lib/resolve/resolvers/FsResolver.js

@@ -7,7 +7,7 @@ var Resolver = require('../Resolver');
 var copy = require('../../util/copy');
 var extract = require('../../util/extract');
 var createError = require('../../util/createError');
-var osJunk = require('../../util/osJunk');
+var junk = require('junk');
 
 var FsResolver = function (source, options) {
     Resolver.call(this, source, options);
@@ -89,7 +89,7 @@ FsResolver.prototype._rename = function () {
 
         // Remove any OS specific files from the files array
         // before checking its length
-        files = files.filter(osJunk.isNotOsJunk);
+        files = files.filter(junk.isnt);
 
         if (files.length === 1) {
             file = files[0];

lib/resolve/resolvers/UrlResolver.js

@@ -7,7 +7,7 @@ var mout = require('mout');
 var Resolver = require('../Resolver');
 var extract = require('../../util/extract');
 var createError = require('../../util/createError');
-var osJunk = require('../../util/osJunk');
+var junk = require('junk');
 
 var UrlResolver = function (source, options) {
     var pos;
@@ -176,7 +176,7 @@ UrlResolver.prototype._rename = function () {
 
         // Remove any OS specific files from the files array
         // before checking its length
-        files = files.filter(osJunk.isNotOsJunk);
+        files = files.filter(junk.isnt);
 
         if (files.length === 1) {
             file = files[0];

lib/util/extract.js

@@ -5,7 +5,7 @@ var unzip = require('unzip');
 var tar = require('tar');
 var Q = require('q');
 var mout = require('mout');
-var osJunk = require('./osJunk');
+var junk = require('junk');
 
 // This forces the default chunk size to something small in an attempt
 // to avoid issue #314
@@ -99,7 +99,7 @@ function isSingleDir(dir) {
 
         // Remove any OS specific files from the files array
         // before checking its length
-        files = files.filter(osJunk.isNotOsJunk);
+        files = files.filter(junk.isnt);
 
         if (files.length !== 1) {
             return false;

lib/util/osJunk.js

@@ -1,29 +0,0 @@
-var osJunk = [
-    // MacOSX
-    /^__MACOSX$/,
-    /^\.DS_Store/,
-    /^\.AppleDouble$/,
-    /^\.LSOverride$/,
-    /\.Trashes/,
-    /^\._.*/,
-    /^.Spotlight-V100$/,
-    /^Icon[\r\?]?/,
-    // Windows
-    /^ehthumbs\.db$/,
-    /^Thumbs\.db$/,
-    /^Desktop.ini$/
-];
-
-function isOsJunk(filename) {
-    return osJunk.some(function (extra) {
-        return extra.test(filename);
-    });
-}
-
-function isNotOsJunk(filename) {
-    return !isOsJunk(filename);
-}
-
-module.exports.isOsJunk = isOsJunk;
-module.exports.isNotOsJunk = isNotOsJunk;
-module.exports.osJunk = osJunk;

package.json

@@ -29,7 +29,8 @@
     "unzip": "~0.1.7",
     "tar": "~0.1.17",
     "fstream": "~0.1.22",
-    "fstream-ignore": "0.0.6"
+    "fstream-ignore": "0.0.6",
+    "junk": "~0.2.0"
   },
   "devDependencies": {
     "mocha": "~1.8.2",