Merge branch 'release/0.5.2'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.2 (June 2, 2017)
+
+BUG FIXES:
+- fix parsing of the log level from Tendermint config (#97)
+
 ## 0.5.1 (May 30, 2017)
 
 BUG FIXES:

Makefile

@@ -8,6 +8,10 @@ build:
 install:
 	go install ./cmd/...
 
+dist:
+	@ sudo bash scripts/dist.sh
+	@ bash scripts/publish.sh
+
 test:
 	go test `${NOVENDOR}`
 	#go run tests/tendermint/*.go

cmd/commands/start.go

@@ -12,8 +12,8 @@ import (
 	"github.com/tendermint/abci/server"
 	eyes "github.com/tendermint/merkleeyes/client"
 	"github.com/tendermint/tmlibs/cli"
+	cliflags "github.com/tendermint/tmlibs/cli/flags"
 	cmn "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/tmlibs/log"
 
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/node"
@@ -139,13 +139,10 @@ func startTendermint(dir string, basecoinApp *app.Basecoin) error {
 		return err
 	}
 
-	// TODO: parse the log level from the config properly (multi modules)
-	// but some tm code must be refactored for better usability
-	lvl, err := log.AllowLevel(cfg.LogLevel)
+	tmLogger, err := cliflags.ParseLogLevel(cfg.LogLevel, logger, config.DefaultConfig().LogLevel)
 	if err != nil {
 		return err
 	}
-	tmLogger := log.NewFilter(logger, lvl)
 
 	// Create & start tendermint node
 	privValidator := types.LoadOrGenPrivValidator(cfg.PrivValidatorFile(), tmLogger)

glide.yaml

@@ -49,6 +49,7 @@ import:
   version: ~0.2.0
   subpackages:
   - cli
+  - cli/flags
   - common
   - events
   - log

scripts/dist.sh

@@ -21,13 +21,6 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
 # Change into that dir because we expect that.
 cd "$DIR"
 
-# Generate the tag.
-if [ -z "$NOTAG" ]; then
-  echo "==> Tagging..."
-  git commit --allow-empty -a -m "Release v$VERSION"
-  git tag -a -m "Version $VERSION" "v${VERSION}" master
-fi
-
 # Do a hermetic build inside a Docker container.
 docker build -t tendermint/${REPO_NAME}-builder scripts/${REPO_NAME}-builder/
 docker run --rm -e "BUILD_TAGS=$BUILD_TAGS" -v "$(pwd)":/go/src/github.com/tendermint/${REPO_NAME} tendermint/${REPO_NAME}-builder ./scripts/dist_build.sh

scripts/publish.sh

@@ -0,0 +1,7 @@
+#! /bin/bash 
+
+# Get the version from the environment, or try to figure it out.
+if [ -z $VERSION ]; then
+	VERSION=$(awk -F\" '/Version =/ { print $2; exit }' < version/version.go)
+fi
+aws s3 cp --recursive build/dist s3://tendermint/binaries/basecoin/v${VERSION} --acl public-read

version/version.go

@@ -2,6 +2,6 @@ package version
 
 const Maj = "0"
 const Min = "5"
-const Fix = "1"
+const Fix = "2"
 
-const Version = "0.5.1"
+const Version = "0.5.2"