Merge branch 'dev'

Conflicts:
	lib/commands/push.js

.gitignore

@@ -3,3 +3,4 @@ test/ensure_dir
 dist
 stamp-build
 www
+.*.swp

.gitmodules

@@ -28,3 +28,9 @@
 [submodule "deps/node-parser"]
 	path = deps/node-parser
 	url = git://github.com/Floby/node-parser.git
+[submodule "deps/couchapp"]
+	path = deps/couchapp
+	url = https://github.com/mikeal/node.couchapp.js.git
+[submodule "deps/node-semver"]
+	path = deps/node-semver
+	url = https://github.com/isaacs/node-semver.git

Makefile

@@ -9,22 +9,23 @@ NODEJSLIBDIR ?= $(LIBDIR)/$(NODEJS)
 
 BUILDDIR = dist
 
-COMMONJSFILES = $(shell find ./commonjs/kanso/*.js | grep -v ./commonjs/kanso/sha1.js | grep -v ./commonjs/kanso/underscore.js)
-
 $(shell if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi)
 
 all: build
 
-build: stamp-build
+submodules:
+	git submodule update --init --recursive
+
+build: submodules stamp-build
 
-stamp-build: $(wildcard  deps/* lib/*.js)
+stamp-build: $(wildcard  deps/* src/*)
 	touch $@;
 	mkdir -p $(BUILDDIR)/kanso
-	cp -R bin deps project static commonjs lib admin package.json $(BUILDDIR)/kanso
-	printf '#!/bin/sh\n$(NODEJS) $(NODEJSLIBDIR)/$(PACKAGE)/bin/kanso $$@' > $(BUILDDIR)/kanso.sh
+	cp -R bin scripts project deps src package.json $(BUILDDIR)/kanso
+	tar --exclude='.git' -c -f - deps | (cd $(BUILDDIR)/kanso ; tar xfp -)
 
 test:
-	nodeunit test
+	./scripts/run_tests.sh test
 
 docs:
 	rm -rf www
@@ -35,17 +36,21 @@ docs:
 	$(NODEJS) docs/build_docs.js
 
 install: build
-	#install --directory $(NODEJSLIBDIR)
 	cp -Ra $(BUILDDIR)/kanso $(NODEJSLIBDIR)
-	install -m 0755 $(BUILDDIR)/kanso.sh $(BINDIR)/kanso
+	ln -sf $(NODEJSLIBDIR)/$(PACKAGE)/bin/kanso $(BINDIR)/kanso
+
+autocomplete:
+	$(NODEJS) scripts/install_autocomp.js "$(NODEJSLIBDIR)/kanso"
 
 uninstall:
 	rm -rf $(NODEJSLIBDIR)/kanso $(NODEJSLIBDIR)/kanso.js $(BINDIR)/kanso
 
 clean:
 	rm -rf $(BUILDDIR) stamp-build
 
+reinstall: uninstall clean install
+
 lint:
-	nodelint --config nodelint.cfg ./bin/kanso $(COMMONJSFILES) ./lib/*.js ./static/kanso.js ./admin/lib/*.js ./testsuite/lib/*.js ./testsuite/tests/*.js
+	nodelint --config nodelint.cfg ./bin/kanso ./src/kanso/*.js ./testsuite/lib/*.js ./testsuite/tests/*.js
 
-.PHONY: test install uninstall build all clean lint docs
+.PHONY: test install uninstall build all clean lint docs autocomplete

README.md

@@ -1,19 +1,57 @@
-![Kanso](http://kansojs.org/images/kanso.png)
+# Kanso
 
-The write-once, run both ends framework for pure CouchApps.
+Simple, distributable JavaScript apps using CouchDB
 
-By implementing and extending the CouchDB API in the browser, Kanso lets you write
-your routing, rendering and validation functions once and have them run
-client-side when possible, or on CouchDB as a fall-back.
+![Kanso Tools in action](http://kan.so/static/img/banner.png)
 
-This means highly-responsive web-apps, that are still search-engine friendly.
+Kanso is a set of tools and packages for creating JavaScript apps that run
+directly on CouchDB. Your app and related code can be easily packaged and shared
+with the community, or deployed to a number of cloud-hosted services.
 
-* __Website:__ [http://kansojs.org](http://kansojs.org)
-* __Wiki:__ [https://github.com/caolan/kanso/wiki](https://github.com/caolan/kanso/wiki)
-* __Issues:__ [https://github.com/caolan/kanso/issues](https://github.com/caolan/kanso/issues)
-* __Mailing List:__ [http://groups.google.com/group/kanso](http://groups.google.com/group/kanso)
-* __IRC:__ #kansojs on FreeNode
+The command-line tool is used for building and deploying these applications, as
+well as providing some useful utilities for working with CouchDB and JSON data.
 
-Kanso provides a whole host of tools for making serious CouchApp development easier,
-to find out more about this new approach to web development take a look at the
-[Kanso website](http://kansojs.org).
+
+## Why develop apps with Kanso?
+
+* __Scalability:__ easily grow from hobby-project to high-demand app with CouchDB
+* __Deployment:__ effortless to deploy, to the cloud or local machines, promoting
+  quick iterations
+* __Multi-platform:__ runs anywhere with CouchDB (Windows, OSX, Linux, Android and
+  iOS)
+* __Keep your data yours:__ now you can keep sensitive data in-house, and avoid
+  sharing it with cloud services
+* __Easy to distribute:__ apps are easy to share and distribute, between people and
+  servers
+* __Avoid lock-in:__ easy to deploy and based on open-source, don't be held hostage
+  to a proprietary API
+* __Homogeneity:__ your development environment matches your production environment
+* __One language to rule them all:__ with just CouchDB and the browser, all you
+  need to speak is JavaScript!
+
+
+## Get started
+
+Fetch the code from GitHub and install:
+
+    git clone https://github.com/kanso/kanso.git
+    cd kanso
+    make && sudo make install
+
+Learn more: [Simplest possible app](http://kan.so/docs/Simplest_possible_app)
+
+
+## Developer community
+
+Kanso is an open-source project written by developers using CouchApps everyday, in
+real-world projects. Kanso provides the tools to share code and resources,
+regardless of the way in which your app is built. It's easy to use coffee-script,
+less stylesheets, or any number of JavaScript frameworks in your app, and still
+benefit from the wealth of packages provided by the community.
+
+Find other Kanso developers in #kansojs on FreeNode, or on the mailing list.
+
+
+## Find out more
+
+For more information on the project, check out the [Kanso website](http://kan.so).