restructure directories

www.js is our 'main' file, it's now at the project's root instead of server.js
routes, views, assets are now in lib, too

lib/cache.js

@@ -1,6 +1,7 @@
 var logging = require("./logging");
 var node_redis = require("redis");
 var config = require("./config");
+var path = require("path");
 var url = require("url");
 var fs = require("fs");
 
@@ -39,17 +40,17 @@ function connect_redis() {
 // the helms file is ignored because we only need 1 file to read/write from
 function update_file_date(rid, skin_hash) {
   if (skin_hash) {
-    var path = config.faces_dir + skin_hash + ".png";
+    var face_path = path.join(__dirname, "..", config.faces_dir, skin_hash + ".png");
-    fs.exists(path, function(exists) {
+    fs.exists(face_path, function(exists) {
       if (exists) {
         var date = new Date();
-        fs.utimes(path, date, date, function(err) {
+        fs.utimes(face_path, date, date, function(err) {
           if (err) {
             logging.error(rid, "Error:", err.stack);
           }
         });
       } else {
-        logging.error(rid, "tried to update", path + " date, but it does not exist");
+        logging.error(rid, "tried to update", face_path + " date, but it does not exist");
       }
     });
   }

lib/routes/avatars.js

@@ -1,8 +1,8 @@
-var logging = require("../lib/logging");
+var logging = require("../logging");
-var helpers = require("../lib/helpers");
+var helpers = require("../helpers");
-var config = require("../lib/config");
+var config = require("../config");
-var skins = require("../lib/skins");
+var skins = require("../skins");
-var cache = require("../lib/cache");
+var cache = require("../cache");
 
 var human_status = {
   0: "none",

lib/routes/capes.js

@@ -1,7 +1,7 @@
-var logging = require("../lib/logging");
+var logging = require("../logging");
-var helpers = require("../lib/helpers");
+var helpers = require("../helpers");
-var config = require("../lib/config");
+var config = require("../config");
-var cache = require("../lib/cache");
+var cache = require("../cache");
 
 var human_status = {
   0: "none",

lib/routes/index.js

@@ -1,4 +1,4 @@
-var config = require("../lib/config");
+var config = require("../config");
 var path = require("path");
 var jade = require("jade");
 

lib/routes/renders.js

@@ -1,9 +1,9 @@
-var logging = require("../lib/logging");
+var logging = require("../logging");
-var helpers = require("../lib/helpers");
+var helpers = require("../helpers");
-var config = require("../lib/config");
+var config = require("../config");
-var cache = require("../lib/cache");
+var cache = require("../cache");
-var skins = require("../lib/skins");
+var skins = require("../skins");
-var renders = require("../lib/renders");
+var renders = require("../renders");
 var fs = require("fs");
 
 var human_status = {

lib/routes/skins.js

@@ -1,7 +1,8 @@
-var logging = require("../lib/logging");
+var logging = require("../logging");
-var helpers = require("../lib/helpers");
+var helpers = require("../helpers");
-var config = require("../lib/config");
+var config = require("../config");
-var skins = require("../lib/skins");
+var skins = require("../skins");
+var path = require("path");
 var lwip = require("lwip");
 
 // GET skin request
@@ -40,7 +41,7 @@ module.exports = function(req, res) {
       res.end();
     } else {
       def = def || skins.default_skin(userId);
-      lwip.open("public/images/" + def + "_skin.png", function(err, image) {
+      lwip.open(path.join(__dirname, "..", "public", "images", def + "_skin.png"), function(err, image) {
         // FIXME: err is not handled
         image.toBuffer("png", function(buf_err, buffer) {
           // FIXME: buf_err is not handled

lib/server.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-var logging = require("./lib/logging");
+var logging = require("./logging");
 var querystring = require("querystring");
-var config = require("./lib/config");
+var config = require("./config");
 var http = require("http");
 var mime = require("mime");
 var path = require("path");

package.json

@@ -22,7 +22,7 @@
   ],
   "scripts": {
     "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 lib/www.js",
+    "start": "forever -l logs/log.log -o logs/out.log -e logs/error.log -p ./ -a --minUptime 8000 --spinSleepTime 1500 www.js",
     "test": "mocha",
     "test-travis": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
   },

test/test.js

@@ -6,7 +6,7 @@ var logging = require("../lib/logging");
 var config = require("../lib/config");
 var skins = require("../lib/skins");
 var cache = require("../lib/cache");
-var server = require("../server");
+var server = require("../lib/server");
 var cleaner = require("../lib/cleaner");
 var request = require("request");
 

www.js

@@ -1,6 +1,6 @@
-var logging = require("../lib/logging");
+var logging = require("./lib/logging");
-var cleaner = require("../lib/cleaner");
+var cleaner = require("./lib/cleaner");
-var config = require("../lib/config");
+var config = require("./lib/config");
 var cluster = require("cluster");
 
 if (cluster.isMaster) {
@@ -17,5 +17,5 @@ if (cluster.isMaster) {
 
   setInterval(cleaner.run, config.cleaning_interval * 1000);
 } else {
-  require("../server.js").boot();
+  require("./lib/server.js").boot();
 }