merged with rockets2 branch

Makefile

@@ -1,22 +1,26 @@
+all: fulltest
+
 version:
-	echo 'VERSION=`git describe`; sed -i "s/^VERSION\=.*$$/VERSION=\"$${VERSION}\"/g" rockets/__init__.py' | sh
+	echo 'VERSION=`git describe --tags`; sed -i "s/^VERSION\=.*$$/VERSION=\"$${VERSION}\"/g" rockets/__init__.py' | sh
 
 testenv: clean build/rockets.tar.gz
 	virtualenv --no-site-packages env 
 	env/bin/python setup.py install 
 	readlink -f . > env/lib/python2.6/site-packages/rockets.pth
 
 	# make local
-	grep -v "egg=Rocket" rockets/bin/rocket > env/bin/rocket
-	chmod +x env/bin/rocket
+	grep -v "egg=Rocket" rockets/bin/rocket2 > env/bin/rocket2
+	chmod +x env/bin/rocket2
 
 	# test begin!
 	rm -rf tests
 	mkdir -p tests
-	-cd tests; rocket init
+	-cd tests; rocket2 init
 	mkdir -p tests/.rockets/lib/python2.6/site-packages/
 	readlink -f . > tests/.rockets/lib/python2.6/site-packages/rockets.pth
-	cd tests; rocket init
+
+test:
+	cd tests; rocket2 init
 
 fulltest: clean build/rockets.tar.gz
 	rm -rf /tmp/rockets-env 
@@ -26,12 +30,12 @@ fulltest: clean build/rockets.tar.gz
 	mkdir -p /tmp/rockets-test
 	cd /tmp/rockets-test/; /tmp/rockets-env/bin/rocket init
 
-build/rockets.tar.gz:
+build/rockets.tar.gz: version
 	find . -name "*~" -exec rm -f {} \;
 	find . -name "*.pyc" -exec rm -f {} \;
 	rm -rf build/
 	mkdir -p build/
-	tar -cvvf build/rockets.tar rockets setup.py
+	tar -cf build/rockets.tar rockets setup.py
 	gzip build/rockets.tar 
 
 clean:
@@ -41,5 +45,4 @@ setupgit:
 	git remote add github "git@github.com:ssimasanti/rockets.git"
 	git remote add dropbox ../../Dropbox/projects/rockets/
 	echo "build/" >> .git/info/exclude 
-	echo "tests/" >> .git/info/exclude 
-
+	echo "tests/" >> .git/info/exclude

README.txt

@@ -0,0 +1,8 @@
+rocket use localhost
+rocket add uwsgi boatyardapp 
+rocket add domain boatyardapp www.boatyardapp.com 
+rocket push 
+
+rocket edit uwsgi
+rocket edit uwsgi boatyardapp  
+rocket remove uwsgi 

requirements.ini

@@ -1,4 +1,5 @@
-Django==1.1.1
-Fabric==0.9.0
--e svn+https://svn.apache.org/repos/asf/incubator/libcloud/trunk@921044#egg=apache_libcloud-0.3.0-py2.6-dev_r921044
+Fabric==0.9.2
+paramiko==1.7.6
+pycrypto==2.0.1
+wsgiref==0.1.2
 

rockets/__init__.py

@@ -1,9 +1,16 @@
+#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
+
 # BEGIN GIT POSTCOMMIT #################################
-VERSION="0.6-18-g448e7f0"
+VERSION="r2-1-gaad8d93"
 # END GIT POSTCOMMIT ###################################
 
+from rocket import services as services
+from rocket import models as models
+from rocket import loaders as loaders
+from rocket import conf as conf
+
 def get_path():
 	import os
 	return os.path.abspath(os.path.dirname(__file__))

rockets/bin/rocket → rockets/bin/rocket2

@@ -1,11 +1,12 @@
 #!/bin/bash
 
-ROCKETDIR=`pwd`
+ROCKETDIR=$(pwd)
 REQUIREMENTS="""
-Django==1.1.1
-Fabric==0.9.0
-zope.interface==3.5.3
--e svn+https://svn.apache.org/repos/asf/incubator/libcloud/trunk@921044#egg=apache_libcloud-0.3.0-py2.6-dev_r921044
+Django==1.2.3
+Fabric==0.9.2
+paramiko==1.7.6
+pycrypto==2.0.1
+wsgiref==0.1.2
 -e git+http://github.com/ssimasanti/rockets.git#egg=Rockets
 """
 
@@ -24,23 +25,25 @@ if [ -z $ROCKETDIR ]
 then
 	if [ "$1" == "init" ]
 	then
-		ROCKETDIR=`pwd`
+		ROCKETDIR=$(pwd)
 		virtualenv --no-site-packages .rockets
 	else
 		echo "fatal: Not a rocket (or any of the parent directories): .rockets"
 		exit 1
 	fi
 fi
 
+PYTHON=$ROCKETDIR/.rockets/bin/python
+PIP=$ROCKETDIR/.rockets/bin/pip
 if [ "$1" == "init" ]
 then
 	for X in $REQUIREMENTS
 	do
-		$ROCKETDIR/.rockets/bin/pip install "$X"
+		$PIP install "$X"
 	done
-	$ROCKETDIR/.rockets/bin/python -m rockets.servers.bootstrap "$ROCKETDIR"
-	$ROCKETDIR/.rockets/bin/python $ROCKETDIR/manage.py syncdb 
+	$PYTHON -m rockets.bootstrap "$ROCKETDIR"
+	$PYTHON $ROCKETDIR/manage.py syncdb 
 else
-	$ROCKETDIR/.rockets/bin/python $ROCKETDIR/manage.py $*
+	$PYTHON $ROCKETDIR/manage.py $*
 fi
 

rockets/boatyard/templates/boatyard/ubuntu/etc/apt/sources.list.d/boatyard.list

@@ -0,0 +1 @@
+deb http://boatyard.s3.amazonaws.com/packages/ubuntu karmic main

rockets/bootstrap.py

@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+
+from django.core.management import setup_environ
+try:
+	import settings # Assumed to be in the same directory.
+except ImportError:
+	import sys
+	sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+	sys.exit(1)
+
+if __name__ == "__main__":
+	setup_environ(settings)
+	import os, sys, getpass
+	from rocket.templates import dump
+
+	project_path = sys.argv[1]
+	user = getpass.getuser()
+	prototype_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'prototype'))
+	dump(prototype_path, project_path, {
+		'secret': unicode(os.urandom(32).encode('hex')),
+		'user': unicode(user),
+	})
+

rockets/hostings/templates/hostings/python/home/{{user}}/{{name}}.git/hooks/post-update → rockets/git/templates/gitdeploy/all/home/{{name}}/{{name}}.git/hooks/post-update.e/10-deploy.sh

@@ -14,7 +14,6 @@
 git-update-server-info
 
 is_bare=$(git-config --get --bool core.bare)
-APP_PATH=/home/{{user}}/deployed-apps/{{name}}
 
 
 if [ -z "$is_bare" ]
@@ -80,14 +79,3 @@ then
 	done
 fi
 
-
-echo "Checking requirements.ini" >&2
-if [ -f "$APP_PATH/app{{secret}}/requirements.ini" ]
-then 
-	$APP_PATH/env/bin/pip install -r "$APP_PATH/app{{secret}}/requirements.ini" | sed "s@$APP_PATH/app{{secret}}/@@g" | sed "s@$APP_PATH/env/@@g"
-fi
-
-echo "Reload server" >&2
-/etc/init.d/boatyard-{{name}} reload
-
-