From f8efb2d7ea33c2a4fe9eb5d04e79a781b77d8962 Mon Sep 17 00:00:00 2001
From: Ama Asare <aasare@thoughtworks.com>
Date: Tue, 3 May 2016 16:15:29 -0500
Subject: [PATCH] Ama/Chris #7121 Added script to run or test redash vagrant
 server in one command.

---
 Vagrantfile             |  7 +++++++
 circle.yml              |  4 +---
 docs/dev/vagrant.rst    | 28 +++++-----------------------
 install_requirements.sh |  5 +++++
 run_redash_locally.sh   |  7 +++++++
 run_tests.sh            |  7 +++++++
 vagrant_provision.sh    | 13 +++++++++++++
 7 files changed, 45 insertions(+), 26 deletions(-)
 create mode 100755 install_requirements.sh
 create mode 100755 run_redash_locally.sh
 create mode 100644 run_tests.sh
 create mode 100755 vagrant_provision.sh

diff --git a/Vagrantfile b/Vagrantfile
index 7af657f2ac0..c24a14a229f 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,4 +8,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "redash/dev"
   config.vm.synced_folder "./", "/opt/redash/current"
   config.vm.network "forwarded_port", guest: 5000, host: 9001
+  config.vm.provision "shell" do |s|
+    s.inline = "/opt/redash/current/install_requirements.sh"
+  end
+  config.vm.provision "shell" do |s|
+    s.inline = "/opt/redash/current/vagrant_provision.sh"
+    s.privileged = false
+  end
 end
diff --git a/circle.yml b/circle.yml
index e93e92d05ce..5ab71e1e7c1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,9 +9,7 @@ machine:
       2.7.3
 dependencies:
   pre:
-    - pip install -r requirements_dev.txt
-    - pip install -r requirements.txt
-    - pip install pymongo==3.2.1
+    - ./install_requirements.sh
     - if [ "$CIRCLE_BRANCH" = "master" ]; then make deps; fi
   cache_directories:
     - rd_ui/node_modules/
diff --git a/docs/dev/vagrant.rst b/docs/dev/vagrant.rst
index 40fa8e2e188..2b2114c05fd 100644
--- a/docs/dev/vagrant.rst
+++ b/docs/dev/vagrant.rst
@@ -14,28 +14,10 @@ To get started with this box:
     `Vagrant <https://www.vagrantup.com/>`__ installed.
 2.  Clone the Re:dash repository:
     ``git clone https://github.com/getredash/redash.git``.
-3.  Change dir into the repository (``cd redash``) and run run
-    ``vagrant up``. This might take some time the first time you run it,
+3.  Change dir into the repository (``cd redash``)
+4a. To execute tests, run ``./run_tests.sh``
+4b. To run the app, run ``./run_redash_locally.sh``.
+    This might take some time the first time you run it,
     as it downloads the Vagrant virtual box.
-4.  Once Vagrant is ready, ssh into the instance (``vagrant ssh``), and
-    change dir to ``/opt/redash/current`` -- this is where your local
-    repository copy synced to.
-5.  Copy ``.env`` file into this directory (``cp ../.env ./``).
-6.  From ``/opt/redash/current/rd_ui`` run ``bower install`` to install
-    frontend packages. This can be done from your host machine as well,
-    if you have bower installed.
-7.  Go back to ``/opt/redash/current`` and install python dependencies
-    ``sudo pip install -r requirements.txt``
-8.  Update database schema to the latest version:
-
-    ::
-
-        bin/run ./manage.py database drop_tables
-        bin/run ./manage.py database create_tables
-        bin/run ./manage.py users create --admin --password admin "Admin" "admin"
-9.  Purging the Redis cache
-    ``redis-cli -n 1 FLUSHALL``
-10. Start the server and background workers with
-    ``bin/run honcho start -f Procfile.dev``.
-11. Now the server should be available on your host on port 9001 and you
+    Now the server should be available on your host on port 9001 and you
     can login with username admin and password admin.
diff --git a/install_requirements.sh b/install_requirements.sh
new file mode 100755
index 00000000000..7bd79c01699
--- /dev/null
+++ b/install_requirements.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+pip install -r /opt/redash/current/requirements_dev.txt
+pip install -r /opt/redash/current/requirements.txt
+pip install pymongo==3.2.1
\ No newline at end of file
diff --git a/run_redash_locally.sh b/run_redash_locally.sh
new file mode 100755
index 00000000000..2fe0f1aaa0e
--- /dev/null
+++ b/run_redash_locally.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+#Provision VM
+vagrant up
+
+#start server and background workers
+vagrant ssh -c "cd /opt/redash/current; bin/run honcho start -f Procfile.dev" &
\ No newline at end of file
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100644
index 00000000000..40e8e078662
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+#Provision VM
+vagrant up
+
+#Run tests
+vagrant ssh -c "cd /opt/redash/current; nosetests --with-coverage --cover-package=redash tests/"
\ No newline at end of file
diff --git a/vagrant_provision.sh b/vagrant_provision.sh
new file mode 100755
index 00000000000..aa06b86668d
--- /dev/null
+++ b/vagrant_provision.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+cd /opt/redash/current
+cp /opt/redash/.env /opt/redash/current
+cd /opt/redash/current/rd_ui
+bower install
+cd /opt/redash/current
+
+#update database
+bin/run ./manage.py database drop_tables
+bin/run ./manage.py database create_tables
+bin/run ./manage.py users create --admin --password admin "Admin" "admin"
+