Merge branch 'fix-scripts'

README.md

@@ -0,0 +1,41 @@
+GoLang implementation of a simple EventStore
+
+# Getting started
+
+## Pre-requisites
+
+- Install [GoLang](https://golang.org/doc/install) version 1.6+
+- Install [libsodium](https://download.libsodium.org/libsodium/releases/)\* version 1.0.10+ (Linux only^)
+- Install [zeromq](http://zeromq.org/intro:get-the-software)\* version 4.0+ (Linux only^)
+- Install [msys2](https://msys2.github.io/) (Windows only)
+
+\* On Linux libsodium and zeromq are installed from source (`./configure && make && sudo make install && sudo ldconfig`)  
+^ On Window libzmq and libsodium are installed using pacman in MSYS2 shell (`pacman -S mingw-w64-x86_64-zeromq`)
+
+You can look at [scripts/bootstrap.sh](https://github.com/adymitruk/goes/blob/master/scripts/bootstrap.sh) to get an idea on how to install all the pre-requisites.
+
+## Build
+
+### Fetching GO packages
+
+In your GOPATH folder, execute the following commands:
+
+  `go get github.com/adymitruk/goes`  
+  `go get github.com/pebbe/zmq4`  
+  `go get github.com/satori/go.uuid`  
+  
+### Compiling the binary
+
+In your GOPATH folder, execute the following command:
+
+  `go build -o bin/goes src/github.com/adymitruk/goes/simpleserver/simpleserver.go`
+  
+\* Use `-o bin/goes.exe` on Windows
+
+## Running the server
+
+In your GOPATH folder, execute the following command:
+
+  `./bin/goes --db=./events --addr=tcp://127.0.0.1:12345`
+
+Both flags are optional and their default values are the same as the example.

Vagrantfile

@@ -0,0 +1,73 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "ubuntu/trusty64"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  config.vm.provision "shell", inline: <<-SHELL
+     apt-get update
+     cd /vagrant
+     . ./scripts/bootstrap.sh 
+     . ./scripts/install.sh
+  SHELL
+end

scripts/bootstrap.sh

@@ -1,39 +1,37 @@
 #!/usr/bin/env bash
 # Server installation
-sudo -i
+pushd .
-cd ~
 
-apt-get install git buildessential
+sudo apt-get install -y git build-essential pkg-config
 
 # Install Golang
-pushd .
-wget -q https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
-
 cd /usr/local
-tar -xvf ~/go1.6.linux-amd64.tar.gz
+echo 'Downloading and installing Go 1.6 ...'
+curl -s https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz | tar xz
 export GOROOT=/usr/local/go
 echo 'export GOROOT=/usr/local/go' > /etc/profile.d/go.sh
+export GOPATH=~/go
+echo 'export GOPATH=~/go' >> /etc/profile.d/go.sh
 export PATH=$PATH:/usr/local/go/bin
 echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile.d/go.sh
-popd
 
 # Install zeromq
-pushd .
+cd ~
-wget -q http://download.zeromq.org/zeromq-4.1.4.tar.gz
+echo 'Downloading libsodium-1.0.10 ...'
+curl -s https://download.libsodium.org/libsodium/releases/libsodium-1.0.10.tar.gz | tar xz
+cd libsodium-1.0.10
+./configure
+make && make check && sudo make install
 
-tar -xvf zeromq-4.1.4.tar.gz
+sudo ldconfig
+
+cd ~
+echo 'Downloading zeromq-4.1.4 ...'
+curl -s http://download.zeromq.org/zeromq-4.1.4.tar.gz | tar xz
 cd zeromq-4.1.4
 ./configure
-make && make check && make install
+make && make check && sudo make install
-popd
+
+sudo ldconfig
 
-# Install Goes
-pushd .
-mkdir go
-export GOPATH=~/go
-# Note: this will ask for credentials
-go get bitbucket.org/nicdex/adaptech-goes
-cd $GOPATH/src/bitbucket.org/nicdex/adaptech-goes
-chmod +x ./scripts/*
-./scripts/install.sh
 popd

scripts/install.sh

@@ -2,10 +2,13 @@
 # Install Goes
 go get github.com/satori/go.uuid
 go get github.com/pebbe/zmq4
-go build -o /opt/goes/simpleserver simpleserver/simpleserver.go
+go build -o bin/simpleserver simpleserver/simpleserver.go
-cp -R scripts /opt/goes
+
+sudo mkdir /opt/goes
+sudo cp -R bin /opt/goes
+sudo cp -R scripts /opt/goes
 
 # Reminders
 echo Goes reminders:
 echo - Set the system TimeZone for expected day projection
-echo '- Configure start script (/opt/goes/scripts/start.sh)'
+echo '- Configure start script (/opt/goes/scripts/start.sh)'

scripts/start.sh

@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
-cd /opt/goes
+/opt/goes/bin/simpleserver --db /var/events &>/var/log/goes.log &
-./simpleserver --db /var/events &>/var/log/goes.log &

simpleserver/simpleserver.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/pebbe/zmq4"
 	"github.com/satori/go.uuid"
-	"github.com/adymitruk/goes"
+	goes ".."
 	"bytes"
 	"errors"
 	"flag"