From 234abd82a2b20ff4b3c68e085279a5d2d2269cb9 Mon Sep 17 00:00:00 2001
From: dceejay <conway@uk.ibm.com>
Date: Fri, 6 Mar 2015 10:17:00 +0000
Subject: [PATCH] Move away from __defineGetter syntax, in red and server Bump
 test coverage forwards a bit

---
 red/red.js           | 26 ++++++++++----------------
 red/server.js        | 24 +++++++++++-------------
 test/red/red_spec.js | 26 +++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/red/red.js b/red/red.js
index 84dcc3bf4..b6e6a3e15 100644
--- a/red/red.js
+++ b/red/red.js
@@ -24,15 +24,12 @@ var fs = require("fs");
 var settings = require("./settings");
 var credentials = require("./nodes/credentials");
 var auth = require("./api/auth");
-
 var path = require('path');
+var events = require("events");
 
 process.env.NODE_RED_HOME = process.env.NODE_RED_HOME || path.resolve(__dirname+"/..");
 
-var events = require("events");
-
 var RED = {
-
     init: function(httpServer,userSettings) {
         userSettings.version = this.version();
         log.init(userSettings);
@@ -40,7 +37,6 @@ var RED = {
         server.init(httpServer,settings);
         return server.app;
     },
-    
     start: server.start,
     stop: server.stop,
     nodes: nodes,
@@ -55,18 +51,16 @@ var RED = {
         needsPermission: auth.needsPermission
     },
     version: function () {
-        var p = require(path.join(process.env.NODE_RED_HOME,"package.json"));
+        var p = require(path.join(process.env.NODE_RED_HOME,"package.json")).version;
+        /* istanbul ignore else */
         if (fs.existsSync(path.join(process.env.NODE_RED_HOME,".git"))) {
-            return p.version+".git";
-        } else {
-            return p.version;
+            p += ".git";
         }
-    }
+        return p;
+    },
+    get app() { console.log("Deprecated use of RED.app - use RED.httpAdmin instead"); return server.app },
+    get httpAdmin() { return server.app },
+    get httpNode() { return server.nodeApp },
+    get server() { return server.server }
 };
-
-RED.__defineGetter__("app", function() { console.log("Deprecated use of RED.app - use RED.httpAdmin instead"); return server.app });
-RED.__defineGetter__("httpAdmin", function() { return server.app });
-RED.__defineGetter__("httpNode", function() { return server.nodeApp });
-RED.__defineGetter__("server", function() { return server.server });
-
 module.exports = RED;
diff --git a/red/server.js b/red/server.js
index cc4d763eb..283b1ef95 100644
--- a/red/server.js
+++ b/red/server.js
@@ -197,10 +197,10 @@ function uninstallModule(module) {
         if (!fs.existsSync(moduleDir)) {
             return reject(new Error("Unabled to uninstall "+module+"."));
         }
-        
+
         var list = redNodes.removeModule(module);
         log.info("Removing module: "+module);
-        var child = child_process.exec('npm remove '+module, 
+        var child = child_process.exec('npm remove '+module,
             {
                 cwd: installDir
             },
@@ -223,27 +223,25 @@ function uninstallModule(module) {
 
 function reportMetrics() {
     var memUsage = process.memoryUsage();
-    
+
     // only need to init these once per report
     var metrics = {};
     metrics.level = log.METRIC;
-    
+
     //report it
     metrics.event = "runtime.memory.rss"
     metrics.value = memUsage.rss;
     log.log(metrics);
-    
+
     metrics.event = "runtime.memory.heapTotal"
     metrics.value = memUsage.heapTotal;
     log.log(metrics);
-    
+
     metrics.event = "runtime.memory.heapUsed"
     metrics.value = memUsage.heapUsed;
     log.log(metrics);
 }
 
-
-
 function stop() {
     if (runtimeMetricInterval) {
         clearInterval(runtimeMetricInterval);
@@ -261,9 +259,9 @@ module.exports = {
     reportAddedModules: reportAddedModules,
     reportRemovedModules: reportRemovedModules,
     installModule: installModule,
-    uninstallModule: uninstallModule
-}
+    uninstallModule: uninstallModule,
 
-module.exports.__defineGetter__("app", function() { return app });
-module.exports.__defineGetter__("nodeApp", function() { return nodeApp });
-module.exports.__defineGetter__("server", function() { return server });
+    get app() { return app },
+    get nodeApp() { return nodeApp },
+    get server() { return server }
+}
diff --git a/test/red/red_spec.js b/test/red/red_spec.js
index f61fd55b7..dac1618a8 100644
--- a/test/red/red_spec.js
+++ b/test/red/red_spec.js
@@ -17,6 +17,30 @@ var should = require("should");
 
 describe("red/red", function() {
     it('can be required without errors', function() {
-        require("../../red/red");
+        var RED = require("../../red/red");
     });
+
+    var RED = require("../../red/red");
+
+    it('returns an app object', function() {
+        var srv = RED.app.use("/test", function() { return "app"; });
+        srv.should.be.an.instanceOf(Object);
+    });
+
+    it('returns an httpAdmin object', function() {
+        var srv = RED.httpAdmin.use("/test", function() { return "Admin"; });
+        srv.should.be.an.instanceOf(Object);
+    });
+
+    it('reuturns an httpNode object', function() {
+        var srv = RED.httpNode.use("/test", function() { return "Node"; });
+        srv.should.be.an.instanceOf(Object);
+    });
+
+    it('it returns a server object', function() {
+        var srv = RED.server;
+        srv.should.be.an.instanceOf(Object).and.have.property('domain', null);
+        srv.should.be.an.instanceOf(Object).and.have.property('timeout', 120000);
+    });
+
 });