[Monotone-commits-diffs] net.venge.monotone.contrib.usher.path-instead-of-server: 50297091046b03045a02c583a246fa302f8388b2

[code]

revision:            50297091046b03045a02c583a246fa302f8388b2
date:                2011-06-01T09:43:24
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher.path-instead-of-server
changelog:
* test/run-tests.sh (usherctl_mkproject): Use 'path' instead of
  'project'.
  In the main loop, user USHER_PATHDIR instead of USHER_PROJECTDIR.
* utils/usherctl.in: Rename 'server' to 'path' and enhance some
  messages.

manifest:
format_version "1"

new_manifest [f7dbfb6e0c9643a2e13620e531a2503f6474730b]

old_revision [2a9ffc0e790a5ceb17916dd5f99fc6fcbfe9cbe1]

patch "test/run-tests.sh"
 from [3ec71cb41289f08a81c021916bddfadb29b224e6]
   to [0d33dba120a5aa094aa902f4fe9a78fb80056f71]

patch "utils/usherctl.in"
 from [925b3148ef6c70d4377638058249c703d55d84be]
   to [278ce4660d81b4f8cc7baab470735014c405341e]
============================================================
--- test/run-tests.sh	3ec71cb41289f08a81c021916bddfadb29b224e6
+++ test/run-tests.sh	0d33dba120a5aa094aa902f4fe9a78fb80056f71
@@ -73,7 +73,7 @@ usherctl_mkproject() {
 	priv | pub )
 	    (
 		set -e
-		$USHERCTL mk${type}project "$servername"
+		$USHERCTL mk${type}path "$servername"
 		$USHERCTL addpattern "$servername" "$pattern*"
 		while [ $# -gt 0 ]; do
 		    $mtn_quiet --db :memory: --keydir ./keys automate get_public_key `echo $1 | cut -f2 -d:` | \
@@ -252,7 +252,7 @@ for test_name in $tests; do
 	    USHER_HOME=$(pwd)/usher
 	    (
 		echo "USHER_CONFDIR=\"$USHER_HOME\""
-		echo "USHER_PROJECTDIR=\"$USHER_HOME/projects\""
+		echo "USHER_PATHDIR=\"$USHER_HOME/paths\""
 		echo "USHER_PIDFILE=\"$USHER_HOME/usher.pid\""
 		echo "USHER_LOGFILE=\"$USHER_HOME/usher.log\""
 		echo "USHER_LOGDIR=\"$USHER_HOME/logs\""
============================================================
--- utils/usherctl.in	925b3148ef6c70d4377638058249c703d55d84be
+++ utils/usherctl.in	278ce4660d81b4f8cc7baab470735014c405341e
@@ -296,7 +296,7 @@ writesrv0 () {
     fi
 
     (
-	echo "server \"$path\""
+	echo "path \"$path\""
 	if [ -n "$host" ]; then echo "host \"$host\""; fi
 	if [ -n "$pattern" ]; then
 	    if [ "$pattern" = ";" ]; then
@@ -325,7 +325,7 @@ writesrv0 () {
     _maybe_set_file_owner "$USHER_CONFD/$path.conf"
     chmod 640 "$USHER_CONFD/$path.conf"
     rebuild
-    echo >&2 "Server '$path' $op."
+    echo >&2 "Server with path '$path' $op."
 }
 
 writesrv () {
@@ -410,7 +410,7 @@ delsrv0 () {
 
     rm -f "$USHER_CONFD/$path.conf" "$USHER_CONFD/$path.conf~"
     rebuild
-    echo >&2 "Server '$path' deleted."
+    echo >&2 "Server with path '$path' deleted."
 }
 
 delsrv () {
@@ -456,7 +456,7 @@ rebuild_permissions () {
 
 # $1 type
 # $2 path
-mkserver () {
+mkpath () {
     type="$1"; shift
     path="$1"; shift
 
@@ -722,7 +722,7 @@ list () {
 }
 
 list () {
-    grep '^ *server  *"' "$USHER_CONF" | cut -f2 -d'"' | while read path; do
+    grep '^ *path  *"' "$USHER_CONF" | cut -f2 -d'"' | while read path; do
 	text="$path"
 	extratext=" (WARNING: seems manually added, might get overwritten)"
 	if [ -f "$USHER_CONFD/$path.conf" ]; then
@@ -840,7 +840,7 @@ case $1 in
 		${op}srv "$path" "$host" "$pattern" "$@"
 		;;
 	    * )
-		echo >&2 "Unknown server type $1."
+		echo >&2 "Unknown path type $1."
 		exit 1
 		;;
 	esac
@@ -855,8 +855,8 @@ case $1 in
 	delsrv "$path"
 	;;
 
-    mkpubserver | mkprivserver )
-	type=`case $1 in mkpubserver ) echo public ;; mkprivserver ) echo private ;; esac`
+    mkpubpath | mkprivpath )
+	type=`case $1 in mkpubpath ) echo public ;; mkprivpath ) echo private ;; esac`
 	shift
 	path="$1"; shift
 	if [ -z "$path" ]; then
@@ -864,9 +864,9 @@ case $1 in
 	    exit 1
 	fi
 
-	mkserver "$type" "$path"
+	mkpath "$type" "$path"
 	;;
-    rmserver )
+    rmpath )
 	shift
 	path="$1"; shift
 	if [ -z "$path" ]; then
@@ -874,7 +874,7 @@ case $1 in
 	    exit 1
 	fi
 	
-	rmserver "$1"
+	rmpath "$1"
 	;;
 
     info )
@@ -921,9 +921,9 @@ case $1 in
 	infos=`echo $c $d $p $t`
 
 	if [ -z "$infos" ]; then
-	    serverinfo "$path" configdir database patterns type
+	    pathinfo "$path" configdir database patterns type
 	else
-	    serverinfo "$path" $infos
+	    pathinfo "$path" $infos
 	fi
 	;;
 
@@ -957,7 +957,7 @@ case $1 in
 	    esac
 	done
 
-	addserverkey "$path" "$type"	# The key itself is on stdin
+	addpathkey "$path" "$type"	# The key itself is on stdin
 	;;
 
     addpattern )
@@ -969,7 +969,7 @@ case $1 in
 	    exit 1
 	fi
 
-	addserverpattern "$path" "$pattern"
+	addpathpattern "$path" "$pattern"
 	;;
 
     start | stop | restart | reload | status | list )