Merge pull request #452 from dritter/improve_travis_and_vms

Improve travis and VMs

8 files changed, 77 insertions, 4 deletions

diff --git a/.travis.yml b/.travis.yml
index 3e2439d3..134f31f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,9 @@ before_script:
 
 install:
   - "sudo apt-get update -qq"
-  - "sudo apt-get install zsh"
+  - "sudo apt-get install -y zsh"
   - "sudo chsh -s $(which zsh)"
+  - "sudo apt-get install -y git mercurial subversion jq node golang ruby python python-virtualenv"
 
 script:
   - test/powerlevel9k.spec
diff --git a/test-bsd-vm/bootstrap.sh b/test-bsd-vm/bootstrap.sh
index f78b3078..ba27ffb3 100644
--- a/test-bsd-vm/bootstrap.sh
+++ b/test-bsd-vm/bootstrap.sh
@@ -3,6 +3,11 @@
 # Install ZSH
 sudo pkg install -y zsh
 sudo chsh -s `which zsh` vagrant
+sudo ln -s /usr/local/bin/zsh /usr/bin/zsh
 
 # Install git
-sudo pkg install -y git
\ No newline at end of file
+sudo pkg install -y git
+# Install mercurial
+sudo pkg install -y mercurial
+# Install subversion
+sudo pkg install -y subversion
\ No newline at end of file
diff --git a/test-vm-providers/plain.sh b/test-vm-providers/plain.sh
index a87220f8..b827a0c4 100644
--- a/test-vm-providers/plain.sh
+++ b/test-vm-providers/plain.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/zsh
 
-echo 'LANG=en_US.UTF-8' !> ~/.zshrc
-echo 'source /vagrant_data/powerlevel9k.zsh-theme' >> ~/.zshrc
\ No newline at end of file
+echo 'LANG=en_US.UTF-8' >! ~/.zshrc
+echo 'source /vagrant_data/powerlevel9k.zsh-theme' >> ~/.zshrc
+
+echo 'echo "Have a look at the ~/p9k folder for prepared test setups."' >> ~/.zshrc
+
+# setup environment
+/vagrant_data/test-vm-providers/setup-environment.sh
\ No newline at end of file
diff --git a/test-vm-providers/setup-environment.sh b/test-vm-providers/setup-environment.sh
new file mode 100755
index 00000000..0e8beb6d
--- /dev/null
+++ b/test-vm-providers/setup-environment.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/zsh
+
+OLDPWD="$(pwd)"
+cd $HOME
+
+TESTFOLDER="${HOME}/p9k"
+mkdir -p $TESTFOLDER
+cd $TESTFOLDER
+
+# Make a deep test folder
+mkdir -p deep-folder/1/12/123/1234/12345/123456/1234567/123455678/123456789
+
+# Make a git repo
+mkdir git-repo
+cd git-repo
+git config --global user.email "test@powerlevel9k.theme"
+git config --global user.name  "Testing Tester"
+git init
+echo "TEST" >> testfile
+git add testfile
+git commit -m "Initial commit"
+cd $TESTFOLDER
+
+# Make a Mercurial repo
+mkdir hg-repo
+cd hg-repo
+export HGUSER="Test bot <bot@example.com>"
+hg init
+echo "TEST" >> testfile
+hg add testfile
+hg ci -m "Initial commit"
+cd $TESTFOLDER
+
+# Setup a SVN folder
+svnadmin create ~/.svn-repo
+mkdir svn-repo
+svn checkout "file://${HOME}/.svn-repo" "svn-repo"
+cd svn-repo
+echo "TEST" >> testfile
+svn add testfile
+svn commit -m "Initial commit"
+cd $TESTFOLDER
+
+cd $OLDPWD
\ No newline at end of file
diff --git a/test-vm/antigen.sh b/test-vm/antigen.sh
index 0f44c6ca..2c563322 100644
--- a/test-vm/antigen.sh
+++ b/test-vm/antigen.sh
@@ -24,4 +24,7 @@ antigen apply
         mkdir ~/antigen
         curl -qL https://raw.githubusercontent.com/zsh-users/antigen/master/antigen.zsh > ~/antigen/antigen.zsh
         source ~/antigen/antigen.zsh
+
+        # setup environment
+        /vagrant_data/test-vm-providers/setup-environment.sh
 )
diff --git a/test-vm/bootstrap.sh b/test-vm/bootstrap.sh
index 9651c4eb..f680d4b8 100644
--- a/test-vm/bootstrap.sh
+++ b/test-vm/bootstrap.sh
@@ -7,3 +7,13 @@ sudo apt-get install -y git
 
 sudo apt-get install -y zsh
 sudo chsh -s $(which zsh) vagrant
+
+# Install mercurial
+sudo apt-get install -y mercurial
+# Install Subversion
+sudo apt-get install -y subversion
+# install golang
+echo 'golang-go golang-go/dashboard boolean false' | sudo debconf-set-selections
+sudo apt-get install -y golang
+# Install dependencies for tests
+sudo apt-get install -y jq node ruby python python-virtualenv
\ No newline at end of file
diff --git a/test-vm/omz.sh b/test-vm/omz.sh
index 953f5c8f..73b659f3 100644
--- a/test-vm/omz.sh
+++ b/test-vm/omz.sh
@@ -28,4 +28,6 @@ plugins=(git rake ruby)
 source $ZSH/oh-my-zsh.sh
 ' > $HOME/.zshrc
 
+        # setup environment
+        /vagrant_data/test-vm-providers/setup-environment.sh
 )
diff --git a/test-vm/prezto.sh b/test-vm/prezto.sh
index af4e7454..3ac38503 100644
--- a/test-vm/prezto.sh
+++ b/test-vm/prezto.sh
@@ -23,4 +23,7 @@ chmod 440 /etc/sudoers.d/$NEW_USER
 
         ln -s /vagrant_data/powerlevel9k.zsh-theme ~/.zprezto/modules/prompt/functions/prompt_powerlevel9k_setup
         sed -i "s/theme\ 'sorin'/theme\ 'powerlevel9k'/g" ~/.zpreztorc
+
+        # setup environment
+        /vagrant_data/test-vm-providers/setup-environment.sh
 )