percheron 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4858cd5f4ec9b26b7976179c56f074a1cb5570
-  data.tar.gz: 050b74b700b9c127766e5454eba7aea97c85ba7c
+  metadata.gz: bea44fa6bffb36f64cc87ea1b7440f5adec930ee
+  data.tar.gz: f80411ab025ea216f43d8f114160e3d8007e03e8
 SHA512:
-  metadata.gz: 9865aad4f0d56c8e2607bd74dc579443d7c645afc20c1362b855ad867c09475080d5588ffcdf89f86ed89e5cf7ab0e3791b2f85cc8e91565b54fda597198ecb0
-  data.tar.gz: 438581d49d52687a2d06cf5d6bd538b3f1bf0df2dfe7b5dab655e1b2bd5a87f62fa5a194f559a3b41dfdf5bebeb32f54aadc24c0a4be3bdc5f6f510ee7bd31ef
+  metadata.gz: 820eebf1087b9201bd950c3eb989c993389974d0b46b574421516dcaf4cc7ab241b0b077b1894b45191b1be56a56d11faaa54ab055e2ef02601cc4f2a1a11bf9
+  data.tar.gz: 8428c2dc52c9cf6ff2ca82a3a508d9112955b9b5d6cbef68079ffdabd1650def1c6a0263b657fc0830f6e5a173671750813399a7ffd638a0c55458500cd93238

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.8.1 / 2015-08-21
+
+* BUGfix when creating units via Start action
+* Support needed_unit_names and dependant_unit_names
+* Added image size to the ascii table for status
+
 ## v0.8.0 / 2015-08-19
 
 * Hostname is the full `<stack_name>_<name>` by default

data/README.md

@@ -81,13 +81,11 @@ Parameters:
 
 Subcommands:
     list, status                  List stacks and its units
-    console                       Start a pry console session
     start                         Start a stack
     stop                          Stop a stack
     restart                       Restart a stack
-    build                         Build images for a stack
-    create                        Build images and create units for a stack
-    recreate                      Recreate a stack
+    build, rebuild                (Re)build image(s) for a stack
+    create, recreate              (Re)build image(s) and (re)create units for a stack
     purge                         Purge a stack
     shell                         Shell into a unit
     logs                          Show logs for a unit
@@ -96,13 +94,15 @@ Subcommands:
 Options:
     -h, --help                    print help
     -c, --config_file CONFIG      Config file (default: ".percheron.yml")
-    --version                     show version
+    --version                     show versionn
 ```
 
 ## Demo (using boot2docker)
 
 1) Get boot2docker up and running
 
+Follow the directions at https://docs.docker.com/installation
+
 ```bash
 boot2docker up && eval $(boot2docker shellinit) && export BOOT2DOCKER_IP=$(boot2docker ip)
 ```
@@ -126,14 +126,14 @@ stacks:
         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
+          - "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:
+        needed_unit_names:
           - master
 ```
 
@@ -169,7 +169,7 @@ percheron status consul-stack
 6) Ensure consul is running
 
 ```bash
-curl http://boot2docker:8500/v1/catalog/nodes
+curl http://${BOOT2DOCKER_IP}:8500/v1/catalog/nodes
 
 [{"Node":"agent1","Address":"172.17.0.5"},{"Node":"agent2","Address":"172.17.0.6"},{"Node":"master","Address":"172.17.0.4"}]
 ```
@@ -177,7 +177,7 @@ curl http://boot2docker:8500/v1/catalog/nodes
 7) Perform some DNS lookups using consul
 
 ```bash
-dig @boot2docker -p 8600 master.node.consul agent1.node.consul agent2.node.consul +short
+dig @${BOOT2DOCKER_IP} -p 8600 master.node.consul agent1.node.consul agent2.node.consul +short
 
 172.17.0.7
 172.17.0.8
@@ -187,7 +187,7 @@ dig @boot2docker -p 8600 master.node.consul agent1.node.consul agent2.node.consu
 8) Bring up the consul UI
 
 ```bash
