Merge pull request #200 from basho/features/lrb/otp-19-support-gh-199

Update hamcrest dep.

rebar.config

@@ -6,8 +6,8 @@
 ]}.
 
 {deps, [
-    {protobuffs, "0.8.*", {git, "git://github.com/basho/erlang_protobuffs.git", {tag, "0.8.3"}}},
-    {hamcrest, ".*", {git, "https://github.com/basho/hamcrest-erlang.git", {tag, "0.2.0-basho"}}}
+    {protobuffs, "0.8.*", {git, "https://github.com/basho/erlang_protobuffs.git", {tag, "0.8.4"}}},
+    {hamcrest, "0.3.*", {git, "https://github.com/basho/hamcrest-erlang.git", {tag, "0.3.0-basho"}}}
 ]}.
 
 {xref_checks, [

tools.mk

@@ -1,11 +1,49 @@
+#  -------------------------------------------------------------------
+#
+#  Copyright (c) 2014 Basho Technologies, Inc.
+#
+#  This file is provided to you under the Apache License,
+#  Version 2.0 (the "License"); you may not use this file
+#  except in compliance with the License.  You may obtain
+#  a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#  -------------------------------------------------------------------
+
+#  -------------------------------------------------------------------
+#  NOTE: This file is is from https://github.com/basho/tools.mk.
+#  It should not be edited in a project. It should simply be updated
+#  wholesale when a new version of tools.mk is released.
+#  -------------------------------------------------------------------
+
 REBAR ?= ./rebar
+REVISION ?= $(shell git rev-parse --short HEAD)
+PROJECT ?= $(shell basename `find src -name "*.app.src"` .app.src)
+
+.PHONY: compile-no-deps test docs xref dialyzer-run dialyzer-quick dialyzer \
+		cleanplt upload-docs
 
 compile-no-deps:
 	${REBAR} compile skip_deps=true
 
 test: compile
 	${REBAR} eunit skip_deps=true
 
+upload-docs: docs
+	@if [ -z "${BUCKET}" -o -z "${PROJECT}" -o -z "${REVISION}" ]; then \
+		echo "Set BUCKET, PROJECT, and REVISION env vars to upload docs"; \
+	        exit 1; fi
+	@cd doc; s3cmd put -P * "s3://${BUCKET}/${PROJECT}/${REVISION}/" > /dev/null
+	@echo "Docs built at: http://${BUCKET}.s3-website-us-east-1.amazonaws.com/${PROJECT}/${REVISION}"
+
 docs:
 	${REBAR} doc skip_deps=true
 
@@ -36,6 +74,29 @@ ${LOCAL_PLT}: compile
 
 dialyzer-run:
 	@echo "==> $(shell basename $(shell pwd)) (dialyzer)"
+# The bulk of the code below deals with the dialyzer.ignore-warnings file
+# which contains strings to ignore if output by dialyzer.
+# Typically the strings include line numbers. Using them exactly is hard
+# to maintain as the code changes. This approach instead ignores the line
+# numbers, but takes into account the number of times a string is listed
+# for a given file. So if one string is listed once, for example, and it
+# appears twice in the warnings, the user is alerted. It is possible but
+# unlikely that this approach could mask a warning if one ignored warning
+# is removed and two warnings of the same kind appear in the file, for
+# example. But it is a trade-off that seems worth it.
+# Details of the cryptic commands:
+#   - Remove line numbers from dialyzer.ignore-warnings
+#   - Pre-pend duplicate count to each warning with sort | uniq -c
+#   - Remove annoying white space around duplicate count
+#   - Save in dialyer.ignore-warnings.tmp
+#   - Do the same to dialyzer_warnings
+#   - Remove matches from dialyzer.ignore-warnings.tmp from output
+#   - Remove duplicate count
+#   - Escape regex special chars to use lines as regex patterns
+#   - Add pattern to match any line number (file.erl:\d+:)
+#   - Anchor to match the entire line (^entire line$)
+#   - Save in dialyzer_unhandled_warnings
+#   - Output matches for those patterns found in the original warnings
 	@if [ -f $(LOCAL_PLT) ]; then \
 		PLTS="$(PLT) $(LOCAL_PLT)"; \
 	else \
@@ -47,9 +108,29 @@ dialyzer-run:
 			exit 1; \
 		fi; \
 		dialyzer $(DIALYZER_FLAGS) --plts $${PLTS} -c ebin > dialyzer_warnings ; \
-		egrep -v "^[[:space:]]*(done|Checking|Proceeding|Compiling)" dialyzer_warnings | grep -F -f dialyzer.ignore-warnings -v > dialyzer_unhandled_warnings ; \
-		cat dialyzer_unhandled_warnings ; \
-		[ $$(cat dialyzer_unhandled_warnings | wc -l) -eq 0 ] ; \
+		cat dialyzer.ignore-warnings \
+		| sed -E 's/^([^:]+:)[^:]+:/\1/' \
+		| sort \
+		| uniq -c \
+		| sed -E '/.*\.erl: /!s/^[[:space:]]*[0-9]+[[:space:]]*//' \
+		> dialyzer.ignore-warnings.tmp ; \
+		egrep -v "^[[:space:]]*(done|Checking|Proceeding|Compiling)" dialyzer_warnings \
+		| sed -E 's/^([^:]+:)[^:]+:/\1/' \
+		| sort \
+		| uniq -c \
+		| sed -E '/.*\.erl: /!s/^[[:space:]]*[0-9]+[[:space:]]*//' \
+		| grep -F -f dialyzer.ignore-warnings.tmp -v \
+		| sed -E 's/^[[:space:]]*[0-9]+[[:space:]]*//' \
+		| sed -E 's/([]\^:+?|()*.$${}\[])/\\\1/g' \
+		| sed -E 's/(\\\.erl\\\:)/\1[[:digit:]]+:/g' \
+		| sed -E 's/^(.*)$$/^[[:space:]]*\1$$/g' \
+		> dialyzer_unhandled_warnings ; \
+		rm dialyzer.ignore-warnings.tmp; \
+		if [ $$(cat dialyzer_unhandled_warnings | wc -l) -gt 0 ]; then \
+		    egrep -f dialyzer_unhandled_warnings dialyzer_warnings ; \
+			found_warnings=1; \
+	    fi; \
+		[ "$$found_warnings" != 1 ] ; \
 	else \
 		dialyzer $(DIALYZER_FLAGS) --plts $${PLTS} -c ebin; \
 	fi