percheron 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febfd28281497bcdac84631381e348032bdf5308
-  data.tar.gz: 3dce8fa1c163bc54d369463b239f9198d3233d74
+  metadata.gz: 61e4d66006bf086c797d921852dae42438f8abca
+  data.tar.gz: b91b6698c444e51757bee46fa5f290b67211670b
 SHA512:
-  metadata.gz: b1ec93761eae6aec601ffb80c6072182f956f240610d9b3277ec561360efa8c5360f61a841f0cfc1c6d857e0ed22d96683c176726f8591d307363232a5a435e4
-  data.tar.gz: 8019b9377222d367f8a4f3a0316860456829a503c0678e5b72e8928c35d9f3b347fffd6e4666971698f267ff73cbbd33bba5c785fd90b9696b5e050417a48a32
+  metadata.gz: 9a136f407d6823d6983723a36ea9056f56e440411e56df65e2101348fbb4dcd957027f570a9af29b21f9e5c273698ca9a460a05666fa79353577413c00e8892e
+  data.tar.gz: b87043f174f595bd1aed913e087089575d7ee602d5a46a5810d01c98aebd38d4816aa1a45145f2b7b685fb443bb1fd4d10c29a3e7ed0dc8396048a0299bbb97c

data/lib/percheron/actions/base.rb

@@ -36,11 +36,11 @@ module Percheron
         end
       end
 
-      def start_containers!(containers)
+      def start_containers!(containers, exec_scripts: true)
         exec_on_containers!(containers) do |container|
           unless container.running?
             $logger.debug "Starting '#{container.name}' container"
-            Start.new(container, container.dependant_containers.values).execute!
+            Start.new(container, dependant_containers: container.dependant_containers.values, exec_scripts: exec_scripts).execute!
           end
         end
       end

data/lib/percheron/actions/build.rb

@@ -10,8 +10,9 @@ module Percheron
       end
 
       def execute!
-        build!
-        container
+        results = []
+        results << build!
+        results.compact.empty? ? nil : container
       end
 
       private
@@ -30,7 +31,7 @@ module Percheron
         def build!
           in_working_directory(base_dir) do
             execute_pre_build_scripts!  unless container.pre_build_scripts.empty?
-            $logger.info "Building '#{container.image_name}'"
+            $logger.info "Building '#{container.image_name}' image"
             Docker::Image.build_from_dir(base_dir, build_opts) do |out|
               $logger.debug '%s' % [ out.strip ]
             end

data/lib/percheron/actions/create.rb

@@ -10,12 +10,13 @@ module Percheron
       end
 
       def execute!(opts={})
+        results = []
         if recreate? || !container.exists?
-          create!(opts)
-          container
+          results << create!(opts)
         else
           $logger.debug "Container '#{container.name}' already exists"
         end
+        results.compact.empty? ? nil : container
       end
 
       private
@@ -60,8 +61,7 @@ module Percheron
         end
 
         def create!(opts)
-          $logger.debug "Container '#{container.name}' does not exist, creating"
-          build_image!
+          build_image! unless container.image_exists?
           insert_scripts!
           create_container!(opts.fetch(:create, {}))
           execute_post_create_scripts! unless container.post_create_scripts.empty?
@@ -69,41 +69,29 @@ module Percheron
         end
 
         def build_image!
-          unless container.image_exists?
-            $logger.info "Creating '#{container.image_name}' image"
-            Build.new(container).execute!
-          end
+          Build.new(container).execute!
         end
 
-        def set_dockerfile_md5!
-          $logger.info "Setting MD5 for '#{container.name}' container to #{container.current_dockerfile_md5}"
-          $metastore.set("#{container.metastore_key}.dockerfile_md5", container.current_dockerfile_md5)
+        def insert_scripts!
+          insert_files!(container.post_create_scripts)
+          insert_files!(container.post_start_scripts)
         end
 
         def create_container!(opts)
           options = base_options.merge(host_config_options).merge(opts)
-
           $logger.info "Creating '%s' container" % options['name']
           Docker::Container.create(options)
         end
 
-        def insert_scripts!
-          insert_post_create_scripts!
-          insert_post_start_scripts!
-        end
-
-        def insert_post_create_scripts!
-          insert_files!(container.post_create_scripts)
-        end
-
-        def insert_post_start_scripts!
-          insert_files!(container.post_start_scripts)
-        end
-
         def execute_post_create_scripts!
           Exec.new(container, container.dependant_containers.values, container.post_create_scripts, 'POST create').execute!
         end
 
