Linted sources. Fix some typos.

Trott · Dec 19, 2012 · 46a8580 · 46a8580
1 parent 61614f1
commit 46a8580
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 24 deletions.
diff --git a/lib/fs-tools.js b/lib/fs-tools.js
@@ -308,7 +308,7 @@ fstools.remove = function (path, callback) {
     async.series([
       async.apply(walk_flat, path, fstools.remove),
       async.apply(fs.rmdir, path)
-    ], function (err, results) {
+    ], function (err/*, results */) {
       callback(err);
     });
   });
@@ -576,31 +576,24 @@ fstools.copy = function (src, dst, callback) {
  *  Moves file from `source` to `destination`.
  **/
 fstools.move = function move(source, destination, callback) {
-  fs.lstat(source, function (err, stats) {
-    if (err) {
-      callback(err);
+  fs.rename(source, destination, function (err) {
+    if (!err) {
+      callback();
       return;
     }
 
-    fs.rename(source, destination, function (err) {
-      if (!err) {
-        callback();
-        return;
-      }
-
-      // TODO: Needs testing coverage
+    // TODO: Needs testing coverage
 
-      // normally err.code can be:
-      // - EXDEV (different partitions/devices)
-      // - ENOTEMPTY (source and destination are not-empty dirs)
-      // - EISDIR (destionation is dir, source is file)
+    // normally err.code can be:
+    // - EXDEV (different partitions/devices)
+    // - ENOTEMPTY (source and destination are not-empty dirs)
+    // - EISDIR (destionation is dir, source is file)
 
-      async.series([
-        async.apply(fstools.copy, source, destination),
-        async.apply(fstools.remove, source)
-      ], function (err/*, results*/) {
-        callback();
-      });
+    async.series([
+      async.apply(fstools.copy, source, destination),
+      async.apply(fstools.remove, source)
+    ], function (err/*, results*/) {
+      callback(err);
     });
   });
 };

diff --git a/test/copy-test.js b/test/copy-test.js
@@ -18,6 +18,7 @@ require('vows').describe('copy()').addBatch({
       });
     },
     'should just work': function (err, dst) {
+      dst = dst; // ugly workaround for jshint + vows
       Assert.ok(!err, 'Has no errror');
     },
     'creates directory fuu': function (err, dst) {
@@ -78,6 +79,7 @@ require('vows').describe('copy()').addBatch({
     'links are overwriten': 'TBD',
 
     'directories are merged': function (err) {
+      err = err; // ugly workaround for jshint + vows
       Assert.pathExists(SANDBOX + '/foo/baz');
       Assert.isDirectory(Fs.statSync(SANDBOX + '/foo/baz'));
     }

diff --git a/test/find-sorted-test.js b/test/find-sorted-test.js
@@ -10,7 +10,6 @@ var SANDBOX = Helper.SANDBOX_DIR + '/find-sorted';
 require('vows').describe('findSorted()').addBatch({
   'found files in deirectory': {
     topic: function () {
-      var cb = this.callback;
       FsTools.findSorted(SANDBOX, this.callback);
     },
 

diff --git a/test/helper.js b/test/helper.js
@@ -2,7 +2,6 @@
 
 
 var Fs = require('fs');
-var Path = require('path');
 var Assert = require('assert');
 var Helper = module.exports = {};
 

diff --git a/test/mkdir-test.js b/test/mkdir-test.js
@@ -32,6 +32,7 @@ require('vows').describe('mkdir()').addBatch({
       FsTools.mkdir('/FOOBAR-FS-TOOLS', this.callback);
     },
     'can\'t create under /etc': function (err, result) {
+      result = result; // ugly workaround for jshint + vows
       Assert.instanceOf(err, Error);
       Assert.equal(err.code, 'EACCES');
     }

diff --git a/test/move-test.js b/test/move-test.js
@@ -20,6 +20,7 @@ require('vows').describe('move()').addBatch({
       });
     },
     'should just work': function (err, dst) {
+      dst = dst; // ugly workaround for jshint + vows
       Assert.ok(!err, 'Has no errror');
     },
     'creates directory fuu': function (err, dst) {
@@ -35,6 +36,7 @@ require('vows').describe('move()').addBatch({
       Assert.isDirectory(Fs.statSync(dst + '/bar/baz/link'));
     },
     'removes foo': function (err, dst) {
+      dst = dst; // ugly workaround for jshint + vows
       Assert.pathNotExists(SANDBOX + '/foo');
     },
     'after all': {
@@ -83,6 +85,7 @@ require('vows').describe('move()').addBatch({
     'links are overwriten': 'TBD',
 
     'directories are merged': function (err) {
+      err = err; // ugly workaround for jshint + vows
       Assert.pathExists(SANDBOX + '/foo/baz');
       Assert.isDirectory(Fs.statSync(SANDBOX + '/foo/baz'));
     }

diff --git a/test/tmpdir-test.js b/test/tmpdir-test.js
@@ -2,7 +2,6 @@
 
 
 var FsTools = require('../');
-var Helper = require('./helper');
 var Assert = require('assert');
 
 require('vows').describe('tmpdir()').addBatch({

diff --git a/test/walk-test.js b/test/walk-test.js
@@ -30,6 +30,7 @@ require('vows').describe('walk()').addBatch({
       });
     },
     'finishes without errors': function (err, result) {
+      result = result; // ugly workaround for jshint + vows
       Assert.ok(!err, 'Has no errors');
     },
     'calls iterator on all entries': function (err, result) {