0.0.1

Author: mattqs

Gruntfile.js

@@ -1,15 +1,7 @@
 
 module.exports = function (grunt) {  
 
-  grunt.initConfig({
-    shell: {
-      exec: {
-        options: {
-          stdout: true,
-          stderr: true
-        }
-      }
-    },
+  grunt.initConfig({   
     jshint: {
       options: {
         jshintrc: true,
@@ -21,7 +13,6 @@ module.exports = function (grunt) {
       ]
     },
     mochaTest: {
-      config: config,
       test: {
         options: {
           reporter: 'spec',

README.md

@@ -35,6 +35,28 @@ mongo.command('db.isMaster()').then(function (data) {
 });
 
 
+//data = {
+//  command: 'mongo --host localhost --port 27017  --eval "db.isMaster()"',
+//  raw: '["MongoDB shell version: 3.2.0\\nconnecting to: localhost:27017/test\\n{\\n\\t\\"ismaster\\" : false,\\n\\t\\"secondary\\" : false,\\n\\t\\"info\\" : \\"Does not have a valid replica set config\\",\\n\\t\\"isreplicaset\\" : true,\\n\\t\\"maxBsonObjectSize\\" : 16777216,\\n\\t\\"maxMessageSizeBytes\\" : 48000000,\\n\\t\\"maxWriteBatchSize\\" : 1000,\\n\\t\\"localTime\\" : ISODate(\\"2015-12-24T22:19:22.939Z\\"),\\n\\t\\"maxWireVersion\\" : 4,\\n\\t\\"minWireVersion\\" : 0,\\n\\t\\"ok\\" : 1\\n}\\n",""]',
+//  lines:
+//   ['MongoDB shell version: 3.2.0',
+//     'connecting to: localhost:27017/test'],
+//  object:
+//   {
+//     ismaster: false,
+//     secondary: false,
+//     info: 'Does not have a valid replica set config',
+//     isreplicaset: true,
+//     maxBsonObjectSize: 16777216,
+//     maxMessageSizeBytes: 48000000,
+//     maxWriteBatchSize: 1000,
+//     localTime: { '$date': '2015-12-24T22:19:22.939Z' },
+//     maxWireVersion: 4,
+//     minWireVersion: 0,
+//     ok: 1
+//   }
+//}
+
 ```
 
 With callback:

lib/index.js

@@ -31,16 +31,16 @@ var Mongo = function (opts) {
 
 Mongo.prototype.command = function (command, callback) {
   var self = this;
-  var exec_command = 'mongo ';
+  var exec_command = 'mongo';
 
   return Promise.resolve().then(function () {
-    var params = _.reduce(self.driver, function (result, value, key) {
+    var params = _.reduce(self, function (result, value, key) {
       result += util.format('--%s %s ', key, value);
       return result;
     }, '');
 
-    exec_command += util.format(' %s --eval"%s"', params, command);
-    console.log('exec_command =', exec_command);
+    exec_command += util.format(' %s --eval "%s"', params, command);
+    //console.log('exec_command =', exec_command);
 
     var exec_options = {
       env: {
@@ -49,7 +49,6 @@ Mongo.prototype.command = function (command, callback) {
         EDITOR: process.env.EDITOR,
         HOMEDRIVE: process.env.HOMEDRIVE,
         HOMEPATH: process.env.HOMEPATH,
-        PATH: process.env.PATH,
         DEBUG: ''
       }
     };
@@ -83,6 +82,24 @@ var extractResult = function (result) {
       var lines = obj[0].split(os.EOL);
       resultp.lines = lines;
 
+      try{
+        var tempArray = lines.splice(2);
+        //console.log('tempArray', tempArray);
+
+        var jsonString = tempArray.reduce(function (previousValue, currentValue) {
+          var cleaned = cleanJsonDate(currentValue.trim());
+          return previousValue + cleaned;
+        }, '');
+        //console.log('jsonString', jsonString);
+        resultp.object = JSON.parse(jsonString);
+
+
+      } catch (e) {
+        resultp.error = e;
+      }
+
+
+
       return resultp;
     }
   }
@@ -106,3 +123,30 @@ var extractResult = function (result) {
 
   return result;
 };
+
+
+var cleanJsonDate = function (line) {
+  if (line.indexOf('ISODate') > -1) {
+    var parts = line.split(':');
+
+    var re = /ISODate\("(.*)"/g;
+    var str = line;
+    var m, value;
+
+    while ((m = re.exec(str)) !== null) {
+      if (m.index === re.lastIndex) {
+        re.lastIndex++;
+      }
+      // View your result using the m-variable.
+      // eg m[0] etc.
+      //console.log('m', m);
+      value = m && m[1] ? m[1] : 'error';
+    }
+
+    return util.format('%s : { "$date" : "%s" },', parts[0], value);
+  } else {
+    return line;
+  }
+
+
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongo-cli-js",
   "version": "0.0.1",
-  "description": "A node.js wrapper for the docker-machine CLI",
+  "description": "A node.js wrapper for the mongo CLI",
   "main": "lib/index.js",
   "scripts": {
     "test": "grunt"
@@ -20,14 +20,12 @@
   },
   "homepage": "https://github.com/Quobject/mongo-cli-js",
   "devDependencies": {
-    "grunt-shell": "~1.1.2",
     "grunt": "~0.4.5",
     "grunt-contrib-jshint": "~0.11.3",
     "mocha": "~2.3.3",
     "grunt-mocha-test": "~0.12.7",
     "should": "~7.1.0",
-    "chai": "~3.3.0",
-    "dockermachine": "0.0.5"
+    "chai": "~3.3.0"
   },
   "dependencies": {
     "lodash": "~3.10.1",

test/index.js

@@ -24,16 +24,20 @@ var assert = require('chai').assert;
 
 describe('Mongo', function () {
 
-  it('should merge opts', function () {
-    var mongo = new Mongo({ a: 'a' });
-    assert.isNotNull(mongo);
-    assert.equal(mongo.a, 'a');
-    console.log('mongo', mongo);
-  });
+  //it('should merge opts', function () {
+  //  var mongo = new Mongo({ a: 'a' });
+  //  assert.isNotNull(mongo);
+  //  assert.equal(mongo.a, 'a');
+  //  console.log('mongo', mongo);
+  //});
 
 
   it('command db.isMaster() should pass', function (done) {
-    var mongo = new Mongo();
+    var mongo = new Mongo({
+      host: 'localhost',
+      port: 27017
+    });
+
 
     assert.isNotNull(mongo);
     var failed = false;