Merge pull request #347 from sjanuary/headless

Add 0.10 compatability to recent headless code

Author: tobespc

src/appmetrics.cpp

@@ -304,7 +304,11 @@ NAN_METHOD(getOption) {
 	if (info.Length() > 0) {
 		Local<String> value = info[0]->ToString();
 		std::string property = loaderApi->getProperty(toStdString(value).c_str());
+#if NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
 		v8::Local<v8::String> v8str = v8::String::NewFromUtf8(v8::Isolate::GetCurrent(), property.c_str());
+#else
+		v8::Local<v8::String> v8str = v8::String::New(property.c_str(), strlen(property.c_str()));
+#endif
 		info.GetReturnValue().Set<v8::String>(v8str);
 	} else {
 		loaderApi->logMessage(warning, "Incorrect number of parameters passed to getOption");

src/headlessutils.cpp

@@ -34,10 +34,18 @@ uv_async_t async_zip;
 uv_loop_t* loop;
 std::string outputDir;
 
+#if NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
 void asyncfunc(uv_async_t* handle) {
+#else
+void asyncfunc(uv_async_t* handle, int status) {
+#endif
 	Nan::HandleScope scope;
  	v8::Isolate* isolate = v8::Isolate::GetCurrent();
-  	v8::Local<v8::Value> argv[] = { v8::String::NewFromUtf8(isolate, outputDir.c_str()) };
+#if NODE_VERSION_AT_LEAST(0, 11, 0) // > v0.11+
+	v8::Local<v8::Value> argv[] = { v8::String::NewFromUtf8(isolate, outputDir.c_str()) };
+#else
+	v8::Local<v8::Value> argv[] = { v8::String::New(outputDir.c_str(),  strlen(outputDir.c_str())) };
+#endif
   	headless::zipFunction->Call(1, argv);
 }
 

tests/headless_test.js

@@ -42,8 +42,8 @@ tap.test('Headless mode should produce a .hcd file', function(t) {
         return
       }
       for (var i = 0, len = files.length; i < len; i++) {
-        if(files[i].endsWith('.hcd')) {
-	  t.pass(".hcd file found");
+        if(/(\w+)\.hcd/.test(files[i].toString())) {
+	  t.pass(files[i] + " HCD file found");
           t.end();
           cleanUp();
           return;