Merge branch 'sverrejoh/master'

21 files changed, 254 insertions, 18 deletions

diff --git a/README b/README
index 080df8a..86af4ca 100644
--- a/README
+++ b/README
@@ -6,27 +6,23 @@ ChiShop/DjangoPyPI
 Installation
 ============
 
-First you have to install the dependencies::
+Install dependencies::
 
-    $ python setup.py build
-    # python setup.py install # (run as root)
+    $ python bootstrap.py --distribute
+    $ ./bin/buildout
 
 Initial configuration
 ---------------------
 ::
 
-    $ cd chipshop/
-
-    $ $EDITOR settings.py
-
-    $ python manage.py syncdb
+    $ $EDITOR chishop/settings.py
+    $ ./bin/django syncdb
 
 Run the PyPI server
 -------------------
 ::
 
-    $ python manage.py runserver
-
+    $ ./bin/django runserver
 
 Please note that ``chishop/media/dists`` has to be writable by the
 user the web-server is running as.
diff --git a/bootstrap.py b/bootstrap.py
new file mode 100644
index 0000000..b964024
--- /dev/null
+++ b/bootstrap.py
@@ -0,0 +1,121 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+
+$Id$
+"""
+
+import os, shutil, sys, tempfile, urllib2
+from optparse import OptionParser
+
+tmpeggs = tempfile.mkdtemp()
+
+is_jython = sys.platform.startswith('java')
+
+# parsing arguments
+parser = OptionParser()
+parser.add_option("-v", "--version", dest="version",
+                          help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+                   action="store_true", dest="distribute", default=False,
+                   help="Use Disribute rather than Setuptools.")
+
+parser.add_option("-c", None, action="store", dest="config_file",
+                   help=("Specify the path to the buildout configuration "
+                         "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+    args += ['-c', options.config_file]
+
+if options.version is not None:
+    VERSION = '==%s' % options.version
+else:
+    VERSION = ''
+
+USE_DISTRIBUTE = options.distribute
+args = args + ['bootstrap']
+
+to_reload = False
+try:
+    import pkg_resources
+    if not hasattr(pkg_resources, '_distribute'):
+        to_reload = True
+        raise ImportError
+except ImportError:
+    ez = {}
+    if USE_DISTRIBUTE:
+        exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
+                         ).read() in ez
+        ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
+    else:
+        exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+                             ).read() in ez
+        ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+
+    if to_reload:
+        reload(pkg_resources)
+    else:
+        import pkg_resources
+
+if sys.platform == 'win32':
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws  = pkg_resources.working_set
+
+if USE_DISTRIBUTE:
+    requirement = 'distribute'
+else:
+    requirement = 'setuptools'
+
+if is_jython:
+    import subprocess
+
+    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+           quote(tmpeggs), 'zc.buildout' + VERSION],
+           env=dict(os.environ,
+               PYTHONPATH=
+               ws.find(pkg_resources.Requirement.parse(requirement)).location
+               ),
+           ).wait() == 0
+
+else:
+    assert os.spawnle(
+        os.P_WAIT, sys.executable, quote (sys.executable),
+        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
+        dict(os.environ,
+            PYTHONPATH=
+            ws.find(pkg_resources.Requirement.parse(requirement)).location
+            ),
+        ) == 0
+
+ws.add_entry(tmpeggs)
+ws.require('zc.buildout' + VERSION)
+import zc.buildout.buildout
+zc.buildout.buildout.main(args)
+shutil.rmtree(tmpeggs)
diff --git a/buildout.cfg b/buildout.cfg
index fc36b3c..160db4c 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,11 +1,15 @@
 [buildout]
 parts = django
+find-links = http://bitbucket.org/ubernostrum/django-registration/downloads/django-registration-0.8-alpha-1.tar.gz
+unzip = true
 eggs = pkginfo
+       django-registration==0.8-alpha-1
 
 [django]
 recipe = djangorecipe
-version = 1.0.2
-settings = development
+version = 1.1.1
+settings = settings
 eggs = ${buildout:eggs}
+test = djangopypi
 project = chishop
 wsgi = true
diff --git a/chishop/settings.py b/chishop/settings.py
index 00cf06d..ee286b5 100644
--- a/chishop/settings.py
+++ b/chishop/settings.py
@@ -16,6 +16,14 @@ DJANGOPYPI_RELEASE_UPLOAD_TO = 'dists'
 # change to False if you do not want Django's default server to serve static pages
 LOCAL_DEVELOPMENT = True
 
+REGISTRATION_OPEN = True
+ACCOUNT_ACTIVATION_DAYS = 7
+LOGIN_REDIRECT_URL = "/"
+
+EMAIL_HOST = ''
+DEFAULT_FROM_EMAIL = ''
+SERVER_EMAIL = DEFAULT_FROM_EMAIL
+
 MANAGERS = ADMINS
 
 DATABASE_ENGINE = ''
@@ -77,6 +85,14 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'urls'
 
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.core.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.request",
+)
+
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
@@ -92,5 +108,6 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.markup',
     'django.contrib.admindocs',
+    'registration',
     'djangopypi',
 )
diff --git a/chishop/templates/base.html b/chishop/templates/base.html
index cc21bf5..76483ce 100644
--- a/chishop/templates/base.html
+++ b/chishop/templates/base.html
@@ -20,6 +20,16 @@
         {% block site_logo %}{% endblock %}
         <h1 id="site-name">{% block site_name_header %}{% endblock %}</h1>
         </div>
+
+        <div id="user-tools">
+          {% if user.is_authenticated %}
+          Welcome, <strong>{{user.username}}</strong>.
+          <a href="{% url django.contrib.auth.views.logout %}?next={{request.path}}">Log out</a>
+          {% else %}
+          <a href="{% url django.contrib.auth.views.login %}?next={{request.path}}">Log in</a> /
+          <a href="{% url registration_register %}">Register</a>
+          {% endif %}
+        </div>
     </div>
     <!-- END Header -->
 
@@ -60,4 +70,3 @@
 
 </body>
 </html>
-
diff --git a/djangopypi/templates/djangopypi/pypi.html b/chishop/templates/djangopypi/pypi.html
index f98cf44..f98cf44 100644
--- a/djangopypi/templates/djangopypi/pypi.html
+++ b/chishop/templates/djangopypi/pypi.html
diff --git a/djangopypi/templates/djangopypi/pypi_show_links.html b/chishop/templates/djangopypi/pypi_show_links.html
index 6b239d1..6b239d1 100644
--- a/djangopypi/templates/djangopypi/pypi_show_links.html
+++ b/chishop/templates/djangopypi/pypi_show_links.html
diff --git a/djangopypi/templates/djangopypi/show_links.html b/chishop/templates/djangopypi/show_links.html
index 57a1268..57a1268 100644
--- a/djangopypi/templates/djangopypi/show_links.html
+++ b/chishop/templates/djangopypi/show_links.html
diff --git a/djangopypi/templates/djangopypi/show_version.html b/chishop/templates/djangopypi/show_version.html
index d3b393a..d3b393a 100644
--- a/djangopypi/templates/djangopypi/show_version.html
+++ b/chishop/templates/djangopypi/show_version.html
diff --git a/djangopypi/templates/djangopypi/simple.html b/chishop/templates/djangopypi/simple.html
index 6a21d5c..6a21d5c 100644
--- a/djangopypi/templates/djangopypi/simple.html
+++ b/chishop/templates/djangopypi/simple.html
diff --git a/chishop/templates/registration/activate.html b/chishop/templates/registration/activate.html
new file mode 100644
index 0000000..bc67771
--- /dev/null
+++ b/chishop/templates/registration/activate.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Activation Failed</h1>
+<p>
+  Activation with key {{activation_key}} failed.
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/activation_complete.html b/chishop/templates/registration/activation_complete.html
new file mode 100644
index 0000000..c8e8aca
--- /dev/null
+++ b/chishop/templates/registration/activation_complete.html
@@ -0,0 +1,9 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Activation complete.</h1>
+<p>
+  Hello {{user}}, you are registered.
+  Go <a href="/">here</a> to get back to the main page.
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/activation_email.txt b/chishop/templates/registration/activation_email.txt
new file mode 100644
index 0000000..0a25329
--- /dev/null
+++ b/chishop/templates/registration/activation_email.txt
@@ -0,0 +1,6 @@
+Welcome to Chishop.
+
+Please click here to activate your account:
+http://{{site}}/accounts/activate/{{activation_key}}/
+
+Account has to be activated within {{expiration_days}} days.
diff --git a/chishop/templates/registration/activation_email_subject.txt b/chishop/templates/registration/activation_email_subject.txt
new file mode 100644
index 0000000..93618cc
--- /dev/null
+++ b/chishop/templates/registration/activation_email_subject.txt
@@ -0,0 +1 @@
+Account Activation - {{ site }}
diff --git a/chishop/templates/registration/login.html b/chishop/templates/registration/login.html
new file mode 100644
index 0000000..6c7f799
--- /dev/null
+++ b/chishop/templates/registration/login.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<form method="post" action="">
+  {{form.as_p}}
+  <input type="submit" value="Login">
+</form>
+{% endblock %}
diff --git a/chishop/templates/registration/logout.html b/chishop/templates/registration/logout.html
new file mode 100644
index 0000000..06483a8
--- /dev/null
+++ b/chishop/templates/registration/logout.html
@@ -0,0 +1,7 @@
+{% extends "base_site.html" %}
+
+{% block main_content %}
+<p>
+  {%trans "Logged out."%}
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/registration_closed.html b/chishop/templates/registration/registration_closed.html
new file mode 100644
index 0000000..c92e80b
--- /dev/null
+++ b/chishop/templates/registration/registration_closed.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Registration Closed</h1>
+<p>
+  Registration is disabled.
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/registration_complete.html b/chishop/templates/registration/registration_complete.html
new file mode 100644
index 0000000..d9a19cf
--- /dev/null
+++ b/chishop/templates/registration/registration_complete.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Registration complete</h1>
+<p>
+  An activation mail has been sent to you.
+</p>
+{% endblock %}
diff --git a/chishop/templates/registration/registration_form.html b/chishop/templates/registration/registration_form.html
new file mode 100644
index 0000000..719a875
--- /dev/null
+++ b/chishop/templates/registration/registration_form.html
@@ -0,0 +1,8 @@
+{% extends "base_site.html" %}
+
+{% block content %}
+<h1>Register</h1>
+<form method="post" action="">
+  {{form.as_p}}
+<input type="submit" value="Register">
+{% endblock %}
diff --git a/chishop/urls.py b/chishop/urls.py
index b9f3e65..ab2e8a9 100644
--- a/chishop/urls.py
+++ b/chishop/urls.py
@@ -18,6 +18,9 @@ urlpatterns += patterns("",
     url(r'^admin/doc/', include("django.contrib.admindocs.urls")),
     url(r'^admin/(.*)', admin.site.root),
 
+    # Registration
+    url(r'^accounts/', include('registration.backends.default.urls')),
+
+    # The Chishop
     url(r'', include("djangopypi.urls"))
 )
-
diff --git a/djangopypi/views.py b/djangopypi/views.py
index 816a170..597598f 100644
--- a/djangopypi/views.py
+++ b/djangopypi/views.py
@@ -10,15 +10,17 @@ from django.conf import settings
 from django.http import Http404, HttpResponse, HttpResponseBadRequest
 from django.http import QueryDict, HttpResponseForbidden
 from django.shortcuts import render_to_response
-from djangopypi.models import Project, Classifier, Release, UPLOAD_TO
-from djangopypi.forms import ProjectForm, ReleaseForm
 from django.template import RequestContext
 from django.utils.datastructures import MultiValueDict
 from django.utils.translation import ugettext_lazy as _
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.contrib.auth import authenticate, login
-from djangopypi.http import HttpResponseNotImplemented
-from djangopypi.http import HttpResponseUnauthorized
+from registration.backends import get_backend
+from registration.forms import RegistrationForm
+
+from djangopypi.models import Project, Classifier, Release, UPLOAD_TO
+from djangopypi.forms import ProjectForm, ReleaseForm
+from djangopypi.http import HttpResponseNotImplemented, HttpResponseUnauthorized
 from djangopypi.utils import decode_fs
 
 
@@ -108,12 +110,33 @@ def register_or_upload(request, post_data, files):
 
     return submit_project_or_release(user, post_data, files)
 
+def create_user(request, post_data, files):
+    """Create new user from a distutil client request"""
+    form = RegistrationForm({"username": post_data["name"],
+                             "email": post_data["email"],
+                             "password1": post_data["password"],
+                             "password2": post_data["password"]})
+    if not form.is_valid():
+        # Dist Utils requires error msg in HTTP status: "HTTP/1.1 400 msg"
+        # Which is HTTP/WSGI incompatible, so we're just returning a empty 400.
+        return HttpResponseBadRequest()
+
+    backend = get_backend("registration.backends.default.DefaultBackend")
+    if not backend.registration_allowed(request):
+        return HttpResponseBadRequest()
+    new_user = backend.register(request, **form.cleaned_data)
+    return HttpResponse("OK\n", status=200, mimetype='text/plain')
+
+
 ACTIONS = {
     # file_upload is the action used with distutils ``sdist`` command.
     "file_upload": register_or_upload,
 
     # submit is the :action used with distutils ``register`` command.
     "submit": register_or_upload,
+
+    # user is the action used when registering a new user
+    "user": create_user,
 }