Merge branch 'master' into soycode-simplesocksnode

Author: soycode

Gruntfile.coffee

@@ -628,6 +628,11 @@ gruntConfig = {
         npmLibNames: ['freedom-for-firefox']
         pathsFromDevBuild: ['lib/echo', 'lib/loggingprovider']
         localDestPath: 'lib/samples/echo-server-firefoxapp/data/'
+    libsForEchoServerNode:
+      Rule.copyLibs
+        npmLibNames: ['freedom-for-node']
+        pathsFromDevBuild: ['lib/echo', 'lib/loggingprovider']
+        localDestPath: 'lib/samples/echo-server-node/'
 
     libsForCopypasteChatChromeApp:
       Rule.copyLibs
@@ -1030,6 +1035,7 @@ taskManager.add 'echoServer', [
   'browserify:echoServerFreedomModule'
   'copy:libsForEchoServerChromeApp'
   'copy:libsForEchoServerFirefoxApp'
+  'copy:libsForEchoServerNode'
 ]
 
 taskManager.add 'copypasteChat', [

src/lib/samples/echo-server-node/index.js

@@ -0,0 +1,10 @@
+var freedom = require('freedom-for-node');
+
+freedom.freedom('./lib/echo/freedom-module.json', {
+  'logger': './lib/loggingprovider/freedom-module.json',
+  'debug': 'debug'
+}).then(function(moduleFactory) {
+  moduleFactory();
+}, function(e) {
+  console.error('could not load freedomjs module: ' + e.message);
+});