Merge lp:~negronjl/pyjuju/874801 into lp:pyjuju

[Juan L. Negron]

Capistrano status output renderer for Juju. LP: 874801

[Kapil Thangavelu (hazmat)]

Needs a unit test.

[Juan L. Negron (negronjl)]

Thanks to ben (bcsaller) for the help.
This should be ready for review now.
-Juan

[Kapil Thangavelu (hazmat)]

added some discussion to the bug report about this branch as that has a wider subscription.

[William Reade (fwereade)]

Re: bug report discussion: this is clear and simple; it seems to be genuinely useful to some potential users; it doesn't add any real complexity to juju as it stands. My only worry is that it may be somewhat tedious to maintain (or just become useless) when we allow co-located units, and by including it we are setting up an expectation that it will continue to work; this makes me personally -0 on the proposal, but other people seem to like it a lot so I'm comfortable approving it nonetheless.

review: Approve

[Kapil Thangavelu (hazmat)]

so based on the discussion on irc, it sounds like we've got consensus to structure this as a separate package from the core.

Unmerged revisions

409. By Juan L. Negron on 2011-10-17

Merged in bcsaller's changes

408. By Juan L. Negron on 2011-10-15

Capfile renderer for juju status. LP: 874801

=== modified file 'juju/control/status.py'
--- juju/control/status.py	2011-09-30 03:18:49 +0000
+++ juju/control/status.py	2011-10-17 17:33:23 +0000
@@ -389,6 +389,25 @@
 
     filelike.write(dot.create(format=format))
 
+
+def render_capistrano(data, filelike, environment):
+    """capistrano role output
+
+    see https://github.com/capistrano/capistrano/wiki/2.x-Getting-Started
+    """
+    for service_name, service in data["services"].iteritems():
+        filelike.write("role :%s, " % service_name)
+        unit_addresses = []
+        for unit_name, unit in service["units"].iteritems():
+            if isinstance(unit.get("public-address"), str):
+                unit_addresses.append("%r" % unit["public-address"])
+
+        if unit_addresses:
+            filelike.write(", ".join(unit_addresses))
+
+        filelike.write("\n")
+
 renderers["dot"] = render_dot
 renderers["svg"] = functools.partial(render_dot, format="svg")
 renderers["png"] = functools.partial(render_dot, format="png")
+renderers["capistrano"] = render_capistrano

=== modified file 'juju/control/tests/test_status.py'
--- juju/control/tests/test_status.py	2011-09-30 03:18:49 +0000
+++ juju/control/tests/test_status.py	2011-10-17 17:33:23 +0000
@@ -658,3 +658,24 @@
 
         # look for a hint the process completed.
         self.assertIn("</svg>", self.output.getvalue())
+
+    @inlineCallbacks
+    def test_render_capistrano(self):
+        yield self.build_topology()
+        self.mock_environment()
+        self.mocker.replay()
+
+        yield status.status(self.environment, [],
+                            status.renderers["capistrano"],
+                            self.output,
+                            None)
+
+        expected = """
+role :varnish, 'varnish-1.example.com', 'varnish-0.example.com'
+role :memcache, 'memcache-0.example.com', 'memcache-1.example.com'
+role :wordpress, 'wordpress-0.example.com'
+role :mysql, 'mysql-0.example.com', 'mysql-1.example.com'
+"""
+        self.assertEqual(expected.strip(),
+                         self.output.getvalue().strip())
+