Merge pull request #344 from knight42/fix-docker-inspect

Fix inconsistent behaviour of Container.inspect

Author: apocas

lib/container.js

@@ -45,12 +45,6 @@ Container.prototype.inspect = function(opts, callback) {
   var self = this;
   var args = util.processArgs(opts, callback);
 
-  if (typeof args.callback !== 'function') {
-    return JSON.stringify({
-      id: this.id
-    });
-  }
-
   var optsf = {
     path: '/containers/' + this.id + '/json?',
     method: 'GET',

lib/exec.js

@@ -101,11 +101,6 @@ Exec.prototype.resize = function(opts, callback) {
  */
 Exec.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      id: this.id
-    });
-  }
 
   var optsf = {
     path: '/exec/' + this.id + '/json',

lib/image.js

@@ -17,11 +17,6 @@ var Image = function(modem, name) {
  */
 Image.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      name: this.name
-    });
-  }
 
   var opts = {
     path: '/images/' + this.name + '/json',

lib/network.js

@@ -17,11 +17,6 @@ var Network = function(modem, id) {
  */
 Network.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      Id: this.id
-    });
-  }
 
   var opts = {
     path: '/networks/' + this.id,

lib/node.js

@@ -18,11 +18,6 @@ var Node = function(modem, id) {
  */
 Node.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      id: this.id
-    });
-  }
 
   var optsf = {
     path: '/nodes/' + this.id,
@@ -102,11 +97,6 @@ Node.prototype.update = function(opts, callback) {
  */
 Node.prototype.remove = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      id: this.id
-    });
-  }
 
   var optsf = {
     path: '/nodes/' + this.id,

lib/plugin.js

@@ -18,11 +18,6 @@ var Plugin = function(modem, name, remote) {
  */
 Plugin.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      name: this.name
-    });
-  }
 
   var optsf = {
     path: '/plugins/' + this.name,

lib/secret.js

@@ -17,11 +17,6 @@ var Secret = function(modem, id) {
  */
 Secret.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      id: this.id
-    });
-  }
 
   var optsf = {
     path: '/secrets/' + this.id,

lib/service.js

@@ -18,11 +18,6 @@ var Service = function(modem, id) {
  */
 Service.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      id: this.id
-    });
-  }
 
   var optsf = {
     path: '/services/' + this.id,

lib/task.js

@@ -18,11 +18,6 @@ var Task = function(modem, id) {
  */
 Task.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      id: this.id
-    });
-  }
 
   var optsf = {
     path: '/tasks/' + this.id,

lib/volume.js

@@ -17,11 +17,6 @@ var Volume = function(modem, name) {
  */
 Volume.prototype.inspect = function(callback) {
   var self = this;
-  if (typeof callback !== 'function') {
-    return JSON.stringify({
-      name: this.name
-    });
-  }
 
   var optsf = {
     path: '/volumes/' + this.name,