percheron 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d390c7370c3f9ed4da778a0c5bff35a0bb1a3e
-  data.tar.gz: db80598848ec004fcd08433c973a2c4df01fcfbf
+  metadata.gz: 4b3358819570477f97ff3f4c1b21b689a7007390
+  data.tar.gz: 04f82dae87c48a51b0ebff986bf4bab889036c7b
 SHA512:
-  metadata.gz: 6072c3f0c9c2761014a1a2c53279cc08c43c7d48929a7bfb4ad80169a4a073b4eef9a351c5cd61d81fae61c9e8e5f8f8292796e8dd403f2182b0443f9709d6b4
-  data.tar.gz: 92733cea3b69b070ec201e61d01f35e14d6d426b39d6da4f07b90839a68bdfa577d2c13efc779baa65a898516f799139fc23be6ce3e2fc42d8bf17311ae406ec
+  metadata.gz: 4cafe93d3bddf33b7098cdae3aa87afbe4a4a27d78f65b3e3a36c96808cd9867bbd2881a3a6499f7f334d97a1f8565402129117c93b32cbe32b04a44432005d0
+  data.tar.gz: 502ca1ee96c79cda8f55b347cb1b3ba30f61645374540a057143ea4b3b6ff0cca0ce06ab450f982e812a315ecd5798b9cd12ca6e1875a5fe4550af62485a8e85

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.7.16 / 2015-08-07
+
+* Improved graph look
+
 ## v0.7.15 / 2015-08-06
 
 * Allow --force to be used when recreating

data/examples/consul/.percheron.yml

@@ -0,0 +1,19 @@
+---
+stacks:
+  - name: consul-stack
+    description: A demo consul stack with one master and two agents
+    units:
+      - name: master
+        version: 1.0.0
+        docker_image: gliderlabs/consul-server:0.5
+        start_args: [ "-bootstrap", "-client", "0.0.0.0", "-data-dir", "/data", "-ui-dir", "/ui" ]
+        ports:
+          - 8500:8500
+          - 8600:53/udp
+      - name: agent
+        version: 1.0.0
+        instances: 2
+        docker_image: gliderlabs/consul-agent:0.5
+        start_args: [ "-join", "master" ]
+        dependent_unit_names:
+          - master

data/lib/percheron/graph.rb

@@ -33,24 +33,31 @@ module Percheron
       end
 
       def graph_opts
-        { type: :digraph, nodesep: 0.75, ranksep: 1.0, label: header_label, fontsize: 12 }
+        { type: :digraph, nodesep: 0.75, ranksep: 1.0, label: header_label }
       end
 
-      def units
-        @units ||= stack.units
+      def header_label
+        '<
+          <table border="0" cellborder="0">
+            <tr><td height="36" valign="bottom">
+              <font face="Arial Bold" point-size="14">%s</font>
+            </td></tr>
+            <tr><td height="18"><font face="Arial Italic" point-size="11">%s</font></td></tr>
+          </table>
+          >' % [ stack.name, stack_description ]
       end
 
-      def header_label
-        '\n%s\n%s\n' % [ stack.name, stack.description ]
+      def stack_description
+        stack.description || ' '
+      end
+
+      def units
+        @units ||= stack.units
       end
 
       def add_nodes
         units.each do |_, unit|
-          if unit.pseudo?
-            add_pseudo_node(unit)
-          else
-            add_node(unit)
-          end
+          unit.pseudo? ? add_pseudo_node(unit) : add_node(unit)
         end
       end
 
@@ -70,14 +77,17 @@ module Percheron
       end
 
       def cluster_opts(unit)
-        { label: unit.pseudo_name, style: 'filled', color: 'lightgrey' }
+        label = '<<font face="Arial Bold">%s</font>>' % unit.pseudo_name
+        { label: label, style: 'filled', color: 'lightgrey', fontsize: 13 }
       end
 
       def node_opts(unit)
         shape = unit.startable? ? 'box' : 'ellipse'
-        label = [ unit.name ]
-        unit.ports.each { |ports| label << 'public: %s, internal: %s' % ports.split(':') }
-        { shape: shape, label: label.join("\n"), fontname: 'arial', fontsize: 12 }
+        label = [ '<font face="Arial Bold" point-size="12">%s</font><br/>' % unit.name ]
+        unit.ports.each do |ports|
+          label << '<font point-size="11">p: %s, i: %s</font>' % ports.split(':')
+        end
+        { shape: shape, label: '<%s>' % label.join('<br/>'), fontname: 'arial' }
       end
 
       def pseudo_node_opts(unit)

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = '0.7.15'
+  VERSION = '0.7.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -312,6 +312,7 @@ files:
 - README.md
 - Rakefile
 - bin/percheron
+- examples/consul/.percheron.yml
 - lib/percheron.rb
 - lib/percheron/actions.rb
 - lib/percheron/actions/base.rb