Pipe problems

bin/mason-js

@@ -10,7 +10,9 @@ global.appRoot = process.cwd();
 var masonPath = path.join(global.appRoot, '/mason-versions.ini');
 
 var filterFunc = (src, dest) => {
-  if (fs.lstatSync(src).isFile()){
+  if (src.indexOf('mason.ini') > -1) {
+    return false;
+  } else if (fs.lstatSync(src).isFile()){
     fs.symlinkSync(src,dest);
     return false;
   }else{

lib/retrieve_package.js

@@ -7,6 +7,8 @@ var mkdirp = require('mkdirp');
 var reader = require('../lib/ini_file_reader.js');
 var url = require('url');
 var existsAsync = fs.exists || path.exists;
+var d3 = require('d3-queue');
+
 
 var MASON_BUCKET='https://s3.amazonaws.com/mason-binaries/';
 
@@ -34,6 +36,8 @@ function download(url,callback) {
 }
 
 function place_binary(from,to,callback) {
+    var dst = to.replace('.tar.gz','');
+
     download(from,function(err,req) {
         if (err) return callback(err);
         if (!req) return callback(new Error("empty req"));
@@ -52,7 +56,6 @@ function place_binary(from,to,callback) {
         }
 
         function filter_func(entry) {
-            log.info('install','unpacking ' + entry.path);
             extractCount++;
         }
 
@@ -73,29 +76,27 @@ function place_binary(from,to,callback) {
                 var err = new Error(res.statusCode + ' status code downloading tarball ' + from);
                 err.statusCode = res.statusCode;
                 return callback(err);
-            }else{
-              var dst = to.replace('.tar.gz','');
-              mkdirp(dst,function(err) {
-                  if (err) throw err;  
-                  // start unzipping and untaring
-                  req.pipe(tar.extract({
-                    cwd: to,
-                    strip: 1,
-                    onentry: filter_func
-                  }).on('close', afterTarball).on('error', callback));
-              });
             }
         });
+
+        req.pipe(tar.extract({
+          cwd: dst,
+          strip: 1,
+          onentry: filter_func
+        }).on('close', afterTarball).on('error', callback));
     });
 }
 
 function install(masonPath, callback){
+
   reader.fileReader(masonPath, function(err, packageList) {
     var libraries = packageList;
     if (err) return callback(err); 
     var update_binary = null;
+
+    var q = d3.queue(1);
 
-    packageList.forEach(function(r){
+    packageList.forEach(function(r, i){
         var src = url.resolve(MASON_BUCKET,r.awsPath);
         var dst = path.join(appDir,'mason_packages', r.awsPath);
 
@@ -108,19 +109,25 @@ function install(masonPath, callback){
               return callback(null, libraries);
           } else {
               if (!update_binary) log.info('check','checked for "' + r.name + '" (not found locally)');
-                place_binary(src, dst, function(err, response){
-                  if (err){
-                    throw err;
-                  }else{
-                    return callback(null, libraries);
-                  }
+
+              var dest = dst.replace('.tar.gz','');
+
+              mkdirp.sync(dest);
+
+              q.defer(place_binary,src,dst);
+
+              if(libraries.length - 1 === i){
+                q.awaitAll(function(err, response) {
+                  if (err) return callback(err);
+                  return callback(null, libraries);
               });
+            }
           }
         });
-    });  
-  }); 
-};
+    }); 
 
 
+  }); 
+};
 
 module.exports = {download:download, place_binary:place_binary, install:install}

lib/symlink.js

@@ -13,12 +13,12 @@ function buildLinkPaths(libraries, callback){
 
   libraries.forEach(function(l){
     if (l.headers){
-      var src = path.join(global.appRoot, `/mason_packages/headers/${l.name}/${l.version}/include`);
-      var dst = path.join(global.appRoot, '/mason_packages/.link/include');
+      var src = path.join(global.appRoot, `/mason_packages/headers/${l.name}/${l.version}`);
+      var dst = path.join(global.appRoot, '/mason_packages/.link');
       paths.push([src.replace(/\s/g, ''),dst.replace(/\s/g, '')]);
     }else{
       var src = path.join(global.appRoot, `/mason_packages/${l.os}/${l.name}/${l.version}`);
-      var dst = path.join(global.appRoot, `/mason_packages/.link/${l.name}/`);
+      var dst = path.join(global.appRoot, `/mason_packages/.link`);
       paths.push([src.replace(/\s/g, ''),dst.replace(/\s/g, '')]);
     }
   });

package.json

@@ -25,6 +25,7 @@
   },
   "dependencies": {
     "aws-sdk": "^2.150.0",
+    "d3-queue": "^3.0.7",
     "fs-extra": "^4.0.2",
     "mkdirp": "^0.5.1",
     "npmlog": "^4.1.2",