diff --git a/lib/server.js b/lib/server.js index e4b21773..bb812717 100644 --- a/lib/server.js +++ b/lib/server.js @@ -12,7 +12,7 @@ config = require(DIR_SERVER + 'config'), express = require(DIR_SERVER + 'express'), - tryRequire = require(DIR_SERVER + 'tryRequire'), + tryRequire = require('tryrequire'), io = tryRequire('socket.io', {log: true}); diff --git a/lib/server/auth.js b/lib/server/auth.js index afb94d39..da052d51 100644 --- a/lib/server/auth.js +++ b/lib/server/auth.js @@ -5,7 +5,7 @@ crypto = require('crypto'), - tryRequire = require(DIR + 'tryRequire'), + tryRequire = require('tryrequire'), config = require(DIR + 'config'), oldPass, diff --git a/lib/server/config.js b/lib/server/config.js index 08d9d669..cf8badbe 100644 --- a/lib/server/config.js +++ b/lib/server/config.js @@ -17,7 +17,7 @@ CloudFunc = require(DIR_LIB + 'cloudfunc'), check = Util.check, - tryRequire = require(DIR_SERVER + 'tryRequire'), + tryRequire = require('tryrequire'), pipe = require('pipe-io'), ponse = require('ponse'), diff --git a/lib/server/express.js b/lib/server/express.js index 593b7dfd..25d2ef19 100644 --- a/lib/server/express.js +++ b/lib/server/express.js @@ -5,10 +5,10 @@ DIR_LIB = DIR + 'lib/', Util = require(DIR_LIB + 'util'), - tryRequire = require('./tryRequire'), + + tryRequire = require('tryrequire'), express = tryRequire('express'), - logger = tryRequire('morgan'), app = express && express(); diff --git a/lib/server/patch.js b/lib/server/patch.js index 6b93ca57..3a6d5d65 100644 --- a/lib/server/patch.js +++ b/lib/server/patch.js @@ -2,7 +2,6 @@ 'use strict'; var DIR = '../', - DIR_SERVER = './', fs = require('fs'), @@ -11,7 +10,7 @@ diffPatch = require(DIR + 'diff/diff-match-patch').diff_match_patch, diff = new (require(DIR + 'diff').DiffProto)(diffPatch), - tryRequire = require(DIR_SERVER + 'tryRequire'), + tryRequire = require('tryrequire'), flop = tryRequire('flop', {log: true, exit: true}), ERROR_MSG = 'File is to big. ' + diff --git a/lib/server/rest/markdown.js b/lib/server/rest/markdown.js index 913876aa..f4f23e24 100644 --- a/lib/server/rest/markdown.js +++ b/lib/server/rest/markdown.js @@ -9,14 +9,11 @@ Util = require(DIR_LIB + 'util'), - tryRequire = require(DIR + 'tryRequire'), - tryOptions = {log: true, exit: true}, + mellow = require('mellow'), + pipe = require('pipe-io'), + ponse = require('ponse'), - mellow = tryRequire('mellow', tryOptions), - pipe = tryRequire('pipe-io', tryOptions), - ponse = tryRequire('ponse', tryOptions), - - marked = tryRequire('marked'); + marked = require('marked'); module.exports = function(name, request, callback) { var query, diff --git a/lib/server/terminal.js b/lib/server/terminal.js index b550debc..6e34fa90 100644 --- a/lib/server/terminal.js +++ b/lib/server/terminal.js @@ -7,7 +7,7 @@ Util = require(DIR_LIB + 'util'), CloudFunc = require(DIR_LIB + 'cloudfunc'), - tryRequire = require('./tryRequire.js'), + tryRequire = require('tryrequire'), pty = tryRequire('pty.js'), diff --git a/lib/server/tryRequire.js b/lib/server/tryRequire.js deleted file mode 100644 index 7322ca3f..00000000 --- a/lib/server/tryRequire.js +++ /dev/null @@ -1,40 +0,0 @@ -(function() { - 'use strict'; - - module.exports = function tryRequire(name, options) { - var result, - o = options || {}, - - error = tryCatch(function() { - result = require(name); - }); - - if (error) { - if (o.log) - console.error(error.message); - else if (o.callback) - result = exec.bind(null, error); - - if (o.exit) - process.exit(1); - } - - return result; - }; - - function exec(error, callback) { - callback(error); - } - - function tryCatch(fn) { - var error; - - try { - fn(); - } catch(err) { - error = err; - } - - return error; - } -})(); diff --git a/package.json b/package.json index b387acaa..a2249749 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "pipe-io": "~1.1.1", "ponse": "~1.3.0", "restafary": "~1.0.0", - "socket.io": "~1.2.0" + "socket.io": "~1.2.0", + "tryrequire": "~1.1.5" }, "devDependencies": { "changelog-io": "~1.3.4",