+        def set_dockerfile_md5!
+          $logger.info "Setting MD5 for '#{container.name}' container to #{container.current_dockerfile_md5}"
+          $metastore.set("#{container.metastore_key}.dockerfile_md5", container.current_dockerfile_md5)
+        end
+
     end
   end
 end

data/lib/percheron/actions/exec.rb

@@ -12,11 +12,12 @@ module Percheron
       end
 
       def execute!
+        results = []
         $logger.debug "Executing #{description} scripts '#{scripts.inspect}' on '#{container.name}'"
         started_dependant_containers = start_containers!(dependant_containers)
-        execute_scripts_on_running_container!
-        stop_containers!(started_dependant_containers)
-        container
+        results << execute_scripts_on_running_container!
+        results << stop_containers!(started_dependant_containers)
+        results.compact.empty? ? nil : container
       end
 
       private
@@ -25,7 +26,7 @@ module Percheron
 
         def execute_scripts_on_running_container!
           container_running = container.running?
-          Start.new(container).execute! unless container_running
+          Start.new(container, exec_scripts: false).execute! unless container_running
           execute_scripts!
           Stop.new(container).execute!  unless container_running
         end

data/lib/percheron/actions/exec_local.rb

@@ -13,8 +13,9 @@ module Percheron
       end
 
       def execute!
-        $logger.debug "Executing #{description} scripts '#{scripts.inspect}' locally"
-        execute_scripts!
+        results = []
+        results << execute_scripts!
+        results.compact.empty? ? nil : container
       end
 
       private
@@ -22,6 +23,7 @@ module Percheron
         attr_reader :container, :scripts, :description
 
         def execute_scripts!
+          $logger.debug "Executing #{description} scripts '#{scripts.inspect}' locally"
           scripts.each do |script|
             in_working_directory(base_dir) do
               execute_command!('/bin/bash -x %s 2>&1' % Pathname.new(File.expand_path(script)))

data/lib/percheron/actions/purge.rb

@@ -9,10 +9,11 @@ module Percheron
       end
 
       def execute!
-        stop!
-        delete_container! if container.exists?
-        delete_image!     if container.image_exists?
-        container
+        results = []
+        results << stop!
+        results << delete_container! if container.exists?
+        results << delete_image!     if container.image_exists?
+        results.compact.empty? ? nil : container
       end
 
       private

data/lib/percheron/actions/recreate.rb

@@ -11,9 +11,9 @@ module Percheron
       end
 
       def execute!
+        results = []
         if recreate?
-          recreate!
-          container
+          results << recreate!
         else
           unless dockerfile_md5s_match?
             $logger.warn "Container '#{container.name}' MD5's do not match, consider recreating (bump the version!)"
@@ -21,6 +21,7 @@ module Percheron
             $logger.info "Container '#{container.name}' does not need to be recreated"
           end
         end
+        results.compact.empty? ? nil : container
       end
 
       private

data/lib/percheron/actions/rename.rb

@@ -11,8 +11,9 @@ module Percheron
       end
 
       def execute!
-        rename!
-        container
+        results = []
+        results << rename!
+        results.compact.empty? ? nil : container
       end
 
       private

data/lib/percheron/actions/restart.rb

@@ -9,9 +9,10 @@ module Percheron
       end
 
       def execute!
-        stop!
-        start!
-        container
+        results = []
+        results << stop!
+        results << start!
+        results.compact.empty? ? nil : container
       end
 
       private
@@ -23,7 +24,7 @@ module Percheron
         end
 
         def start!
-          Start.new(container, container.dependant_containers.values).execute!
+          Start.new(container, dependant_containers: container.dependant_containers.values).execute!
         end
 
     end

data/lib/percheron/actions/start.rb

@@ -4,25 +4,32 @@ module Percheron
 
       include Base
 
-      def initialize(container, dependant_containers=[])
+      def initialize(container, dependant_containers: [], exec_scripts: true)
         @container = container
         @dependant_containers = dependant_containers
+        @exec_scripts = exec_scripts
       end
 
       def execute!
-        create! unless container.exists?
+        results = []
+        results << create! unless container.exists?
         unless container.running?
