Merge lp:~gz/ubuntu/raring/juju/0.7 into lp:ubuntu/raring/juju

[Martin Packman]

Update python juju for raring

Includes new upstream release with several added features and bug fixes, use of update-alternatives to allow installing of the go juju on the same mahcine (Mark and I would appreciate any comments on how this is done), and a workaround for an lxc regression.

Unfortunately due to bug 985285 requiring some big hammering to get around, the diff in this merge proposal is likely to be useless. Running a straight diff on this branch compared to the existing state should be more enlightening.

[lp:~gz/ubuntu/raring/juju/0.7]

31. By Martin Packman on 2013-04-10

Add patch working around local provider issue with Python 3 lxc scripts

[James Page (james-page)]

Ignoring the MP as unreadable: had a look at the branch debdiff with current:

1) postinst

Needs to set -e; also you should not set the alternatives manually:

    update-alternatives --set juju $base_dir/juju-$VER/bin/juju

That's something for the end-user to decide; we just decide which is default based on relative priories of juju/go juju binaries.

3) postrm

    rm -Rf /usr/lib/python2.7/dist-packages/juju

That should not be required.

3) rules

Not really the correct way to change the version in the maintainer scripts:

override_dh_builddeb:
    sed -i -e 's/__NEW_VERSION__/$(VER)/' debian/juju/DEBIAN/*
    dh_builddeb

This would be better done by renaming the maintainer scripts <script>.in and having some rules that generate the actual maintainer scripts before builddeb:

debian/juju.postinst: debian/juju.postinst.in
    sed -e "s/__NEW_VERSION__/$(VER)/g' $< > debian/juju.postinst

debian/juju.prerm: debian/juju.prerm.in
    sed -e "s/__NEW_VERSION__/$(VER)/g' $< > debian/juju.prerm

and then override dh_installdeb to get them to generate prior to debhelper installing them:

override_dh_installdeb: debian/juju.postinst debian/juju.prerm
    dh_installdeb

Remember to add cleanup to remove the generated files as well.

4) manpages

Need to be covered by use of alternatives as well.

Should the resulting binary not be called juju-0.7 or something similar? Otherwise when you upgrade to 7.1, you will have to remove old alternatives.

review: Needs Fixing

[lp:~gz/ubuntu/raring/juju/0.7]

32. By Martin Packman on 2013-04-10

Unbreak agent tests after quilt mishap

33. By Martin Packman on 2013-04-10

Collapse debian changelog to one distro relevent update for raring

34. By Mark Mims on 2013-04-10

Templatify and update postinst and prerm scripts as suggested by jamespage in review

35. By Martin Packman on 2013-04-10

Fix get-orig-source rule

36. By Martin Packman on 2013-04-11

Merge in alternatives support for manpages and bash completion

37. By Martin Packman on 2013-04-11

Rename binary package to juju-0.7 and add virtual package juju that depends on it

[Martin Packman (gz)]

Pushed up changes as suggested, Mark and I think everything is covered now. Also included is the rename of the binary package to juju-0.7.

[lp:~gz/ubuntu/raring/juju/0.7]

38. By Martin Packman on 2013-04-11

Fixup rules file after binary package rename

[Iain Lane (laney)]

Hmm, this is really quite late for raring given the scale of the refactoring. Do you consider this essential to be in Raring (and not suitable for, say, a backport from S)?

If so, please file a freeze exception with strong rationale.

[Iain Lane (laney)]

My bad, I didn't see https://bugs.launchpad.net/ubuntu/+source/juju/+bug/1167921 (because it's not referred to from the Debian changelog; probably worth adding it there before uploading)

[lp:~gz/ubuntu/raring/juju/0.7]

39. By Martin Packman on 2013-04-22

Add reference to ffe bug in changelog as requested by laney in review

40. By Martin Packman on 2013-04-22

Move update-alternatives scripts to juju-0.7 as requested by stgraber

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-04-22 11:00:38 +0000
@@ -0,0 +1,12 @@
+/docs/build
+/docs/source/generated
+/_trial_temp
+/_trial_temp-*
+/tags
+zookeeper.log
+.emacs.desktop
+.emacs.desktop.lock
+.coverage
+htmlcov
+/TAGS
+/.testrepository

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-11-06 20:44:41 +0000
+++ .pc/applied-patches	2013-04-22 11:00:38 +0000
@@ -1,1 +1,2 @@
 disable-failing-zookeeper-test.patch
+workaround-lxc-python-env.patch

=== modified file '.pc/disable-failing-zookeeper-test.patch/juju/agents/tests/test_unit.py'
--- .pc/disable-failing-zookeeper-test.patch/juju/agents/tests/test_unit.py	2012-10-02 13:05:17 +0000
+++ .pc/disable-failing-zookeeper-test.patch/juju/agents/tests/test_unit.py	2013-04-22 11:00:38 +0000
@@ -9,7 +9,9 @@
 from juju.charm import get_charm_from_path
 from juju.charm.url import CharmURL
 from juju.errors import JujuError
+from juju.hooks.executor import HookExecutor
 from juju.lib import serializer
+
 from juju.state.environment import GlobalSettingsStateManager
 from juju.state.errors import ServiceStateNotFound
 from juju.state.service import NO_HOOKS, RETRY_HOOKS
@@ -30,11 +32,15 @@
 
     @inlineCallbacks
     def setUp(self):
+        self.patch(HookExecutor,
+                   "LOCK_PATH",
+                   os.path.join(self.makeDir(), "hook.lock"))
         yield super(UnitAgentTestBase, self).setUp()
         settings = GlobalSettingsStateManager(self.client)
         yield settings.set_provider_type("dummy")
         self.change_environment(
             PATH=get_cli_environ_path(),
+            JUJU_ENV_UUID="snowflake",
             JUJU_UNIT_NAME="mysql/0")
 
     @inlineCallbacks

=== added directory '.pc/workaround-lxc-python-env.patch'
=== added file '.pc/workaround-lxc-python-env.patch/.timestamp'
=== added directory '.pc/workaround-lxc-python-env.patch/juju'
=== added directory '.pc/workaround-lxc-python-env.patch/juju/lib'
=== added directory '.pc/workaround-lxc-python-env.patch/juju/lib/lxc'
=== added file '.pc/workaround-lxc-python-env.patch/juju/lib/lxc/__init__.py'
--- .pc/workaround-lxc-python-env.patch/juju/lib/lxc/__init__.py	1970-01-01 00:00:00 +0000
+++ .pc/workaround-lxc-python-env.patch/juju/lib/lxc/__init__.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,308 @@
+import os
+import pipes
+import subprocess
+import sys
+import tempfile
+
+from twisted.internet.defer import inlineCallbacks, returnValue
+from twisted.internet.threads import deferToThread
+
+from juju.errors import JujuError
+
+DATA_PATH = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), "data"))
+
+CONTAINER_OPTIONS_DOC = """
+The following options are expected.
+
+JUJU_CONTAINER_NAME: Applied as the hostname of the machine.
+
+JUJU_ORIGIN: Where to obtain the containers version of juju from.
+             (ppa, distro or branch). When 'branch' JUJU_SOURCE should
+             be set to the location of a bzr(1) accessible branch.
+
+JUJU_PUBLIC_KEY: An SSH public key used by the ubuntu account for
+             interaction with the container.
+
+"""
+
+DEVTMPFS_LINE = """devtmpfs dev devtmpfs mode=0755,nosuid 0 0"""
+
+# Used to specify the name of the default LXC template used
+# for container creation
+DEFAULT_TEMPLATE = "ubuntu-cloud"
+
+
+class LXCError(JujuError):
+    """Indicates a low level error with an LXC container"""
+
+
+def _cmd(args):
+    p = subprocess.Popen(
+        args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    stdout_data, _ = p.communicate()
+    r = p.returncode
+    if  r != 0:
+        # read the stdout/err streams and show the user
+        print >>sys.stderr, stdout_data
+        raise LXCError(stdout_data)
+    return (r, stdout_data)
+
+
+# Wrapped lxc cli primitives
+def _lxc_create(container_name,
+                template,
+                release,
+                cloud_init_file=None,
+                auth_key=None,
+                release_stream=None):
+    # the -- argument indicates the last parameters are passed
+    # to the template and not handled by lxc-create
+    args = ["sudo", "lxc-create",
+            "-n", container_name,
+            "-t", template,
+            "--",
+            "--debug",  # Debug erors / set -x
+            "--hostid", container_name,
+            "-r", release]
+    if cloud_init_file:
+        args.extend(("--userdata", cloud_init_file))
+    if auth_key:
+        args.extend(("-S", auth_key))
+    if release_stream:
+        args.extend(("-s", release_stream))
+    return _cmd(args)
+
+
+def _lxc_start(container_name, debug_log=None, console_log=None):
+    args = ["sudo", "lxc-start", "--daemon", "-n", container_name]
+    if console_log:
+        args.extend(["-c", console_log])
+    if debug_log:
+        args.extend(["-l", "DEBUG", "-o", debug_log])
+    return _cmd(args)
+
+
+def _lxc_stop(container_name):
+    _cmd(["sudo", "lxc-stop", "-n", container_name])
+
+
+def _lxc_destroy(container_name):
+    return _cmd(["sudo", "lxc-destroy", "-n", container_name])
+
+
+def _lxc_ls():
+    _, output = _cmd(["lxc-ls"])
+    output = output.replace("\n", " ")
+    return set([c for c in output.split(" ") if c])
+
+
+def _lxc_wait(container_name, state="RUNNING"):
+    """Wait for container to be in a given state RUNNING|STOPPED."""
+
+    def wait(container_name):
+        rc, _ = _cmd(["sudo", "lxc-wait",
+                   "-n", container_name,
+                   "-s", state])
+        return rc == 0
+
+    return deferToThread(wait, container_name)
+
+
+def _lxc_clone(existing_container_name, new_container_name):
+    return _cmd(["sudo", "lxc-clone", "-o", existing_container_name, "-n",
+                 new_container_name])
+
+
+def _customize_container(customize_script, container_root):
+    if not os.path.isdir(container_root):
+        raise LXCError("Expect container root directory: %s" %
+                       container_root)
+
+    # write the container scripts into the container
+    fd, in_path = tempfile.mkstemp(prefix=os.path.basename(customize_script),
+                                   dir=os.path.join(container_root, "tmp"))
+
+    os.write(fd, open(customize_script, "r").read())
+    os.close(fd)
+    os.chmod(in_path, 0755)
+
+    args = ["sudo", "chroot", container_root,
+            os.path.join("/tmp", os.path.basename(in_path))]
+    return _cmd(args)
+
+
+def validate_path(pathname):
+    if not os.access(pathname, os.R_OK):
+        raise LXCError("Invalid or unreadable file: %s" % pathname)
+
+
+@inlineCallbacks
+def get_containers(prefix):
+    """Return a dictionary of containers key names to runtime boolean value.
+
+    :param prefix: Optionally specify a prefix that the container should
+    match any returned containers.
+    """
+    _, output = yield deferToThread(_cmd, ["lxc-ls"])
+
+    containers = {}
+    for i in filter(None, output.split("\n")):
+        if i in containers:
+            containers[i] = True
+        else:
+            containers[i] = False
+
+    if prefix:
+        remove = [k for k in containers.keys() if not
+                  k.startswith(prefix)]
+        map(containers.pop, remove)
+
+    returnValue(containers)
+
+
+def ensure_devtmpfs_fstab(container_home):
+    """ Workaround for bug in older LXC - We need to force mounting devtmpfs
+        if it is not already in the rootfs, before starting.
+    """
+    rootfs = os.path.join(container_home, 'rootfs')
+    devpts = os.path.join(rootfs, 'dev', 'pts')
+    if not os.path.exists(devpts):
+        fstab_path = os.path.join(container_home, 'fstab')
+        if os.path.exists(fstab_path):
+            with open(fstab_path) as fstab:
+                for line in fstab:
+                    if line.startswith('devtmpfs'):
+                        # Line already there, we are done
+                        return
+            mode = 'a'
+        else:
+            mode = 'w'
+        with open(fstab_path, mode) as fstab:
+            print >>fstab, DEVTMPFS_LINE
+
+
+class LXCContainer(object):
+    def __init__(self,
+                 container_name,
+                 series,
+                 cloud_init=None,
+                 debug_log=None,
+                 console_log=None,
+                 release_stream="released"):
+        """Create an LXCContainer
+
+        :param container_name: should be unique within the system
+
+        :param series: distro release series (oneiric, precise, etc)
+
+        :param cloud_init: full string of cloud-init userdata
+
+        See :data CONFIG_OPTIONS_DOC: explain how these values map
+        into the container in more detail.
+        """
+        self.container_name = container_name
+        self.debug_log = debug_log
+        self.console_log = console_log
+        self.cloud_init = cloud_init
+        self.series = series
+        self.release_stream = release_stream
+
+    @property
+    def container_home(self):
+        return "/var/lib/lxc/%s" % self.container_name
+
+    @property
+    def rootfs(self):
+        return "%s/rootfs/" % self.container_home
+
+    def _p(self, path):
+        if path[0] == "/":
+            path = path[1:]
+        return os.path.join(self.rootfs, path)
+
+    def is_constructed(self):
+        """Does the lxc image exist """
+        return os.path.exists(self.rootfs)
+
+    @inlineCallbacks
+    def is_running(self):
+        """Is the lxc image running."""
+        state = yield get_containers(None)
+        returnValue(state.get(self.container_name))
+
+    def execute(self, args):
+        if not isinstance(args, (list, tuple)):
+            args = [args, ]
+
+        args = ["sudo", "chroot", self.rootfs] + args
+        return _cmd(args)
+
+    def _create_wait(self):
+        """Create the container synchronously."""
+        if self.is_constructed():
+            return
+
+        with tempfile.NamedTemporaryFile() as fh:
+            if self.cloud_init:
+                fh.write(self.cloud_init.render())
+                cloud_init_file = fh.name
+            else:
+                cloud_init_file = None
+            fh.flush()
+            _lxc_create(self.container_name,
+                        template=DEFAULT_TEMPLATE,
+                        cloud_init_file=cloud_init_file,
+                        release=self.series)
+
+        ensure_devtmpfs_fstab(self.container_home)
+
+    @inlineCallbacks
+    def create(self):
+        # open the template file and create a new temp processed
+        yield deferToThread(self._create_wait)
+
+    def _clone_wait(self, container_name):
+        """Return a cloned LXCContainer with a the new container name.
+
+        This method is synchronous and will provision the new image
+        blocking till done.
+        """
+        if not self.is_constructed():
+            raise LXCError("Attempted to clone container "
+                           "that hasn't been had create() called")
+
+        container = LXCContainer(container_name,
+                 series=self.series,
+                 cloud_init=self.cloud_init,
+                 debug_log=self.debug_log,
+                 console_log=self.console_log,
+                 release_stream=self.release_stream)
+
+        if not container.is_constructed():
+            _lxc_clone(self.container_name, container_name)
+        return container
+
+    def clone(self, container_name):
+        return deferToThread(self._clone_wait, container_name)
+
+    @inlineCallbacks
+    def run(self):
+        if not self.is_constructed():
+            raise LXCError("Attempting to run a container that "
+                           "hasn't been created or cloned.")
+
+        yield deferToThread(
+            _lxc_start, self.container_name,
+            debug_log=self.debug_log, console_log=self.console_log)
+        yield _lxc_wait(self.container_name, "RUNNING")
+
+    @inlineCallbacks
+    def stop(self):
+        yield deferToThread(_lxc_stop, self.container_name)
+        yield _lxc_wait(self.container_name, "STOPPED")
+
+    @inlineCallbacks
+    def destroy(self):
+        yield self.stop()
+        yield deferToThread(_lxc_destroy, self.container_name)

=== added file '.testr.conf'
--- .testr.conf	1970-01-01 00:00:00 +0000
+++ .testr.conf	2013-04-22 11:00:38 +0000
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=./test --reporter=subunit $LISTOPT $IDLIST
+test_list_option=-n
+

=== removed file '.testr.conf'
--- .testr.conf	2012-07-19 11:01:09 +0000
+++ .testr.conf	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=./test --reporter=subunit $LISTOPT $IDLIST
-test_list_option=-n
-

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2013-04-22 11:00:38 +0000
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.

=== removed file 'COPYING'
--- COPYING	2012-06-11 15:40:48 +0000
+++ COPYING	1970-01-01 00:00:00 +0000
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2013-04-22 11:00:38 +0000
@@ -0,0 +1,54 @@
+PEP8=pep8
+COVERAGE_FILES=`find juju -name "*py" | grep -v "tests\|lib/mocker.py\|lib/testing.py"`
+
+all:
+	@echo "You've just watched the fastest build on earth."
+
+tests:
+	./test
+
+coverage:
+	python -c "import coverage as c; c.main()" run ./test
+	python -c "import coverage as c; c.main()" html -d htmlcov $(COVERAGE_FILES)
+	gnome-open htmlcov/index.html
+
+ftests:
+	./test --functional
+
+tags:
+	@ctags --python-kinds=-iv -R juju
+
+etags:
+	@ctags -e --python-kinds=-iv -R juju
+
+
+present_pep8=$(shell which $(PEP8))
+present_pyflakes=$(shell which pyflakes)
+warn_missing_linters:
+	@test -n "$(present_pep8)" || echo "WARNING: $(PEP8) not installed."
+	@test -n "$(present_pyflakes)" || echo "WARNING: pyflakes not installed."
+
+
+# "check": Check uncommitted changes for lint.
+check_changes=$(shell bzr status -S | grep '^[ +]*[MN]' | awk '{print $$2;}' | grep "\\.py$$")
+check: warn_missing_linters
+	@test -z $(present_pep8) || (echo $(check_changes) | xargs -r $(PEP8) --repeat)
+	@test -z $(present_pyflakes) || (echo $(check_changes) | xargs -r pyflakes)
+
+
+# "review": Check all changes compared to trunk for lint.
+review_changes=$(shell bzr status -S -r ancestor:$(JUJU_TRUNK) | grep '^[ +]*[MN]' | awk '{print $$2;}' | grep "\\.py$$")
+review: warn_missing_linters
+	#@test -z $(present_pep8) || (echo $(review_changes) | xargs -r $(PEP8) --repeat)
+	@test -z $(present_pyflakes) || (echo $(review_changes) | xargs -r pyflakes)
+
+
+ptests_changes=$(shell bzr status -S -r branch::prev | grep -P '^[ +]*[MN]' | awk '{print $$2;}'| grep "test_.*\\.py$$")
+ptests:
+	@echo $(ptests_changes) | xargs -r ./test
+
+btests_changes=$(shell bzr status -S -r ancestor:$(JUJU_TRUNK)/ | grep "test.*\\.py$$" | awk '{print $$2;}')
+btests:
+	@./test $(btests_changes)
+
+.PHONY: tags check review warn_missing_linters

=== removed file 'Makefile'
--- Makefile	2012-10-09 12:35:35 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-PEP8=pep8
-COVERAGE_FILES=`find juju -name "*py" | grep -v "tests\|lib/mocker.py\|lib/testing.py"`
-
-all:
-	@echo "You've just watched the fastest build on earth."
-
-tests:
-	./test
-
-coverage:
-	python -c "import coverage as c; c.main()" run ./test
-	python -c "import coverage as c; c.main()" html -d htmlcov $(COVERAGE_FILES)
-	gnome-open htmlcov/index.html
-
-ftests:
-	./test --functional
-
-tags:
-	@ctags --python-kinds=-iv -R juju
-
-etags:
-	@ctags -e --python-kinds=-iv -R juju
-
-modified=$(shell bzr status -S  |grep -P '^\s*M' | awk '{print $$2;}'| grep -P ".py$$")
-check:
-	@test -n "$(modified)" && echo $(modified) | xargs $(PEP8) --repeat
-	@test -n "$(modified)" && echo $(modified) | xargs pyflakes
-
-
-modified=$(shell bzr status -S -r ancestor:$(JUJU_TRUNK) |grep -P '^\s*M' | awk '{print $$2;}'| grep -P ".py$$")
-review:
-	#@test -n "$(modified)" && echo $(modified) | xargs $(PEP8) --repeat
-	@test -n "$(modified)" && echo $(modified) | xargs pyflakes
-
-
-modified=$(shell bzr status -S -r branch::prev  |grep -P '^\s*\+?[MN]' | awk '{print $$2;}'| grep -P "test_.*\.py$$")
-ptests:
-	@test -n "$(modified)" && echo $(modified) | xargs ./test
-
-modified=$(shell  bzr status -S -r ancestor:$(JUJU_TRUNK)/|grep -P 'test.*\.py' |awk '{print $$2;}')
-btests:
-	@./test $(modified)
-
-.PHONY: tags check review

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2013-04-22 11:00:38 +0000
@@ -0,0 +1,34 @@
+juju
+====
+
+Welcome to juju, we hope you enjoy your stay.
+
+You can always get the latest juju code by running::
+
+  $ bzr branch lp:juju
+
+The juju bug tracker is at https://bugs.launchpad.net/juju
+
+Documentation for getting setup and running juju can be found at
+http://juju.ubuntu.com/docs
+
+====
+Juju Developers <[e-mail]>
+
+Except where stated otherwise, the files contained within this source
+code tree are covered under the following copyright and license:
+
+Copyright 2010, 2011 Canonical Ltd. All Rights Reserved.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'README'
--- README	2012-07-19 11:01:09 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-juju
-====
-
-Welcome to juju, we hope you enjoy your stay.
-
-You can always get the latest juju code by running::
-
-  $ bzr branch lp:juju
-
-The juju bug tracker is at https://bugs.launchpad.net/juju
-
-Documentation for getting setup and running juju can be found at
-http://juju.ubuntu.com/docs
-
-====
-Juju Developers <[e-mail]>
-
-Except where stated otherwise, the files contained within this source
-code tree are covered under the following copyright and license:
-
-Copyright 2010, 2011 Canonical Ltd. All Rights Reserved.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== added directory 'bin'
=== removed directory 'bin'
=== added file 'bin/close-port'
--- bin/close-port	1970-01-01 00:00:00 +0000
+++ bin/close-port	2013-04-22 11:00:38 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import close_port
+
+if __name__ == '__main__':
+    close_port()

=== removed file 'bin/close-port'
--- bin/close-port	2012-06-11 15:40:48 +0000
+++ bin/close-port	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import close_port
-
-if __name__ == '__main__':
-    close_port()

=== added file 'bin/config-get'
--- bin/config-get	1970-01-01 00:00:00 +0000
+++ bin/config-get	2013-04-22 11:00:38 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import config_get
+
+if __name__ == '__main__':
+    config_get()

=== removed file 'bin/config-get'
--- bin/config-get	2012-06-11 15:40:48 +0000
+++ bin/config-get	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import config_get
-
-if __name__ == '__main__':
-    config_get()

=== added file 'bin/juju'
--- bin/juju	1970-01-01 00:00:00 +0000
+++ bin/juju	2013-04-22 11:00:38 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env python 
+import sys
+
+from juju.control import main
+from juju.errors import JujuError
+
+try:
+    main(sys.argv[1:])
+except JujuError, error:
+    sys.exit("error: %s" % (error,))

=== removed file 'bin/juju'
--- bin/juju	2012-06-11 15:40:48 +0000
+++ bin/juju	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/usr/bin/env python 
-import sys
-
-from juju.control import main
-from juju.errors import JujuError
-
-try:
-    main(sys.argv[1:])
-except JujuError, error:
-    sys.exit("error: %s" % (error,))

=== added file 'bin/juju-admin'
--- bin/juju-admin	1970-01-01 00:00:00 +0000
+++ bin/juju-admin	2013-04-22 11:00:38 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import sys
+
+from juju.control import admin
+from juju.errors import JujuError
+
+try:
+    admin(sys.argv[1:])
+except JujuError, error:
+    sys.exit("error: %s" % (error,))

=== removed file 'bin/juju-admin'
--- bin/juju-admin	2012-06-11 15:40:48 +0000
+++ bin/juju-admin	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import sys
-
-from juju.control import admin
-from juju.errors import JujuError
-
-try:
-    admin(sys.argv[1:])
-except JujuError, error:
-    sys.exit("error: %s" % (error,))

=== added file 'bin/juju-log'
--- bin/juju-log	1970-01-01 00:00:00 +0000
+++ bin/juju-log	2013-04-22 11:00:38 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+
+import os, sys
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import log
+
+if __name__ == '__main__':
+    log()

=== removed file 'bin/juju-log'
--- bin/juju-log	2012-06-11 15:40:48 +0000
+++ bin/juju-log	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-
-import os, sys
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import log
-
-if __name__ == '__main__':
-    log()

=== added file 'bin/open-port'
--- bin/open-port	1970-01-01 00:00:00 +0000
+++ bin/open-port	2013-04-22 11:00:38 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import open_port
+
+if __name__ == '__main__':
+    open_port()

=== removed file 'bin/open-port'
--- bin/open-port	2012-06-11 15:40:48 +0000
+++ bin/open-port	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import open_port
-
-if __name__ == '__main__':
-    open_port()

=== added file 'bin/relation-get'
--- bin/relation-get	1970-01-01 00:00:00 +0000
+++ bin/relation-get	2013-04-22 11:00:38 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import relation_get
+
+if __name__ == '__main__':
+    relation_get()

=== removed file 'bin/relation-get'
--- bin/relation-get	2012-06-11 15:40:48 +0000
+++ bin/relation-get	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import relation_get
-
-if __name__ == '__main__':
-    relation_get()

=== added file 'bin/relation-ids'
--- bin/relation-ids	1970-01-01 00:00:00 +0000
+++ bin/relation-ids	2013-04-22 11:00:38 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import relation_ids
+
+if __name__ == '__main__':
+    relation_ids()

=== removed file 'bin/relation-ids'
--- bin/relation-ids	2012-06-17 15:39:48 +0000
+++ bin/relation-ids	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import relation_ids
-
-if __name__ == '__main__':
-    relation_ids()

=== added file 'bin/relation-list'
--- bin/relation-list	1970-01-01 00:00:00 +0000
+++ bin/relation-list	2013-04-22 11:00:38 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import relation_list
+
+if __name__ == '__main__':
+    relation_list()

=== removed file 'bin/relation-list'
--- bin/relation-list	2012-06-11 15:40:48 +0000
+++ bin/relation-list	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import relation_list
-
-if __name__ == '__main__':
-    relation_list()

=== added file 'bin/relation-set'
--- bin/relation-set	1970-01-01 00:00:00 +0000
+++ bin/relation-set	2013-04-22 11:00:38 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import relation_set
+
+if __name__ == '__main__':
+    relation_set()

=== removed file 'bin/relation-set'
--- bin/relation-set	2012-06-11 15:40:48 +0000
+++ bin/relation-set	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import relation_set
-
-if __name__ == '__main__':
-    relation_set()

=== added file 'bin/unit-get'
--- bin/unit-get	1970-01-01 00:00:00 +0000
+++ bin/unit-get	2013-04-22 11:00:38 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+# We avoid using PYTHONPATH because it can cause side effects on hook execution
+import os, sys
+
+if "JUJU_PYTHONPATH" in os.environ:
+    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
+
+from juju.hooks.commands import unit_get
+
+if __name__ == '__main__':
+    unit_get()

=== removed file 'bin/unit-get'
--- bin/unit-get	2012-06-11 15:40:48 +0000
+++ bin/unit-get	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-# We avoid using PYTHONPATH because it can cause side effects on hook execution
-import os, sys
-
-if "JUJU_PYTHONPATH" in os.environ:
-    sys.path[:0] = filter(None, os.environ["JUJU_PYTHONPATH"].split(":"))
-
-from juju.hooks.commands import unit_get
-
-if __name__ == '__main__':
-    unit_get()

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-03 15:59:21 +0000
+++ debian/changelog	2013-04-22 11:00:38 +0000
@@ -1,10 +1,21 @@
-juju (0.6-1ubuntu2) UNRELEASED; urgency=low
+juju (0.7-0ubuntu1) raring; urgency=low
 
+  [ Clint Byrum ]
   * d/p/fix-tests-do-not-use-etc-lsb-release: Dropped, patch applied upstream.
   * d/p/maas-tag-conversion.patch: Dropped, patch applied upstream.
   * d/juju.docs: Remove examples as they have been dropped upstream.
 
- -- Clint Byrum <[e-mail]>  Tue, 06 Nov 2012 12:14:23 -0800
+  [ Mark Mims ]
+  * Add postinst and prerm scripts using update-alternatives to install into
+    a versioned location, enabling co-installability with the go juju port.
+
+  [ Martin Packman ]
+  * New upstream release. (lp: #1167921)
+  * d/p/workaround-lxc-python-env.patch: Workaround regression with local
+    provider failing with SyntaxError on running lxc scripts when user has
+    Python 3 specific environment variables set. (lp: #1130809)
+
+ -- Martin Packman <[e-mail]>  Wed, 10 Apr 2013 13:57:21 +0000
 
 juju (0.6-1ubuntu1) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-10-10 14:41:08 +0000
+++ debian/control	2013-04-22 11:00:38 +0000
@@ -17,11 +17,13 @@
     lsb-release,
     procps
 Homepage: https://launchpad.net/juju
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 
-Package: juju
+Package: juju-0.7
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-twisted, python-txzookeeper (>= 0.9.5~), python-txaws, python-yaml, openssh-client, tmux, python-oauth, procps
+Breaks: juju (<< 0.7-0ubuntu1~)
+Replaces: juju (<< 0.7-0ubuntu1~)
 Recommends: python-pydot, byobu
 Suggests: apt-cacher-ng, lxc, zookeeper
 Provides: ${python:Provides}, ${misc:Depends}
@@ -32,3 +34,10 @@
  create service formulas, called charms, independently, and make those
  services coordinate their communication and configuration through a
  simple protocol.
+
+Package: juju
+Architecture: all
+Depends: ${misc:Depends}, juju-0.7
+Description: next generation service orchestration system
+ Virtual dependency package providing Juju, a next generation service
+ orchestration framework.

=== removed file 'debian/juju.install'
--- debian/juju.install	2012-06-11 15:40:48 +0000
+++ debian/juju.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-misc/bash_completion.d/juju /etc/bash_completion.d/

=== removed file 'debian/juju.manpages'
--- debian/juju.manpages	2012-06-11 15:40:48 +0000
+++ debian/juju.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/manpages/*.1

=== added file 'debian/juju.postinst.in'
--- debian/juju.postinst.in	1970-01-01 00:00:00 +0000
+++ debian/juju.postinst.in	2013-04-22 11:00:38 +0000
@@ -0,0 +1,43 @@
+#!/bin/sh
+set -e
+
+VER="__NEW_VERSION__"
+base_dir="/usr/lib"
+
+case "$1" in
+  configure)
+    update-alternatives --force --install /usr/bin/juju juju $base_dir/juju-$VER/bin/juju 20 \
+        --slave /usr/share/man/man1/juju.1.gz juju.1.gz $base_dir/juju-$VER/man/man1/juju.1.gz \
+        --slave /usr/bin/open-port open-port $base_dir/juju-$VER/bin/open-port \
+        --slave /usr/share/man/man1/open-port.1.gz open-port.1.gz $base_dir/juju-$VER/man/man1/open-port.1.gz \
+        --slave /usr/bin/close-port close-port $base_dir/juju-$VER/bin/close-port \
+        --slave /usr/share/man/man1/close-port.1.gz close-port.1.gz $base_dir/juju-$VER/man/man1/close-port.1.gz \
+        --slave /usr/bin/config-get config-get $base_dir/juju-$VER/bin/config-get \
+        --slave /usr/share/man/man1/config-get.1.gz config-get.1.gz $base_dir/juju-$VER/man/man1/config-get.1.gz \
+        --slave /usr/bin/relation-list relation-list $base_dir/juju-$VER/bin/relation-list \
+        --slave /usr/share/man/man1/relation-list.1.gz relation-list.1.gz $base_dir/juju-$VER/man/man1/relation-list.1.gz \
+        --slave /usr/bin/unit-get unit-get $base_dir/juju-$VER/bin/unit-get \
+        --slave /usr/share/man/man1/unit-get.1.gz unit-get.1.gz $base_dir/juju-$VER/man/man1/unit-get.1.gz \
+        --slave /usr/bin/juju-admin juju-admin $base_dir/juju-$VER/bin/juju-admin \
+        --slave /usr/share/man/man1/juju-admin.1.gz juju-admin.1.gz $base_dir/juju-$VER/man/man1/juju-admin.1.gz \
+        --slave /usr/bin/relation-ids relation-ids $base_dir/juju-$VER/bin/relation-ids \
+        --slave /usr/share/man/man1/relation-ids.1.gz relation-ids.1.gz $base_dir/juju-$VER/man/man1/relation-ids.1.gz \
+        --slave /usr/bin/juju-log juju-log $base_dir/juju-$VER/bin/juju-log \
+        --slave /usr/share/man/man1/juju-log.1.gz juju-log.1.gz $base_dir/juju-$VER/man/man1/juju-log.1.gz \
+        --slave /usr/bin/relation-get relation-get $base_dir/juju-$VER/bin/relation-get \
+        --slave /usr/share/man/man1/relation-get.1.gz relation-get.1.gz $base_dir/juju-$VER/man/man1/relation-get.1.gz \
+        --slave /usr/bin/relation-set relation-set $base_dir/juju-$VER/bin/relation-set \
+        --slave /usr/share/man/man1/relation-set.1.gz relation-set.1.gz $base_dir/juju-$VER/man/man1/relation-set.1.gz \
+        --slave /etc/bash_completion.d/juju juju-bash-completion $base_dir/juju-$VER/etc/bash_completion.d/juju
+    ;;
+  abort-upgrade|abort-remove|abort-deconfigure)
+    echo "$1"
+    ;;
+  *) echo "$0: didn't understand being called with \`$1'" 1>&2
+    exit 0
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/juju.prerm.in'
--- debian/juju.prerm.in	1970-01-01 00:00:00 +0000
+++ debian/juju.prerm.in	2013-04-22 11:00:38 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+VER="__NEW_VERSION__"
+
+case "$1" in
+  remove|upgrade|deconfigure)
+    update-alternatives --remove juju /usr/lib/juju-$VER/bin/juju
+    ;;
+
+  failed-upgrade)
+    echo "$1"
+    ;;
+
+  *)
+    echo "prerm called with unknown argument \`$1'" >&2
+    exit 0
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-06 20:44:41 +0000
+++ debian/patches/series	2013-04-22 11:00:38 +0000
@@ -1,1 +1,2 @@
 disable-failing-zookeeper-test.patch
+workaround-lxc-python-env.patch

=== added file 'debian/patches/workaround-lxc-python-env.patch'
--- debian/patches/workaround-lxc-python-env.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/workaround-lxc-python-env.patch	2013-04-22 11:00:38 +0000
@@ -0,0 +1,26 @@
+From: Martin Packman <[e-mail]>
+Description: The various lxc scripts installed in /usr/bin are Python 3 only.
+ If the user has PYTHONPATH or other similar environment variables set, these
+ scripts can incorrectly inherit details from the user's Python 2 setup when
+ run. Workaround the problem by sanitising the environment before calling them.
+Forwarded: N/A
+
+Index: juju/juju/lib/lxc/__init__.py
+===================================================================
+--- juju.orig/juju/lib/lxc/__init__.py	2013-04-10 12:11:45.583012000 +0000
++++ juju/juju/lib/lxc/__init__.py	2013-04-10 12:12:29.543012000 +0000
+@@ -38,8 +38,13 @@
+ 
+ 
+ def _cmd(args):
++    # GZ 2013-04-10: Cleanup the user's python environment to avoid issues now
++    #                the lxc scripts require Python 3, see lp:1130809.
++    env = dict((k, os.environ[k]) for k in os.environ
++        if not k.startswith("PYTHON"))
++    env["PYTHONNOUSERSITE"] = "1"
+     p = subprocess.Popen(
+-        args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
++        args, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+     stdout_data, _ = p.communicate()
+     r = p.returncode
+     if  r != 0:

=== modified file 'debian/rules'
--- debian/rules	2012-07-19 11:01:09 +0000
+++ debian/rules	2013-04-22 11:00:38 +0000
@@ -2,9 +2,14 @@
 
 REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]bzr([0-9]+).*,\1,p')
 VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+MAJOR_VER=0.7
+ifeq "$(REV)" ""
+	REV=tag:$(VER)
+endif
+MANDIR=debian/manpages
 
 %:
-	dh $@ --buildsystem=python_distutils --with python2
+	dh $@ --with python2
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -13,17 +18,16 @@
 
 get-orig-source:
 	bzr export -r $(REV) --root=juju-$(VER).orig \
-               juju_$(VER).orig.tar.gz lp:juju
+               juju_$(VER).orig.tar.gz lp:juju/$(MAJOR_VER)
 
 override_dh_auto_clean::
 	rm -f debian/manpages/*.partial
 	rm -f debian/manpages/*.1
 
-override_dh_auto_build:: debian/manpages/juju.1
-
 HELP2MAN=PYTHONPATH=`pwd` help2man -N --version-string $(VER)
 
-debian/manpages/juju.1:
+generate_juju_manpages:
+	mkdir -p $(MANDIR)
 	$(HELP2MAN) --name "juju service orchestration system admin client" \
      --include debian/manpages/juju.includes.in bin/juju \
      > debian/manpages/juju.1.partial
@@ -34,7 +38,31 @@
         $(HELP2MAN) --name "Juju charm API commands" \
          --include debian/manpages/charm_api.in \
          bin/$$i > debian/manpages/$$i.1.partial ;\
-         mv debian/manpages/$$i.1.partial debian/manpages/$$i.1 ;\
+         mv debian/manpages/$$i.1.partial $(MANDIR)/$$i.1 ;\
     done
-	mv -f debian/manpages/juju-admin.1.partial debian/manpages/juju-admin.1
-	mv -f debian/manpages/juju.1.partial debian/manpages/juju.1
+	mv -f debian/manpages/juju-admin.1.partial $(MANDIR)/juju-admin.1
+	mv -f debian/manpages/juju.1.partial $(MANDIR)/juju.1
+
+override_dh_auto_build: generate_juju_manpages
+
+install_juju_manpages:
+	mkdir -p debian/juju-$(MAJOR_VER)/usr/lib/juju-$(VER)/man/man1
+	cp -a debian/manpages/*.1 debian/juju-$(MAJOR_VER)/usr/lib/juju-$(VER)/man/man1/
+	gzip debian/juju-$(MAJOR_VER)/usr/lib/juju-$(VER)/man/man1/*.1
+
+install_bash_completion:
+	mkdir -p debian/juju-$(MAJOR_VER)/usr/lib/juju-$(VER)/etc/bash_completion.d
+	cp -a misc/bash_completion.d/juju debian/juju-$(MAJOR_VER)/usr/lib/juju-$(VER)/etc/bash_completion.d/juju
+
+override_dh_auto_install: install_juju_manpages install_bash_completion
+	set -e && python setup.py install --root=debian/juju-$(MAJOR_VER) --install-layout=deb --install-scripts=/usr/lib/juju-$(VER)/bin --compile
+
+debian/juju-$(VER).postinst: debian/juju.postinst.in
+	sed -e "s/__NEW_VERSION__/$(VER)/g" $< > $@
+
+debian/juju-$(VER).prerm: debian/juju.prerm.in
+	sed -e "s/__NEW_VERSION__/$(VER)/g" $< > $@
+
+override_dh_installdeb: debian/juju-$(VER).postinst debian/juju-$(VER).prerm
+	dh_installdeb
+

=== removed directory 'examples'
=== removed file 'examples/README'
--- examples/README	2012-06-11 15:40:48 +0000
+++ examples/README	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Examples
-========
-
-
-These are some example charms that can be deployed together to create some connected services.
-
-Many more charms of greater functionality and utility exist in the Principia project, which
-currently serves as a clearinghouse for juju charms.
-
-http://launchpad.net/principia
-
-
-Deploying
-=========
-
-As an example of deploying these sample charms as services and connectinng them.
-
-  $ juju bootstrap
-  $ juju deploy --repository=examples local:mysql
-  $ juju deploy --repository=examples local:wordpress
-  $ juju add-relation wordpress mysql
-  $ juju status
-
-The status command will show the address of the newly deployed wordpress service.

=== removed directory 'examples/precise'
=== removed directory 'examples/precise/mysql'
=== removed file 'examples/precise/mysql/config.yaml'
--- examples/precise/mysql/config.yaml	2012-06-17 15:39:48 +0000
+++ examples/precise/mysql/config.yaml	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-options: {}

=== removed directory 'examples/precise/mysql/hooks'
=== removed file 'examples/precise/mysql/hooks/db-relation-joined'
--- examples/precise/mysql/hooks/db-relation-joined	2012-06-17 15:39:48 +0000
+++ examples/precise/mysql/hooks/db-relation-joined	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-hostname=`unit-get private-address`
-
-# Get the mysql password that was generated by the install hook
-password=`cat /var/lib/juju/mysql.passwd`
-
-# Get the database name; this takes a service unit (ex: wordpress/0)
-# and extracts just 'wordpress'
-service=`echo $JUJU_REMOTE_UNIT | cut -d/ -f1` # split on /
-
-# Determine if a database needs to be created for this service
-existing_databases=`mysql --password="$password" --silent --execute 'show databases'`
-for db in $existing_databases; do
-    if [ "$db" = "$service" ] ; then
-        juju-log "Database already exists, publishing details and exiting"
-        service_password=`cat /var/lib/juju/$service.passwd`
-        # Save these settings on the relation; this will trigger the remote
-        # service unit
-        relation-set database="$service" user="$service" password="$service_password"
-        exit 0 # database already exists
-    fi
-done
-
-# Generate a strong password for the database, using /dev/urandom
-service_password=`pwgen 10 1`
-# Store service password, new service units of same service would need it
-echo $service_password >> /var/lib/juju/$service.passwd
-
-# Create new database and corresponding security settings
-juju-log "Creating new database and corresponding security settings"
-mysqladmin --password="$password" create "$service"
-echo "grant all on $service.* to $service identified by '$service_password'" | mysql --password="$password" --database="$service"
-mysqladmin --password="$password" flush-privileges
-
-# Save these settings on the relation; this will trigger the remote
-# service unit
-relation-set database="$service" user="$service" password="$service_password"

=== removed file 'examples/precise/mysql/hooks/install'
--- examples/precise/mysql/hooks/install	2012-08-24 16:02:42 +0000
+++ examples/precise/mysql/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-apt-get install -qqy debconf-utils python-mysqldb pwgen
-
-# Generate a strong password for the mysql service, using /dev/urandom
-PASSWORD=`pwgen 10 1`
-
-# Store the password for later use by the db-relation-changed hook for
-# this service unit. As a general note, for data that service units do
-# not need to share, simply use the machine's local file store.
-PASSFILE=/var/lib/juju/mysql.passwd
-if ! [ -f $PASSFILE ] ; then
-  touch $PASSFILE
-fi
-chmod 0600 $PASSFILE
-if ! [ -s $PASSFILE ] ; then
-  echo $PASSWORD >> /var/lib/juju/mysql.passwd
-fi
-
-echo mysql-server-5.1 mysql-server/root_password password $PASSWORD | debconf-set-selections
-echo mysql-server-5.1 mysql-server/root_password_again password $PASSWORD | debconf-set-selections
-
-juju-log "mysql-server settings preseeded, now installing via apt-get"
-DEBIAN_FRONTEND=noninteractive apt-get -y install -qq mysql-server
-
-juju-log "Editing my.cnf to allow listening on all interfaces"
-sed --in-place=old 's/127\.0\.0\.1/0.0.0.0/' /etc/mysql/my.cnf
-
-juju-log "Stopping mysql service"
-service mysql stop

=== removed file 'examples/precise/mysql/hooks/start'
--- examples/precise/mysql/hooks/start	2012-06-17 15:39:48 +0000
+++ examples/precise/mysql/hooks/start	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Starting mysql service"
-service mysql start || service mysql restart

=== removed file 'examples/precise/mysql/hooks/stop'
--- examples/precise/mysql/hooks/stop	2012-06-17 15:39:48 +0000
+++ examples/precise/mysql/hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Stopping mysql service"
-service mysql stop || true

=== removed file 'examples/precise/mysql/metadata.yaml'
--- examples/precise/mysql/metadata.yaml	2012-06-17 15:39:48 +0000
+++ examples/precise/mysql/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-name: mysql
-summary: "MySQL relational database provider"
-description: |
-    Installs and configures the MySQL package (mysqldb), then runs it.
-
-    Upon a consuming service establishing a relation, creates a new
-    database for that service, if the database does not yet
-    exist. Publishes the following relation settings for consuming
-    services:
-
-      database: database name
-      user: user name to access database
-      password: password to access the database
-      host: local hostname
-provides:
-  db:
-    interface: mysql

=== removed file 'examples/precise/mysql/revision'
--- examples/precise/mysql/revision	2012-06-17 15:39:48 +0000
+++ examples/precise/mysql/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-11

=== removed directory 'examples/precise/php'
=== removed file 'examples/precise/php/config.yaml'
--- examples/precise/php/config.yaml	2012-06-17 15:39:48 +0000
+++ examples/precise/php/config.yaml	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-options:
-  application_file:
-    description: An application file to push.
-    type: string
-

=== removed directory 'examples/precise/php/hooks'
=== removed file 'examples/precise/php/hooks/config-changed'
--- examples/precise/php/hooks/config-changed	2012-06-17 15:39:48 +0000
+++ examples/precise/php/hooks/config-changed	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-hostname=`unit-get public-address`
-
-app_dir="/var/www/$hostname/"
-app_file=`config-get application_file`
-
-if [ -z $app_file ]; then
-    exit 0
-fi
-
-echo "$app_file" > $app_dir/index.php
-chmod a+r $app_dir/index.php
-

=== removed file 'examples/precise/php/hooks/install'
--- examples/precise/php/hooks/install	2012-06-17 15:39:48 +0000
+++ examples/precise/php/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-juju-log "Installing php5 via apt-get"
-set -eu # -x for verbose logging to juju debug-log
-
-apt-get -y install php5
-
-# Create an internal secret key for wordpress; this is unrelated to
-# the password generated for the admin user of wordpress
-hostname=`unit-get public-address`
-
-SITE_PATH="/var/www/$hostname"
-
-
-juju-log "Creating appropriate upload paths and directories"
-# Setup appropriate upload paths and directories
-mkdir -p $SITE_PATH
-chown -R root:www-data $SITE_PATH
-chmod -R a+rw $SITE_PATH
-chmod a+x $SITE_PATH
-
-# Write the apache config
-# XXX a future branch will change this to use augtool
-apache_config_file_path="/etc/apache2/sites-available/$hostname"
-juju-log "Writing apache config file $apache_config_file_path"
-cat > $apache_config_file_path <<EOF
-<VirtualHost *:80>
-  ServerName $hostname
-  DocumentRoot /var/www/$hostname
-  Options All
-  ErrorLog /var/log/apache2/$hostname-error.log
-  TransferLog /var/log/apache2/$hostname-access.log
-  <FilesMatch \.php$>
-    SetHandler application/x-httpd-php
-  </FilesMatch>
-</VirtualHost>
-EOF
-chmod 0644 $apache_config_file_path
-
-# Configure apache
-juju-log "Enabling apache modules: rewrite, vhost_alias"
-a2enmod rewrite
-a2enmod vhost_alias
-juju-log "Enabling apache site: $hostname"
-a2ensite $hostname
-
-# Restart apache
-juju-log "Restarting apache2 service"
-/etc/init.d/apache2 restart

=== removed file 'examples/precise/php/hooks/start'
--- examples/precise/php/hooks/start	2012-06-17 15:39:48 +0000
+++ examples/precise/php/hooks/start	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#!/bin/bash

=== removed file 'examples/precise/php/hooks/stop'
--- examples/precise/php/hooks/stop	2012-06-17 15:39:48 +0000
+++ examples/precise/php/hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Stopping apache"
-/etc/init.d/apache2 stop

=== removed file 'examples/precise/php/metadata.yaml'
--- examples/precise/php/metadata.yaml	2012-06-17 15:39:48 +0000
+++ examples/precise/php/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-name: php
-summary: "php container"
-description: |
-  PHP environment for your code.

=== removed file 'examples/precise/php/revision'
--- examples/precise/php/revision	2012-06-17 15:39:48 +0000
+++ examples/precise/php/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-5

=== removed directory 'examples/precise/recorder'
=== removed directory 'examples/precise/recorder/hooks'
=== removed file 'examples/precise/recorder/hooks/install'
--- examples/precise/recorder/hooks/install	2012-07-19 11:01:09 +0000
+++ examples/precise/recorder/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-# for testing
-open-port 8080
\ No newline at end of file

=== removed file 'examples/precise/recorder/hooks/juju-info-relation-changed'
--- examples/precise/recorder/hooks/juju-info-relation-changed	2012-06-17 15:39:48 +0000
+++ examples/precise/recorder/hooks/juju-info-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -x
-
-juju-log "Changed relation with $JUJU_REMOTE_UNIT"
-juju-log `relation-list`

=== removed file 'examples/precise/recorder/hooks/juju-info-relation-departed'
--- examples/precise/recorder/hooks/juju-info-relation-departed	2012-06-17 15:39:48 +0000
+++ examples/precise/recorder/hooks/juju-info-relation-departed	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-juju-log "Departed from $JUJU_REMOTE_UNIT"

=== removed file 'examples/precise/recorder/hooks/juju-info-relation-joined'
--- examples/precise/recorder/hooks/juju-info-relation-joined	2012-06-17 15:39:48 +0000
+++ examples/precise/recorder/hooks/juju-info-relation-joined	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -x
-
-juju-log "Joined with $JUJU_REMOTE_UNIT"
-juju-log `relation-list`

=== removed file 'examples/precise/recorder/metadata.yaml'
--- examples/precise/recorder/metadata.yaml	2012-06-17 15:39:48 +0000
+++ examples/precise/recorder/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-name: recorder
-summary: "Subordinate test charm"
-description: |
-    Records which units can see each other to show how subordinates work.
-subordinate: true
-requires:
-    juju-info:
-        interface: juju-info
-        scope: container

=== removed file 'examples/precise/recorder/revision'
--- examples/precise/recorder/revision	2012-06-17 15:39:48 +0000
+++ examples/precise/recorder/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-1
\ No newline at end of file

=== removed directory 'examples/precise/wordpress'
=== removed file 'examples/precise/wordpress/config.yaml'
--- examples/precise/wordpress/config.yaml	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/config.yaml	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-options:
-  plugin:
-    description: |
-      The URL of a wordpress plugin which will be installed and made available in the Admin UI.
-      http://downloads.wordpress.org/plugin/buddypress.1.2.8.zip is a valid example.
-    type: string
-

=== removed directory 'examples/precise/wordpress/hooks'
=== removed file 'examples/precise/wordpress/hooks/config-changed'
--- examples/precise/wordpress/hooks/config-changed	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/hooks/config-changed	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-hostname=`unit-get public-address`
-plugin_dir="/var/www/$hostname/wp-content/plugins"
-plugin_url=`config-get plugin`
-
-base_plugin=`basename ${plugin_url}`
-
-cd /tmp
-
-curl -O ${plugin_url}
-
-if [ $? = 0 ]; then
-    cd ${plugin_dir}
-    unzip /tmp/${base_plugin}
-else
-    juju-log -l WARNING "Unable to fetch ${plugin_url}"
-
-fi

=== removed file 'examples/precise/wordpress/hooks/db-relation-changed'
--- examples/precise/wordpress/hooks/db-relation-changed	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/hooks/db-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-set -eu # -x for verbose logging to juju debug-log
-
-UPLOAD_PATH="/var/www/wp-uploads"
-
-hostname=`unit-get public-address`
-juju-log "Retrieved hostname: $hostname"
-
-# Check we haven't already been setup.
-config_file_path="/etc/wordpress/config-$hostname.php"
-if [ -f "$config_file_path" ] ; then
-    juju-log "Wordpress for site $config_file_path already Configured, exiting"
-    echo "Already Configured, Exiting"
-    exit 0 # already setup
-fi
-
-# Get the database settings; if not set, wait for this hook to be
-# invoked again
-database=`relation-get database`
-if [ -z "$database" ] ; then
-    exit 0 # wait for future handshake from database service unit
-fi
-
-# Our protocol on this interface ensures that all or none of the
-# settings are set. But we can verify the setting or the values if
-# more error checking if desired.
-user=`relation-get user`
-password=`relation-get password`
-host=`relation-get private-address`
-
-# Create an internal secret key for wordpress; this is unrelated to
-# the password generated for the admin user of wordpress
-secret_key=`pwgen 10 1`
-
-juju-log "Creating appropriate upload paths and directories"
-# Setup appropriate upload paths and directories
-ln -s /usr/share/wordpress "/var/www/$hostname"
-mkdir -p $UPLOAD_PATH
-mkdir -p "$UPLOAD_PATH/$hostname"
-chown -R root:www-data $UPLOAD_PATH
-chmod 0744 $UPLOAD_PATH
-chmod 0770 "$UPLOAD_PATH/$hostname"
-chown -R root:www-data "/var/www/$hostname/wp-content"
-
-juju-log "Writing wordpress config file $config_file_path"
-# Write the wordpress config
-cat > $config_file_path <<EOF
-<?php
-define('DB_NAME', '$database');
-define('DB_USER', '$user');
-define('DB_PASSWORD', '$password');
-define('DB_HOST', '$host');
-define('SECRET_KEY', '$secret_key');
-
-#This will disable the update notification.
-define('WP_CORE_UPDATE', false);
-
-\$table_prefix  = 'wp_';
-\$server = '$host';
-\$loginsql = '$user';
-\$passsql = '$password';
-\$base = '$database';
-\$upload_path = '/var/www/wp-uploads/$hostname';
-\$upload_url_path = 'http://$hostname/wp-uploads';
-?>
-EOF
-chmod 0644 $config_file_path
-
-# Write the apache config
-# XXX a future branch will change this to use augtool
-apache_config_file_path="/etc/apache2/sites-available/$hostname"
-juju-log "Writing apache config file $apache_config_file_path"
-cat > $apache_config_file_path <<EOF
-<VirtualHost *:80>
-  ServerName $hostname
-  DocumentRoot /var/www/$hostname
-  Options All
-  ErrorLog /var/log/apache2/wp-error.log
-  TransferLog /var/log/apache2/wp-access.log
-  # Store uploads in /var/www/wp-uploads/$0
-  RewriteEngine On
-  RewriteRule ^/wp-uploads/(.*)$ /var/www/wp-uploads/%%{HTTP_HOST}/\$1
-</VirtualHost>
-EOF
-chmod 0644 $apache_config_file_path
-
-# Configure apache
-juju-log "Enabling apache modules: rewrite, vhost_alias"
-a2enmod rewrite
-a2enmod vhost_alias
-juju-log "Enabling apache site: $hostname"
-a2ensite $hostname
-
-# Restart apache
-juju-log "Restarting apache2 service"
-/etc/init.d/apache2 restart
-
-# Make it publicly visible, once the wordpress service is exposed
-open-port 80/tcp

=== removed file 'examples/precise/wordpress/hooks/install'
--- examples/precise/wordpress/hooks/install	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/hooks/install	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-juju-log "Installing wordpress, pwgen via apt-get"
-set -eu # -x for verbose logging to juju debug-log
-
-apt-get -y install wordpress pwgen unzip

=== removed file 'examples/precise/wordpress/hooks/start'
--- examples/precise/wordpress/hooks/start	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/hooks/start	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#!/bin/bash

=== removed file 'examples/precise/wordpress/hooks/stop'
--- examples/precise/wordpress/hooks/stop	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-juju-log "Stopping apache"
-/etc/init.d/apache2 stop

=== removed file 'examples/precise/wordpress/metadata.yaml'
--- examples/precise/wordpress/metadata.yaml	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/metadata.yaml	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-name: wordpress
-summary: "WordPress blog"
-description: |
-    Installs WordPress package (wordpress). Upon the database provider
-    providing the required database, and the relation settings
-    necessary to access it, completes the configuration of WordPress
-    and makes it available on the web.
-requires:
-  db:
-    interface: mysql

=== removed file 'examples/precise/wordpress/revision'
--- examples/precise/wordpress/revision	2012-06-17 15:39:48 +0000
+++ examples/precise/wordpress/revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-31

=== added directory 'juju'
=== removed directory 'juju'
=== added file 'juju/__init__.py'
--- juju/__init__.py	1970-01-01 00:00:00 +0000
+++ juju/__init__.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,2 @@
+#
+__version__ = '0.7'

=== removed file 'juju/__init__.py'
--- juju/__init__.py	2012-10-09 12:35:35 +0000
+++ juju/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#
-__version__ = '0.6'

=== added directory 'juju/agents'
=== removed directory 'juju/agents'
=== added file 'juju/agents/__init__.py'
--- juju/agents/__init__.py	1970-01-01 00:00:00 +0000
+++ juju/agents/__init__.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,1 @@
+#

=== removed file 'juju/agents/__init__.py'
--- juju/agents/__init__.py	2012-06-11 15:40:48 +0000
+++ juju/agents/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#

=== added file 'juju/agents/base.py'
--- juju/agents/base.py	1970-01-01 00:00:00 +0000
+++ juju/agents/base.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,347 @@
+import argparse
+import os
+import logging
+import stat
+import sys
+import yaml
+
+import zookeeper
+
+from twisted.application import service
+from twisted.internet.defer import inlineCallbacks, returnValue
+from twisted.scripts._twistd_unix import UnixApplicationRunner, UnixAppLogger
+from twisted.python.log import PythonLoggingObserver
+
+from txzookeeper import ZookeeperClient
+from txzookeeper.managed import ManagedClient
+
+from juju.control.options import setup_twistd_options
+from juju.errors import NoConnection, JujuError
+from juju.lib.zklog import ZookeeperHandler
+from juju.lib.zk import CLIENT_SESSION_TIMEOUT
+from juju.state.environment import GlobalSettingsStateManager
+
+
+def load_client_id(path):
+    try:
+        with open(path) as f:
+            return yaml.load(f.read())
+    except IOError:
+        return None
+
+
+def save_client_id(path, client_id):
+    parent = os.path.dirname(path)
+    if not os.path.exists(parent):
+        os.makedirs(parent)
+    with open(path, "w") as f:
+        f.write(yaml.dump(client_id))
+    os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
+
+
+class TwistedOptionNamespace(object):
+    """
+    An argparse namespace implementation that is compatible with twisted
+    config dictionary usage.
+    """
+
+    def __getitem__(self, key):
+        return self.__dict__[key]
+
+    def __setitem__(self, key, value):
+        self.__dict__[key] = value
+
+    def get(self, key, default=None):
+        return self.__dict__.get(key, default)
+
+    def has_key(self, key):
+        return key in self.__dict__
+
+
+class AgentLogger(UnixAppLogger):
+
+    def __init__(self, options):
+        super(AgentLogger, self).__init__(options)
+        self._loglevel = options.get("loglevel", logging.DEBUG)
+
+    def _getLogObserver(self):
+
+        if self._logfilename == "-":
+            log_file = sys.stdout
+        else:
+            log_file = open(self._logfilename, "a")
+
+        # Setup file logger
+        log_handler = logging.StreamHandler(log_file)
+        formatter = logging.Formatter(
+            "%(asctime)s: %(name)s@%(levelname)s: %(message)s")
+        log_handler.setFormatter(formatter)
+
+        # Also capture zookeeper logs (XXX not compatible with rotation)
+        zookeeper.set_log_stream(log_file)
+        zookeeper.set_debug_level(0)
+
+        # Configure logging.
+        root = logging.getLogger()
+        root.addHandler(log_handler)
+        root.setLevel(logging.getLevelName(self._loglevel))
+
+        # Twisted logging is painfully verbose on twisted.web, and
+        # there isn't a good way to distinguish different channels
+        # within twisted, so just utlize error level logging only for
+        # all of twisted.
+        twisted_log = logging.getLogger("twisted")
+        twisted_log.setLevel(logging.ERROR)
+
+        observer = PythonLoggingObserver()
+        return observer.emit
+
+
+class AgentRunner(UnixApplicationRunner):
+
+    application = None
+    loggerFactory = AgentLogger
+
+    def createOrGetApplication(self):
+        return self.application
+
+
+class BaseAgent(object, service.Service):
+
+    name = "juju-agent-unknown"
+    client = None
+
+    # Flag when enabling persistent topology watches, testing aid.
+    _watch_enabled = True
+
+    # Distributed debug log handler
+    _debug_log_handler = None
+
+    @classmethod
+    def run(cls):
+        """Runs the agent as a unix daemon.
+
+        Main entry point for starting an agent, parses cli options, and setups
+        a daemon using twistd as per options.
+        """
+        parser = argparse.ArgumentParser()
+        cls.setup_options(parser)
+        config = parser.parse_args(namespace=TwistedOptionNamespace())
+        runner = AgentRunner(config)
+        agent = cls()
+        agent.configure(config)
+        runner.application = agent.as_app()
+        runner.run()
+
+    @classmethod
+    def setup_options(cls, parser):
+        """Configure the argparse cli parser for the agent."""
+        return cls.setup_default_options(parser)
+
+    @classmethod
+    def setup_default_options(cls, parser):
+        """Setup default twistd daemon and agent options.
+
+        This method is intended as a utility for subclasses.
+
+        @param parser an argparse instance.
+        @type C{argparse.ArgumentParser}
+        """
+        setup_twistd_options(parser, cls)
+        setup_default_agent_options(parser, cls)
+
+    def as_app(self):
+        """
+        Return the agent as a C{twisted.application.service.Application}
+        """
+        app = service.Application(self.name)
+        self.setServiceParent(app)
+        return app
+
+    def configure(self, options):
+        """Configure the agent to handle its cli options.
+
+        Invoked called before the service is started.
+
+        @param options
+        @type C{TwistedOptionNamespace} an argparse namespace corresponding
+              to a dict.
+        """
+        if not options.get("zookeeper_servers"):
+            raise NoConnection("No zookeeper connection configured.")
+
+        if not os.path.exists(options.get("juju_directory", "")):
+            raise JujuError(
+                "Invalid juju-directory %r, does not exist." % (
+                    options.get("juju_directory")))
+
+        if options["session_file"] is None:
+            raise JujuError("No session file specified")
+
+        self.config = options
+
+    @inlineCallbacks
+    def _kill_existing_session(self):
+        try:
+            # We might have died suddenly, in which case the session may
+            # still be alive. If this is the case, shoot it in the head, so
+            # it doesn't interfere with our attempts to recreate our state.
+            # (We need to be able to recreate our state *anyway*, and it's
+            # much simpler to force ourselves to recreate it every time than
+            # it is to mess around partially recreating partial state.)
+            client_id = load_client_id(self.config["session_file"])
+            if client_id is None:
+                return
+            temp_client = yield ZookeeperClient().connect(
+                self.config["zookeeper_servers"], client_id=client_id)
+            yield temp_client.close()
+        except zookeeper.ZooKeeperException:
+            # We don't really care what went wrong; just that we're not able
+            # to connect using the old session, and therefore we should be ok
+            # to start a fresh one without transient state hanging around.
+            pass
+
+    @inlineCallbacks
+    def connect(self):
+        """Return an authenticated connection to the juju zookeeper."""
+        yield self._kill_existing_session()
+        self.client = yield ManagedClient(
+            session_timeout=CLIENT_SESSION_TIMEOUT).connect(
+            self.config["zookeeper_servers"])
+        save_client_id(
+            self.config["session_file"], self.client.client_id)
+
+        principals = self.config.get("principals", ())
+        for principal in principals:
+            self.client.add_auth("digest", principal)
+
+        # bug work around to keep auth fast
+        if principals:
+            yield self.client.exists("/")
+
+        returnValue(self.client)
+
+    def start(self):
+        """Callback invoked on the agent's startup.
+
+        The agent will already be connected to zookeeper. Subclasses are
+        responsible for implementing.
+        """
+        raise NotImplementedError
+
+    def stop(self):
+        """Callback invoked on when the agent is shutting down."""
+        pass
+
+    # Twisted IService implementation, used for delegates to maintain naming
+    # conventions.
+    @inlineCallbacks
+    def startService(self):
+        yield self.connect()
+
+        # Start the global settings watch prior to starting the agent.
+        # Allows for debug log to be enabled early.
+        if self.get_watch_enabled():
+            yield self.start_global_settings_watch()
+
+        yield self.start()
+
+    @inlineCallbacks
+    def stopService(self):
+        try:
+            yield self.stop()
+        finally:
+            if self.client and self.client.connected:
+                self.client.close()
+            session_file = self.config["session_file"]
+            if os.path.exists(session_file):
+                os.unlink(session_file)
+
+    def set_watch_enabled(self, flag):
+        """Set boolean flag for whether this agent should watching zookeeper.
+
+        This is mainly used for testing, to allow for setting up the
+        various data scenarios, before enabling an agent watch which will
+        be observing state.
+        """
+        self._watch_enabled = bool(flag)
+
+    def get_watch_enabled(self):
+        """Returns a boolean if the agent should be settings state watches.
+
+        The meaning of this flag is typically agent specific, as each
+        agent has separate watches they'd like to establish on agent specific
+        state within zookeeper. In general if this flag is False, the agent
+        should refrain from establishing a watch on startup. This flag is
+        typically used by tests to isolate and test the watch behavior
+        independent of the agent startup, via construction of test data.
+        """
+        return self._watch_enabled
+
+    def start_global_settings_watch(self):
+        """Start watching the runtime state for configuration changes."""
+        self.global_settings_state = GlobalSettingsStateManager(self.client)
+        return self.global_settings_state.watch_settings_changes(
+            self.on_global_settings_change)
+
+    @inlineCallbacks
+    def on_global_settings_change(self, change):
+        """On global settings change, take action.
+        """
+        if (yield self.global_settings_state.is_debug_log_enabled()):
+            yield self.start_debug_log()
+        else:
+            self.stop_debug_log()
+
+    @inlineCallbacks
+    def start_debug_log(self):
+        """Enable the distributed debug log handler.
+        """
+        if self._debug_log_handler is not None:
+            returnValue(None)
+        context_name = self.get_agent_name()
+        self._debug_log_handler = ZookeeperHandler(
+            self.client, context_name)
+        yield self._debug_log_handler.open()
+        log_root = logging.getLogger()
+        log_root.addHandler(self._debug_log_handler)
+
+    def stop_debug_log(self):
+        """Disable any configured debug log handler.
+        """
+        if self._debug_log_handler is None:
+            return
+        handler, self._debug_log_handler = self._debug_log_handler, None
+        log_root = logging.getLogger()
+        log_root.removeHandler(handler)
+
+    def get_agent_name(self):
+        """Return the agent's name and context such that it can be identified.
+
+        Subclasses should override this to provide additional context and
+        unique naming.
+        """
+        return self.__class__.__name__
+
+
+def setup_default_agent_options(parser, cls):
+
+    principals_default = os.environ.get("JUJU_PRINCIPALS", "").split()
+    parser.add_argument(
+        "--principal", "-e",
+        action="append", dest="principals", default=principals_default,
+        help="Agent principals to utilize for the zookeeper connection")
+
+    servers_default = os.environ.get("JUJU_ZOOKEEPER", "")
+    parser.add_argument(
+        "--zookeeper-servers", "-z", default=servers_default,
+        help="juju Zookeeper servers to connect to ($JUJU_ZOOKEEPER)")
+
+    juju_home = os.environ.get("JUJU_HOME", "/var/lib/juju")
+    parser.add_argument(
+        "--juju-directory", default=juju_home, type=os.path.abspath,
+        help="juju working directory ($JUJU_HOME)")
+
+    parser.add_argument(
+        "--session-file", default=None, type=os.path.abspath,
+        help="like a pidfile, but for the zookeeper session id")

=== removed file 'juju/agents/base.py'
--- juju/agents/base.py	2012-06-11 15:40:48 +0000
+++ juju/agents/base.py	1970-01-01 00:00:00 +0000
@@ -1,345 +0,0 @@
-import argparse
-import os
-import logging
-import stat
-import sys
-import yaml
-
-import zookeeper
-
-from twisted.application import service
-from twisted.internet.defer import inlineCallbacks, returnValue
-from twisted.scripts._twistd_unix import UnixApplicationRunner, UnixAppLogger
-from twisted.python.log import PythonLoggingObserver
-
-from txzookeeper import ZookeeperClient
-from txzookeeper.managed import ManagedClient
-
-from juju.control.options import setup_twistd_options
-from juju.errors import NoConnection, JujuError
-from juju.lib.zklog import ZookeeperHandler
-from juju.state.environment import GlobalSettingsStateManager
-
-
-def load_client_id(path):
-    try:
-        with open(path) as f:
-            return yaml.load(f.read())
-    except IOError:
-        return None
-
-
-def save_client_id(path, client_id):
-    parent = os.path.dirname(path)
-    if not os.path.exists(parent):
-        os.makedirs(parent)
-    with open(path, "w") as f:
-        f.write(yaml.dump(client_id))
-    os.chmod(path, stat.S_IRUSR | stat.S_IWUSR)
-
-
-class TwistedOptionNamespace(object):
-    """
-    An argparse namespace implementation that is compatible with twisted
-    config dictionary usage.
-    """
-
-    def __getitem__(self, key):
-        return self.__dict__[key]
-
-    def __setitem__(self, key, value):
-        self.__dict__[key] = value
-
-    def get(self, key, default=None):
-        return self.__dict__.get(key, default)
-
-    def has_key(self, key):
-        return key in self.__dict__
-
-
-class AgentLogger(UnixAppLogger):
-
-    def __init__(self, options):
-        super(AgentLogger, self).__init__(options)
-        self._loglevel = options.get("loglevel", logging.DEBUG)
-
-    def _getLogObserver(self):
-
-        if self._logfilename == "-":
-            log_file = sys.stdout
-        else:
-            log_file = open(self._logfilename, "a")
-
-        # Setup file logger
-        log_handler = logging.StreamHandler(log_file)
-        formatter = logging.Formatter(
-            "%(asctime)s: %(name)s@%(levelname)s: %(message)s")
-        log_handler.setFormatter(formatter)
-
-        # Also capture zookeeper logs (XXX not compatible with rotation)
-        zookeeper.set_log_stream(log_file)
-        zookeeper.set_debug_level(0)
-
-        # Configure logging.
-        root = logging.getLogger()
-        root.addHandler(log_handler)
-        root.setLevel(logging.getLevelName(self._loglevel))
-
-        # Twisted logging is painfully verbose on twisted.web, and
-        # there isn't a good way to distinguish different channels
-        # within twisted, so just utlize error level logging only for
-        # all of twisted.
-        twisted_log = logging.getLogger("twisted")
-        twisted_log.setLevel(logging.ERROR)
-
-        observer = PythonLoggingObserver()
-        return observer.emit
-
-
-class AgentRunner(UnixApplicationRunner):
-
-    application = None
-    loggerFactory = AgentLogger
-
-    def createOrGetApplication(self):
-        return self.application
-
-
-class BaseAgent(object, service.Service):
-
-    name = "juju-agent-unknown"
-    client = None
-
-    # Flag when enabling persistent topology watches, testing aid.
-    _watch_enabled = True
-
-    # Distributed debug log handler
-    _debug_log_handler = None
-
-    @classmethod
-    def run(cls):
-        """Runs the agent as a unix daemon.
-
-        Main entry point for starting an agent, parses cli options, and setups
-        a daemon using twistd as per options.
-        """
-        parser = argparse.ArgumentParser()
-        cls.setup_options(parser)
-        config = parser.parse_args(namespace=TwistedOptionNamespace())
-        runner = AgentRunner(config)
-        agent = cls()
-        agent.configure(config)
-        runner.application = agent.as_app()
-        runner.run()
-
-    @classmethod
-    def setup_options(cls, parser):
-        """Configure the argparse cli parser for the agent."""
-        return cls.setup_default_options(parser)
-
-    @classmethod
-    def setup_default_options(cls, parser):
-        """Setup default twistd daemon and agent options.
-
-        This method is intended as a utility for subclasses.
-
-        @param parser an argparse instance.
-        @type C{argparse.ArgumentParser}
-        """
-        setup_twistd_options(parser, cls)
-        setup_default_agent_options(parser, cls)
-
-    def as_app(self):
-        """
-        Return the agent as a C{twisted.application.service.Application}
-        """
-        app = service.Application(self.name)
-        self.setServiceParent(app)
-        return app
-
-    def configure(self, options):
-        """Configure the agent to handle its cli options.
-
-        Invoked called before the service is started.
-
-        @param options
-        @type C{TwistedOptionNamespace} an argparse namespace corresponding
-              to a dict.
-        """
-        if not options.get("zookeeper_servers"):
-            raise NoConnection("No zookeeper connection configured.")
-
-        if not os.path.exists(options.get("juju_directory", "")):
-            raise JujuError(
-                "Invalid juju-directory %r, does not exist." % (
-                    options.get("juju_directory")))
-
-        if options["session_file"] is None:
-            raise JujuError("No session file specified")
-
-        self.config = options
-
-    @inlineCallbacks
-    def _kill_existing_session(self):
-        try:
-            # We might have died suddenly, in which case the session may
-            # still be alive. If this is the case, shoot it in the head, so
-            # it doesn't interfere with our attempts to recreate our state.
-            # (We need to be able to recreate our state *anyway*, and it's
-            # much simpler to force ourselves to recreate it every time than
-            # it is to mess around partially recreating partial state.)
-            client_id = load_client_id(self.config["session_file"])
-            if client_id is None:
-                return
-            temp_client = yield ZookeeperClient().connect(
-                self.config["zookeeper_servers"], client_id=client_id)
-            yield temp_client.close()
-        except zookeeper.ZooKeeperException:
-            # We don't really care what went wrong; just that we're not able
-            # to connect using the old session, and therefore we should be ok
-            # to start a fresh one without transient state hanging around.
-            pass
-
-    @inlineCallbacks
-    def connect(self):
-        """Return an authenticated connection to the juju zookeeper."""
-        yield self._kill_existing_session()
-        self.client = yield ManagedClient().connect(
-            self.config["zookeeper_servers"])
-        save_client_id(
-            self.config["session_file"], self.client.client_id)
-
-        principals = self.config.get("principals", ())
-        for principal in principals:
-            self.client.add_auth("digest", principal)
-
-        # bug work around to keep auth fast
-        if principals:
-            yield self.client.exists("/")
-
-        returnValue(self.client)
-
-    def start(self):
-        """Callback invoked on the agent's startup.
-
-        The agent will already be connected to zookeeper. Subclasses are
-        responsible for implementing.
-        """
-        raise NotImplementedError
-
-    def stop(self):
-        """Callback invoked on when the agent is shutting down."""
-        pass
-
-    # Twisted IService implementation, used for delegates to maintain naming
-    # conventions.
-    @inlineCallbacks
-    def startService(self):
-        yield self.connect()
-
-        # Start the global settings watch prior to starting the agent.
-        # Allows for debug log to be enabled early.
-        if self.get_watch_enabled():
-            yield self.start_global_settings_watch()
-
-        yield self.start()
-
-    @inlineCallbacks
-    def stopService(self):
-        try:
-            yield self.stop()
-        finally:
-            if self.client and self.client.connected:
-                self.client.close()
-            session_file = self.config["session_file"]
-            if os.path.exists(session_file):
-                os.unlink(session_file)
-
-    def set_watch_enabled(self, flag):
-        """Set boolean flag for whether this agent should watching zookeeper.
-
-        This is mainly used for testing, to allow for setting up the
-        various data scenarios, before enabling an agent watch which will
-        be observing state.
-        """
-        self._watch_enabled = bool(flag)
-
-    def get_watch_enabled(self):
-        """Returns a boolean if the agent should be settings state watches.
-
-        The meaning of this flag is typically agent specific, as each
-        agent has separate watches they'd like to establish on agent specific
-        state within zookeeper. In general if this flag is False, the agent
-        should refrain from establishing a watch on startup. This flag is
-        typically used by tests to isolate and test the watch behavior
-        independent of the agent startup, via construction of test data.
-        """
-        return self._watch_enabled
-
-    def start_global_settings_watch(self):
-        """Start watching the runtime state for configuration changes."""
-        self.global_settings_state = GlobalSettingsStateManager(self.client)
-        return self.global_settings_state.watch_settings_changes(
-            self.on_global_settings_change)
-
-    @inlineCallbacks
-    def on_global_settings_change(self, change):
-        """On global settings change, take action.
-        """
-        if (yield self.global_settings_state.is_debug_log_enabled()):
-            yield self.start_debug_log()
-        else:
-            self.stop_debug_log()
-
-    @inlineCallbacks
-    def start_debug_log(self):
-        """Enable the distributed debug log handler.
-        """
-        if self._debug_log_handler is not None:
-            returnValue(None)
-        context_name = self.get_agent_name()
-        self._debug_log_handler = ZookeeperHandler(
-            self.client, context_name)
-        yield self._debug_log_handler.open()
-        log_root = logging.getLogger()
-        log_root.addHandler(self._debug_log_handler)
-
-    def stop_debug_log(self):
-        """Disable any configured debug log handler.
-        """
-        if self._debug_log_handler is None:
-            return
-        handler, self._debug_log_handler = self._debug_log_handler, None
-        log_root = logging.getLogger()
-        log_root.removeHandler(handler)
-
-    def get_agent_name(self):
-        """Return the agent's name and context such that it can be identified.
-
-        Subclasses should override this to provide additional context and
-        unique naming.
-        """
-        return self.__class__.__name__
-
-
-def setup_default_agent_options(parser, cls):
-
-    principals_default = os.environ.get("JUJU_PRINCIPALS", "").split()
-    parser.add_argument(
-        "--principal", "-e",
-        action="append", dest="principals", default=principals_default,
-        help="Agent principals to utilize for the zookeeper connection")
-
-    servers_default = os.environ.get("JUJU_ZOOKEEPER", "")
-    parser.add_argument(
-        "--zookeeper-servers", "-z", default=servers_default,
-        help="juju Zookeeper servers to connect to ($JUJU_ZOOKEEPER)")
-
-    juju_home = os.environ.get("JUJU_HOME", "/var/lib/juju")
-    parser.add_argument(
-        "--juju-directory", default=juju_home, type=os.path.abspath,
-        help="juju working directory ($JUJU_HOME)")
-
-    parser.add_argument(
-        "--session-file", default=None, type=os.path.abspath,
-        help="like a pidfile, but for the zookeeper session id")

=== added file 'juju/agents/dummy.py'
--- juju/agents/dummy.py	1970-01-01 00:00:00 +0000
+++ juju/agents/dummy.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,16 @@
+
+from .base import BaseAgent
+
+
+class DummyAgent(BaseAgent):
+    """A do nothing juju agent.
+
+    A bit like a dog, it just lies around basking in the sun,
+    doing nothing, nonetheless its quite content. :-)
+    """
+
+    def start(self):
+        """nothing to see here, move along."""
+
+if __name__ == '__main__':
+    DummyAgent.run()

=== removed file 'juju/agents/dummy.py'
--- juju/agents/dummy.py	2012-06-11 15:40:48 +0000
+++ juju/agents/dummy.py	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-
-from .base import BaseAgent
-
-
-class DummyAgent(BaseAgent):
-    """A do nothing juju agent.
-
-    A bit like a dog, it just lies around basking in the sun,
-    doing nothing, nonetheless its quite content. :-)
-    """
-
-    def start(self):
-        """nothing to see here, move along."""
-
-if __name__ == '__main__':
-    DummyAgent.run()

=== added file 'juju/agents/machine.py'
--- juju/agents/machine.py	1970-01-01 00:00:00 +0000
+++ juju/agents/machine.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,126 @@
+import logging
+import os
+
+from twisted.internet.defer import inlineCallbacks
+
+from juju.errors import JujuError
+from juju.state.machine import MachineStateManager
+from juju.state.service import ServiceStateManager
+from juju.unit.deploy import UnitDeployer
+
+from .base import BaseAgent
+
+
+log = logging.getLogger("juju.agents.machine")
+
+
+class MachineAgent(BaseAgent):
+    """A juju machine agent.
+
+    The machine agent is responsible for monitoring service units
+    assigned to a machine. If a new unit is assigned to machine, the
+    machine agent will download the charm, create a working
+    space for the service unit agent, and then launch it.
+
+    Additionally the machine agent will monitor the running service
+    unit agents on the machine, via their ephemeral nodes, and
+    restart them if they die.
+    """
+
+    name = "juju-machine-agent"
+    unit_agent_module = "juju.agents.unit"
+
+    @property
+    def units_directory(self):
+        return os.path.join(self.config["juju_directory"], "units")
+
+    @property
+    def unit_state_directory(self):
+        return os.path.join(self.config["juju_directory"], "state")
+
+    @inlineCallbacks
+    def start(self):
+        """Start the machine agent.
+
+        Creates state directories on the machine, retrieves the machine state,
+        and enables watch on assigned units.
+        """
+        if not os.path.exists(self.units_directory):
+            os.makedirs(self.units_directory)
+
+        if not os.path.exists(self.unit_state_directory):
+            os.makedirs(self.unit_state_directory)
+
+        # Get state managers we'll be utilizing.
+        self.service_state_manager = ServiceStateManager(self.client)
+        self.unit_deployer = UnitDeployer(
+            self.client, self.get_machine_id(), self.config["juju_directory"])
+        yield self.unit_deployer.start()
+
+        # Retrieve the machine state for the machine we represent.
+        machine_manager = MachineStateManager(self.client)
+        self.machine_state = yield machine_manager.get_machine_state(
+            self.get_machine_id())
+
+        # Watch assigned units for the machine.
+        if self.get_watch_enabled():
+            self.machine_state.watch_assigned_units(
+                self.watch_service_units)
+
+        # Connect the machine agent, broadcasting presence to the world.
+        yield self.machine_state.connect_agent()
+        log.info("Machine agent started id:%s" % self.get_machine_id())
+
+    @inlineCallbacks
+    def watch_service_units(self, old_units, new_units):
+        """Callback invoked when the assigned service units change.
+        """
+        if old_units is None:
+            old_units = set()
+
+        log.debug(
+            "Units changed old:%s new:%s", old_units, new_units)
+
+        stopped = old_units - new_units
+        started = new_units - old_units
+
+        for unit_name in stopped:
+            log.debug("Stopping service unit: %s ...", unit_name)
+            try:
+                yield self.unit_deployer.kill_service_unit(unit_name)
+            except Exception:
+                log.exception("Error stopping unit: %s", unit_name)
+
+        for unit_name in started:
+            log.debug("Starting service unit: %s ...", unit_name)
+            try:
+                yield self.unit_deployer.start_service_unit(unit_name)
+            except Exception:
+                log.exception("Error starting unit: %s", unit_name)
+
+    def get_machine_id(self):
+        """Get the id of the machine as known within the zk state."""
+        return self.config["machine_id"]
+
+    def get_agent_name(self):
+        return "Machine:%s" % (self.get_machine_id())
+
+    def configure(self, options):
+        super(MachineAgent, self).configure(options)
+        if not options.get("machine_id"):
+            msg = ("--machine-id must be provided in the command line, "
+                   "or $JUJU_MACHINE_ID in the environment")
+            raise JujuError(msg)
+
+    @classmethod
+    def setup_options(cls, parser):
+        super(MachineAgent, cls).setup_options(parser)
+
+        machine_id = os.environ.get("JUJU_MACHINE_ID", "")
+        parser.add_argument(
+            "--machine-id", default=machine_id)
+        return parser
+
+
+if __name__ == "__main__":
+    MachineAgent().run()

=== removed file 'juju/agents/machine.py'
--- juju/agents/machine.py	2012-08-24 16:02:42 +0000
+++ juju/agents/machine.py	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-import logging
-import os
-
-from twisted.internet.defer import inlineCallbacks
-
-from juju.errors import JujuError
-from juju.state.machine import MachineStateManager
-from juju.state.service import ServiceStateManager
-from juju.unit.deploy import UnitDeployer
-
-from .base import BaseAgent
-
-
-log = logging.getLogger("juju.agents.machine")
-
-
-class MachineAgent(BaseAgent):
-    """A juju machine agent.
-
-    The machine agent is responsible for monitoring service units
-    assigned to a machine. If a new unit is assigned to machine, the
-    machine agent will download the charm, create a working
-    space for the service unit agent, and then launch it.
-
-    Additionally the machine agent will monitor the running service
-    unit agents on the machine, via their ephemeral nodes, and
-    restart them if they die.
-    """
-
-    name = "juju-machine-agent"
-    unit_agent_module = "juju.agents.unit"
-
-    @property
-    def units_directory(self):
-        return os.path.join(self.config["juju_directory"], "units")
-
-    @property
-    def unit_state_directory(self):
-        return os.path.join(self.config["juju_directory"], "state")
-
-    @inlineCallbacks
-    def start(self):
-        """Start the machine agent.
-
-        Creates state directories on the machine, retrieves the machine state,
-        and enables watch on assigned units.
-        """
-        if not os.path.exists(self.units_directory):
-            os.makedirs(self.units_directory)
-
-        if not os.path.exists(self.unit_state_directory):
-            os.makedirs(self.unit_state_directory)
-
-        # Get state managers we'll be utilizing.
-        self.service_state_manager = ServiceStateManager(self.client)
-        self.unit_deployer = UnitDeployer(
-            self.client, self.get_machine_id(), self.config["juju_directory"])
-        yield self.unit_deployer.start()
-
-        # Retrieve the machine state for the machine we represent.
-        machine_manager = MachineStateManager(self.client)
-        self.machine_state = yield machine_manager.get_machine_state(
-            self.get_machine_id())
-
-        # Watch assigned units for the machine.
-        if self.get_watch_enabled():
-            self.machine_state.watch_assigned_units(
-                self.watch_service_units)
-
-        # Connect the machine agent, broadcasting presence to the world.
-        yield self.machine_state.connect_agent()
-        log.info("Machine agent started id:%s" % self.get_machine_id())
-
-    @inlineCallbacks
-    def watch_service_units(self, old_units, new_units):
-        """Callback invoked when the assigned service units change.
-        """
-        if old_units is None:
-            old_units = set()
-
-        log.debug(
-            "Units changed old:%s new:%s", old_units, new_units)
-
-        stopped = old_units - new_units
-        started = new_units - old_units
-
-        for unit_name in stopped:
-            log.debug("Stopping service unit: %s ...", unit_name)
-            try:
-                yield self.unit_deployer.kill_service_unit(unit_name)
-            except Exception:
-                log.exception("Error stopping unit: %s", unit_name)
-
-        for unit_name in started:
-            log.debug("Starting service unit: %s ...", unit_name)
-            try:
-                yield self.unit_deployer.start_service_unit(unit_name)
-            except Exception:
-                log.exception("Error starting unit: %s", unit_name)
-
-    def get_machine_id(self):
-        """Get the id of the machine as known within the zk state."""
-        return self.config["machine_id"]
-
-    def get_agent_name(self):
-        return "Machine:%s" % (self.get_machine_id())
-
-    def configure(self, options):
-        super(MachineAgent, self).configure(options)
-        if not options.get("machine_id"):
-            msg = ("--machine-id must be provided in the command line, "
-                   "or $JUJU_MACHINE_ID in the environment")
-            raise JujuError(msg)
-
-    @classmethod
-    def setup_options(cls, parser):
-        super(MachineAgent, cls).setup_options(parser)
-
-        machine_id = os.environ.get("JUJU_MACHINE_ID", "")
-        parser.add_argument(
-            "--machine-id", default=machine_id)
-        return parser
-
-
-if __name__ == "__main__":
-    MachineAgent().run()

=== added file 'juju/agents/provision.py'
--- juju/agents/provision.py	1970-01-01 00:00:00 +0000
+++ juju/agents/provision.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,239 @@
+import logging
+
+from twisted.internet.defer import inlineCallbacks, returnValue, succeed
+from zookeeper import NoNodeException
+
+from juju.environment.config import EnvironmentsConfig
+from juju.errors import ProviderError
+from juju.lib.twistutils import concurrent_execution_guard
+from juju.state.errors import MachineStateNotFound, StopWatcher
+from juju.state.firewall import FirewallManager
+from juju.state.machine import MachineStateManager
+from juju.state.service import ServiceStateManager
+
+from .base import BaseAgent
+
+
+log = logging.getLogger("juju.agents.provision")
+
+
+class ProvisioningAgent(BaseAgent):
+
+    name = "juju-provisoning-agent"
+
+    _current_machines = ()
+
+    # time in seconds
+    machine_check_period = 60
+
+    def get_agent_name(self):
+        return "provision:%s" % (self.environment.type)
+
+    @inlineCallbacks
+    def start(self):
+        self._running = True
+
+        self.environment = yield self.configure_environment()
+        self.provider = self.environment.get_machine_provider()
+        self.machine_state_manager = MachineStateManager(self.client)
+        self.service_state_manager = ServiceStateManager(self.client)
+        self.firewall_manager = FirewallManager(
+            self.client, self.is_running, self.provider)
+
+        if self.get_watch_enabled():
+            self.machine_state_manager.watch_machine_states(
+                self.watch_machine_changes)
+            self.service_state_manager.watch_service_states(
+                self.firewall_manager.watch_service_changes)
+            from twisted.internet import reactor
+            reactor.callLater(
+                self.machine_check_period, self.periodic_machine_check)
+            log.info("Started provisioning agent")
+        else:
+            log.info("Started provisioning agent without watches enabled")
+
+    def stop(self):
+        log.info("Stopping provisioning agent")
+        self._running = False
+        return succeed(True)
+
+    def is_running(self):
+        """Whether this agent is running or not."""
+        return self._running
+
+    @inlineCallbacks
+    def configure_environment(self):
+        """The provisioning agent configure its environment on start or change.
+
+        The environment contains the configuration th agent needs to interact
+        with its machine provider, in order to do its work. This configuration
+        data is deployed lazily over an encrypted connection upon first usage.
+
+        The agent waits for this data to exist before completing its startup.
+        """
+        try:
+            get_d, watch_d = self.client.get_and_watch("/environment")
+            environment_data, stat = yield get_d
+            watch_d.addCallback(self._on_environment_changed)
+        except NoNodeException:
+            # Wait till the environment node appears. play twisted gymnastics
+            exists_d, watch_d = self.client.exists_and_watch("/environment")
+            stat = yield exists_d
+            if stat:
+                environment = yield self.configure_environment()
+            else:
+                watch_d.addCallback(
+                    lambda result: self.configure_environment())
+            if not stat:
+                environment = yield watch_d
+            returnValue(environment)
+
+        config = EnvironmentsConfig()
+        config.parse(environment_data)
+        returnValue(config.get_default())
+
+    @inlineCallbacks
+    def _on_environment_changed(self, event):
+        """Reload the environment if its data changes."""
+
+        if event.type_name == "deleted":
+            return
+
+        self.environment = yield self.configure_environment()
+        self.provider = self.environment.get_machine_provider()
+
+    def periodic_machine_check(self):
+        """A periodic checking of machine states and provider machines.
+
+        In addition to the on demand changes to zookeeper states that are
+        monitored by L{watch_machine_changes}, the periodic machine check
+        performs non zookeeper state related verification by periodically
+        checking the last current provider machine states against the
+        last known zookeeper state.
+
+        Primarily this helps in recovering from transient error conditions
+        which may have prevent processing of an individual machine state, as
+        well as verifying the current state of the provider's running machines
+        against the zk state, thus pruning unused resources.
+        """
+        from twisted.internet import reactor
+        d = self.process_machines(self._current_machines)
+        d.addBoth(
+            lambda result: reactor.callLater(
+                self.machine_check_period, self.periodic_machine_check))
+        return d
+
+    @inlineCallbacks
+    def watch_machine_changes(self, old_machines, new_machines):
+        """Watches and processes machine state changes.
+
+        This function is used to subscribe to topology changes, and
+        specifically changes to machines within the topology. It performs
+        work against the machine provider to ensure that the currently
+        running state of the juju cluster corresponds to the topology
+        via creation and deletion of machines.
+
+        The subscription utilized is a permanent one, meaning that this
+        function will automatically be rescheduled to run whenever a topology
+        state change happens that involves machines.
+
+        This functional also caches the current set of machines as an agent
+        instance attribute.
+
+        @param old_machines machine ids as existed in the previous topology.
+        @param new_machines machine ids as exist in the current topology.
+        """
+        if not self._running:
+            raise StopWatcher()
+        log.debug("Machines changed old:%s new:%s", old_machines, new_machines)
+        self._current_machines = new_machines
+        try:
+            yield self.process_machines(self._current_machines)
+        except Exception:
+            # Log and effectively retry later in periodic_machine_check
+            log.exception(
+                "Got unexpected exception in processing machines,"
+                " will retry")
+
+    @concurrent_execution_guard("_processing_machines")
+    @inlineCallbacks
+    def process_machines(self, current_machines):
+        """Ensure the currently running machines correspond to state.
+
+        At the end of each process_machines execution, verify that all
+        running machines within the provider correspond to machine_ids within
+        the topology. If they don't then shut them down.
+
+        Utilizes concurrent execution guard, to ensure that this is only being
+        executed at most once per process.
+        """
+        # XXX this is obviously broken, but the margins of 80 columns prevent
+        # me from describing. hint think concurrent agents, and use a lock.
+
+        # map of instance_id -> machine
+        try:
+            provider_machines = yield self.provider.get_machines()
+        except ProviderError:
+            log.exception("Cannot get machine list")
+            return
+
+        provider_machines = dict(
+            [(m.instance_id, m) for m in provider_machines])
+
+        instance_ids = []
+        for machine_state_id in current_machines:
+            try:
+                instance_id = yield self.process_machine(
+                    machine_state_id, provider_machines)
+            except (MachineStateNotFound, ProviderError):
+                log.exception("Cannot process machine %s", machine_state_id)
+                continue
+            instance_ids.append(instance_id)
+
+        # Terminate all unused juju machines running within the cluster.
+        unused = set(provider_machines.keys()) - set(instance_ids)
+        for instance_id in unused:
+            log.info("Shutting down machine id:%s ...", instance_id)
+            machine = provider_machines[instance_id]
+
+            try:
+                yield self.provider.shutdown_machine(machine)
+            except ProviderError:
+                log.exception("Cannot shutdown machine %s", instance_id)
+                continue
+
+    @inlineCallbacks
+    def process_machine(self, machine_state_id, provider_machine_map):
+        """Ensure a provider machine for a machine state id.
+
+        For each machine_id in new machines which represents the current state
+        of the topology:
+
+          * Check to ensure its state reflects that it has been
+            launched. If it hasn't then create the machine and update
+            the state.
+
+          * Watch the machine's assigned services so that changes can
+            be applied to the firewall for service exposing support.
+        """
+        # fetch the machine state
+        machine_state = yield self.machine_state_manager.get_machine_state(
+            machine_state_id)
+        instance_id = yield machine_state.get_instance_id()
+
+        # Verify a machine id has state and is running, else launch it.
+        if instance_id is None or not instance_id in provider_machine_map:
+            log.info("Starting machine id:%s ...", machine_state.id)
+            constraints = yield machine_state.get_constraints()
+            machines = yield self.provider.start_machine(
+                {"machine-id": machine_state.id, "constraints": constraints})
+            instance_id = machines[0].instance_id
+            yield machine_state.set_instance_id(instance_id)
+
+        # The firewall manager also needs to be checked for any
+        # outstanding retries on this machine
+        yield self.firewall_manager.process_machine(machine_state)
+        returnValue(instance_id)
+
+if __name__ == '__main__':
+    ProvisioningAgent().run()

=== removed file 'juju/agents/provision.py'
--- juju/agents/provision.py	2012-07-19 11:01:09 +0000
+++ juju/agents/provision.py	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-import logging
-
-from twisted.internet.defer import inlineCallbacks, returnValue, succeed
-from zookeeper import NoNodeException
-
-from juju.environment.config import EnvironmentsConfig
-from juju.errors import ProviderError
-from juju.lib.twistutils import concurrent_execution_guard
-from juju.state.errors import MachineStateNotFound, StopWatcher
-from juju.state.firewall import FirewallManager
-from juju.state.machine import MachineStateManager
-from juju.state.service import ServiceStateManager
-
-from .base import BaseAgent
-
-
-log = logging.getLogger("juju.agents.provision")
-
-
-class ProvisioningAgent(BaseAgent):
-
-    name = "juju-provisoning-agent"
-
-    _current_machines = ()
-
-    # time in seconds
-    machine_check_period = 60
-
-    def get_agent_name(self):
-        return "provision:%s" % (self.environment.type)
-
-    @inlineCallbacks
-    def start(self):
-        self._running = True
-
-        self.environment = yield self.configure_environment()
-        self.provider = self.environment.get_machine_provider()
-        self.machine_state_manager = MachineStateManager(self.client)
-        self.service_state_manager = ServiceStateManager(self.client)
-        self.firewall_manager = FirewallManager(
-            self.client, self.is_running, self.provider)
-
-        if self.get_watch_enabled():
-            self.machine_state_manager.watch_machine_states(
-                self.watch_machine_changes)
-            self.service_state_manager.watch_service_states(
-                self.firewall_manager.watch_service_changes)
-            from twisted.internet import reactor
-            reactor.callLater(
-                self.machine_check_period, self.periodic_machine_check)
-            log.info("Started provisioning agent")
-        else:
-            log.info("Started provisioning agent without watches enabled")
-
-    def stop(self):
-        log.info("Stopping provisioning agent")
-        self._running = False
-        return succeed(True)
-
-    def is_running(self):
-        """Whether this agent is running or not."""
-        return self._running
-
-    @inlineCallbacks
-    def configure_environment(self):
-        """The provisioning agent configure its environment on start or change.
-
-        The environment contains the configuration th agent needs to interact
-        with its machine provider, in order to do its work. This configuration
-        data is deployed lazily over an encrypted connection upon first usage.
-
-        The agent waits for this data to exist before completing its startup.
-        """
-        try:
-            get_d, watch_d = self.client.get_and_watch("/environment")
-            environment_data, stat = yield get_d
-            watch_d.addCallback(self._on_environment_changed)
-        except NoNodeException:
-            # Wait till the environment node appears. play twisted gymnastics
-            exists_d, watch_d = self.client.exists_and_watch("/environment")
-            stat = yield exists_d
-            if stat:
-                environment = yield self.configure_environment()
-            else:
-                watch_d.addCallback(
-                    lambda result: self.configure_environment())
-            if not stat:
-                environment = yield watch_d
-            returnValue(environment)
-
-        config = EnvironmentsConfig()
-        config.parse(environment_data)
-        returnValue(config.get_default())
-
-    @inlineCallbacks
-    def _on_environment_changed(self, event):
-        """Reload the environment if its data changes."""
-
-        if event.type_name == "deleted":
-            return
-
-        self.environment = yield self.configure_environment()
-        self.provider = self.environment.get_machine_provider()
-
-    def periodic_machine_check(self):
-        """A periodic checking of machine states and provider machines.
-
-        In addition to the on demand changes to zookeeper states that are
-        monitored by L{watch_machine_changes}, the periodic machine check
-        performs non zookeeper state related verification by periodically
-        checking the last current provider machine states against the
-        last known zookeeper state.
-
-        Primarily this helps in recovering from transient error conditions
-        which may have prevent processing of an individual machine state, as
-        well as verifying the current state of the provider's running machines
-        against the zk state, thus pruning unused resources.
-        """
-        from twisted.internet import reactor
-        d = self.process_machines(self._current_machines)
-        d.addBoth(
-            lambda result: reactor.callLater(
-                self.machine_check_period, self.periodic_machine_check))
-        return d
-
-    @inlineCallbacks
-    def watch_machine_changes(self, old_machines, new_machines):
-        """Watches and processes machine state changes.
-
-        This function is used to subscribe to topology changes, and
-        specifically changes to machines within the topology. It performs
-        work against the machine provider to ensure that the currently
-        running state of the juju cluster corresponds to the topology
-        via creation and deletion of machines.
-
-        The subscription utilized is a permanent one, meaning that this
-        function will automatically be rescheduled to run whenever a topology
-        state change happens that involves machines.
-
-        This functional also caches the current set of machines as an agent
-        instance attribute.
-
-        @param old_machines machine ids as existed in the previous topology.
-        @param new_machines machine ids as exist in the current topology.
-        """
-        if not self._running:
-            raise StopWatcher()
-        log.debug("Machines changed old:%s new:%s", old_machines, new_machines)
-        self._current_machines = new_machines
-        try:
-            yield self.process_machines(self._current_machines)
-        except Exception:
-            # Log and effectively retry later in periodic_machine_check
-            log.exception(
-                "Got unexpected exception in processing machines,"
-                " will retry")
-
-    @concurrent_execution_guard("_processing_machines")
-    @inlineCallbacks
-    def process_machines(self, current_machines):
-        """Ensure the currently running machines correspond to state.
-
-        At the end of each process_machines execution, verify that all
-        running machines within the provider correspond to machine_ids within
-        the topology. If they don't then shut them down.
-
-        Utilizes concurrent execution guard, to ensure that this is only being
-        executed at most once per process.
-        """
-        # XXX this is obviously broken, but the margins of 80 columns prevent
-        # me from describing. hint think concurrent agents, and use a lock.
-
-        # map of instance_id -> machine
-        try:
-            provider_machines = yield self.provider.get_machines()
-        except ProviderError:
-            log.exception("Cannot get machine list")
-            return
-
-        provider_machines = dict(
-            [(m.instance_id, m) for m in provider_machines])
-
-        instance_ids = []
-        for machine_state_id in current_machines:
-            try:
-                instance_id = yield self.process_machine(
-                    machine_state_id, provider_machines)
-            except (MachineStateNotFound, ProviderError):
-                log.exception("Cannot process machine %s", machine_state_id)
-                continue
-            instance_ids.append(instance_id)
-
-        # Terminate all unused juju machines running within the cluster.
-        unused = set(provider_machines.keys()) - set(instance_ids)
-        for instance_id in unused:
-            log.info("Shutting down machine id:%s ...", instance_id)
-            machine = provider_machines[instance_id]
-
-            try:
-                yield self.provider.shutdown_machine(machine)
-            except ProviderError:
-                log.exception("Cannot shutdown machine %s", instance_id)
-                continue
-
-    @inlineCallbacks
-    def process_machine(self, machine_state_id, provider_machine_map):
-        """Ensure a provider machine for a machine state id.
-
-        For each machine_id in new machines which represents the current state
-        of the topology:
-
-          * Check to ensure its state reflects that it has been
-            launched. If it hasn't then create the machine and update
-            the state.
-
-          * Watch the machine's assigned services so that changes can
-            be applied to the firewall for service exposing support.
-        """
-        # fetch the machine state
-        machine_state = yield self.machine_state_manager.get_machine_state(
-            machine_state_id)
-        instance_id = yield machine_state.get_instance_id()
-
-        # Verify a machine id has state and is running, else launch it.
-        if instance_id is None or not instance_id in provider_machine_map:
-            log.info("Starting machine id:%s ...", machine_state.id)
-            constraints = yield machine_state.get_constraints()
-            machines = yield self.provider.start_machine(
-                {"machine-id": machine_state.id, "constraints": constraints})
-            instance_id = machines[0].instance_id
-            yield machine_state.set_instance_id(instance_id)
-
-        # The firewall manager also needs to be checked for any
-        # outstanding retries on this machine
-        yield self.firewall_manager.process_machine(machine_state)
-        returnValue(instance_id)
-
-if __name__ == '__main__':
-    ProvisioningAgent().run()

=== added directory 'juju/agents/tests'
=== removed directory 'juju/agents/tests'
=== added file 'juju/agents/tests/__init__.py'
--- juju/agents/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ juju/agents/tests/__init__.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,1 @@
+#

=== removed file 'juju/agents/tests/__init__.py'
--- juju/agents/tests/__init__.py	2012-06-11 15:40:48 +0000
+++ juju/agents/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-#

=== added file 'juju/agents/tests/common.py'
--- juju/agents/tests/common.py	1970-01-01 00:00:00 +0000
+++ juju/agents/tests/common.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,52 @@
+import os
+
+from twisted.internet.defer import inlineCallbacks, succeed
+
+from txzookeeper.tests.utils import deleteTree
+
+from juju.agents.base import TwistedOptionNamespace
+from juju.state.tests.common import StateTestBase
+from juju.tests.common import get_test_zookeeper_address
+
+
+class AgentTestBase(StateTestBase):
+
+    agent_class = None
+    juju_directory = None
+    setup_environment = True
+
+    @inlineCallbacks
+    def setUp(self):
+        self.juju_directory = self.makeDir()
+        yield super(AgentTestBase, self).setUp()
+        assert self.agent_class, "Agent Class must be specified on test"
+        if self.setup_environment:
+            yield self.push_default_config()
+        self.agent = self.agent_class()
+        self.options = yield self.get_agent_config()
+        self.agent.configure(self.options)
+        self.agent.set_watch_enabled(False)
+
+    def tearDown(self):
+        if self.agent.client and self.agent.client.connected:
+            self.agent.client.close()
+
+        if self.client.connected:
+            deleteTree("/", self.client.handle)
+            self.client.close()
+
+    def get_agent_config(self):
+        options = TwistedOptionNamespace()
+        options["juju_directory"] = self.juju_directory
+        options["zookeeper_servers"] = get_test_zookeeper_address()
+        options["session_file"] = self.makeFile()
+        return succeed(options)
+
+    @inlineCallbacks
+    def debug_pprint_tree(self, path="/", indent=1):
+        children = yield self.client.get_children(path)
+        for n in children:
+            print " " * indent, "/" + n
+            yield self.debug_pprint_tree(
+                os.path.join(path, n),
+                indent + 1)

=== removed file 'juju/agents/tests/common.py'
--- juju/agents/tests/common.py	2012-06-11 15:40:48 +0000
+++ juju/agents/tests/common.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-import os
-
-from twisted.internet.defer import inlineCallbacks, succeed
-
-from txzookeeper.tests.utils import deleteTree
-
-from juju.agents.base import TwistedOptionNamespace
-from juju.state.tests.common import StateTestBase
-from juju.tests.common import get_test_zookeeper_address
-
-
-class AgentTestBase(StateTestBase):
-
-    agent_class = None
-    juju_directory = None
-    setup_environment = True
-
-    @inlineCallbacks
-    def setUp(self):
-        self.juju_directory = self.makeDir()
-        yield super(AgentTestBase, self).setUp()
-        assert self.agent_class, "Agent Class must be specified on test"
-        if self.setup_environment:
-            yield self.push_default_config()
-        self.agent = self.agent_class()
-        self.options = yield self.get_agent_config()
-        self.agent.configure(self.options)
-        self.agent.set_watch_enabled(False)
-
-    def tearDown(self):
-        if self.agent.client and self.agent.client.connected:
-            self.agent.client.close()
-
-        if self.client.connected:
-            deleteTree("/", self.client.handle)
-            self.client.close()
-
-    def get_agent_config(self):
-        options = TwistedOptionNamespace()
-        options["juju_directory"] = self.juju_directory
-        options["zookeeper_servers"] = get_test_zookeeper_address()
-        options["session_file"] = self.makeFile()
-        return succeed(options)
-
-    @inlineCallbacks
-    def debug_pprint_tree(self, path="/", indent=1):
-        children = yield self.client.get_children(path)
-        for n in children:
-            print " " * indent, "/" + n
-            yield self.debug_pprint_tree(
-                os.path.join(path, n),
-                indent + 1)

=== added file 'juju/agents/tests/test_base.py'
--- juju/agents/tests/test_base.py	1970-01-01 00:00:00 +0000
+++ juju/agents/tests/test_base.py	2013-04-22 11:00:38 +0000
@@ -0,0 +1,633 @@
+import argparse
+import json
+import logging
+import os
+import stat
+import sys
+import yaml
+
+from twisted.application.app import AppLogger
+from twisted.application.service import IService, IServiceCollection
+from twisted.internet.defer import (
+    fail, succeed, Deferred, inlineCallbacks, returnValue)
+from twisted.python.components import Componentized
+from twisted.python import log
+
+import zookeeper
+from txzookeeper import ZookeeperClient
+from juju.lib.testing import TestCase
+from juju.lib.mocker import MATCH
+from juju.tests.common import get_test_zookeeper_address
+
+from juju.agents.base import (
+    BaseAgent, TwistedOptionNamespace, AgentRunner, AgentLogger)
+from juju.agents.dummy import DummyAgent
+from juju.errors import NoConnection, JujuError
+from juju.lib.zklog import ZookeeperHandler
+
+from juju.agents.tests.common import AgentTestBase
+
+MATCH_APP = MATCH(lambda x: isinstance(x, Componentized))
+MATCH_HANDLER = MATCH(lambda x: isinstance(x, ZookeeperHandler))
+
+
+class BaseAgentTest(TestCase):
+
+    @inlineCallbacks
+    def setUp(self):
+        yield super(BaseAgentTest, self).setUp()
+        self.juju_home = self.makeDir()
+        self.change_environment(JUJU_HOME=self.juju_home)
+
+    def test_as_app(self):
+        """The agent class can be accessed as an application."""
+        app = BaseAgent().as_app()
+        multi_service = IService(app, None)
+        self.assertTrue(IServiceCollection.providedBy(multi_service))
+        services = list(multi_service)
+        self.assertEqual(len(services), 1)
+
+    def test_twistd_default_options(self):
+        """The agent cli parsing, populates standard twistd options."""
+        parser = argparse.ArgumentParser()
+        BaseAgent.setup_options(parser)
+
+        # Daemon group
+        self.assertEqual(
+            parser.get_default("logfile"), "%s.log" % BaseAgent.name)
+        self.assertEqual(parser.get_default("pidfile"), "")
+
+        self.assertEqual(parser.get_default("loglevel"), "DEBUG")
+        self.assertFalse(parser.get_default("nodaemon"))
+        self.assertEqual(parser.get_default("rundir"), ".")
+        self.assertEqual(parser.get_default("chroot"), None)
+        self.assertEqual(parser.get_default("umask"), '0022')
+        self.assertEqual(parser.get_default("uid"), None)
+        self.assertEqual(parser.get_default("gid"), None)
+        self.assertEqual(parser.get_default("euid"), None)
+        self.assertEqual(parser.get_default("prefix"), BaseAgent.name)
+        self.assertEqual(parser.get_default("syslog"), False)
+
+        # Development Group
+        self.assertFalse(parser.get_default("debug"))
+        self.assertFalse(parser.get_default("profile"))
+        self.assertFalse(parser.get_default("savestats"))
+        self.assertEqual(parser.get_default("profiler"), "cprofile")
+
+        # Hidden defaults
+        self.assertEqual(parser.get_default("reactor"), "epoll")
+        self.assertEqual(parser.get_default("originalname"), None)
+
+        # Agent options
+        self.assertEqual(parser.get_default("principals"), [])
+        self.assertEqual(parser.get_default("zookeeper_servers"), "")
+        self.assertEqual(parser.get_default("juju_directory"), self.juju_home)
+        self.assertEqual(parser.get_default("session_file"), None)
+
+    def test_twistd_flags_correspond(self):
+        parser = argparse.ArgumentParser()
+        BaseAgent.setup_options(parser)
+        args = [
+            "--profile",
+            "--savestats",
+            "--nodaemon"]
+
+        options = parser.parse_args(args, namespace=TwistedOptionNamespace())
+        self.assertEqual(options.get("savestats"), True)
+        self.assertEqual(options.get("nodaemon"), True)
+        self.assertEqual(options.get("profile"), True)
+
+    def test_agent_logger(self):
+        parser = argparse.ArgumentParser()
+        BaseAgent.setup_options(parser)
+        log_file_path = self.makeFile()
+
+        options = parser.parse_args(
+            ["--logfile", log_file_path, "--session-file", self.makeFile()],
+            namespace=TwistedOptionNamespace())
+
+        def match_observer(observer):
+            return isinstance(observer.im_self, log.PythonLoggingObserver)
+
+        def cleanup(observer):
+            # post test cleanup of global state.
+            log.removeObserver(observer)
+            logging.getLogger().handlers = []
+
+        original_log_with_observer = log.startLoggingWithObserver
+
+        def _start_log_with_observer(observer):
+            self.addCleanup(cleanup, observer)
+            # by default logging will replace stdout/stderr
+            return original_log_with_observer(observer, 0)
+
+        app = self.mocker.mock()
+        app.getComponent(log.ILogObserver, None)
+        self.mocker.result(None)
+
+        start_log_with_observer = self.mocker.replace(
+            log.startLoggingWithObserver)
+        start_log_with_observer(MATCH(match_observer))
+        self.mocker.call(_start_log_with_observer)
+        self.mocker.replay()
+
+        agent_logger = AgentLogger(options)
+        agent_logger.start(app)
+
+        # We suppress twisted messages below the error level.
+        output = open(log_file_path).read()
+        self.assertFalse(output)
+
+        # also verify we didn't mess with the app logging.
+        app_log = logging.getLogger()
+        app_log.info("Good")
+
+        # and that twisted errors still go through.
+        log.err("Something bad happened")
+        output = open(log_file_path).read()
+
+        self.assertIn("Good", output)
+        self.assertIn("Something bad happened", output)
+
+    def test_custom_log_level(self):
+        parser = argparse.ArgumentParser()
+        BaseAgent.setup_options(parser)
+        options = parser.parse_args(
+            ["--loglevel", "INFO"], namespace=TwistedOptionNamespace())
+        self.assertEqual(options.loglevel, "INFO")
+
+    def test_twistd_option_namespace(self):
+        """
+        The twisted option namespace bridges argparse attribute access,
+        to twisted dictionary access for cli options.
+        """
+        options = TwistedOptionNamespace()
+        options.x = 1
+        self.assertEqual(options['x'], 1)
+        self.assertEqual(options.get('x'), 1)
+        self.assertEqual(options.get('y'), None)
+        self.assertRaises(KeyError, options.__getitem__, 'y')
+        options['y'] = 2
+        self.assertEqual(options.y, 2)
+        self.assertTrue(options.has_key('y'))
+        self.assertFalse(options.has_key('z'))
+
+    def test_runner_attribute_application(self):
+        """The agent runner retrieve the application as an attribute."""
+        runner = AgentRunner({})
+        self.assertEqual(runner.createOrGetApplication(), None)
+        runner.application = 21
+        self.assertEqual(runner.createOrGetApplication(), 21)
+
+    def test_run(self):
+        """Invokes the run class method on an agent.
+
+        This will create an agent instance,  parse the cli args, passes them to
+        the agent, and starts the agent runner.
+        """
+        self.change_args(
+            "es-agent", "--zookeeper-servers", get_test_zookeeper_address(),
+            "--session-file", self.makeFile())
+        runner = self.mocker.patch(AgentRunner)
+        runner.run()
+        mock_agent = self.mocker.patch(BaseAgent)
+
+        def match_args(config):
+            self.assertEqual(config["zookeeper_servers"],
+                             get_test_zookeeper_address())
+            return True
+
+        mock_agent.configure(MATCH(match_args))
+        self.mocker.passthrough()
+
+        self.mocker.replay()
+        BaseAgent.run()
+
+    def test_full_run(self):
+        """Verify a functional agent start via the 'run' method.
+
+        This test requires Zookeeper running on the default port of localhost.
+        The mocked portions are to prevent the daemon start from altering the
+        test environment (sys.stdout/sys.stderr, and reactor start).
+        """
+        zookeeper.set_debug_level(0)
+        started = Deferred()
+
+        class DummyAgent(BaseAgent):
+            started = False
+
+            def start(self):
+                started.callback(self)
+
+        def validate_started(agent):
+            self.assertTrue(agent.client.connected)
+
+        started.addCallback(validate_started)
+
+        self.change_args(
+            "es-agent", "--nodaemon",
+            "--zookeeper-servers", get_test_zookeeper_address(),
+            "--session-file", self.makeFile())
+        runner = self.mocker.patch(AgentRunner)
+        logger = self.mocker.patch(AppLogger)
+        logger.start(MATCH_APP)
+        runner.startReactor(None, sys.stdout, sys.stderr)
+        logger.stop()
+        self.mocker.replay()
+        DummyAgent.run()
+        return started
+
+    @inlineCallbacks
+    def test_stop_service_stub_closes_agent(self):
+        """The base class agent, stopService will the stop method.
+
+        Additionally it will close the agent's zookeeper client if
+        the client is still connected.
+        """
+        mock_agent = self.mocker.patch(BaseAgent)
+        mock_client = self.mocker.mock(ZookeeperClient)
+        session_file = self.makeFile()
+
+        # connection is closed after agent.stop invoked.
+        with self.mocker.order():
+            mock_agent.stop()
+            self.mocker.passthrough()
+
+            # client existence check
+            mock_agent.client
+            self.mocker.result(mock_client)
+
+            # client connected check
+            mock_agent.client
+            self.mocker.result(mock_client)
+            mock_client.connected
+            self.mocker.result(True)
+
+            # client close
+            mock_agent.client
+            self.mocker.result(mock_client)
+            mock_client.close()
+
+            # delete session file
+            mock_agent.config
+            self.mocker.result({"session_file": session_file})
+
+        self.mocker.replay()
+
+        agent = BaseAgent()
+        yield agent.stopService()
+        self.assertFalse(os.path.exists(session_file))
+