dtk-common 0.5.11

data/rich_tests/fixtures/dsl_test1/sm-dtk-testv1/global_module_refs.json

@@ -0,0 +1,14 @@
+{
+  "component_modules": {
+    "dtk_postgresql": {
+      "version" : "0.1.0",
+      "remote_namespace": "r8"
+    }, 
+    "common_user": {
+      "remote_namespace": "r8"
+    },
+    "dtk_server": {
+      "version" : "0.1.0"
+    }
+  }
+}

data/rich_tests/fixtures/dsl_test1/sm-rich-app/global_module_refs.json

@@ -0,0 +1,5 @@
+{
+  "component_modules": {
+    "stdlib": "3.2.0"
+  }
+}

data/rich_tests/fixtures/dsl_test1/sm-rich-hdp/global_module_refs.json

@@ -0,0 +1,3 @@
+{
+
+}

data/rich_tests/fixtures/dsl_test1/sm-rich-test_dtk/global_module_refs.json

@@ -0,0 +1,5 @@
+{
+  "component_modules": {
+    "gitolite": "0.1.0"
+  }
+}

data/rich_tests/fixtures/dsl_test2/sm-dtk-dtk/assemblies/message_bus/assembly.json

@@ -0,0 +1,23 @@
+{
+  "node_bindings": {
+    "dtk-message_bus/node": "natty-micro"
+  },
+  "assemblies": {
+    "dtk-message_bus": {
+      "name": "message_bus",
+      "nodes": {
+        "node": {
+          "components": [
+            "dtk",
+            "dtk_java",
+            "stdlib",
+            "dtk_activemq"
+          ]
+        }
+      },
+      "port_links": [
+
+      ]
+    }
+  }
+}

data/rich_tests/fixtures/dsl_test2/sm-dtk-dtk/assemblies/repo_manager/assembly.json

@@ -0,0 +1,26 @@
+{
+  "name": "repo_manager",
+  "node_bindings": {
+    "repo_manager": "natty-micro"
+  },
+  "assembly": {
+    "nodes": {
+      "repo_manager": {
+        "components": [
+          "stdlib",
+	  "dtk",
+          {"common_user": {"attributes": {"name": "git"}}},
+          {"gitolite" : {"attributes": {"name" : "git"}}},
+	  "dtk_repo_manager",
+          "dtk_postgresql::server",
+	  {"thin": {
+            "attributes": {
+	      "app_dir": "/home/git/repo_manager",
+              "daemon_user": "git"
+            }
+          }}
+        ]
+      }
+    }
+  }
+}

data/rich_tests/fixtures/dsl_test2/sm-dtk-dtk/assemblies/server-nginx/assembly.json

@@ -0,0 +1,64 @@
+{
+  "node_bindings": {
+    "dtk-server-nginx/tenant": "natty-small"
+  },
+  "assemblies": {
+    "dtk-server-nginx": {
+      "name": "server-nginx",
+      "nodes": {
+        "tenant": {
+          "components": [
+            "dtk_postgresql::server",
+            "dtk",
+            {
+              "dtk_thin::instance": {
+                "name": "dtk",
+                "app_dir": "/home/dtk/server/application"
+              }
+            },
+            {
+              "dtk_server::tenant": {
+                "gitolite_user": "git2",
+                "name": "dtk",
+                "server_public_dns": "foo1.r8network.com"
+              }
+            },
+            "dtk_nginx::base",
+            "dtk_nginx::service",
+            "dtk_java",
+            {
+              "dtk_postgresql::db": {
+                "name": "dtk"
+              }
+            },
+            {
+              "gitolite": {
+                "name": "git2"
+              }
+            },
+            {
+              "dtk_nginx::vhost_for_tenant": {
+                "name": "dtk",
+                "tenant_dns_address": "foo1.r8network.com"
+              }
+            },
+            "dtk_thin::base",
+            {
+              "gitolite::admin_client": {
+                "gitolite_user": "git2",
+                "name": "dtk"
+              }
+            },
+            "dtk_activemq",
+            "stdlib",
+            "nginx::include",
+            "dtk_server::base"
+          ]
+        }
+      },
+      "port_links": [
+
+      ]
+    }
+  }
+}

data/rich_tests/fixtures/dsl_test2/sm-dtk-dtk/assemblies/server-on-one-node/assembly.json

@@ -0,0 +1,47 @@
+{
+  "node_bindings": {
+    "dtk-server-on-one-node/tenant": "natty-small"
+  },
+  "assemblies": {
+    "dtk-server-on-one-node": {
+      "name": "server-on-one-node",
+      "nodes": {
+        "tenant": {
+          "components": [
+            "dtk",
+            {
+              "dtk_server::tenant": {
+                "name": "dtk"
+              }
+            },
+            "dtk_java",
+            "dtk_postgresql::server",
+            {
+              "dtk_postgresql::db": {
+                "name": "dtk"
+              }
+            },
+            "gitolite",
+            {
+              "thin": {
+                "app_dir": "/home/dtk/server/application",
+                "daemon_user": "dtk"
+              }
+            },
+            {
+              "gitolite::admin_client": {
+                "name": "dtk"
+              }
+            },
+            "stdlib",
+            "dtk_activemq",
+            "dtk_server::base"
+          ]
+        }
+      },
+      "port_links": [
+
+      ]
+    }
+  }
+}

data/rich_tests/fixtures/dsl_test2/sm-dtk-dtk/assemblies/t4/assembly.json

@@ -0,0 +1,20 @@
+{
+  "node_bindings": {
+    "dtk-t4/test1": "natty-micro"
+  },
+  "assemblies": {
+    "dtk-t4": {
+      "name": "t4",
+      "nodes": {
+        "test1": {
+          "components": [
+            "stdlib"
+          ]
+        }
+      },
+      "port_links": [
+
+      ]
+    }
+  }
+}

data/rich_tests/fixtures/dsl_test2/sm-dtk-dtk/global_module_refs.json

@@ -0,0 +1,7 @@
+{
+  "component_modules": {
+    "gitolite" : "0.0.1",
+    "dtk_repo_manager": "0.0.1",
+    "thin": "0.0.1"
+  }
+}

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/config

@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/hooks/pre-commit.sample

@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END

data/rich_tests/fixtures/dsl_test4/sm-dtk-dtk.git/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"