Add Vagrant machine

* Remove accidentally commmitted module code
* Adjust gitignore files
* Add MakeFile target for pulling down puppet modules
* Add settings file for MySQL/Postgres

Author: codeinthehole

.gitignore

@@ -17,12 +17,6 @@ oscar/share
 .~lock.*
 dist/
 *.DS_Store
-sites/sandbox/*.sqlite
-sites/sandbox/public/
-sites/sandbox/whoosh_index/
-sites/demo/*.sqlite
-sites/demo/public/
-sites/demo/whoosh_index/
 .idea
 TODO
 .coverage
@@ -34,3 +28,10 @@ coverage.xml
 violations.txt
 nosetests.xml
 settings_local.py
+.vagrant
+sites/sandbox/*.sqlite
+sites/sandbox/public/
+sites/sandbox/whoosh_index/
+sites/demo/*.sqlite
+sites/demo/public/
+sites/demo/whoosh_index/

.vagrant

@@ -38,4 +38,10 @@ i18n:
 		../sites/sandbox/manage.py makemessages --ignore=sandbox/ --locale=ru; \
 		../sites/sandbox/manage.py makemessages --ignore=sandbox/ --locale=es; \
 		../sites/sandbox/manage.py makemessages --ignore=sandbox/ --locale=it; \
-		../sites/sandbox/manage.py makemessages --ignore=sandbox/ --locale=da
+		../sites/sandbox/manage.py makemessages --ignore=sandbox/ --locale=da
+
+puppet:
+	# Install puppet modules required to set-up a Vagrant box
+	puppet module install --target-dir sites/puppet/modules/ saz-memcached -v 2.0.2
+	git clone git://github.com/uggedal/puppet-module-python.git sites/puppet/modules/python
+	git clone git://github.com/codeinthehole/puppet-userconfig.git sites/puppet/modules/userconfig

Makefile

@@ -0,0 +1,21 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Before bringing up your Vagrant machine, run:
+#
+#     make puppet
+#
+# to fetch the puppet modules required to build the VM.
+
+Vagrant::Config.run do |config|
+    config.vm.box = "precise64"
+    config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+	config.vm.forward_port 8000, 8080
+	#config.vm.boot_mode = :gui
+    config.vm.provision :puppet do |puppet|
+        puppet.manifests_path = "sites/puppet/manifests"
+        puppet.manifest_file = "site.pp"
+        puppet.module_path = "sites/puppet/modules"
+		#puppet.options = "--debug"
+    end
+end

Vagrantfile

@@ -8,17 +8,19 @@
 """
 
 from setuptools import setup, find_packages
+import os
 
 from oscar import get_version
 
+PROJECT_DIR = os.path.dirname(__file__)
 
 setup(name='django-oscar',
       version=get_version().replace(' ', '-'),
       url='https://github.com/tangentlabs/django-oscar',
       author="David Winterbottom",
       author_email="[email protected]",
       description="A domain-driven e-commerce framework for Django 1.3+",
-      long_description=open('README.rst').read(),
+      long_description=open(os.path.join(PROJECT_DIR, 'README.rst')).read(),
       keywords="E-commerce, Django, domain-driven",
       license='BSD',
       platforms=['linux'],

setup.py

@@ -10,14 +10,17 @@
 	class {"memcached": max_memory => 64 }
 
 	# Python
+	# - set-up a virtualenv
+	# - install testing requirements
+	# - install oscar in 'develop' mode
 	$virtualenv = "/var/www/virtualenv"
 	include python::dev
 	include python::venv
 	python::venv::isolate { $virtualenv:
 	    requirements => "/vagrant/requirements.txt"
 	}
     exec {"install-oscar":
-	    command => "$virtualenv/bin/python /vagrant/setup.py develop",
+	    command => "cd /vagrant && $virtualenv/bin/python setup.py develop",
 		require => Python::Venv::Isolate[$virtualenv]
 	}
 }