Moved log function to the separate module

Refactor
Updated README

Author: sashasimkin

README.md

@@ -1,6 +1,6 @@
 About
 ===
-Git web-hook receiver written on node.js
+Git web-hook receiver written in node.js
 
 Requirements
 ===
@@ -9,25 +9,29 @@ Requirements
 
 Instalation
 ===
+```
 git clone git://github.com/sashasimkin/hook-receiver.git
+```
 
 Usage
 ===
-1. Create file %name%.json
-2. Write config(below about this)(json object):
-3. Change server PORT and IP(line 1-2)
-4. node app.js
-5. Use http://IP:PORT/%name% as hook url in github, gitlab, etc.
+1. Create file {{name}}.json with config object in dir config/ below about this).
+2. node app.js IP:PORT (IP non-required, but if you filled port only the command must looks like `node app.js :PORT`). Defaults `IP='0.0.0.0';PORT=6666`.
+3. Use `http://IP:PORT/{{name}}` as hook url in github, gitlab, etc.
 
-Config parameters:
+Configuration:
 ===
-* user - System user, from which will ne performed commands
-* path - root path for project
-* commands - Shell commands, which will be performed after receive hook
-* refs - Non-required, if ref not match, any operation will not be performed. String or Array of Strings which be substituted to ref.match()
+It is a json file with json object inside in directory config/. This configuration used every time when hook has been recieved.
+
+Configuration parameters:
+===
+* `user` - System user, from which will be performed commands
+* `path` - root path for project, shell commans has been executed there
+* `commands` - Shell commands, which will be performed after recieve hook
+* `refs` - Non-required, if ref not match, any operation will not be performed. string or array of strings which be substituted to ref.match()
 
 
 TODO
 ===
-* Think about string-command executing
-* require in config with shell commands results
+* Commands string instade of array.
+* cfg.require parameter with applying the cfg.commands results

app.js

@@ -1,25 +1,9 @@
-process.env.IP = process.env.IP || '0.0.0.0';
-process.env.PORT = process.env.PORT || 6666;
-//Rewrite for logging to files
-var dbg = true;
-function log(msg, file){
-    if(file){
-        //Write to file
-    } else {
-        console.log(msg);
-        if(dbg && typeof msg == 'object'){
-            console.dir(msg);
-        }
-    }
-    
-    return false;
-}
 //Dependencies
 var http = require("http");
 var fs = require("fs");
 var path = require("path");
-// var os = require("os");
 var child_process = require('child_process');
+var log = require("./logging");
 //Runtime variables
 var cfg_dir = __dirname + '/config/';
 var cfg_map = {};
@@ -66,13 +50,21 @@ fs.readdir(cfg_dir, function(wtf, files){
     });
 });
 
+//Server options
+if(process.argv[3]){
+    var run_argv = process.argv[3].split(':');
+    process.env.IP = run_argv[0] || '0.0.0.0';
+    process.env.PORT = run_argv[1];
+}
+process.env.IP = process.env.IP || '0.0.0.0';
+process.env.PORT = process.env.PORT || 6666;
+
 // create a server
 http.createServer(function(request, response) {
     request.url = request.url.slice(1);
-    //Fucking favicon.ico!
-    if(request.url == 'favicon.ico'){
-        return request.connection.destroy();
-    }
+    
+    //Prevent favicon.ico requests
+    if(request.url == 'favicon.ico') return request.connection.destroy();
 
     if(request.method == 'POST' && cfg_map[request.url]){
         var body = '';
@@ -85,64 +77,57 @@ http.createServer(function(request, response) {
         });
 
         request.on('end', function () {
-            var bodyObj = JSON.parse(body.trim())
-            log(body);
-            
+            var bodyObj = JSON.parse(body.trim());
             var cfg = cfg_map[request.url];
             var spawn_options = {
                 encoding: "utf-8",
                 env: process.env
             };
-            if(cfg.user) spawn_options.uid = cfg.user;
 
-            if(!fs.readdirSync(cfg.path)){
+            if(cfg.user) {
+                spawn_options.uid = cfg.user;
+            }
+            
+            if(!fs.readdirSync(cfg.path)) {
                 return log('Invalid path "' + cfg.path + '" in config "' + request.url + '"');
             }
             spawn_options.cwd = cfg.path;
 
             var refsType = typeof cfg.refs;
-            if(['string', 'object'].indexOf(refsType = typeof cfg.refs)){
+            if(['string', 'object'].indexOf(refsType)){
                 if(refsType == 'string') cfg.refs = [cfg.refs];
-                var cont = false;
+                var refNotMatch = true;
                 for(var key in cfg.refs){
                     if(bodyObj.ref.match(cfg.refs[key])) {
-                        cont = true;
+                        refNotMatch = false;
                         break;
                     }
                 }
-                if(!cont) return log('No refs match. Aborting.');
+                if(refNotMatch) return log('No refs match. Aborting.');
             }
 
             if(cfg.commands.length){
-                var handleExec = function(err, stdout, stderr) {
-                    if(err){log(err);}
-                    
-                    
+                var onData = function(data) {
+                    log('Command "' + commandString + '" with data: ' + data);
+                };
+                var onError = function(data) {
+                    log('Error in command "' + commandString + '" with data: ' + data);
                 };
 
                 for(var i in cfg.commands){
                     var commandArray = cfg.commands[i];
                     var commandString = commandArray.join(' ');
                     var result = child_process.spawn(commandArray.shift(), commandArray, spawn_options);
 
-                    result.stdout.on('data', function (data) {
-                        log('Command "' + commandString + '" with data: ' + data);
-                    });
-
-                    result.stderr.on('data', function (data) {
-                        log('Error in command "' + commandString + '" with data: ' + data);
-                    });
+                    result.stdout.on('data', onData);
+                    result.stderr.on('data', onError);
                 }
             }
-            //Do work according to hook data
         });
+        
+        response.end("Deploy in queue!");
+    } else {
+        response.writeHead(404, 'There is nothing.');
+        response.end("404;");
     }
-    // on every request, we'll output 'Hello world'
-    response.end("I'm alive!");
 }).listen(process.env.PORT, process.env.IP);
-
-// Note: when spawning a server on Cloud9 IDE, 
-// listen on the process.env.PORT and process.env.IP environment variables
-
-// Click the 'Run' button at the top to start your server,
-// then click the URL that is emitted to the Output tab of the console

logging/lib/log.js

@@ -0,0 +1,15 @@
+var dbg = true;
+var dir = __dirname + '/../logs';
+
+exports = module.exports = function(msg, file){
+    if(file){
+        //TODO: Write to file
+    } else {
+        console.log(msg);
+        if(dbg && typeof msg == 'object'){
+            console.dir(msg);
+        }
+    }
+    
+    return false;
+}

logging/logs/.gitkeep

@@ -0,0 +1,21 @@
+{
+  "name": "Lite Logging",
+  "description": "Lite logging system",
+  "version": "0.1",
+  "author": {
+    "name": "Sash Simkin",
+    "email": "sashasimkin@gmail.com"
+  },
+  "main": "lib/log",
+  "engines": {
+    "node": ">=0.6.21"
+  },
+  "licenses": [
+    {
+      "type": "GPL",
+      "url": "http://github.com/martynsmith/node-irc/raw/master/COPYING"
+    }
+  ],
+  "readme": "Read me please",
+  "_id": "logging@0.1"
+}