diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index 79cc2c6d..b10f71c5 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -8,7 +8,7 @@ DIR = __dirname + '/../', DIR_LIB = DIR + 'lib/', - Util = require(DIR_LIB + 'util'), + rendy = require('rendy'), HOME_PAGE = 'General help using Cloud Commander: <{{ url }}>', @@ -47,8 +47,8 @@ } function test() { - Util.log('Cloud Commander testing mode'); - Util.log('argv: ', argv); + console.log('Cloud Commander testing mode'); + console.log('argv: ', argv); require('..'); } @@ -67,7 +67,7 @@ var bin = require('../json/bin'), usage = 'Usage: cloudcmd [options]', - site = Util.render(HOME_PAGE, { + site = rendy(HOME_PAGE, { url: Info.homepage }); diff --git a/gulp/tasks/docs.js b/gulp/tasks/docs.js index b36076c7..790f6cb5 100644 --- a/gulp/tasks/docs.js +++ b/gulp/tasks/docs.js @@ -5,6 +5,7 @@ cl = require('../cl'), place = require('place'), + rendy = require('rendy'), Util = require(DIR + 'lib/util'), Info = require(DIR + 'package'); @@ -22,7 +23,7 @@ } else { replaceVersion('README.md', version, versionNew, callback); replaceVersion('HELP.md', version, versionNew, function() { - var historyNew = history + Util.render(template, { + var historyNew = history + rendy(template, { date : Util.getShortDate, version : versionNew }); diff --git a/lib/server/rest.js b/lib/server/rest.js index 61f28041..a8bb218c 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -27,6 +27,7 @@ flop = require('flop'), pipe = require('pipe-io'), ponse = require('ponse'), + rendy = require('rendy'), Modules = require(DIR_JSON + 'modules'), @@ -326,7 +327,7 @@ function getWin32RootMsg(direction) { var messageRaw = 'Could not copy {{ direction }} root on windows!', - message = Util.render(messageRaw, { + message = rendy(messageRaw, { direction: direction }), error = Error(message); diff --git a/lib/server/route.js b/lib/server/route.js index 6db8645e..c64a04a0 100644 --- a/lib/server/route.js +++ b/lib/server/route.js @@ -12,6 +12,7 @@ mellow = require('mellow'), ponse = require('ponse'), files = require('files-io'), + rendy = require('rendy'), minify = require('minify'), config = require(DIR_SERVER + 'config'), @@ -55,19 +56,19 @@ data = data.replace(keysPanel + '"', keysPanel +' hidden"'); } - left = Util.render(Template.panel, { + left = rendy(Template.panel, { id : LEFT, side : 'left', content : panel }); - right = Util.render(Template.panel, { + right = rendy(Template.panel, { id : RIGHT, side : 'right', content : panel }); - data = Util.render(data, { + data = rendy(data, { title : CloudFunc.getTitle(), fm : left + right }); diff --git a/package.json b/package.json index dca33bcf..93172004 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "mollify": "~1.0.0", "pipe-io": "~1.1.1", "ponse": "~1.3.0", + "rendy": "~1.0.2", "restafary": "~1.0.0", "socket.io": "~1.2.0", "tryrequire": "~1.1.5"