From f984b203448b9675ff65fabb0c16a8893979d776 Mon Sep 17 00:00:00 2001 From: jomo Date: Fri, 27 Feb 2015 18:49:39 +0100 Subject: [PATCH] mv modules/ lib/ that's what all the cool kids do --- .gitignore | 2 +- .travis.yml | 2 +- bin/www.js | 6 +++--- {modules => lib}/cache.js | 0 {modules => lib}/cleaner.js | 0 {modules => lib}/config.example.js | 0 {modules => lib}/helpers.js | 0 {modules => lib}/logging.js | 0 {modules => lib}/networking.js | 0 {modules => lib}/renders.js | 0 {modules => lib}/skins.js | 0 package.json | 2 +- routes/avatars.js | 10 +++++----- routes/capes.js | 8 ++++---- routes/index.js | 2 +- routes/renders.js | 12 ++++++------ routes/skins.js | 8 ++++---- server.js | 4 ++-- test/test.js | 16 ++++++++-------- 19 files changed, 36 insertions(+), 36 deletions(-) rename {modules => lib}/cache.js (100%) rename {modules => lib}/cleaner.js (100%) rename {modules => lib}/config.example.js (100%) rename {modules => lib}/helpers.js (100%) rename {modules => lib}/logging.js (100%) rename {modules => lib}/networking.js (100%) rename {modules => lib}/renders.js (100%) rename {modules => lib}/skins.js (100%) diff --git a/.gitignore b/.gitignore index 3bc451a..85620a6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ node_modules/ .DS_Store *.rdb coverage/ -modules/config.js +lib/config.js undefined*.png *.sublime-* diff --git a/.travis.yml b/.travis.yml index c738bcd..5c7ccc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - "iojs-v1.3" before_script: - - cp "modules/config.example.js" "modules/config.js" + - cp "lib/config.example.js" "lib/config.js" before_install: - sudo apt-get install libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ notifications: diff --git a/bin/www.js b/bin/www.js index ffefdf9..69b1a77 100644 --- a/bin/www.js +++ b/bin/www.js @@ -1,6 +1,6 @@ -var logging = require ("../modules/logging"); -var cleaner = require("../modules/cleaner"); -var config = require("../modules/config"); +var logging = require ("../lib/logging"); +var cleaner = require("../lib/cleaner"); +var config = require("../lib/config"); var cluster = require("cluster"); if (cluster.isMaster) { diff --git a/modules/cache.js b/lib/cache.js similarity index 100% rename from modules/cache.js rename to lib/cache.js diff --git a/modules/cleaner.js b/lib/cleaner.js similarity index 100% rename from modules/cleaner.js rename to lib/cleaner.js diff --git a/modules/config.example.js b/lib/config.example.js similarity index 100% rename from modules/config.example.js rename to lib/config.example.js diff --git a/modules/helpers.js b/lib/helpers.js similarity index 100% rename from modules/helpers.js rename to lib/helpers.js diff --git a/modules/logging.js b/lib/logging.js similarity index 100% rename from modules/logging.js rename to lib/logging.js diff --git a/modules/networking.js b/lib/networking.js similarity index 100% rename from modules/networking.js rename to lib/networking.js diff --git a/modules/renders.js b/lib/renders.js similarity index 100% rename from modules/renders.js rename to lib/renders.js diff --git a/modules/skins.js b/lib/skins.js similarity index 100% rename from modules/skins.js rename to lib/skins.js diff --git a/package.json b/package.json index 4b617b5..1da9fd1 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "avatar" ], "scripts": { - "postinstall": "cp 'modules/config.example.js' 'modules/config.js'", + "postinstall": "cp 'lib/config.example.js' 'lib/config.js'", "start": "forever -l logs/log.log -o logs/out.log -e logs/error.log -p ./ -a --minUptime 8000 --spinSleepTime 1500 bin/www.js", "test": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage" }, diff --git a/routes/avatars.js b/routes/avatars.js index edb76c7..ce492b4 100644 --- a/routes/avatars.js +++ b/routes/avatars.js @@ -1,8 +1,8 @@ -var logging = require("../modules/logging"); -var helpers = require("../modules/helpers"); -var config = require("../modules/config"); -var skins = require("../modules/skins"); -var cache = require("../modules/cache"); +var logging = require("../lib/logging"); +var helpers = require("../lib/helpers"); +var config = require("../lib/config"); +var skins = require("../lib/skins"); +var cache = require("../lib/cache"); var human_status = { 0: "none", diff --git a/routes/capes.js b/routes/capes.js index 604fe43..3f2f0f8 100644 --- a/routes/capes.js +++ b/routes/capes.js @@ -1,7 +1,7 @@ -var logging = require("../modules/logging"); -var helpers = require("../modules/helpers"); -var config = require("../modules/config"); -var cache = require("../modules/cache"); +var logging = require("../lib/logging"); +var helpers = require("../lib/helpers"); +var config = require("../lib/config"); +var cache = require("../lib/cache"); var human_status = { 0: "none", diff --git a/routes/index.js b/routes/index.js index c67a6cb..c3221a2 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,4 +1,4 @@ -var config = require("../modules/config"); +var config = require("../lib/config"); var jade = require("jade"); // compile jade diff --git a/routes/renders.js b/routes/renders.js index 350b2e0..3d0d1ee 100644 --- a/routes/renders.js +++ b/routes/renders.js @@ -1,9 +1,9 @@ -var logging = require("../modules/logging"); -var helpers = require("../modules/helpers"); -var config = require("../modules/config"); -var cache = require("../modules/cache"); -var skins = require("../modules/skins"); -var renders = require("../modules/renders"); +var logging = require("../lib/logging"); +var helpers = require("../lib/helpers"); +var config = require("../lib/config"); +var cache = require("../lib/cache"); +var skins = require("../lib/skins"); +var renders = require("../lib/renders"); var fs = require("fs"); var human_status = { diff --git a/routes/skins.js b/routes/skins.js index 0268855..f2b65b5 100644 --- a/routes/skins.js +++ b/routes/skins.js @@ -1,7 +1,7 @@ -var logging = require("../modules/logging"); -var helpers = require("../modules/helpers"); -var config = require("../modules/config"); -var skins = require("../modules/skins"); +var logging = require("../lib/logging"); +var helpers = require("../lib/helpers"); +var config = require("../lib/config"); +var skins = require("../lib/skins"); var lwip = require("lwip"); // GET skin request diff --git a/server.js b/server.js index 2313823..34934a7 100644 --- a/server.js +++ b/server.js @@ -1,7 +1,7 @@ #!/usr/bin/env node -var logging = require("./modules/logging"); +var logging = require("./lib/logging"); var querystring = require("querystring"); -var config = require("./modules/config"); +var config = require("./lib/config"); var http = require("http"); var mime = require("mime"); var url = require("url"); diff --git a/test/test.js b/test/test.js index 0af58e9..c8f3dea 100644 --- a/test/test.js +++ b/test/test.js @@ -1,14 +1,14 @@ var assert = require("assert"); var fs = require("fs"); -var networking = require("../modules/networking"); -var helpers = require("../modules/helpers"); -var logging = require("../modules/logging"); -var config = require("../modules/config"); -var skins = require("../modules/skins"); -var cache = require("../modules/cache"); -var renders = require("../modules/renders"); +var networking = require("../lib/networking"); +var helpers = require("../lib/helpers"); +var logging = require("../lib/logging"); +var config = require("../lib/config"); +var skins = require("../lib/skins"); +var cache = require("../lib/cache"); +var renders = require("../lib/renders"); var server = require("../server"); -var cleaner = require("../modules/cleaner"); +var cleaner = require("../lib/cleaner"); var request = require("request"); // we don't want tests to fail because of slow internet