From 12966dc9f77e19a7260382c95bc4e089f7976309 Mon Sep 17 00:00:00 2001
From: Chavez <matthew@el-chavez.me>
Date: Thu, 4 Dec 2014 21:24:05 -0800
Subject: [PATCH 1/3] Vagrant updates

* Add go tools to provision script
* Sync project folder
* Fix ruby styling issues
* Add --cover flag to test commands
---
 Makefile    |  4 ++--
 Vagrantfile | 28 ++++++++++++++++------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index ddf0c548a..3eb003341 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,10 @@ deps:
 
 test: deps
 	./scripts/verify_no_uuid.sh
-	go list ./... | xargs -n1 go test
+	go list ./... | xargs -n1 go test --cover
 
 integ:
-	go list ./... | INTEG_TESTS=yes xargs -n1 go test
+	go list ./... | INTEG_TESTS=yes xargs -n1 go test -test --cover
 
 format: deps
 	@echo "--> Running go fmt"
diff --git a/Vagrantfile b/Vagrantfile
index 2cb6c7f0d..101ce30d8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,9 +2,9 @@
 # vi: set ft=ruby :
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
+VAGRANTFILE_API_VERSION = '2'
 
-$script = <<SCRIPT
+@script = <<SCRIPT
 SRCROOT="/opt/go"
 
 # Install Go
@@ -29,23 +29,27 @@ sudo chown -R vagrant:vagrant /opt/gopath
 
 # Install git
 sudo apt-get install -y git-core
+
+# Install go tools
+go get code.google.com/p/go.tools/cmd/cover
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.provision "shell", inline: $script
+  config.vm.provision 'shell', inline: @script
+  config.vm.synced_folder '.', '/opt/gopath/src/github.com/hashicorp/consul'
 
-  ["vmware_fusion", "vmware_workstation"].each do |p|
-    config.vm.provider "p" do |v|
-      v.vmx["memsize"] = "2048"
-      v.vmx["numvcpus"] = "2"
-      v.vmx["cpuid.coresPerSocket"] = "1"
+  %w[vmware_fusion vmware_workstation].each do |_|
+    config.vm.provider 'p' do |v|
+      v.vmx['memsize'] = '2048'
+      v.vmx['numvcpus'] = '2'
+      v.vmx['cpuid.coresPerSocket'] = '1'
     end
   end
 
-  config.vm.define "64bit" do |n1|
-      n1.vm.box = "chef/ubuntu-10.04"
+  config.vm.define '64bit' do |n1|
+    n1.vm.box = 'chef/ubuntu-10.04'
   end
-  config.vm.define "32bit" do |n2|
-      n2.vm.box = "chef/ubuntu-10.04-i386"
+  config.vm.define '32bit' do |n2|
+    n2.vm.box = 'chef/ubuntu-10.04-i386'
   end
 end

From 904b14dc93b7e3541dabf315862759607ab7d8be Mon Sep 17 00:00:00 2001
From: Chavez <matthew@el-chavez.me>
Date: Thu, 4 Dec 2014 23:11:47 -0800
Subject: [PATCH 2/3] Fix typo

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3eb003341..da0b7c65c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ test: deps
 	go list ./... | xargs -n1 go test --cover
 
 integ:
-	go list ./... | INTEG_TESTS=yes xargs -n1 go test -test --cover
+	go list ./... | INTEG_TESTS=yes xargs -n1 go test --cover
 
 format: deps
 	@echo "--> Running go fmt"

From 72904e39bd0df1207d966b552349594816ad719c Mon Sep 17 00:00:00 2001
From: Chavez <matthew@el-chavez.me>
Date: Fri, 5 Dec 2014 18:47:23 -0800
Subject: [PATCH 3/3] Separate cover target for tests

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index da0b7c65c..4146605dc 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,14 @@ deps:
 
 test: deps
 	./scripts/verify_no_uuid.sh
-	go list ./... | xargs -n1 go test --cover
+	go list ./... | xargs -n1 go test
 
 integ:
-	go list ./... | INTEG_TESTS=yes xargs -n1 go test --cover
+	go list ./... | INTEG_TESTS=yes xargs -n1 go test
+
+cover: deps
+	./scripts/verify_no_uuid.sh
+	go list ./... | xargs -n1 go test --cover
 
 format: deps
 	@echo "--> Running go fmt"