Merge branch 'release/0.4.0'

.travis.yml

@@ -8,13 +8,20 @@ install:
   - godep get
   - godep go build -v ./...
 before_script:
+  - wget 'https://releases.hashicorp.com/consul/0.5.2/consul_0.5.2_linux_amd64.zip'
+  - unzip "consul_0.5.2_linux_amd64.zip"
+  - ./consul --version
   - psql -c 'create database sql_runner_tests_1' -U postgres
   - psql -c 'create database sql_runner_tests_2' -U postgres
 script:
+  - ./consul agent -server -bootstrap-expect 1 -data-dir /tmp/consul &
+  - sleep 5
+  - ./integration-tests/consul_travis.bash
   - godep go test -i ./...
   - godep go test ./...
   - test -z "$(go fmt ./...)"
   - godep go build -v
+  - sql-runner -playbook integration-tests/good-postgres.yml -var test_date=`date "+%Y_%m_%d"` -fromStep "Create schema and table" -consul localhost:8500
   - sql-runner -playbook ./integration-tests/good-postgres.yml -var test_date=`date "+%Y_%m_%d"` -fromStep "Create schema and table"
   - test "7" = "$(sql-runner -playbook ./integration-tests/bad-mixed.yml &>/dev/null; echo $?)"
   - test "6" = "$(sql-runner -playbook ./integration-tests/good-postgres.yml -var test_date=`date "+%Y_%m_%d"` &>/dev/null; echo $?)"

CHANGELOG

@@ -1,3 +1,13 @@
+Version 0.4.0 (2015-12-03)
+--------------------------
+Bump gopkg.in/pg.v2 to v3 (#48)
+Initialize the variables map inside the playbook properly, thanks @andrioni! (#47)
+Add -dryRun mode (#45)
+Add ability for SQL files to be read from Consul (#44)
+Add ability to read playbook from Consul (#43)
+Add an environment variable function (#30)
+Moved SQL file reading to startup (#22)
+
 Version 0.3.0 (2015-11-05)
 --------------------------
 Hardened push script (#8)