From 67eab76ab0f633cfb698e87efba0de085084045f Mon Sep 17 00:00:00 2001 From: jigsaw Date: Fri, 21 Aug 2015 12:52:43 +0900 Subject: [PATCH 1/2] Update for connect by domain name feature #32 --- bin/vantage.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/bin/vantage.js b/bin/vantage.js index a99342b..564e385 100755 --- a/bin/vantage.js +++ b/bin/vantage.js @@ -31,8 +31,8 @@ function parseConnection(str) { var port = (parts.length === 2) ? parts[1] : void 0; var server = (parts.length === 2) ? parts[0] : void 0; if (parts.length === 1) { - server = (String(parts[0]).split(".").length === 4) ? parts[0] : void 0; - port = (String(parts[0]).length < 6 && !isNaN(parts[0])) ? parts[0] : void 0; + server = (isNumber(parts[0])) ? void 0 : parts[0]; + port = (String(parts[0]).length < 6 && isNumber(parts[0])) ? parts[0] : void 0; } server = (!server) ? "127.0.0.1" : server; port = (!port) ? "80" : port; @@ -42,11 +42,8 @@ function parseConnection(str) { }); } -function validateConnection(connection) { - var valid = (String(connection.server).split(".").length !== 4 || isNaN(connection.port)) - ? ("\n Invalid server/port passed: " + connection.server + ":" + connection.port + "\n") - : true; - return valid; +function isNumber(str) { + !isNaN(parseInt(str)); } function connect(vantage, server, port, opt) { @@ -87,11 +84,6 @@ function execute(cmd, opt) { var vantage = new Vantage().show(); var connection = parseConnection(cmd); - var valid = validateConnection(connection); - if (valid !== true) { - vantage.log(valid); - process.exit(1); - } // If there is somewhere to go, connect. if (cmd !== undefined) { @@ -100,4 +92,3 @@ function execute(cmd, opt) { } execute(command, options); - From d2ab62c9de18e3cc82408f74d655ae1eaa756eed Mon Sep 17 00:00:00 2001 From: jigsaw Date: Fri, 21 Aug 2015 13:27:33 +0900 Subject: [PATCH 2/2] Add return --- bin/vantage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/vantage.js b/bin/vantage.js index 564e385..91b024d 100755 --- a/bin/vantage.js +++ b/bin/vantage.js @@ -43,7 +43,7 @@ function parseConnection(str) { } function isNumber(str) { - !isNaN(parseInt(str)); + return !isNaN(parseInt(str)); } function connect(vantage, server, port, opt) {