code clean up

q2s2t · Feb 6, 2018 · 89f8262 · 89f8262
1 parent 60b7ccf
commit 89f8262
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 49 deletions.
diff --git a/lib/add.js b/lib/add.js
@@ -19,7 +19,7 @@ var u = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function(archive, files, options) {
-  return when.promise(function (resolve, reject, progress) {
+  return when.promise(function(resolve, reject, progress) {
 
     // Convert array of files into a string if needed.
     files = u.files(files);
@@ -38,9 +38,9 @@ module.exports = function(archive, files, options) {
     // When a stdout is emitted, parse each line and search for a pattern. When
     // the pattern is found, extract the file (or directory) name from it and
     // pass it to an array. Finally returns this array in the progress function.
-    .progress(function (data) {
+    .progress(function(data) {
       var entries = [];
-      data.split('\n').forEach(function (line) {
+      data.split('\n').forEach(function(line) {
         if (line.substr(0, 13) === 'Compressing  ') {
           entries.push(line.substr(13, line.length).replace(path.sep, '/'));
         }
@@ -49,12 +49,12 @@ module.exports = function(archive, files, options) {
     })
 
     // When all is done resolve the Promise.
-    .then(function (args) {
+    .then(function(args) {
       return resolve(args);
     })
 
     // Catch the error and pass it to the reject function of the Promise.
-    .catch(function (err) {
+    .catch(function(err) {
       return reject(err);
     });
 

diff --git a/lib/delete.js b/lib/delete.js
@@ -17,7 +17,7 @@ var u = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function(archive, files, options) {
-  return when.promise(function (resolve, reject) {
+  return when.promise(function(resolve, reject) {
 
     // Convert array of files into a string if needed.
     files = u.files(files);
@@ -36,12 +36,12 @@ module.exports = function(archive, files, options) {
     u.run(command, options)
 
     // When all is done resolve the Promise.
-    .then(function (args) {
+    .then(function(args) {
       return resolve(args);
     })
 
     // Catch the error and pass it to the reject function of the Promise.
-    .catch(function (err) {
+    .catch(function(err) {
       return reject(err);
     });
 

diff --git a/lib/extract.js b/lib/extract.js
@@ -18,7 +18,7 @@ var u = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function(archive, dest, options) {
-  return when.promise(function (resolve, reject, progress) {
+  return when.promise(function(resolve, reject, progress) {
 
     // Create a string that can be parsed by `run`.
     try {
@@ -37,7 +37,7 @@ module.exports = function(archive, dest, options) {
     // the pattern is found, extract the file (or directory) name from it and
     // pass it to an array. Finally returns this array.
     // Also check if a file is extracted using an Unsupported Method of 7-Zip.
-    .progress(function (data) {
+    .progress(function(data) {
 
       var entries = [];
       var isUnsupportedMethod = (data.search('Unsupported Method'))
@@ -56,12 +56,12 @@ module.exports = function(archive, dest, options) {
     })
 
     // When all is done resolve the Promise.
-    .then(function (args) {
+    .then(function(args) {
       return resolve(args);
     })
 
     // Catch the error and pass it to the reject function of the Promise.
-    .catch(function (err) {
+    .catch(function(err) {
       return reject(err);
     });
 

diff --git a/lib/extractFull.js b/lib/extractFull.js
@@ -18,7 +18,7 @@ var u = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function(archive, dest, options) {
-  return when.promise(function (resolve, reject, progress) {
+  return when.promise(function(resolve, reject, progress) {
 
     // Create a string that can be parsed by `run`.
     try {
@@ -37,7 +37,7 @@ module.exports = function(archive, dest, options) {
     // the pattern is found, extract the file (or directory) name from it and
     // pass it to an array. Finally returns this array.
     // Also check if a file is extracted using an Unsupported Method of 7-Zip.
-    .progress(function (data) {
+    .progress(function(data) {
 
       var entries = [];
       var isUnsupportedMethod = (data.search('Unsupported Method'))
@@ -48,7 +48,7 @@ module.exports = function(archive, dest, options) {
       }
 
       var entries = [];
-      data.split('\n').forEach(function (line) {
+      data.split('\n').forEach(function(line) {
         if (line.substr(0, 12) === 'Extracting  ') {
           entries.push(line.substr(12, line.length).replace(path.sep, '/'));
         }
@@ -57,12 +57,12 @@ module.exports = function(archive, dest, options) {
     })
 
     // When all is done resolve the Promise.
-    .then(function (args) {
+    .then(function(args) {
       return resolve(args);
     })
 
     // Catch the error and pass it to the reject function of the Promise.
-    .catch(function (err) {
+    .catch(function(err) {
       return reject(err);
     });
 

diff --git a/lib/list.js b/lib/list.js
@@ -17,7 +17,7 @@ var u = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function(archive, options) {
-  return when.promise(function (resolve, reject, progress) {
+  return when.promise(function(resolve, reject, progress) {
 
     var spec  = {};
     /* jshint maxlen: 130 */
@@ -41,7 +41,7 @@ module.exports = function(archive, options) {
     // When a stdout is emitted, parse each line and search for a pattern. When
     // the pattern is found, extract the file (or directory) name from it and
     // pass it to an array. Finally returns this array.
-    .progress(function (data) {
+    .progress(function(data) {
       var entries = [];
 
       // Last progress had an incomplete line. Prepend it to the data and clear
@@ -51,7 +51,7 @@ module.exports = function(archive, options) {
         buffer = "";
       }
 
-      data.split('\n').forEach(function (line) {
+      data.split('\n').forEach(function(line) {
 
         // Populate the tech specs of the archive that are passed to the
         // resolve handler.
@@ -96,12 +96,12 @@ module.exports = function(archive, options) {
     })
 
     // When all is done resolve the Promise.
-    .then(function () {
+    .then(function() {
       return resolve(spec);
     })
 
     // Catch the error and pass it to the reject function of the Promise.
-    .catch(function (err) {
+    .catch(function(err) {
       return reject(err);
     });
 

diff --git a/lib/update.js b/lib/update.js
@@ -18,7 +18,7 @@ var u = {
  * @reject {Error} The error as issued by 7-Zip.
  */
 module.exports = function(archive, files, options) {
-  return when.promise(function (resolve, reject, progress) {
+  return when.promise(function(resolve, reject, progress) {
 
     // Create a string that can be parsed by `run`.
     try {
@@ -36,7 +36,7 @@ module.exports = function(archive, files, options) {
     // When a stdout is emitted, parse each line and search for a pattern. When
     // the pattern is found, extract the file (or directory) name from it and
     // pass it to an array. Finally returns this array.
-    .progress(function (data) {
+    .progress(function(data) {
       var entries = [];
       data.split('\n').forEach(function (line) {
         if (line.substr(0, 13) === 'Compressing  ') {
@@ -47,12 +47,12 @@ module.exports = function(archive, files, options) {
     })
 
     // When all is done resolve the Promise.
-    .then(function () {
+    .then(function() {
       return resolve();
     })
 
     // Catch the error and pass it to the reject function of the Promise.
-    .catch(function (err) {
+    .catch(function(err) {
       return reject(err);
     });
 

diff --git a/test/lib/add.test.js b/test/lib/add.test.js
@@ -6,36 +6,36 @@ var add = require('../../lib/add');
 var path = require('../../util/path');
 var _7zcmd = path();
 
-describe('Method: `Zip.add`', function () {
+describe('Method: `Zip.add`', function() {
 
-  it('should return an error on 7z error', function (done) {
+  it('should return an error on 7z error', function(done) {
     add('.tmp/test/addnot.7z', '.tmp/test/nothere', { '???': true })
-    .catch(function (err) {
+    .catch(function(err) {
       expect(err).to.be.an.instanceof(Error);
       done();
     });
   });
 
-  it('should return entries on progress', function (done) {
+  it('should return entries on progress', function(done) {
     add('.tmp/test/add.zip', '*.md')
-    .progress(function (entries) {
+    .progress(function(entries) {
       expect(entries.length).to.be.at.least(1);
       done();
     })
-    .catch(function (err) {
+    .catch(function(err) {
       done();
     });
   });
 
-  it('should accept array as source', function (done) {
+  it('should accept array as source', function(done) {
     var store = [];
     add('.tmp/test/add.zip', ['*.md', '*.js'])
-    .progress(function (entries) {
-      entries.forEach(function (e) {
+    .progress(function(entries) {
+      entries.forEach(function(e) {
         store.push(e);
       });
     })
-    .done(function () {
+    .done(function() {
       expect(store.length).to.be.at.least(4);
       done();
     });

diff --git a/util/run.js b/util/run.js
@@ -1,8 +1,8 @@
 'use strict';
-var os    = require('os');
+var os = require('os');
 var spawn = require('cross-spawn');
-var when  = require('when');
-var path  = require('path');
+var when = require('when');
+var path = require('path');
 var utilSwitches = require('./switches');
 
 /**
@@ -13,8 +13,8 @@ var utilSwitches = require('./switches');
  * @reject {Error} The error issued by 7-Zip.
  * @reject {number} Exit code issued by 7-Zip.
  */
-module.exports = function (command, switches) {   
-  return when.promise(function (fulfill, reject, progress) {
+module.exports = function(command, switches) {   
+  return when.promise(function(fulfill, reject, progress) {
 
     var macos = (process.platform == "darwin") ? require('macos-release').version : '';
     var pathto7z = path.join(__dirname, "..","binaries", macos == '' ? process.platform : process.platform, macos );  
@@ -27,12 +27,12 @@ module.exports = function (command, switches) {
     } 
     // add platform binary to command
     var tmpcmd = command.split(' ')[0];
-    var cmd  = path.join(pathto7z,tmpcmd);
+    var cmd = path.join(pathto7z,tmpcmd);
     var args = [ command.split(' ')[1] ];
 
     // Parse and add command (non-switches parameters) to `args`.
     var regexpCommands = /"((?:\\.|[^"\\])*)"/g;
-    var commands       = command.match(regexpCommands);
+    var commands = command.match(regexpCommands);
     if (commands) {
       commands.forEach(function (c) {
         c = c.replace(/\//, path.sep);
@@ -45,7 +45,7 @@ module.exports = function (command, switches) {
     // Special treatment for the output switch because it is exposed as a
     // parameter in the API and not as a option. Plus wilcards can be passed.
     var regexpOutput = /-o"((?:\\.|[^"\\])*)"/g;
-    var output       = command.match(regexpOutput);
+    var output = command.match(regexpOutput);
     if (output) {
       args.pop();
       var o = output[0];
@@ -63,7 +63,7 @@ module.exports = function (command, switches) {
     // Remove now double quotes. If present in the spawned process 7-Zip will
     // read them as part of the paths (e.g.: create a `"archive.7z"` with
     // quotes in the file-name);
-    args.forEach(function (e, i) {
+    args.forEach(function(e, i) {
       if (typeof e !== 'string') {
         return;
       }
@@ -83,7 +83,7 @@ module.exports = function (command, switches) {
       cmd: cmd,
       args: args,
       options: { stdio: 'pipe' } };
-    console.log('>>', res.cmd, res.args.join(' '), res.options);
+    console.log('>> ', res.cmd, res.args.join(' '), res.options,' <<');
     var run = spawn(res.cmd, res.args, res.options);
     run.stdout.on('data', function (data) {
       var res = reg.exec(data.toString());
@@ -92,14 +92,14 @@ module.exports = function (command, switches) {
       }
       return progress(data.toString());
     });
-    run.stderr.on('data', function (data) {
+    run.stderr.on('data', function(data) {
       //throw errors
 		  err = data.toString();
     });
-    run.on('error', function (err) {
+    run.on('error', function(err) {
       reject(err)
     });
-    run.on('close', function (code) {
+    run.on('close', function(code) {
       if (code === 0) {
         return fulfill(args);
       }