percheron 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e3ddd051314e0499f89ac94434e3f8db4853d38
-  data.tar.gz: 2920032bebd374d9fdf48f1147a98cadd83a8c9b
+  metadata.gz: 184231c68ed6ae113dd7f46af5290a523b098066
+  data.tar.gz: f9abacfe6fb20d642faecd4719bd1a0294183158
 SHA512:
-  metadata.gz: 8e35dd0de12e652c68904d9759c274c4e603929dbd9fd97419ad9d6c8a6527d41c5e1e34985879958c5fb7d8904ccbb1f5ffe2c2b3f7d53a4598b67018676216
-  data.tar.gz: 870da0edb41d07986ee64aef65a7dac5cfd71536a411664c37aadbed476a408d6b3af9b9261397159b487a53102a2c8697e0179104746ba5d32a8c47e8f08268
+  metadata.gz: a08a95231a9a22eb805451da21768e17addb2da749778f59626ae4cee1b370e040051b7f6457549e18cd5efa247173716d8f120515405b04d2f6ba3254c6f5bc
+  data.tar.gz: 90a61d02bcbb222e44837526803a2a1a0da12f9b9f0fbbd2eafba03eee861160fc3528bbfff50937ff7ce024569a99cd5402e35973e5786d1937f449f52c9563

data/lib/percheron/actions/base.rb

@@ -29,13 +29,19 @@ module Percheron
 
       def stop_containers!(containers)
         exec_on_containers!(containers) do |container|
-          Stop.new(container).execute! if container.running?
+          if container.running?
+            $logger.debug "Stopping '#{container.name}' container"
+            Stop.new(container).execute!
+          end
         end
       end
 
       def start_containers!(containers)
         exec_on_containers!(containers) do |container|
-          Start.new(container, container.dependant_containers.values).execute! unless container.running?
+          unless container.running?
+            $logger.debug "Starting '#{container.name}' container"
+            Start.new(container, container.dependant_containers.values).execute!
+          end
         end
       end
 

data/lib/percheron/actions/build.rb

@@ -29,8 +29,7 @@ module Percheron
 
         def build!
           in_working_directory(base_dir) do
-            execute_pre_build_scripts!
-
+            execute_pre_build_scripts!  unless container.pre_build_scripts.empty?
             $logger.info "Building '#{container.image_name}'"
             Docker::Image.build_from_dir(base_dir, build_opts) do |out|
               $logger.debug '%s' % [ out.strip ]
@@ -39,7 +38,7 @@ module Percheron
         end
 
         def execute_pre_build_scripts!
-          Exec.new(container, container.dependant_containers.values, container.pre_build_scripts, 'PRE build').execute!
+          ExecLocal.new(container, container.pre_build_scripts, 'PRE build').execute!
         end
 
     end

data/lib/percheron/actions/create.rb

@@ -64,7 +64,7 @@ module Percheron
           build_image!
           insert_scripts!
           create_container!(opts.fetch(:create, {}))
-          execute_post_create_scripts!
+          execute_post_create_scripts! unless container.post_create_scripts.empty?
           set_dockerfile_md5!
         end
 

data/lib/percheron/actions/exec_local.rb

@@ -0,0 +1,43 @@
+require 'open3'
+
+module Percheron
+  module Actions
+    class ExecLocal
+
+      include Base
+
+      def initialize(container, scripts, description)
+        @container = container
+        @scripts = scripts
+        @description = description
+      end
+
+      def execute!
+        $logger.debug "Executing #{description} scripts '#{scripts.inspect}' locally"
+        execute_scripts!
+      end
+
+      private
+
+        attr_reader :container, :scripts, :description
+
+        def execute_scripts!
+          scripts.each do |script|
+            in_working_directory(base_dir) do
+              execute_command!('/bin/bash -x %s 2>&1' % Pathname.new(File.expand_path(script)))
+            end
+          end
+        end
+
+        def execute_command!(command)
+          $logger.info "Executing #{description} '#{command}' locally"
+          Open3.popen2e(command) do |stdin, stdout_stderr, wait_thr|
+            while line = stdout_stderr.gets
+              $logger.debug line.strip
+            end
+          end
+        end
+
+    end
+  end
+end

data/lib/percheron/actions/start.rb

@@ -11,8 +11,10 @@ module Percheron
 
       def execute!
         create_or_recreate!
-        start!                        unless container.running?
-        execute_post_start_scripts!   unless container.post_start_scripts.empty?
+        unless container.running?
+          start!
+          execute_post_start_scripts! unless container.post_start_scripts.empty?
+        end
         container
       end
 

data/lib/percheron/actions.rb

@@ -8,6 +8,7 @@ require 'percheron/actions/rename'
 require 'percheron/actions/build'
 require 'percheron/actions/purge'
 require 'percheron/actions/exec'
+require 'percheron/actions/exec_local'
 
 module Percheron
   module Actions

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ash McKenzie
@@ -231,6 +231,7 @@ files:
 - lib/percheron/actions/build.rb
 - lib/percheron/actions/create.rb
 - lib/percheron/actions/exec.rb
+- lib/percheron/actions/exec_local.rb
 - lib/percheron/actions/purge.rb
 - lib/percheron/actions/recreate.rb
 - lib/percheron/actions/rename.rb