Merge pull request #14 from taqtiqa-mark/joss-review

Add install and test scripts to dev/test environment.

.gitignore

@@ -103,4 +103,7 @@ ENV/
 .mypy_cache/
 
 # vagrant
-.vagrant/
+.vagrant/
+
+# VS Code
+.vscode/

dev/bionic/Vagrantfile

@@ -1,13 +1,13 @@
-# -*- mode: ruby -*- 
-# vi: set ft=ruby : 
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
 #
 # INSTRUCTIONS
 # Assumptions:
 #   - A working installation, and knowledge, of Vagrant
 #   - A DigitalOcean account: https://m.do.co/c/9a152ce8c79e
 #   - Vagrant plugins installed:
 #     - vagrant-digitalocean
-#     - vagrant-omnibus 
+#     - vagrant-omnibus
 #   - Shell environment variables:
 #     - DIGITALOCEAN_TOKEN
 #     - DIGITALOCEAN_SSH_KEY_NAME
@@ -20,23 +20,41 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # config.ohai.plugins_dir = "/var/ohai/custom_plugins"
   # config.ohai.plugin_path = ["/etc/chef/ohai_plugins"]
 
-  config.vm.provider :digital_ocean do |provider, override| 
-    provider.token  = ENV['DIGITAL_OCEAN_TOKEN']
+  config.vm.define "pymarket1804"
+
+  config.vm.provider :digital_ocean do |provider, override|
+
+    provider.name = "pymarket1804"
 
     provider.image  = 'ubuntu-18-04-x64' # vagrant digitalocean-list images $DIGITALOCEAN_TOKEN
     provider.region = 'nyc3'             # vagrant digitalocean-list regions $DIGITALOCEAN_TOKEN
     provider.size   = 's-2vcpu-4gb'      # vagrant digitalocean-list sizes $DIGITALOCEAN_TOKEN
 
-    provider.ssh_key_name = ENV['DIGITAL_OCEAN_SSH_KEY_NAME'] 
-
-    override.ssh.private_key_path = '~/.ssh/id_rsa' 
+    provider.token        = ENV['DIGITAL_OCEAN_TOKEN']
+    provider.ssh_key_name = ENV['DIGITAL_OCEAN_SSH_KEY_NAME']
+
+    override.ssh.private_key_path = '~/.ssh/id_rsa'
     override.vm.box               = 'digital_ocean'
     override.vm.box_url           = 'https://github.com/devopsgroup-io/vagrant-digitalocean/raw/master/box/digital_ocean.box'
 
-    provider.ca_path = "/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt" 
+    provider.ca_path = "/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt"
+  end
+
+    config.vm.provider :virtualbox do |vbox, override| 
+    # override box url
+    override.vm.box = "hashicorp/bionic64"
+  end
+
+  config.vm.provision "disable-apt-periodic-updates", type: "shell" do |s|
+    s.privileged = true
+    s.inline = "echo 'APT::Periodic::Enable \"0\";' > /etc/apt/apt.conf.d/02periodic"
+  end
+  config.vm.provision "fix-no-tty", type: "shell" do |s|
+    s.privileged = true
+    s.inline = "sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n \\|\\| true/' /root/.profile"
   end
 
   config.vm.provision 'shell', path: 'setup.sh'
-  config.vm.provision 'shell', inline: 'pip3 install pymarket'
+  config.vm.provision 'shell', path: 'install_test.sh'
 
 end

dev/bionic/install_test.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# install, upgrade etc.
+pip3 install --user --upgrade pip
+pip3 install --user pymarket
+
+# Now to run the tests
+git clone git://github.com/gus0k/pymarket
+pushd pymarket
+pip3 install --user -r requirements_dev.txt
+make test
+popd

dev/bionic/setup.sh

@@ -2,12 +2,14 @@
 
 # Generic requirements for funtional curl, etc.
 echo "Provisioning virtual machine..."
+apt update
 apt install --yes apt-transport-https
 apt install --yes ca-certificates
 apt install --yes software-properties-common
 apt install --yes curl
-
+apt autoremove --yes
 # pymarket repository specifics
 echo "Installing pymarket and requirements..."
 
 apt install --yes python3-pip=9.0.1-2.3~ubuntu1.18.04.1
+apt autoremove --yes

dev/xenial/Vagrantfile

@@ -20,23 +20,40 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # config.ohai.plugins_dir = "/var/ohai/custom_plugins"
   # config.ohai.plugin_path = ["/etc/chef/ohai_plugins"]
 
-  config.vm.provider :digital_ocean do |provider, override| 
-    provider.token  = ENV['DIGITAL_OCEAN_TOKEN']
+  config.vm.define "pymarket1604"
+
+  config.vm.provider :digital_ocean do |provider, override|
+
+    provider.name = "pymarket1604"
 
     provider.image  = 'ubuntu-16-04-x64' # vagrant digitalocean-list images $DIGITALOCEAN_TOKEN
     provider.region = 'nyc3'             # vagrant digitalocean-list regions $DIGITALOCEAN_TOKEN
     provider.size   = 's-2vcpu-4gb'      # vagrant digitalocean-list sizes $DIGITALOCEAN_TOKEN
 
+    provider.token       = ENV['DIGITAL_OCEAN_TOKEN']
     provider.ssh_key_name = ENV['DIGITAL_OCEAN_SSH_KEY_NAME'] 
-  
-    override.ssh.private_key_path = '~/.ssh/id_rsa' 
+
+    override.ssh.private_key_path = '~/.ssh/id_rsa'
     override.vm.box               = 'digital_ocean'
     override.vm.box_url           = 'https://github.com/devopsgroup-io/vagrant-digitalocean/raw/master/box/digital_ocean.box'
 
     provider.ca_path = "/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt" 
   end
 
+  config.vm.provider :virtualbox do |vbox, override| 
+    # override box url
+    override.vm.box = "v0rtex/xenial64"
+  end
+
+  config.vm.provision "disable-apt-periodic-updates", type: "shell" do |s|
+    s.privileged = true
+    s.inline = "echo 'APT::Periodic::Enable \"0\";' > /etc/apt/apt.conf.d/02periodic"
+  end
+  config.vm.provision "fix-no-tty", type: "shell" do |s|
+    s.privileged = true
+    s.inline = "sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n \\|\\| true/' /root/.profile"
+  end
   config.vm.provision 'shell', path: 'setup.sh'
-  config.vm.provision 'shell', inline: 'pip3 install pymarket'
+  config.vm.provision 'shell', path: 'install_test.sh'
 
 end

dev/xenial/install_test.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# install test etc.
+pip3 install --user --upgrade pip
+pip3 install --user pymarket
+
+# Now to run the tests
+git clone git://github.com/gus0k/pymarket
+pushd pymarket
+pip3 install --user -r requirements_dev.txt
+make test
+popd

dev/xenial/setup.sh

@@ -1,7 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Generic requirements for funtional curl, etc.
 echo "Provisioning virtual machine..."
+apt update
 apt install --yes apt-transport-https
 apt install --yes ca-certificates
 apt install --yes software-properties-common