Merge lp:~marcustomlinson/unity-js-scopes/lp-1552661 into lp:unity-js-scopes

[Marcus Tomlinson]

Support for "unity-js-scopes-tool install <module>@<version>"

Support for "unity-js-scopes-tool install <module>@<version>"

Although we do inadvertently support this command, our check for whether the module is already installed breaks due to a directory name mismatch.

[lp:~marcustomlinson/unity-js-scopes/lp-1552661]

138. By Marcus Tomlinson on 2016-03-03

Cleanup

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/84
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/84/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/83

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/83/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-js-scopes/lp-1552661]

139. By Marcus Tomlinson on 2016-03-03

Added comment

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/85
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/85/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/84

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/84/rebuild

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

Just a nit suggestion, it might be good in the "Installing npm module" std::cout line to also mention the version being installed,

otherwise ok,

review: Approve

[lp:~marcustomlinson/unity-js-scopes/lp-1552661]

140. By Marcus Tomlinson on 2016-03-04

Mention the version being installed in the "Installing npm module..." output

=== modified file 'src/tool/main.cc'
--- src/tool/main.cc	2016-01-15 10:19:11 +0000
+++ src/tool/main.cc	2016-03-04 05:13:05 +0000
@@ -196,7 +196,17 @@
     if (boost::algorithm::ends_with(std::string(argv[1]), "install") && argc > 3
         && std::string(argv[3]) != "unity-js-scopes") // Install an npm module
     {
-      std::string npm_module = argv[3];
+      std::string npm_module_raw = argv[3];
+      std::string npm_module = npm_module_raw;
+      std::string npm_module_full = npm_module_raw;
+
+      // Extract npm_module from npm_module_raw by chopping off the "@<version>" postfix (if present)
+      auto pos = npm_module_raw.find('@');
+      if (pos != std::string::npos)
+      {
+        npm_module = npm_module_raw.substr(0, pos);
+        npm_module_full = npm_module + " (" + npm_module_raw.substr(pos+1) + ")";
+      }
 
       // Don't reinstall an already installed module unless "reinstall" is called
       if (std::string(argv[1]) == "reinstall" || !boost::filesystem::exists(modules_dir + "/" + npm_module))
@@ -208,9 +218,9 @@
         }
 
         // Install the npm module
-        std::cout << "Installing npm module '" << npm_module << "' to '" << modules_dir << "' ..." << std::endl;
+        std::cout << "Installing npm module '" << npm_module_full << "' to '" << modules_dir << "' ..." << std::endl;
 
-        std::string node_cmd = "node /node_modules/npm/cli.js --prefix='" + modules_dir + "/../' --ignore-scripts install " + npm_module;
+        std::string node_cmd = "node /node_modules/npm/cli.js --prefix='" + modules_dir + "/../' --ignore-scripts install " + npm_module_raw;
         std::cout << "Running '" << node_cmd << "' ..." << std::endl;
         result = system(node_cmd.c_str());
       }