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

[Marcus Tomlinson]

Store runtime config (via optional launcher paramter) in an env var use in constructing the runtime from scope.cc

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

=== modified file 'examples/simple/simple.ini'
--- examples/simple/simple.ini	2015-07-09 06:40:58 +0000
+++ examples/simple/simple.ini	2015-07-22 09:51:01 +0000
@@ -1,5 +1,5 @@
 [ScopeConfig]
-ScopeRunner=/usr/bin/unity-js-scopes-launcher --scope %S
+ScopeRunner=/usr/bin/unity-js-scopes-launcher %S %R
 DisplayName = mock.DisplayName
 Description = mock.Description
 Author = test
 
=== modified file 'src/bindings/src/scope.cc'
--- src/bindings/src/scope.cc	2015-07-20 19:24:44 +0000
+++ src/bindings/src/scope.cc	2015-07-22 09:51:01 +0000
@@ -28,8 +28,27 @@
 
 JavascriptScopeRuntime::JavascriptScopeRuntime(
       const std::string& config_file)
-      : runtime_(unity::scopes::Runtime::create(config_file)),
-        scope_base_(new ScopeBase()) {
+      : scope_base_(new ScopeBase()) {
+    std::string current_runtime_config = config_file;
+
+    if (current_runtime_config.empty()) {
+      char * env_runtime_config =
+        std::getenv(kJavascriptUnityRuntimeEnvVarName);
+
+      if (env_runtime_config) {
+        current_runtime_config = env_runtime_config;
+
+        if ( ! boost::ends_with(current_runtime_config, ".ini")) {
+          throw std::runtime_error("Invalid runtime config (ini file)");
+        }
+
+        if (!boost::filesystem::path(current_runtime_config).is_absolute()) {
+          current_runtime_config = boost::filesystem::canonical(current_runtime_config).native();
+        }
+      }
+    }
+
+    runtime_ = unity::scopes::Runtime::create(current_runtime_config);
 }
 
 JavascriptScopeRuntime::~JavascriptScopeRuntime() {
 
=== modified file 'src/common/config.h'
--- src/common/config.h	2015-07-20 19:07:45 +0000
+++ src/common/config.h	2015-07-22 09:51:01 +0000
@@ -21,6 +21,7 @@
 
 
 const char kJavascriptUnityScopeIdEnvVarName[] = "JS_UNITY_SCOPE_ID_ENV_VAR_NAME";
+const char kJavascriptUnityRuntimeEnvVarName[] = "JS_UNITY_RUNTIME_ENV_VAR_NAME";
 
 
 #endif // _UNITY_JS_SCOPES_CONFIG_H_
 
=== modified file 'src/launcher/config.h.in'
--- src/launcher/config.h.in	2015-07-20 19:07:45 +0000
+++ src/launcher/config.h.in	2015-07-22 09:51:01 +0000
@@ -19,6 +19,8 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#include <string>
+
 inline std::string executable_name() {
   return "@LAUNCHER_EXECUTABLE_NAME@";
 }
 
=== modified file 'src/launcher/main.cc'
--- src/launcher/main.cc	2015-07-20 19:07:45 +0000
+++ src/launcher/main.cc	2015-07-22 09:51:01 +0000
@@ -28,38 +28,26 @@
 
 #include <boost/filesystem.hpp>
 
-namespace {
-
-const char kScopeInitPathArgumentHeader[] = "--scope=";
-
-}
-
 void usage() {
   std::cout << executable_name()
             << " "
-            << kScopeInitPathArgumentHeader
-            << "<path-to-ini-file>"
+            << "<path-to-scope-ini>"
+            << "[<path-to-runtime-ini>]"
             << std::endl;
 }
 
 int main(int argc, char *argv[]) {
-  if (argc < 2) {
+  if (argc < 2 || argc > 3) {
     usage();
     return EXIT_FAILURE;
   }
 
-  std::string ini_filename;
-  for (int i = 0; i < argc; ++i) {
-    std::string argument(argv[i]);
-    if (argument.substr(0, sizeof(kScopeInitPathArgumentHeader)-1)
-            == kScopeInitPathArgumentHeader) {
-      ini_filename = argument.substr(sizeof(kScopeInitPathArgumentHeader)-1);
-    }
-  }
+  std::string ini_filename = argv[1];
 
   if (ini_filename.empty()
       || !boost::filesystem::exists(ini_filename)) {
-    std::cout << "Invalid or non existant scope ini file name";
+    std::cout << "Invalid or non existant scope ini file name: "
+              << ini_filename << std::endl;
     usage();
     return EXIT_FAILURE;
   }
@@ -67,8 +55,8 @@
   boost::filesystem::path p(ini_filename);
 
   if (p.extension().string() != ".ini") {
-    std::cout << "Invalid scope ini file name extension "
-              << ini_filename;
+    std::cout << "Invalid scope ini file name extension: "
+              << ini_filename << std::endl;
     return EXIT_FAILURE;
   }
 
@@ -76,13 +64,38 @@
          p.string().c_str(),
          true);
 
+  if (argc == 3) {
+      std::string runtime_filename = argv[2];
+
+      if (runtime_filename.empty()
+          || !boost::filesystem::exists(runtime_filename)) {
+        std::cout << "Invalid or non existant runtime ini file name: "
+                  << runtime_filename << std::endl;
+        usage();
+        return EXIT_FAILURE;
+      }
+
+      boost::filesystem::path p(runtime_filename);
+
+      if (p.extension().string() != ".ini") {
+        std::cout << "Invalid runtime ini file name extension: "
+                  << runtime_filename << std::endl;
+        return EXIT_FAILURE;
+      }
+
+      setenv(kJavascriptUnityRuntimeEnvVarName,
+             p.string().c_str(),
+             true);
+  }
+
   std::string base_name = p.filename().string();
 
   boost::filesystem::path script_path = p.parent_path();
   script_path += std::string("/") + p.stem().string() + ".js";
 
   if (!boost::filesystem::exists(script_path)) {
-    std::cout << "Could not find scope javascript file";
+    std::cout << "Could not find scope javascript file: "
+              << script_path.string() << std::endl;
     return EXIT_FAILURE;
   }