1.0.3 replaced dockermachineconfig with dockermachine-cli-js

Author: mattqs

lib/index.js

@@ -19,8 +19,8 @@ var Promise = require("bluebird");
 var exec = Promise.promisify(require('child_process').exec);
 var os = require("os");
 var _ = require('lodash');
-var dockermachine = require('dockermachineconfig');
 var cliTable2Json = require('cli-table-2-json');
+var DockerMachine = require('dockermachine-cli-js');
 
 var Docker = function (opts) {
   if (!(this instanceof Docker)) {
@@ -36,22 +36,32 @@ Docker.prototype.command = function(command, callback) {
 
   return Promise.resolve().then(function () {
     if (self.machinename) {
-      return dockermachine.config(self.machinename).then(function (data) {
-        self.machineconfig = data;
+      var dockerMachine = new DockerMachine({});
+
+      return dockerMachine.command('config ' + self.machinename).then(function (data) {
+        console.log('data = ', data);
+        self.machineconfig = data.machine.config;
       });
+
     }
   }).then(function (data) {
 
     if (self.machineconfig) {
-      exec_command += self.machineconfig.raw + ' ';
+      exec_command += self.machineconfig + ' ';
     }
     exec_command += command + ' ';
 
-    var exec_options = {};
+    var exec_options = {
+      env: {
+        HOME: process.env.HOME,
+        PATH: process.env.PATH,
+        DEBUG: ''
+      }
+    };
     if (self.cwd) {
       exec_options.cwd = self.cwd;
     }
-    //console.log('exec options =', exec_options);
+    console.log('exec options =', exec_options);
 
     return exec(exec_command, exec_options);
 
@@ -116,37 +126,8 @@ var extractResult = function (result) {
      run: function (resultp) {
        var obj = JSON.parse(resultp.raw);
        var lines = obj[0].split(os.EOL);
-       var i, line, columns, container, lineObj;
-       resultp.containerList = [];
-
-       for (i = 1; i < lines.length; i++) {
-         line = lines[i].trim();
-         if (line.length === 0) {
-           continue;
-         }
-         columns = line.split(/ [ ]+/);
-         lineObj = {};
-         resultp.containerList.push(lineObj);
-         lineObj.containerId = columns[0];
-         lineObj.image = columns[1];
-         lineObj.command = columns[2];
-         lineObj.created = columns[3];
-         lineObj.status = columns[4];
-         lineObj.ports = columns[5];
-         lineObj.name = columns[6];
-       }
-
-       //data =  { command: 'docker ps ',
-       //  raw: '["CONTAINER ID        IMAGE               COMMAND                  CREATED             STATUS              PORTS
-       //                  NAMES\\nc0df7ad37763        nginximg1           \\"nginx -g \'daemon off\\"   33 minutes ago      Up 33 minutes       0.0.0.0:80->80/tcp, 443/tcp   nginxcont\\n",""]',
-       //containerList:
-       //[ { containerId: 'c0df7ad37763',
-       //  image: 'nginximg1',
-       //  command: '"nginx -g \'daemon off"',
-       //  created: '33 minutes ago',
-       //  status: 'Up 33 minutes',
-       //  ports: '0.0.0.0:80->80/tcp, 443/tcp',
-       //  name: 'nginxcont' } ] }
+
+       resultp.containerList = cliTable2Json(lines);
 
        return resultp;
      }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docker-cli-js",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A wrapper for the docker CLI",
   "main": "lib/index.js",
   "scripts": {
@@ -30,10 +30,10 @@
     "dockermachine": "0.0.5"
   },
   "dependencies": {
-    "dockermachineconfig": "~1.0.4",
     "lodash": "~3.10.1",
     "bluebird": "~2.10.1",
     "debug": "~2.2.0",
-    "cli-table-2-json": "~1.0.0"
+    "cli-table-2-json": "~1.0.0",
+    "dockermachine-cli-js": "1.0.1"
   }
 }

test/index.js

@@ -135,7 +135,33 @@ describe('docker', function () {
   //  });
   //});
 
-  //it('command ps', function (done) {
+  it('command ps', function (done) {
+    this.timeout(15000);
+    var docker = new Docker({
+      machinename: config.DockerMachineName,
+    });
+    console.log('docker', docker);
+    assert.isNotNull(docker);
+    var failed = false;
+    var err = null;
+    docker.command('ps').then(function (data) {
+      console.log('data = ', data);
+      assert.isNotNull(data);
+    }).catch(function (error) {
+      assert.isNotNull(error);
+      err = error;
+      failed = true;
+      console.log('error = ', error);
+    }).finally(function () {
+      console.log('finally ');
+      assert.isFalse(failed);
+      assert.isNull(err);
+      done();
+    });
+  });
+
+
+  //it('command images', function (done) {
   //  this.timeout(15000);
   //  var docker = new Docker({
   //    //machinename: config.DockerMachineName,
@@ -144,7 +170,7 @@ describe('docker', function () {
   //  assert.isNotNull(docker);
   //  var failed = false;
   //  var err = null;
-  //  docker.command('ps').then(function (data) {
+  //  docker.command('images').then(function (data) {
   //    console.log('data = ', data);
   //    assert.isNotNull(data);
   //  }).catch(function (error) {
@@ -160,32 +186,6 @@ describe('docker', function () {
   //  });
   //});
 
-
-  it('command images', function (done) {
-    this.timeout(15000);
-    var docker = new Docker({
-      //machinename: config.DockerMachineName,
-    });
-    //console.log('docker', docker);
-    assert.isNotNull(docker);
-    var failed = false;
-    var err = null;
-    docker.command('images').then(function (data) {
-      console.log('data = ', data);
-      assert.isNotNull(data);
-    }).catch(function (error) {
-      assert.isNotNull(error);
-      err = error;
-      failed = true;
-      console.log('error = ', error);
-    }).finally(function () {
-      console.log('finally ');
-      assert.isFalse(failed);
-      assert.isNull(err);
-      done();
-    });
-  });
-
 });