pong

diff --git a/README.rst b/README.rst
index 9e5b8d1..3ae122f 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -1,7 +1,7 @@
 Démarrage d'un nouveau projet
 =============================
 
-* django-admin.py startproject <nom du projet> --name=django --template=
+* django-admin.py startproject {{ project_name }} --template=<url du squelette> --name=django --name=django.wsgi --name=deploy
 
 * (optionnel) configurer les versions de PYTHON au besoin dans :
    ./bin/deploy
@@ -37,4 +37,4 @@ Développement du projet
 
 * bin/deploy development
 
-* bin/django runserver --settings=settings.development
+* bin/django runserver --settings={{ project_name }}.settings.development

diff --git a/bin/deploy b/bin/deploy
index 2f63114..89890a2 100755 (executable)
--- a/bin/deploy
+++ b/bin/deploy
@@ -1,8 +1,11 @@
 #! /bin/bash
 
+PYTHON="python2.6"
 ROOT_PATH=.
+PROJECT_NAME="{{ project_name }}"
+
 if [ ! -e "$ROOT_PATH/README.rst" ]; then
-    echo "Placez vous à la racine du projet."
+    echo "Placez vous a la racine du projet."
     exit -1
 fi
 
@@ -12,14 +15,14 @@ if [ "$BUILD" = "" ]; then
     BUILD='production'
 fi
 REQUIREMENTS=$ROOT_PATH/requirements/$BUILD.txt
-SETTINGS=settings.$BUILD
+SETTINGS=$PROJECT_NAME.settings.$BUILD
 
 
 VENV_PATH=$ROOT_PATH/.virtualenv
 if [ -e "$VENV_PATH" ]; then
-    echo "l'environnement virtuel existe déjà."
+    echo "l'environnement virtuel existe deja."
 else
-    echo "Création de l'environnement virtuel."
+    echo "Creation de l'environnement virtuel."
     virtualenv --python=$PYTHON $VENV_PATH
     rm -f distribute*.tar.gz
 fi
@@ -29,7 +32,7 @@ source $VENV_PATH/bin/activate
 which python
 
 
-echo "Installation des dépendances."
+echo "Installation des dependances."
 pip install -r $REQUIREMENTS
 
 echo "Commandes Django"

diff --git a/bin/django b/bin/django
index 8139e5a..6f4a7d8 100755 (executable)
--- a/bin/django
+++ b/bin/django
@@ -4,11 +4,9 @@
 import os
 import sys
 
-ROOT_DIR = os.path.dirname((os.path.dirname(__file__)))
-VENV_DIR = os.path.join(ROOT_DIR, '.virtualenv')
-PROJECT_DIR = os.path.join(ROOT_DIR, '{{ project_name }}')
+ROOT_DIR = os.path.abspath(os.path.dirname((os.path.dirname(__file__))))
 
-sys.path.append(PROJECT_DIR)
+sys.path.append(ROOT_DIR)
 
 if __name__ == "__main__":
     from django.core.management import execute_from_command_line

diff --git a/bin/django.wsgi b/bin/django.wsgi
index 9ebb28b..a839962 100755 (executable)
--- a/bin/django.wsgi
+++ b/bin/django.wsgi
@@ -6,17 +6,13 @@ import site
 
 PYTHON = "python2.6"
 
-os.environ['DJANGO_SETTINGS_MODULE'] = '{{ project_name }}.production'
+os.environ['DJANGO_SETTINGS_MODULE'] = '{{ project_name }}.settings.production'
 
 ROOT_DIR = os.path.abspath(os.path.dirname(__file__))
 VENV_DIR = os.path.join(ROOT_DIR, '.virtualenv')
 VENV_PKG_DIR = os.path.join(VENV_DIR, 'lib', PYTHON, 'site-packages')
 
-sys.path.append(os.path.join(
-    ROOT_DIR,
-    '{{ project_name }}',
-    '{{ project_name }}')
-    )
+sys.path.append(ROOT_DIR)
 
 # extra site-packages
 PATHS = (

diff --git a/project_name/settings/base.py b/project_name/settings/base.py
index 62e0dd6..a1f94a7 100644 (file)
--- a/project_name/settings/base.py
+++ b/project_name/settings/base.py
@@ -44,6 +44,7 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'south',
     'raven.contrib.django',
+    'auf.django.pong',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_TEMPLATE_CONTEXT_PROCESSORS + (

diff --git a/project_name/urls.py b/project_name/urls.py
new file mode 100644 (file)
index 0000000..dd649e1
--- /dev/null
+++ b/project_name/urls.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+from django.conf.urls.defaults import patterns, include,\
+    handler500, handler404, url
+from django.conf import settings
+
+from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+
+admin.autodiscover()
+
+handler404
+handler500
+
+urlpatterns = patterns(
+    '',
+    url(r'^api/pong/', include('auf.django.pong.urls')),
+    (r'^admin/', include(admin.site.urls)),
+)
+
+if settings.DEBUG:
+    urlpatterns += staticfiles_urlpatterns()
+    urlpatterns += patterns(
+        '',
+        url(r'^media/(?P<path>.*)$',
+            'django.views.static.serve',
+            {'document_root': settings.MEDIA_ROOT, }),
+        )

diff --git a/requirements/production.txt b/requirements/production.txt
index 10fbeda..7e7a80d 100644 (file)
--- a/requirements/production.txt
+++ b/requirements/production.txt
@@ -4,3 +4,4 @@ raven==3.4.1
 south==0.8.2
 
 http://pypi.auf.org/media/dist/auf.django.piwik-1.8.tar.gz#md5=da2be13ae62b8b89c39448b753f48abd
+http://pypi.auf.org/media/dist/auf.django.pong-0.2.3.tar.gz#md5=8e3f55e80e4f06d85c1d65bd47a60aad