From 4bda762e02bf07617ab86f32c583de6414c89926 Mon Sep 17 00:00:00 2001
From: Aleksey V Zapparov <ixti@member.fsf.org>
Date: Sun, 8 Jul 2012 16:33:40 +0200
Subject: [PATCH] Update make doc & publish

---
 .ndocrc  | 31 +++++++++++++++++++++++++------
 Makefile |  8 +++++---
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.ndocrc b/.ndocrc
index 788bdc01..ff31c34a 100644
--- a/.ndocrc
+++ b/.ndocrc
@@ -1,6 +1,25 @@
---index       "./README.md"
---package     "./package.json"
---gh-ribbon   "{package.homepage}"
---output      "doc"
---render      "html"
---link-format "{package.homepage}/blob/master/{file}#L{line}"
+#
+# Common nodeca config
+################################################################################
+
+--index         "./README.md"
+--package       "./package.json"
+--gh-ribbon     "{package.homepage}"
+--output        "doc"
+--render        "html"
+--link-format   "{package.homepage}/blob/master/{file}#L{line}"
+--broken-links  "throw"
+
+
+#
+# Paths with sources
+################################################################################
+
+lib
+
+
+#
+# Project specific configuration
+################################################################################
+
+--show-all
diff --git a/Makefile b/Makefile
index 29ea732c..69f36d7f 100644
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,7 @@ doc:
 		exit 128 ; \
 		fi
 	rm -rf ./doc
-	ndoc lib \
-		--link-format "{package.homepage}/blob/${CURR_HEAD}/{file}#L{line}" \
-		--show-all
+	ndoc --link-format "{package.homepage}/blob/${CURR_HEAD}/{file}#L{line}"
 
 
 dev-deps:
@@ -86,6 +84,10 @@ publish:
 		echo "Unclean working tree. Commit or stash changes first." >&2 ; \
 		exit 128 ; \
 		fi
+	@if test 0 -ne `git fetch ; git status | grep '^# Your branch' | wc -l` ; then \
+		echo "Local/Remote history differs. Please push/pull changes." >&2 ; \
+		exit 128 ; \
+		fi
 	@if test 0 -ne `git tag -l ${NPM_VERSION} | wc -l` ; then \
 		echo "Tag ${NPM_VERSION} exists. Update package.json" >&2 ; \
 		exit 128 ; \