cli removed

Author: unbornchikken

cmake/BoostLib.cmake

@@ -11,14 +11,15 @@ function(require_boost_libs req_boost_version req_boost_libs)
     string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" m "${req_boost_version}")
     if(NOT m STREQUAL "")
         find_package(Boost "${req_boost_version}" COMPONENTS "${req_boost_libs}")
-        if(Boost_FOUND)
-            message(STATUS "Boost package found.")
-        else(Boost_FOUND)
-            boost_lib_installer("${req_boost_version}" "${req_boost_libs}")
-            message(STATUS "Boost installed.")
-        endif(Boost_FOUND)
     endif()
 
+    if(Boost_FOUND)
+        message(STATUS "Boost package found.")
+    else(Boost_FOUND)
+        boost_lib_installer("${req_boost_version}" "${req_boost_libs}")
+        message(STATUS "Boost installed.")
+    endif(Boost_FOUND)
+
     message(STATUS "Boost Include dirs: ${Boost_INCLUDE_DIRS}")
     message(STATUS "Boost Libraries: ${Boost_LIBRARIES}")
 

lib/boostDownloader.js

@@ -6,10 +6,10 @@ var fs = Bluebird.promisifyAll(require("fs-extra"));
 var semver = require("semver");
 var path = require("path");
 var environment = cmakejs.environment;
-var cli = require("cli");
 var zlib = require("zlib");
 var tar = require("tar");
 var request = require("request");
+var exec = require('child_process').exec;
 
 function downloadTo(url, result) {
     return new Bluebird(function (resolve, reject) {
@@ -99,8 +99,13 @@ BoostDownloader.prototype._download = function () {
     self.log.verbose("BOOST", "Getting Boost releases.");
     var command = "git ls-remote --tags https://github.com/boostorg/boost.git";
     return new Bluebird(function (resolve, reject) {
-        cli.exec(command,
-            function (output) {
+        exec(command, function(err, stdout, stderr) {
+            if (err) {
+                reject(err);
+                return;
+            }
+            if (stdout) {
+                var output = stdout.split("\n");
                 var downloadVersion = null;
                 if (output && output.length) {
                     output.reverse();
@@ -125,22 +130,11 @@ BoostDownloader.prototype._download = function () {
                         .catch(function (e) {
                             reject(e);
                         });
-                }
-                else {
-                    reject(new Error("No releases found."));
-                }
-            },
-            function (err, output) {
-                if (err instanceof Error) {
-                    reject(new Error(err.message + (output ? ("\n" + output) : "")));
                     return;
                 }
-                if (_.isArray(output) && output.length || err && err.message) {
-                    reject(new Error("Git exec error: " + err.message || err));
-                    return;
-                }
-                reject(new Error("Git exec error."));
-            });
+            }
+            reject(new Error("No releases found."));
+        });
     });
 };
 

package.json

@@ -28,8 +28,7 @@
   },
   "dependencies": {
     "bluebird": "^2.9.15",
-    "cli": "^0.6.5",
-    "cmake-js": "^0.10.1",
+    "cmake-js": "^0.10.2",
     "debug": "^2.1.3",
     "fs-extra": "^0.16.5",
     "lodash": "^3.6.0",