Added ability to copy symlinked directories

Gruntfile.js

@@ -81,6 +81,15 @@ module.exports = function(grunt) {
           {expand: true, cwd: 'test/fixtures', src: ['*.js'], dest: 'tmp/copy_test_symlink'}
         ]
       },
+
+      dirlink: {
+        options: {
+          copySymlinkAsSymlink: true,
+        },
+        files: [
+          {expand: true, cwd: 'test/fixtures/dirlink', src: ['**/*'], dest: 'tmp/copy_test_dirlink'}
+        ]
+      },
     },
 
     // Unit tests.

tasks/copy.js

@@ -37,6 +37,7 @@ module.exports = function(grunt) {
     var srcStat;
     var fileMode;
     var isLink;
+    var copiedDirLinks = [];
     var tally = {
       dirs: 0,
       files: 0
@@ -46,21 +47,38 @@ module.exports = function(grunt) {
       isExpandedPair = filePair.orig.expand || false;
 
       filePair.src.forEach(function(src) {
+        var skip = false;
+        if (copiedDirLinks.length) {
+          for (var i in copiedDirLinks) {
+            if (copiedDirLinks[i].test(src)) {
+              skip = true;
+              break;
+            }
+          }
+        }
+        if (skip) {
+          return;
+        }
+
         if (detectDestType(filePair.dest) === 'directory') {
           dest = (isExpandedPair) ? filePair.dest : unixifyPath(path.join(filePair.dest, src));
         } else {
           dest = filePair.dest;
         }
 
-        isLink = false;
+        srcStat = fs.lstatSync(src);
+        isLink = srcStat.isSymbolicLink();
         if (grunt.file.isDir(src)) {
           grunt.verbose.writeln('Creating ' + chalk.cyan(dest));
-          grunt.file.mkdir(dest);
+          if (options.copySymlinkAsSymlink && process.platform !== 'win32' && isLink) {
+            fs.symlinkSync(fs.readlinkSync(src), dest);
+            copiedDirLinks.push(new RegExp('^' + src.replace(/\/*$/,'/').replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&")));
+          } else {
+            grunt.file.mkdir(dest);
+          }
           tally.dirs++;
         } else {
           grunt.verbose.writeln('Copying ' + chalk.cyan(src) + ' -> ' + chalk.cyan(dest));
-          srcStat = fs.lstatSync(src);
-          isLink = srcStat.isSymbolicLink();
           if (options.copySymlinkAsSymlink && process.platform !== 'win32' && isLink) {
             grunt.file.mkdir(path.dirname(dest));
             if (grunt.file.exists(dest)) {

test/copy_test.js

@@ -69,4 +69,20 @@ exports.copy = {
 
     test.done();
   },
+
+  dirlink: function(test) {
+    'use strict';
+
+    test.expect(1);
+
+    if (process.platform === 'win32') {
+      test.ok(true);
+    } else {
+      var actual = fs.readdirSync('tmp/copy_test_dirlink').sort();
+      var expected = fs.readdirSync('test/expected/copy_test_dirlink').sort();
+      test.deepEqual(expected, actual, 'should copy mix of directories, files and symlinks');
+    }
+
+    test.done();
+  },
 };

test/expected/copy_test_dirlink/dir/file-a.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/expected/copy_test_dirlink/dir/file-b.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/expected/copy_test_dirlink/dir/link-b.js

@@ -0,0 +1 @@
+file-b.js

test/expected/copy_test_dirlink/link

@@ -0,0 +1 @@
+dir

test/expected/copy_test_flatten/file-a.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/expected/copy_test_flatten/file-b.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/expected/copy_test_flatten/link-b.js

@@ -0,0 +1 @@
+file-b.js

test/expected/copy_test_mix/dirlink/dir/file-a.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/expected/copy_test_mix/dirlink/dir/file-b.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/expected/copy_test_mix/dirlink/link

@@ -0,0 +1 @@
+dir

test/fixtures/dirlink/dir/file-a.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/fixtures/dirlink/dir/file-b.js

@@ -0,0 +1 @@
+$(document).ready(function(){$.noConflict();});

test/fixtures/dirlink/dir/link-b.js

@@ -0,0 +1 @@
+file-b.js

test/fixtures/dirlink/link

@@ -0,0 +1 @@
+dir