Update make doc & publish

kkaefer · Jul 8, 2012 · 677297a · 677297a
1 parent 17dc84b
commit 677297a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.ndocrc b/.ndocrc
@@ -1,7 +1,18 @@
+#
+# 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
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ doc:
 		exit 128 ; \
 		fi
 	rm -rf ./doc
-	ndoc lib --link-format "{package.homepage}/blob/${CURR_HEAD}/{file}#L{line}"
+	ndoc --link-format "{package.homepage}/blob/${CURR_HEAD}/{file}#L{line}"
 
 
 dev-deps:
@@ -84,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 ; \