percheron 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4d585a406d9b1b5a23ef33013450d00755ceaf3
-  data.tar.gz: a63795fa29c8c6fd05de2f6bf9587c57bf0f98bb
+  metadata.gz: ddfc86ead3b58968ec07cccf692a841643a45060
+  data.tar.gz: a09225865990c275d6812e26ab9dd2496d1171f6
 SHA512:
-  metadata.gz: 8b8b0e9fc1748c246c710ae0b52bf48f31665e0e9d4ae2445e4f9f5982e2461514dc194079f06c91da36c00671f05f4a02dd751a075b425bc4d4537bccf6f49e
-  data.tar.gz: 0e09f330cd3a70896296e65d9610c3381a82c246a67e0c672187a92f00a8ddda7364abc70b7bc6efbc048fb6e4ab8a6b1f74be93858d48ba11067e3fde7b8b27
+  metadata.gz: a8a42293482b1d1ac38891aa44a2dbb1dd7d1d1000a1e2879ee78e07230e3af1d8f0747d8d8e9ab945f4534338362d561e6f2dfc53df2100311139c9934fb726
+  data.tar.gz: c153bc4ca7252f604143e96d55a6e5d8f0fe7684cf14e893657e00ab150fd227d4e78ccbe88169a85832325492a57d958d185f40b5198ae6b1389c6f724c2a04

data/README.md

