Merge pull request #9 from seguri/testapp-1.4

testapp with working build script and django admin

app.yaml

@@ -26,5 +26,9 @@ handlers:
   static_dir: django/contrib/admin/media
   expiration: '0'
 
+- url: /static/admin
+  static_dir: django/contrib/admin/static/admin
+  expiration: '0'
+
 - url: /.*
   script: djangoappengine.main.application

build.sh

@@ -1,19 +1,29 @@
 #!/bin/sh
 
-mkdir build
+DOWNLOAD_DIR=./src
 
-pip install --download='./build' --no-install -r requirements.txt
+# test for git and hg commands
+for cmd in git hg; do
+    command -v ${cmd} >/dev/null || { echo "sh: command not found: ${cmd}"; exit 1; }
+done
 
-unzip -q build/django-autoload-0.01.zip -d build
-unzip -q build/django-dbindexer-0.3.zip -d build
-unzip -q build/django-nonrel-1.4.5.zip -d build
-unzip -q build/djangoappengine-1.0.zip -d build
-unzip -q build/djangotoolbox-0.9.2.zip -d build
+# download all packages to ./src (default)
+pip install --no-install -r requirements.txt
+
+cp -r ${DOWNLOAD_DIR}/django-autoload/autoload ./autoload
+cp -r ${DOWNLOAD_DIR}/django-dbindexer/dbindexer ./dbindexer
+cp -r ${DOWNLOAD_DIR}/django-nonrel/django ./django
+cp -r ${DOWNLOAD_DIR}/djangoappengine/djangoappengine ./djangoappengine
+cp -r ${DOWNLOAD_DIR}/djangotoolbox/djangotoolbox ./djangotoolbox
+
+[ -f ${DOWNLOAD_DIR}/pip-delete-this-directory.txt ] && rm -rf ${DOWNLOAD_DIR}
+
+echo "Now run:
+./manage.py runserver
+
+To launch this app. If you want access to django /admin, run also:
+./manage.py createsuperuser
+
+And then login in <your_app_ip>/admin, probably http://127.0.0.1:8000/admin"
 
-cp -r build/django-autoload/autoload ./autoload
-cp -r build/django-dbindexer/dbindexer ./dbindexer
-cp -r build/django-nonrel/django ./django
-cp -r build/djangoappengine/djangoappengine ./djangoappengine
-cp -r build/djangotoolbox/djangotoolbox ./djangotoolbox
 
-rm -r ./djangoappengine/djangoappengine.egg-info

settings.py

@@ -13,7 +13,7 @@
 SECRET_KEY = '=r-$b*8hglm+858&9t043hlm6-&6-3d3vfc4((7yd0dbrakhvi'
 
 INSTALLED_APPS = (
-#    'django.contrib.admin',
+    'django.contrib.admin',
     'django.contrib.contenttypes',
     'django.contrib.auth',
     'django.contrib.sessions',
@@ -44,7 +44,8 @@
 # corresponding output. Helps a lot with print-debugging.
 TEST_RUNNER = 'djangotoolbox.test.CapturingTestSuiteRunner'
 
-ADMIN_MEDIA_PREFIX = '/media/admin/'
+STATIC_URL = '/static/'
+
 TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), 'templates'),)
 
 ROOT_URLCONF = 'urls'

urls.py

@@ -1,9 +1,17 @@
 from django.conf.urls.defaults import *
+from django.contrib import admin
+import dbindexer
 
 handler500 = 'djangotoolbox.errorviews.server_error'
 
+# django admin
+admin.autodiscover()
+
+# search for dbindexes.py in all INSTALLED_APPS and load them
+dbindexer.autodiscover()
+
 urlpatterns = patterns('',
     ('^_ah/warmup$', 'djangoappengine.views.warmup'),
-    ('^$', 'django.views.generic.simple.direct_to_template',
-     {'template': 'home.html'}),
+    ('^$', 'django.views.generic.simple.direct_to_template', {'template': 'home.html'}),
+    ('^admin/', include(admin.site.urls)),
 )