Merge pull request componentjs#69 from CamShaft/master

tj · tj · commit c8869bcc264e · 2013-02-15T08:36:34.000-08:00
Add a configuration to copy files instead of symlink
diff --git a/lib/builder.js b/lib/builder.js
@@ -4,6 +4,7 @@
  */
 
 var fs = require('fs')
+  , cp = require('fs-extra').copy
   , path = require('path')
   , join = path.join
   , dirname = path.dirname
@@ -48,6 +49,7 @@ function Builder(dir, parent) {
     images: [],
     fonts: []
   };
+  this.copy = parent ? parent.copy : false;
   this.on('dependency', this.inherit.bind(this));
 }
 
@@ -112,6 +114,17 @@ Builder.prototype.development = function(){
   this.dev = true;
 };
 
+/**
+ * Enable "copyFiles" in the build.
+ *
+ * @api public
+ */
+
+Builder.prototype.copyFiles = function(){
+  debug('copy files enabled');
+  this.copy = true;
+};
+
 /**
  * Enable "sourceURLs" in the build.
  *
@@ -673,15 +686,22 @@ Builder.prototype.buildAsset = function(type, fn){
  */
 
 Builder.prototype.copyTo = function(file, dest, fn){
-  var dir = dirname(dest);
+  var dir = dirname(dest)
+    , self = this
+    , done = function(err) {
+      if (err && 'EEXIST' == err.code) return fn(null, dest);
+      fn(err, dest);
+    };
   debug('mkdir -p %s', dir);
   mkdir(dir, function(err){
     if (err) return fn(err);
-    debug('link %s -> %s', file, dest);
-    fs.symlink(file, dest, function(err){
-      if (err && 'EEXIST' == err.code) return fn(null, dest);
-      fn(err, dest);
-    });
+    if (self.copy){
+      debug('cp %s -> %s', file, dest);
+      cp(file, dest, done);
+    } else {
+      debug('link %s -> %s', file, dest);
+      fs.symlink(file, dest, done);
+    }
   });
 };
 
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "batch": "0.2.1",
     "mkdirp": "0.3.4",
     "debug": "*",
-    "better-assert": "~0.1.0"
+    "better-assert": "~0.1.0",
+    "fs-extra": "~0.5.0"
   },
   "devDependencies": {
     "mocha": "*",
diff --git a/test/builder.js b/test/builder.js
@@ -169,6 +169,46 @@ describe('Builder', function(){
       });
     })
 
+    it('should copy .images in copyFiles mode', function(done){
+      var builder = new Builder('test/fixtures/assets');
+      builder.copyFiles();
+      builder.addLookup('test/fixtures');
+      builder.copyAssetsTo('/tmp/build');
+      builder.build(function(err, res){
+        if (err) return done(err);
+        assert(3 == res.images.length);
+        assert('/tmp/build/assets/images/logo.png' == res.images[0]);
+        assert('/tmp/build/assets/images/maru.jpeg' == res.images[1]);
+        assert('/tmp/build/assets/images/npm.png' == res.images[2]);
+        assert(exists('/tmp/build/assets/images/maru.jpeg'));
+        assert(exists('/tmp/build/assets/images/logo.png'));
+        assert(exists('/tmp/build/assets/images/npm.png'));
+        // images aren't symlinks
+        fs.lstat('/tmp/build/assets/images/npm.png', function(err, stats) {
+          assert(stats.isSymbolicLink() == false);
+          done();
+        });
+      });
+    })
+
+    it('should copy .files in copyFiles mode', function(done){
+      var builder = new Builder('test/fixtures/assets-parent');
+      builder.copyFiles();
+      builder.addLookup('test/fixtures');
+      builder.copyAssetsTo('/tmp/build');
+      builder.build(function(err, res){
+        if (err) return done(err);
+        assert(1 == res.files.length);
+        assert('/tmp/build/assets/some.txt' == res.files[0]);
+        assert(exists('/tmp/build/assets/some.txt'));
+        // files aren't symlinks
+        fs.lstat('/tmp/build/assets/some.txt', function(err, stats) {
+          assert(stats.isSymbolicLink() == false);
+          done();
+        });
+      });
+    })
+
     it('should rewrite css urls', function(done){
       var builder = new Builder('test/fixtures/assets-parent');
       builder.addLookup('test/fixtures');
