From 589e33390fa15f0a732be1a8ea6099c0b2f63204 Mon Sep 17 00:00:00 2001
From: Guido Stevens <guido.stevens@cosent.nl>
Date: Mon, 26 Nov 2012 13:56:23 +0000
Subject: [PATCH] provide a virtualenv-enabled Travis buildout that can be
 debugged on a dev box

---
 .gitignore   |  1 +
 Makefile     | 36 ++++++++++++++++--------------------
 buildout.cfg | 12 +++++++++++-
 travis.cfg   |  9 ---------
 4 files changed, 28 insertions(+), 30 deletions(-)
 delete mode 100644 travis.cfg

diff --git a/.gitignore b/.gitignore
index b781618..6c70778 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ lib/
 parts/
 var/
 dist/
+buildout-cache
diff --git a/Makefile b/Makefile
index 35e0cab..156450e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,22 @@
-# convenience makefile to boostrap & run buildout
-# use `make options=-v` to run buildout with extra options
+default: buildout test
 
-pep8_ignores = E501
-options = -N -q -t 3
+buildout: bin/buildout buildout-cache/downloads
+	bin/buildout -c buildout.cfg -N -t 3
 
-.PHONY: help prerequisites install test
+test:
+	bin/test
+	bin/flake8 plonesocial
 
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo " prerequisites    Install requisites"
-	@echo "       install    Install"
-	@echo "         tests    Run all testes"
+bin/buildout: bin/python
+	bin/easy_install zc.buildout==1.6.3
+	bin/easy_install distribute==0.6.28
 
-prerequisites:
-	sudo apt-get install -qq pep8 pyflakes
-	mkdir -p buildout-cache/downloads
+bin/python:
+	virtualenv --clear --no-site-packages --distribute .
 
-install: prerequisites
-	python bootstrap.py -c travis.cfg
-	bin/buildout -c travis.cfg $(options)
+buildout-cache/downloads:
+	[ -d buildout-cache ] || mkdir -p buildout-cache/downloads
+
+clean:
+	rm -rf bin/* .installed.cfg parts/download
 
-tests:
-	bin/test
-	pyflakes plonesocial/
-	pep8 --ignore=$(pep8_ignores) plonesocial/
diff --git a/buildout.cfg b/buildout.cfg
index 12413ac..bca2500 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,9 +1,19 @@
 [buildout]
 extends =
-    http://svn.plone.org/svn/collective/buildout/plonetest/test-4.x.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
 
 package-name = plonesocial.microblog
 package-extras = [test]
 
+parts +=
+      flake8
+
 [versions]
 zc.buildout = 1.6.3
+
+[flake8]
+recipe = zc.recipe.egg
+eggs = flake8
+       ${instance:eggs}
+entry-points =
+    flake8=flake8.run:main
\ No newline at end of file
diff --git a/travis.cfg b/travis.cfg
deleted file mode 100644
index f6a2a81..0000000
--- a/travis.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-[buildout]
-extends =
-    https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
-
-package-name = plonesocial.microblog
-package-extras = [test]
-
-[versions]
-zc.buildout = 1.6.3