fine tuning installation deps

edubkendo · Sep 13, 2012 · 7b2f5b7 · 7b2f5b7
1 parent 06e4451
commit 7b2f5b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.npmignore b/.npmignore
@@ -14,4 +14,5 @@ build/
 .travis.yml
 ROADMAP.md
 inspiration.md
-/config.json
+/config.json
+packages/
diff --git a/bin/tower b/bin/tower
@@ -4,10 +4,6 @@ var fs = require('fs');
 var path = require('path');
 var script = path.join(process.env.PWD, 'scripts', 'tower');
 
-try {
-  require('fibers')
-} catch (error) {}
-
 if (fs.existsSync(script)) {
   require(script);
 } else {

diff --git a/package.json b/package.json
@@ -96,11 +96,11 @@
     "knox": "0.0.11",
     "socket.io": ">= 0.8.7",
     "socket.io-client": ">= 0.9.5",
-    "hook.io": "~0.8.10"
+    "hook.io": "~0.8.10",
+    "fibers": "~0.6.8"
   },
   "globalDependencies": {
-    "ejs": ">= 0.6.1",
-    "fibers": "~0.6.8"
+    "ejs": ">= 0.6.1"
   },
   "localDependencies": {
     "useragent": ">= 1.0.5",

diff --git a/packages/tower-generator/server/generators/tower/app/templates/pack b/packages/tower-generator/server/generators/tower/app/templates/pack
@@ -64,7 +64,9 @@
     "superagent": ">= 0.4.0",
     "wrench": ">= 1.3.8",
     "cli-table": ">= 0.0.1",
-    "hook.io": "~0.8.10"
+    "hook.io": "~0.8.10",
+    "fibers": "~0.6.8",
+    "ejs": ">= 0.6.1"
   },
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha $(find test -name \"*Test.coffee\")",

diff --git a/src/tower/server/generator/generators/tower/app/templates/scripts/tower b/src/tower/server/generator/generators/tower/app/templates/scripts/tower