From 12346b368afc146c0aaa2a3d652906c6b5dea1d6 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Mon, 23 Mar 2015 08:55:10 +0000
Subject: [PATCH] Bootstrap scripts (fixes: #302)

---
 .travis.yml         |  7 ++-----
 Vagrantfile         |  4 +---
 bootstrap/README    |  2 ++
 bootstrap/mac.sh    |  2 ++
 bootstrap/ubuntu.sh | 10 ++++++++++
 docs/using.rst      |  7 ++-----
 6 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 bootstrap/README
 create mode 100755 bootstrap/mac.sh
 create mode 100755 bootstrap/ubuntu.sh

diff --git a/.travis.yml b/.travis.yml
index 526b3d33a..7f800d7c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,7 @@
 language: python
 
-# please keep this in sync with docs/using.rst (Ubuntu section, apt-get)
-before_install: >
-  travis_retry sudo apt-get install python python-setuptools
-  python-virtualenv python-dev gcc swig dialog libaugeas0 libssl-dev
-  libffi-dev ca-certificates
+# http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
+before_install: travis_retry ./bootstrap/ubuntu.sh
 
 install: "travis_retry pip install tox coveralls"
 script: "travis_retry tox"
diff --git a/Vagrantfile b/Vagrantfile
index a9e5494ac..7fb5113f8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -6,10 +6,8 @@ VAGRANTFILE_API_VERSION = "2"
 
 # Setup instructions from docs/using.rst
 $ubuntu_setup_script = <<SETUP_SCRIPT
-sudo apt-get update
-sudo apt-get install -y python python-setuptools python-virtualenv python-dev gcc swig dialog libaugeas0 libssl-dev libffi-dev ca-certificates
-
 cd /vagrant
+./bootstrap/ubuntu.sh
 if [ ! -d "venv" ]; then
   virtualenv --no-site-packages -p python2 venv
   ./venv/bin/python setup.py dev
diff --git a/bootstrap/README b/bootstrap/README
new file mode 100644
index 000000000..847129c03
--- /dev/null
+++ b/bootstrap/README
@@ -0,0 +1,2 @@
+This directory contains scripts that install necessary OS-specific
+prerequisite dependencies (see docs/using.rst).
\ No newline at end of file
diff --git a/bootstrap/mac.sh b/bootstrap/mac.sh
new file mode 100755
index 000000000..a24590131
--- /dev/null
+++ b/bootstrap/mac.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo brew install augeas swig
diff --git a/bootstrap/ubuntu.sh b/bootstrap/ubuntu.sh
new file mode 100755
index 000000000..f3e8088d9
--- /dev/null
+++ b/bootstrap/ubuntu.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Tested with:
+#   - 12.04 (Travis)
+#   - 14.04 (Vagrant)
+
+sudo apt-get update
+sudo apt-get install -y --no-install-recommends \
+     python python-setuptools python-virtualenv python-dev gcc swig \
+     dialog libaugeas0 libssl-dev libffi-dev ca-certificates
diff --git a/docs/using.rst b/docs/using.rst
index 362b75d81..516dc044d 100644
--- a/docs/using.rst
+++ b/docs/using.rst
@@ -23,18 +23,15 @@ Ubuntu
 
 .. code-block:: shell
 
-   sudo apt-get install python python-setuptools python-virtualenv python-dev \
-                        gcc swig dialog libaugeas0 libssl-dev libffi-dev \
-                        ca-certificates
+   ./bootstrap/ubuntu.sh
 
-.. Please keep the above command in sync with .travis.yml (before_install)
 
 Mac OSX
 -------
 
 .. code-block:: shell
 
-   sudo brew install augeas swig
+   ./bootstrap/mac.sh
 
 
 Installation