re-org

lib/nserve.js

@@ -1,5 +1,5 @@
 (function() {
-  var DEFAULT_PORT, colors, connect, fileTransfer, fs, http, parse, program, start, sys, time, util, versioning, _fileTransferCallback, _init, _isVerbose, _now, _parseCLI, _port, _rate, _root, _router, _server, _version, _versionNumber;
+  var DEFAULT_PORT, colors, connect, fileTransfer, fs, http, parse, program, start, sys, util, _fileTransferCallback, _init, _isVerbose, _now, _parseCLI, _port, _rate, _root, _router, _server, _version, _versionNumber;
   DEFAULT_PORT = 3000;
   sys = require("sys");
   fs = require("fs");
@@ -8,8 +8,6 @@
   connect = require("connect");
   program = require("commander");
   colors = require("colors");
-  versioning = require("./versioning");
-  time = require('./time');
   fileTransfer = (require("./connect-file-transfer")).transfer;
   util = require("./util");
   /* Private */
@@ -21,7 +19,7 @@
   _root = null;
   _version = function() {
     try {
-      return _versionNumber = versioning.getVersionNumber();
+      return _versionNumber = util.getVersionNumber();
     } catch (error) {
       return console.error(error);
     }
@@ -40,7 +38,7 @@
   };
   _now = function() {
     if (_isVerbose) {
-      return " @ " + (time.now());
+      return " @ " + (util.now());
     } else {
       return "";
     }

lib/util.js

@@ -1,7 +1,19 @@
 (function() {
-  var absoluteDirPath, fs, path;
+  var absoluteDirPath, fs, getVersionNumber, now, path, _packagePath, _root;
   path = require('path');
   fs = require('fs');
+  _root = path.resolve(__dirname, "..");
+  _packagePath = path.join(_root, "package.json");
+  getVersionNumber = function() {
+    var packageContent, packageObj, versionNumber;
+    try {
+      packageContent = fs.readFileSync(_packagePath, "utf8");
+      packageObj = JSON.parse(packageContent);
+      return versionNumber = packageObj["version"];
+    } catch (error) {
+      throw error;
+    }
+  };
   /*
       return absolute directory path or null if it is not valid
   */
@@ -21,5 +33,15 @@
     }
     return absDir;
   };
+  now = function() {
+    var nowArr, nowStr;
+    now = new Date();
+    nowStr = now.toTimeString();
+    nowArr = nowStr.split(' ');
+    return "" + nowArr[0] + " " + nowArr[2];
+  };
+  /* exports */
+  exports.getVersionNumber = getVersionNumber;
   exports.absoluteDirPath = absoluteDirPath;
+  exports.now = now;
 }).call(this);

src/nserve.coffee

@@ -9,8 +9,6 @@ connect = require "connect"
 program = require "commander"
 colors = require "colors"
 
-versioning = require "./versioning"
-time = require './time'
 fileTransfer = (require "./connect-file-transfer").transfer
 util = require "./util"
 
@@ -26,7 +24,7 @@ _root = null
 
 _version = ->
     try
-        _versionNumber = versioning.getVersionNumber()
+        _versionNumber = util.getVersionNumber()
     catch error
         console.error error
 
@@ -45,11 +43,10 @@ _parseCLI = ()->
     _rate = program.rate
 
     root = util.absoluteDirPath program.directory
-    _root = if root? then root else process.cwd()
-
+    _root = if root? then root else process.cwd() 
 
 _now = ->
-    if _isVerbose then " @ #{time.now()}" else ""
+    if _isVerbose then " @ #{util.now()}" else ""
 
 _fileTransferCallback  = (data) ->
     switch data.status

src/util.coffee

@@ -1,6 +1,17 @@
 path = require 'path'
 fs = require 'fs'
 
+_root = path.resolve __dirname, ".."
+_packagePath = path.join _root, "package.json"
+
+getVersionNumber = ->
+    try
+        packageContent = fs.readFileSync _packagePath, "utf8"
+        packageObj = JSON.parse packageContent
+        versionNumber = packageObj["version"]
+    catch error
+        throw error
+
 ###
     return absolute directory path or null if it is not valid
 ###
@@ -16,5 +27,15 @@ absoluteDirPath = (pathStr) ->
         absDir = null
 
     absDir
-
+
+now = ->
+    now = new Date()
+    nowStr = now.toTimeString()
+    nowArr = nowStr.split ' '
+    "#{nowArr[0]} #{nowArr[2]}"
+
+### exports ###
+
+exports.getVersionNumber = getVersionNumber
 exports.absoluteDirPath = absoluteDirPath
+exports.now = now