Comparing version 0.1.4 to 0.1.5
@@ -7,2 +7,3 @@ var optimist = require('optimist'); | ||
var winston = require('winston'); | ||
var isatty = require('tty').isatty; | ||
var hasOwnProperty = Object.prototype.hasOwnProperty; | ||
@@ -91,5 +92,9 @@ | ||
cmd.flags = argv; | ||
if(!isatty(0)) { | ||
cmd.stream = process.openStdin(); | ||
} | ||
cmd.url = '/' + argv._.map(function encode(component) { | ||
return encodeURIComponent(component) | ||
}).join('/'); | ||
console.log(cmd.url) | ||
var tty = new TTYHelper(); | ||
@@ -152,6 +157,9 @@ this.handle(cmd, tty, cb); | ||
for(var i = 0; i < routers.length; i++) { | ||
var route = routers[i], match; | ||
if (match = route.matcher(cmd.url)) { | ||
var route = routers[i], | ||
match = route.matcher(cmd.url); | ||
if (match) { | ||
//matching route, fire off all the middleware | ||
cmd.params = match; | ||
cmd.params = match.length ? match[0].split('/').map(function(part) { | ||
return decodeURIComponent(part); | ||
}) : ''; | ||
tty = tty || new CLIResponse(); | ||
@@ -177,2 +185,3 @@ if (this.middleware.length) { | ||
if(!cmd.flags.h) { | ||
console.log(cmd.url.length > 1 && cmd.url.slice(-1) == '/') | ||
if(cmd.url.length > 1 && cmd.url.slice(-1) == '/') { | ||
@@ -188,3 +197,3 @@ cmd.url = cmd.url.slice(0,-1); | ||
} | ||
else if(cmd.url) { | ||
else if(cmd.url && cmd.url !== '/') { | ||
cmd.url = cmd.url[0] + cmd.url.slice(1).replace(/([\/]|^)[^\/]*$/,''); | ||
@@ -191,0 +200,0 @@ this.handle(cmd, tty, cb); |
@@ -5,3 +5,3 @@ { | ||
"author": "bradleymeck", | ||
"version": "0.1.4", | ||
"version": "0.1.5", | ||
"keywords": [ | ||
@@ -8,0 +8,0 @@ "CLI" |
17884
493