@@ -6,7 +6,7 @@
 [![Test Coverage](https://codeclimate.com/github/ashmckenzie/percheron/badges/coverage.svg)](https://codeclimate.com/github/ashmckenzie/percheron)
 [![Dependency Status](https://gemnasium.com/ashmckenzie/percheron.svg)](https://gemnasium.com/ashmckenzie/percheron)
 
-![Perheron](https://raw.githubusercontent.com/ashmckenzie/percheron/cache-store/assets/percheron.png)
+![Percheron](https://raw.githubusercontent.com/ashmckenzie/percheron/master/assets/percheron.png)
 
 Organise your Docker containers with muscle and intelligence.
 

data/lib/percheron/cli/recreate_command.rb

@@ -4,8 +4,10 @@ module Percheron
 
       parameter 'STACK_NAME', 'stack name'
 
+      option "--force", :flag, 'Force recreation', default: false
+
       def execute
-        Percheron::Stack.new(config, stack_name).recreate!(bypass_auto_recreate: true)
+        Percheron::Stack.new(config, stack_name).recreate!(force_recreate: force?, force_auto_recreate: true)
       end
     end
   end

data/lib/percheron/config.rb

@@ -15,10 +15,7 @@ module Percheron
     end
 
     def stacks
-      contents.stacks.inject({}) do |all, stack_config|
-        all[stack_config.name] = stack_config unless all[stack_config.name]
-        all
-      end
+      contents.stacks.to_hash_by_key(:name)
     end
 
     def file_base_path

data/lib/percheron/container/actions/build.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Percheron
   module Container
     module Actions
@@ -9,10 +11,12 @@ module Percheron
         end
 
         def execute!
-          base_dir = container.dockerfile.dirname.to_s
-          $logger.debug "Building '#{container.image}'"
-          Docker::Image.build_from_dir(base_dir, build_opts) do |out|
-            $logger.debug '%s' % [ out.strip ]
+          in_working_directory(base_dir) do
+            execute_pre_build_scripts!
+            $logger.debug "Building '#{container.image}'"
+            Docker::Image.build_from_dir(base_dir, build_opts) do |out|
+              $logger.debug '%s' % [ out.strip ]
+            end
           end
         end
 
@@ -29,6 +33,31 @@ module Percheron
             }
           end
 
+          def base_dir
+            container.dockerfile.dirname.to_s
+          end
+
+          def in_working_directory(new_dir)
+            old_dir = Dir.pwd
+            Dir.chdir(new_dir)
+            yield
+            Dir.chdir(old_dir)
+          end
+
+          def execute_pre_build_scripts!
+            container.pre_build_scripts.each do |script|
+              in_working_directory(base_dir) do
+                command = '/bin/bash -x %s 2>&1' % Pathname.new(File.expand_path(script))
+                $logger.debug "Executing '#{command}' for '#{container.name}' container"
+                Open3.popen2e(command) do |stdin, stdout_err, wait_thr|
+                  while line = stdout_err.gets
+                    $logger.debug line.strip
+                  end
+                end
+              end
+            end
+          end
+
       end
     end
   end

data/lib/percheron/container/main.rb

@@ -8,7 +8,7 @@ module Percheron
       def_delegators :container_config, :name
 
       def_config_item_with_default :container_config, false, :auto_recreate
-      def_config_item_with_default :container_config, [], :env, :ports, :volumes, :dependant_container_names
+      def_config_item_with_default :container_config, [], :env, :ports, :volumes, :dependant_container_names, :pre_build_scripts
 
       alias_method :auto_recreate?, :auto_recreate
 
@@ -66,6 +66,7 @@ module Percheron
       end
 
       def start!
+        start_dependant_containers!
         create!
         recreate!
         Container::Actions::Start.new(self).execute!
@@ -86,9 +87,9 @@ module Percheron
         end
       end
 
-      def recreate!(bypass_auto_recreate: false)
+      def recreate!(force_recreate: false, force_auto_recreate: false)
         if exists?
-          if recreate?(bypass_auto_recreate: bypass_auto_recreate)
+          if recreate?(force_recreate: force_recreate, force_auto_recreate: force_auto_recreate)
             $logger.warn "Container '#{name}' exists and will be recreated"
             Container::Actions::Recreate.new(self).execute!
             set_dockerfile_md5!
@@ -108,8 +109,8 @@ module Percheron
         !dockerfile_md5s_match?
       end
 
-      def recreate?(bypass_auto_recreate: false)
-        recreatable? && versions_mismatch? && (bypass_auto_recreate || auto_recreate?)
+      def recreate?(force_recreate: false, force_auto_recreate: false)
+        (force_recreate || (recreatable? && versions_mismatch?)) && (force_auto_recreate || auto_recreate?)
       end
 
       def running?
@@ -169,6 +170,18 @@ module Percheron
           @container_config ||= stack.container_configs[container_name] || Hashie::Mash.new({})
         end
 
+        def dependant_containers
+          dependant_container_names.map { |container_name| stack.containers[container_name] }
+        end
+
+        def start_dependant_containers!
+          dependant_containers.each do |container|
+            next if container.running?
+            $logger.debug "Container '#{container.name}' being started as it's a dependancy"
+            container.start!
+          end
+        end
+
     end
   end
 end

data/lib/percheron/core_extensions.rb

@@ -1,7 +1,8 @@
 module Percheron
   module CoreExtensions
     module Array
-      module Returning
+      module Extras
+
         def return
           result = nil
           each do |x|
@@ -13,9 +14,17 @@ module Percheron
           end
           result
         end
+
+        def to_hash_by_key(key_attr)
+          inject({}) do |all, e|
+            all[e.send(key_attr)] = e unless all[e.send(key_attr)]
+            all
+          end
+        end
+
       end
     end
   end
 end
 
-Array.include(Percheron::CoreExtensions::Array::Returning)
+Array.include(Percheron::CoreExtensions::Array::Extras)

data/lib/percheron/stack.rb

@@ -30,10 +30,7 @@ module Percheron
     end
 
     def container_configs
-      stack_config.containers.inject({}) do |all, container|
-        all[container.name] = container unless all[container.name]
-        all
-      end
+      stack_config.containers.to_hash_by_key(:name)
     end
 
     def containers
@@ -61,8 +58,8 @@ module Percheron
       exec_on_containers { |container| container.create! }
     end
 
-    def recreate!(bypass_auto_recreate: false)
-      exec_on_containers { |container| container.recreate!(bypass_auto_recreate: bypass_auto_recreate) }
+    def recreate!(force_recreate: false, force_auto_recreate: false)
+      exec_on_containers { |container| container.recreate!(force_recreate: force_recreate, force_auto_recreate: force_auto_recreate) }
     end
 
     def valid?

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Ash McKenzie