diff options
Diffstat (limited to 'lib/utils/fs.js')
-rw-r--r-- | lib/utils/fs.js | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/lib/utils/fs.js b/lib/utils/fs.js index 0a9d846..716e3a0 100644 --- a/lib/utils/fs.js +++ b/lib/utils/fs.js @@ -1,10 +1,10 @@ -var _ = require("lodash"); -var Q = require("q"); -var tmp = require("tmp"); -var path = require("path"); -var fs = require("graceful-fs"); -var fsExtra = require("fs-extra"); -var Ignore = require("fstream-ignore"); +var _ = require('lodash'); +var Q = require('q'); +var tmp = require('tmp'); +var path = require('path'); +var fs = require('graceful-fs'); +var fsExtra = require('fs-extra'); +var Ignore = require('fstream-ignore'); var fsUtils = { tmp: { @@ -33,7 +33,7 @@ var fsUtils = { existsSync: fs.existsSync.bind(fs), readFileSync: fs.readFileSync.bind(fs), clean: cleanFolder, - getUniqueFilename: getUniqueFilename, + getUniqueFilename: getUniqueFilename }; // Write a file @@ -57,14 +57,14 @@ function writeStream(filename, st) { var wstream = fs.createWriteStream(filename); - wstream.on("finish", function () { + wstream.on('finish', function () { d.resolve(); }); - wstream.on("error", function (err) { + wstream.on('error', function (err) { d.reject(err); }); - st.on("error", function(err) { + st.on('error', function(err) { d.reject(err); }); @@ -77,7 +77,7 @@ function writeStream(filename, st) { function getUniqueFilename(base, filename) { if (!filename) { filename = base; - base = "/"; + base = '/'; } filename = path.resolve(base, filename); @@ -87,9 +87,8 @@ function getUniqueFilename(base, filename) { var _filename = filename+ext; var i = 0; - while (1) { - if (!fs.existsSync(filename)) break; - _filename = filename+"_"+i+ext; + while (fs.existsSync(filename)) { + _filename = filename+'_'+i+ext; i = i + 1; } @@ -115,20 +114,20 @@ function listFiles(root, options) { }); // Add extra rules to ignore common folders - ig.addIgnoreRules(options.ignoreRules, "__custom_stuff"); + ig.addIgnoreRules(options.ignoreRules, '__custom_stuff'); // Push each file to our list - ig.on("child", function (c) { + ig.on('child', function (c) { files.push( - c.path.substr(c.root.path.length + 1) + (c.props.Directory === true ? "/" : "") + c.path.substr(c.root.path.length + 1) + (c.props.Directory === true ? '/' : '') ); }); - ig.on("end", function() { + ig.on('end', function() { // Normalize paths on Windows - if(process.platform === "win32") { + if(process.platform === 'win32') { return d.resolve(files.map(function(file) { - return file.replace(/\\/g, "/"); + return file.replace(/\\/g, '/'); })); } @@ -136,7 +135,7 @@ function listFiles(root, options) { return d.resolve(files); }); - ig.on("error", d.reject); + ig.on('error', d.reject); return d.promise; } @@ -150,8 +149,8 @@ function cleanFolder(root) { ignoreFiles: [], ignoreRules: [ // Skip Git and SVN stuff - ".git/", - ".svn/" + '.git/', + '.svn/' ] }) .then(function(files) { |