-open http://boot2docker:8500/ui
+open http://${BOOT2DOCKER_IP}:8500/ui
 ```
 
 9) Purge it!
@@ -213,10 +213,6 @@ percheron graph consul-stack
 
 ![consul-stack](https://raw.githubusercontent.com/ashmckenzie/percheron-consul/master/assets/stack.png)
 
-## Demo asciicast
-
-[![asciicast](https://asciinema.org/a/7l1ar35xlmfsaphhptrqvx7jg.png)](https://asciinema.org/a/7l1ar35xlmfsaphhptrqvx7jg)
-
 ## Debugging
 
 To perform debugging you will need to install the `pry-byebug` gem:

data/examples/consul/.percheron.yml

@@ -8,12 +8,12 @@ stacks:
         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
+          - "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:
+        needed_unit_names:
           - master

data/lib/percheron/actions/create.rb

@@ -112,8 +112,8 @@ module Percheron
         end
 
         def start_and_insert_scripts!
-          Start.new(unit).execute!
           insert_post_start_scripts!
+          Start.new(unit, create: false).execute!
         end
 
         def update_dockerfile_md5!

data/lib/percheron/actions/start.rb

@@ -3,17 +3,18 @@ module Percheron
     class Start
       include Base
 
-      def initialize(unit, needed_units: [], cmd: false, exec_scripts: true)
+      def initialize(unit, needed_units: [], create: true, cmd: false, exec_scripts: true)
         @unit = unit
         @needed_units = needed_units
+        @create = create
         @cmd = cmd
         @exec_scripts = exec_scripts
       end
 
       def execute!
-        results = []
-        results << create!
-        unless unit.running?
+        return nil if unit.running?
+        results = [ create! ]
+        if unit.startable?
           results << start!
           results << execute_post_start_scripts!
         end
@@ -22,21 +23,40 @@ module Percheron
 
       private
 
-        attr_reader :unit, :needed_units, :cmd, :exec_scripts
+        attr_reader :unit, :needed_units, :create, :cmd, :exec_scripts
+        alias_method :create?, :create
 
         def exec_scripts?
           !unit.post_start_scripts.empty? && exec_scripts
         end
 
         def create!
-          return nil if unit.exists?
+          return nil unless create?
           Create.new(unit, cmd: cmd).execute!
         end
 
         def start!
-          return nil if !unit.startable? || unit.running?
-          $logger.info "Starting '#{unit.display_name}' unit"
-          unit.container.start!
+          return nil if unit_running?
+          if needed_unit_names_not_running.empty?
+            $logger.info "Starting '#{unit.display_name}' unit"
+            unit.container.start!
+          else
+            $logger.error "Cannot start '%s' unit, %s not running" %
+              [ unit.display_name, needed_unit_names_not_running ]
+          end
+        end
+
+        def unit_running?
+          !unit.startable? || unit.running?
+        end
+
+        def needed_unit_names_not_running
+          @needed_unit_names_not_running ||= begin
+            unit.startable_needed_units.each_with_object([]) do |unit_tuple, all|
+              _, unit = unit_tuple
+              all << unit.name unless unit.running?
+            end
+          end
         end
 
         def execute_post_start_scripts!

data/lib/percheron/commands/purge.rb

@@ -14,7 +14,7 @@ module Percheron
       private
 
         def confirm?
-          ask('Are you sure? (y|n) ') do |q|
+          ask('Are you sure you want to purge? (y|n) ') do |q|
             q.validate = /y(es)?|n(o)?/i
           end.match(/y(es)?/i)
         end

data/lib/percheron/formatters/stack/table.rb

@@ -30,6 +30,7 @@ module Percheron
               'IP',
               'Ports',
               'Volumes',
+              'Size',
               'Version'
             ]
           end
@@ -59,6 +60,7 @@ module Percheron
               unit.ip,
               unit.ports.join(', '),
               unit.volumes.join("\n"),
+              unit.image_size,
               version(unit)
             ]
           end

data/lib/percheron/unit.rb

@@ -8,8 +8,8 @@ module Percheron
     include Unit::ImageHelper
 
     def_delegators :unit_config, :name, :pseudo_name, :docker_image
-    def_config_item_with_default :unit_config, [], :env, :ports, :volumes, :needed_unit_names,
-                                 :pre_build_scripts, :post_start_scripts, :start_args, :dns
+    def_config_item_with_default :unit_config, [], :env, :ports, :volumes, :pre_build_scripts,
+                                 :post_start_scripts, :start_args, :dns
     def_config_item_with_default :unit_config, true, :startable
 
     def initialize(config, stack, unit_name)
@@ -20,6 +20,10 @@ module Percheron
       self
     end
 
+    def needed_unit_names
+      unit_config.fetch('needed_unit_names', unit_config.fetch('dependant_unit_names', []))
+    end
+
     def needed_units
       needed_unit_names.each_with_object({}) do |unit_name, all|
         all[unit_name] = stack.units[unit_name]

data/lib/percheron/unit/image_helper.rb

@@ -28,6 +28,10 @@ module Percheron
       def image_exists?
         image.nil? ? false : true
       end
+
+      def image_size
+        image.nil? ? nil : '%s MB' % [ image.info['VirtualSize'] / 1_048_576 ]
+      end
     end
   end
 end

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp