Merge pull request gtg092x#3 from iliazubkov/master

json format fixed, arg variable
iliazubkov · Feb 16, 2017 · 940b406 · 940b406
2 parents 17b8079 + 32509ff
commit 940b406
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/lib/WP.js b/lib/WP.js
@@ -94,7 +94,7 @@ WP.discover = function(options,cb){
 						var required = command.args.filter(function(arg){
 							return arg.required;
 						});
-						if(required.length>args.length)
+						if(required.length>arg.length)
 							throw "Error args "+required.map(function(r){return "<"+r.arg+">";}).join(" ")+" are required for "+use.join(" ")+"."+" See http://wp-cli.org/commands/"+use.join('/');
 
 						//end check commands

diff --git a/lib/utils.js b/lib/utils.js
@@ -60,17 +60,12 @@ module.exports.wp = function(use,args,flags,cb){
         // shelve this for now
         cb(e,out);
 	};
-
-
+
 	exec("wp "+args.join(" ")+" "+flagArgs,function(err,stdout,stderr){
-
-		if(flags.format=="json"&&stdout){
-			try{
-				helpIfError(err||stderr,JSON.parse(stdout));
-			}catch(e){
-				helpIfError(err||stderr||e,stdout);
-			}
-		}else
-			helpIfError(err||stderr,stdout);
+	  try{
+      helpIfError(err||stderr,JSON.parse(stdout));
+    }catch(e){
+      helpIfError(err||stderr,stdout);
+    }
 	});
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wp-cli",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "Node Wrapper for Wordpress CLI",
   "main": "index.js",
   "scripts": {