-          start!
-          execute_post_start_scripts! unless container.post_start_scripts.empty?
+          results << start!
+          results << execute_post_start_scripts! if exec_scripts?
         end
-        container
+        results.compact.empty? ? nil : container
       end
 
       private
 
-        attr_reader :container, :dependant_containers
+        attr_reader :container, :dependant_containers, :exec_scripts
+
+        def exec_scripts?
+          !container.post_start_scripts.empty? && exec_scripts
+        end
 
         def create!
+          $logger.info "Creating '#{container.name}' container as it doesn't exist"
           Create.new(container).execute!
         end
 

data/lib/percheron/actions/stop.rb

@@ -9,8 +9,9 @@ module Percheron
       end
 
       def execute!
-        stop! if container.running?
-        container
+        results = []
+        results << stop! if container.running?
+        results.compact.empty? ? nil : container
       end
 
       private

data/lib/percheron/commands/abstract.rb

@@ -18,6 +18,10 @@ module Percheron
         end
       end
 
+      def stack
+        Percheron::Stack.new(config, stack_name)
+      end
+
       def default_config_file
         ENV.fetch('PERCHERON_CONFIG', DEFAULT_CONFIG_FILE)
       end

data/lib/percheron/commands/create.rb

@@ -6,7 +6,7 @@ module Percheron
 
       def execute
         opts = { container_names: container_names }
-        Percheron::Stack.new(config, stack_name).create!(opts)
+        stack.create!(opts)
       end
     end
   end

data/lib/percheron/commands/purge.rb

@@ -2,10 +2,11 @@ module Percheron
   module Commands
     class Purge < Abstract
 
-      parameter('STACK_NAME', 'stack name', required: false)
+      default_parameters!
 
       def execute
-        Percheron::Stack.new(config, stack_name).purge!
+        opts = { container_names: container_names }
+        stack.purge!(opts)
       end
     end
   end

data/lib/percheron/commands/recreate.rb

@@ -14,7 +14,7 @@ module Percheron
           delete: delete?
         }
 
-        Percheron::Stack.new(config, stack_name).recreate!(opts)
+        stack.recreate!(opts)
       end
     end
   end

data/lib/percheron/commands/restart.rb

@@ -6,7 +6,7 @@ module Percheron
 
       def execute
         opts = { container_names: container_names }
-        Percheron::Stack.new(config, stack_name).restart!(opts)
+        stack.restart!(opts)
       end
     end
   end

data/lib/percheron/commands/start.rb

@@ -6,7 +6,7 @@ module Percheron
 
       def execute
         opts = { container_names: container_names }
-        Percheron::Stack.new(config, stack_name).start!(opts)
+        stack.start!(opts)
       end
     end
   end

data/lib/percheron/commands/stop.rb

@@ -6,7 +6,7 @@ module Percheron
 
       def execute
         opts = { container_names: container_names }
-        Percheron::Stack.new(config, stack_name).stop!(opts)
+        stack.stop!(opts)
       end
     end
   end

data/lib/percheron/stack.rb

@@ -46,8 +46,7 @@ module Percheron
 
     def start!(container_names: [])
       container_names = dependant_containers_for(container_names)
-      exec_on_dependant_containers_for(container_names) { |container| Actions::Start.new(container, container.dependant_containers.values).execute! }
-
+      exec_on_dependant_containers_for(container_names) { |container| Actions::Start.new(container, dependant_containers: container.dependant_containers.values).execute! }
     end
 
     def restart!(container_names: [])
@@ -73,11 +72,9 @@ module Percheron
       exec_on_dependant_containers_for(container_names_final.uniq) { |container| Actions::Recreate.new(container, force_recreate: force_recreate, delete: delete).execute! }
     end
 
-    def purge!
-      serial_processor(filter_container_names) do |container|
-        Actions::Purge.new(container).execute!
-        $logger.info ''
-      end
+    def purge!(container_names: [])
+      container_names = filter_container_names(container_names)
+      exec_on_dependant_containers_for(container_names) { |container| Actions::Purge.new(container).execute! }
     end
 
     def valid?
@@ -106,8 +103,7 @@ module Percheron
 
       def exec_on_dependant_containers_for(container_names)
         serial_processor(container_names) do |container|
-          yield(container)
-          $logger.info ''
+          $logger.info '' if yield(container)
         end
       end
 

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp