Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

add which to generated package.json

  • Loading branch information...
commit 8653a326dc0183178e15ba4a0389e9114df393bf 1 parent 9c4b17c
@lancejpollard lancejpollard authored
View
7 Makefile
@@ -1,13 +1,9 @@
-PATH_SEP = $(shell node -e "console.log(require('path').sep)")
SRC = $(shell find test/cases -name client -prune -o -name '*Test.coffee' -print)
STORES = memory mongodb
CMD = node_modules/mocha/bin/mocha
DIR = $(shell pwd)
GRUNT = grunt
FOREVER = forever
-# darwin (mac), linux, win32 (windows)
-OS = $(shell node -e "console.log(require('os').platform())")
-DEPENDENCIES = bin$(PATH_SEP)dependencies
PORT = 3210
TEST_URL = http://localhost:$(PORT)/?test=support,application,store,model
CLIENT_PID = null
@@ -132,6 +128,7 @@ whitespace:
install:
npm install
+ npm install-dev
watch: clean
$(GRUNT) start --config $(RUN)grunt.coffee
@@ -163,4 +160,4 @@ define get-processes
$(shell ps -ef | grep -e '$(1)' | grep -v grep)
endef
-.PHONY: all test-memory test-mongodb test test-all test-client build dist check-phantomjs check-grunt check-forever build-test-client start-test-client
+.PHONY: all test-memory test-mongodb test test-all test-client build dist check-phantomjs check-grunt check-forever build-test-client start-test-client
View
2  package.json
@@ -126,4 +126,4 @@
"docs": "make docs",
"postinstall": "make install-dependencies"
}
-}
+}
View
5 packages/tower-command/server/generate.coffee
@@ -5,6 +5,7 @@ class Tower.CommandGenerate
# tower generate template
# tower generate model
# tower generate library # a plugin/module/extension
+ # @todo default to not overriding the files w/o the --force option.
# @todo Need to implement these options
#
# @example --controller option for defining belongsTo
@@ -12,6 +13,10 @@ class Tower.CommandGenerate
#
# @example --seed 20 (or without number, generates default of 100, enough to explore pagination)
# tower generate scaffold Comment body:string --seed 100
+ #
+ # @todo for `$ tower generate service TwitterService --homepage http://twitter.com/`
+ # it should fetch the page and get metadata about the page to add to the class
+ # or even `tower generate service http://twitter.com` and have it get a good name
program
.version(Tower.version)
.option('-v, --version')
View
3  packages/tower-generator/server/generators/tower/app/templates/pack
@@ -41,7 +41,8 @@
"socket.io": ">= 0.8.7",
"async": ">= 0.1.12",
"socket.io-client": ">= 0.9.5",
- "tower": ">= 0.4.1"
+ "tower": ">= 0.4.1",
+ "which": ">= 1.0.5"
},
"optionalDependencies": {
"nodemailer": "~0.3.21",
View
2  packages/tower-generator/server/generators/tower/app/templates/test/mocha.opts
@@ -1,4 +1,4 @@
---require coffee-script ./test/server
+--require coffee-script ./test/server.coffee
--reporter spec
--ui bdd
--timeout 2000
2  wiki
@@ -1 +1 @@
-Subproject commit 00dd3a9887b7cfab32aff617ce13ba023d52fa06
+Subproject commit b810e76b9d5500f96b1c4e953649ad1f3242bf10
Please sign in to comment.
Something went wrong with that request. Please try again.