added more tests to cover additional scenarios, simplified code change

Gruntfile.js

@@ -69,6 +69,21 @@ module.exports = function (grunt) {
         },
         src: ['test/tmp/movedfile.png'],
         dest: 'test/tmp/copyfalse'
+      },
+      withCopyNullDest: {
+        options: {
+          algorithm: 'sha1',
+          length: 4
+        },
+        src: ['test/tmp/another.png'],
+        dest: 'test/tmp/nocopy'
+      },
+      withCopyNullNoDest: {
+        options: {
+          algorithm: 'sha1',
+          length: 4
+        },
+        src: ['test/tmp/movednocopyfile.png']
       }
     },
     simplemocha: {

tasks/filerev.js

@@ -47,14 +47,7 @@ module.exports = function (grunt) {
         dirname = el.dest ? el.dest : path.dirname(file);
         resultPath = path.resolve(dirname, newName);
 
-        if (options.copy === null) {
-          // If options.copy is null, defer to wether or not destination is defined (old behavior)
-          if (el.dest) {
-            grunt.file.copy(file, resultPath);
-          } else {
-            fs.renameSync(file, resultPath);
-          }
-        } else if (options.copy) {
+        if (options.copy || (options.copy === null && el.dest)) {
           grunt.file.copy(file, resultPath);
         } else {
           fs.renameSync(file, resultPath);

test/filerev_test.js

@@ -42,4 +42,20 @@ describe('filerev', function () {
     var fileExists = fs.existsSync('test/tmp/movedfile.png');
     assert(fileExists === false);
   });
+
+  it('should copy the file without copy option when dest is specified', function () {
+    var original = fs.statSync('test/fixtures/another.png').size;
+    var revisioned= fs.statSync('test/tmp/nocopy/another.37ba.png').size;
+    assert(revisioned === original);
+    var fileExists = fs.existsSync('test/tmp/another.png');
+    assert(fileExists === true);
+  });
+
+  it('should move the file without copy option when dest is not specified', function () {
+    var original = fs.statSync('test/fixtures/movednocopyfile.png').size;
+    var revisioned= fs.statSync('test/tmp/movednocopyfile.37ba.png').size;
+    assert(revisioned === original);
+    var fileExists = fs.existsSync('test/tmp/movednocopyfile.png');
+    assert(fileExists === false);
+  });
 });