Merge branch 'release/1.5'

.coveragerc

@@ -1,6 +1,8 @@
 [run]
 branch = True
 include = sauce/*
-omit = *.mak
+omit =
+	*.mak
+	sauce/tests/*
 [report]
 include = sauce/*

.gitignore

@@ -15,6 +15,7 @@
 devdata.db
 
 # Default data directory
+/data
 data/*
 
 # Packages
@@ -33,3 +34,4 @@ pip-log.txt
 .coveralls.yml
 htmlcov
 coverage.xml
+.idea

.openshift/action_hooks/build

@@ -14,7 +14,7 @@ source "${VIRTENV}/bin/activate"
 
 pushd "${OPENSHIFT_REPO_DIR}"
 python setup.py develop
-easy_install SAUCE[similarity]
+easy_install SAUCE[similarity,lti]
 popd
 
 for dir in libs wsgi; do

.openshift/action_hooks/deploy

@@ -20,3 +20,7 @@ if [[ ! -e "${OPENSHIFT_DATA_DIR}/DB_INITIALIZED" ]]; then
 	touch "${OPENSHIFT_DATA_DIR}/DB_INITIALIZED"
 fi
 
+pushd "${OPENSHIFT_REPO_DIR}"
+echo "Upgrading database"
+./alembic "${OPENSHIFT_REPO_DIR}/production.ini" upgrade head
+popd

.travis.yml

@@ -1,47 +1,70 @@
 language: python
+
 python:
-  - 2.6
-  - 2.7
+- 2.6
+- 2.7
 env:
-  - TG2_VERSION=2.1.5
-  - TG2_VERSION=2.2.0
-  - TG2_VERSION=2.2.1
-  - TG2_VERSION=2.2.2
-  - TG2_VERSION=current
-  - TG2_VERSION=""
+- TG2_VERSION=2.1.5
+- TG2_VERSION=2.2.0
+- TG2_VERSION=2.2.1
+- TG2_VERSION=2.2.2
+- TG2_VERSION=current
+- TG2_VERSION=""
+branches:
+  only:
+  - master
+  - develop
+  - /^feature\/.*$/
+  - travis
 
-before_install:
-  - git submodule update --init --recursive
-  - sudo apt-get update -qq
+cache:
+  apt: true
+  directories:
+  - $HOME/.pip-cache
 
+before_install:
+- git submodule update --init --recursive
+- sudo apt-get update -qq
 install:
-  - sudo apt-get install -qq openjdk-7-jdk gcc g++
-#  - sudo apt-get build-dep -qq python-numpy python-matplotlib
-  - sudo apt-get install -qq gfortran libfreetype6-dev
-  - travis_retry pip install -i http://tg.gy/${TG2_VERSION//./}/ tg.devtools
-  - travis_retry pip install -M -e .[similarity,nosetests]
-  - travis_retry pip install -M python-coveralls
-
+- sudo apt-get install -qq openjdk-7-jdk gcc g++
+- sudo apt-get install -qq gfortran libfreetype6-dev
+- travis_retry pip install --download-cache=$HOME/.pip-cache -M Pygments
+- travis_retry pip install --download-cache=$HOME/.pip-cache -i http://tg.gy/${TG2_VERSION//./}/ tg.devtools
+- travis_retry pip install --download-cache=$HOME/.pip-cache -M -e .[similarity,lti,nosetests]
+- travis_retry pip install --download-cache=$HOME/.pip-cache -M python-coveralls
 before_script:
-# Show all installed package versions for dependency debugging
-  - pip freeze
-
+- pip freeze
 script:
-  - python setup.py nosetests
-
+- python setup.py nosetests
 after_success:
-  - coveralls
-
-branches:
-  only:
-    - master
-    - develop
-    - /^feature\/.*$/
-    - travis
+- coveralls
 
 notifications:
   email:
     recipients:
-      - [email protected]
+    - [email protected]
     on_success: change
     on_failure: always
+
+deploy:
+  - provider: heroku
+    api_key:
+      secure: YKP5iWrB+xiYFHSjg76n7FmE2osK5JK4/mOXoBDH0+iKe8nNttbgP1YrEvwpbdrAy7PFL/ADkOdcp/zaoudB1ODFc1iEml4uraEy74RTKYlcZmaXNfwFty6ctJR+RNqFHvOC4Ez1sF1+Cg/aoNcYliNtFOXGsmax2osubZgurUI=
+    app: sauce-moschlar
+    on:
+      repo: moschlar/SAUCE
+      branch: develop
+      python: 2.7
+      condition: "$TG2_VERSION = current"
+
+  - provider: openshift
+    user: [email protected]
+    password:
+      secure: he9mRCYikWNz799INO7Y42qSjgrO7cjP6sHy8zxAB0cRhHNDwWOIJ/b3NpwUJeJHOJUU8s+z0W1jU2OpsiWDvpbwUFsH1c/EDx3U0cjMX4x0jV/oAfCpCgQ0V0OH6Rmg5MVZtGbbz9NnZpDW8tD8KYl54LeFnLTEndLxM9+Ecls=
+    app: sauce
+    domain: moschlar
+    on:
+      repo: moschlar/SAUCE
+      branch: develop
+      python: 2.7
+      condition: "$TG2_VERSION = current"

CONTRIBUTING.md

@@ -0,0 +1,41 @@
+# How to contribute
+
+**SAUCE** heavily uses the
+[successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/)
+by Vincent Driessen
+([summary figure](http://nvie.com/files/Git-branching-model.pdf)).
+His [git-flow extension](https://github.com/nvie/gitflow) makes it easier to employ this model.
+
+**Please** just submit your *feature* branches for pull requests.
+
+---
+
+The following sections are mostly copied from https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md
+
+---
+
+## Getting Started
+
+* If it's a bug or something worth discussing first, submit a ticket for your issue,
+  assuming one does not already exist. You can skip that for simple new features
+  since discussion can also happen on the pull request.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+  * Make sure you fill in the earliest version that you know has the issue.
+* Fork the repository on GitHub
+
+## Making Changes
+
+* Create a *feature* branch (also called topic branch) from where you want to base your work
+  (see the note on git-flow above).
+  * This is usually the `develop` branch.
+  * If you are certain your fix must be on a *release* branch, you should use a *hotfix* branch.
+  * Please avoid working directly on the `develop` and `master` branches.
+* Make commits of logical units.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are in the proper format.
+* If you can, please add tests for your changes (even broken tests are better than no tests).
+
+## Submitting Changes
+
+* Push your changes to a feature branch in your fork of the repository.
+* Submit a pull request to the repository.

Changelog

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+Version 1.5
+-----------
+
+- **Submission lists**: View and link to a listing of all submissions of a user
+- **Enrolling**: Students can register themselves for an event, including the
+  selection of a lesson and/or team. Can be "secured" by a passphrase.
+- Visibility property of **Submissions: Public/Private**
+- Allow SAUCE to be used as a **LTI Tool Provider**
+- Speedup in sub menu generation
+- Use feature switches for disabling/enabling specific/rarely tested features
+- Changed listing of teammate submissions - now those are only visible on the
+  assignment page and not on the user profile anymore.
+- Direct member assignment to events (no need for stub lessons)
+- ``parallel_sort`` parameter for tests to ensure correct ordering in parallel
+  applications
 
 Version 1.4
 -----------

Dockerfile

@@ -0,0 +1,36 @@
+FROM ubuntu:precise
+
+ENV DEBIAN_FRONTEND noninteractive
+
+#ADD https://help.ubuntu.com/lts/sample/sources.list /etc/apt/sources.list
+RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
+RUN echo "deb http://archive.ubuntu.com/ubuntu precise-updates main universe" >> /etc/apt/sources.list
+RUN echo "deb http://security.ubuntu.com/ubuntu precise-security main universe" >> /etc/apt/sources.list
+RUN apt-get -q update
+
+#RUN apt-get -q -y upgrade
+RUN apt-get -q -y install wget
+RUN apt-get -q -y install --no-install-recommends gcc openjdk-7-jre-headless openjdk-7-jdk
+RUN apt-get -q -y install python-pip python-dev
+#RUN apt-get -q -y install python-numpy python-matplotlib
+
+ENV DEBIAN_FRONTEND dialog
+
+RUN mkdir -p /opt/SAUCE && cd /opt/SAUCE/ && wget -q --no-check-certificate https://github.com/moschlar/SAUCE/archive/master.tar.gz
+RUN tar -xzf /opt/SAUCE/master.tar.gz -C /opt/SAUCE/
+
+RUN pip install -i http://tg.gy/222/ tg.devtools
+RUN pip install -M -e /opt/SAUCE/SAUCE-master
+#RUN pip install -M SAUCE[similarity,nosetests]
+
+RUN cd /opt/SAUCE/SAUCE-master/ && paster setup-app development.ini
+
+RUN sed -e 's/127.0.0.1/0.0.0.0/g' -i /opt/SAUCE/SAUCE-master/development.ini
+
+MAINTAINER moschlar
+
+EXPOSE 8080
+
+ENTRYPOINT cd /opt/SAUCE/SAUCE-master/ && paster serve development.ini
+CMD cd /opt/SAUCE/SAUCE-master/ && paster serve development.ini
+

INSTALL.rst

@@ -1,8 +1,3 @@
-==============================================
- SAUCE - System for AUtomated Code Evaluation
-==============================================
-
-
 Usage
 -----
 
@@ -27,21 +22,31 @@ To set up a local instance of the SAUCE application, you will need:
 - A Python interpreter (2.6 or 2.7)
 - The ``virtualenv`` package for Python
   (e.g. called ``python-virtualenv`` in Ubuntu)
-- The Python packages ``numpy`` and ``matplotlib`` have to be
-  installed system-wide, too.
-  (e.g. called ``python-numpy`` and ``python-matplotlib`` in
-  Ubuntu)
+
+*Optionally*, you can:
+
+- Install the Python packages ``numpy`` and ``matplotlib``
+  from your distribution (e.g. called ``python-numpy`` and
+  ``python-matplotlib`` in  Ubuntu), which will save you some time
+  and hassle if they don't have to be compiled.
+
+  **NOTE:** If you do this, you will have to create your virtualenv
+  below with ``--system-site-packages`` instead of ``--no-site-packages``.
+  If you are not familiar with what this switch does, please ask
+  for help *now* to avoid probems in the future ;).
 
 No further packages have to be installed in the system, everything else
-gets installed inside a virtualenv (a "sandbox" for installing Python
-packages without polluting the system ``site-packages``).
+gets installed inside a `virtualenv <http://www.virtualenv.org>`_
+(a "sandbox" for installing Python packages without polluting the systems
+``site-packages``).
 
 Now create such a virtualenv and source the ``activate`` script to
-enter it (the option ``--system-site-packages`` is important to
-make the ``numpy`` and ``matplotlib`` packages available inside the
-virtualenv)::
+enter it.
+(Remember to use ``--system-site-packages`` if you want to
+make the ``numpy`` and ``matplotlib`` packages installed through your
+distribution available inside the virtualenv)::
 
-    $ virtualenv --system-site-packages tg
+    $ virtualenv --no-site-packages tg
     $ cd tg
     $ . bin/activate
 

README.rst

@@ -14,21 +14,29 @@ You find a copy of that license in the file
 Build Status
 ============
 
-.. |master| image:: https://secure.travis-ci.org/moschlar/SAUCE.png?branch=master
+.. |travis-master| image:: https://secure.travis-ci.org/moschlar/SAUCE.png?branch=master
    :alt: Build Status - master branch
    :target: http://travis-ci.org/moschlar/SAUCE
 
-.. |develop| image:: https://secure.travis-ci.org/moschlar/SAUCE.png?branch=develop
+.. |travis-develop| image:: https://secure.travis-ci.org/moschlar/SAUCE.png?branch=develop
    :alt: Build Status - develop branch
    :target: http://travis-ci.org/moschlar/SAUCE
 
-+----------+-----------+
-| Branch   | Status    |
-+==========+===========+
-| master   | |master|  |
-+----------+-----------+
-| develop  | |develop| |
-+----------+-----------+
+.. |coveralls-master| image:: https://coveralls.io/repos/moschlar/SAUCE/badge.png?branch=master
+   :alt: Test Coverage - master branch
+   :target: https://coveralls.io/r/moschlar/SAUCE?branch=master
+
+.. |coveralls-develop| image:: https://coveralls.io/repos/moschlar/SAUCE/badge.png?branch=develop
+   :alt: Test Coverage - develop branch
+   :target: https://coveralls.io/r/moschlar/SAUCE?branch=develop
+
++--------------+------------------+---------------------+
+| Branch       | Build Status     | Test Coverage       |
++==============+==================+=====================+
+| **master**   | |travis-master|  | |coveralls-master|  |
++--------------+------------------+---------------------+
+| **develop**  | |travis-develop| | |coveralls-develop| |
++--------------+------------------+---------------------+
 
 
 Installation

Roadmap

@@ -2,6 +2,7 @@ Roadmap
 =======
 
 Planned changes, improvements and milestones
+--------------------------------------------
 
 - Allow Submissions consisting of multiple files
 - Submission history handling (like in a SCM repository)

TurboGears-requirements.txt

@@ -1,26 +1,25 @@
 -f http://tg.gy/222/
 Babel==0.9.6
-Beaker==1.6.3
+Beaker==1.6.4
+crank==0.6.4
+decorator==3.4.0
+distribute==0.6.34
 FormEncode==1.2.4
-Mako==0.7.3
-MarkupSafe==0.15
+Mako==0.9.0
+MarkupSafe==0.18
+nose==1.3.0
 Paste==1.7.5.1
 PasteDeploy==1.5.0
 PasteScript==1.7.5
 Pylons==1.0
+repoze.lru==0.6
 Routes==1.13
+simplejson==3.3.1
 Tempita==0.5.1
+tg.devtools==2.2.2
 TurboGears2==2.2.2
 WebError==0.10.3
 WebFlash==0.1a9
 WebHelpers==1.3
 WebOb==1.1.1
 WebTest==1.4.3
-crank==0.6.4
-decorator==3.4.0
-distribute==0.6.24
-nose==1.1.2
-repoze.lru==0.5
-simplejson==3.0.7
-tg.devtools==2.2.2
-wsgiref==0.1.2

bin/post_compile

@@ -5,5 +5,5 @@ set -e
 
 pip install --use-mirrors --exists-action=w psycopg2 gunicorn
 
-pip install --use-mirrors numpy
-pip install --use-mirrors -e .[similarity]
+pip install --use-mirrors matplotlib==1.3.1 hcluster==0.2.0 libripoff==0.2.1
+pip install --use-mirrors -e .[similarity,lti]