From 4986dbfe46e3513a61df109c881185df4d5b5f88 Mon Sep 17 00:00:00 2001 From: Max Thayer Date: Wed, 10 Jul 2013 12:57:06 -0400 Subject: [PATCH 1/4] change name to couchappjs to prevent namespace overlap with python couchapp --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 21a0d81..a2787e3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "couchapp", + "name": "couchappjs", "description": "Utilities for building CouchDB applications.", "tags": [ "couchdb", @@ -21,6 +21,6 @@ "coffee-script": "*" }, "bin": { - "couchapp": "./bin.js" + "couchappjs": "./bin.js" } } From d26cf082c9b241e875b8ddd56768c516b631c4c0 Mon Sep 17 00:00:00 2001 From: Max Thayer Date: Wed, 10 Jul 2013 13:04:04 -0400 Subject: [PATCH 2/4] updated readme --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e18f0e4..56e25b3 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,15 @@ $ npm link . 
-$ couchapp help
-couchapp -- utility for creating couchapps
+$ couchappjs help
+couchappjs -- utility for creating couchapps
 
 Usage - old style with single app.js:
-  couchapp <command> app.js http://localhost:5984/dbname [opts]
+  couchappjs <command> app.js http://localhost:5984/dbname [opts]
 
 Usage - new style with multiple app files:
   directory based config specified by switch - multiple app files and pre- and post-processing capability)
-  couchapp -dc < <appconfigdirectory> http://localhost:5984/dbname
+  couchappjs -dc < <appconfigdirectory> http://localhost:5984/dbname
 
 Commands:
   push   : Push app once to server.
@@ -47,7 +47,7 @@ Directory-based config:
 
   beforepushsync.js and afterpushsync.js can be used to perform any before/after processing, using node.js code for example.
 
-  The sample afterpushsync.js shows lookup data being added to CouchDB after the CouchApp has been pushed.
+  The sample afterpushsync.js shows lookup data being added to CouchDB after the couchapp has been pushed.
app.js example: @@ -117,9 +117,9 @@ Local development server example. Start the server: - couchapp serve app.js http://localhost:5984/example_db -p 3000 -l -d attachments + couchappjs serve app.js http://localhost:5984/example_db -p 3000 -l -d attachments Now you can access your couchapp at http://localhost:3000/ . Code, hack and when you are happy with the result simply do: - couchapp push app.js http://localhost:5984/example_db + couchappjs push app.js http://localhost:5984/example_db From ed7a00247ff117851ed9b2f20594c2f75915b235 Mon Sep 17 00:00:00 2001 From: Max Thayer Date: Wed, 10 Jul 2013 13:37:26 -0400 Subject: [PATCH 3/4] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56e25b3..fc4accd 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Directory-based config: beforepushsync.js and afterpushsync.js can be used to perform any before/after processing, using node.js code for example. - The sample afterpushsync.js shows lookup data being added to CouchDB after the couchapp has been pushed. + The sample afterpushsync.js shows lookup data being added to CouchDB after the CouchApp has been pushed. app.js example: From 667c608a83c6ab82f64a35147317f8067fe6f6fa Mon Sep 17 00:00:00 2001 From: Max Thayer Date: Wed, 10 Jul 2013 13:39:44 -0400 Subject: [PATCH 4/4] update boilerplate --- boiler/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boiler/app.js b/boiler/app.js index 8d38b04..9a53692 100644 --- a/boiler/app.js +++ b/boiler/app.js @@ -1,4 +1,4 @@ - var couchapp = require('couchapp') + var couchapp = require('couchappjs') , path = require('path') ;