percheron 0.5.0 → 0.6.0

data/lib/percheron/errors.rb

@@ -4,6 +4,5 @@ module Percheron
     class StackInvalid < StandardError; end
     class ContainerInvalid < StandardError; end
     class ContainerDoesNotExist < StandardError; end
-    class ContainerNotRunning < StandardError; end
   end
 end

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

@@ -29,7 +29,7 @@ module Percheron
           end
 
           def rows
-            stack.containers.map do |container_name, container|
+            stack.filter_containers.map do |container_name, container|
               [
                 container_name,
                 container.id,

data/lib/percheron/null_container.rb

@@ -0,0 +1,13 @@
+module Percheron
+  NullContainer = Naught.build do |config|
+    config.mimic Container
+
+    def info
+      {}
+    end
+
+    def kind_of?(klass)
+      self.class == klass
+    end
+  end
+end

data/lib/percheron/oh_dear.rb

@@ -0,0 +1,46 @@
+module Percheron
+  class OhDear
+
+    def initialize(exception)
+      @exception = exception
+    end
+
+    def generate
+      <<-EOS
+
+OH DEAR, we are terribly sorry.. something unexpected occurred :(
+
+--snip--
+
+Info
+----
+Ruby: #{RUBY_VERSION}
+Percheron: #{Percheron::VERSION}
+
+Trace
+-----
+#{exception_message}
+
+#{exception_backtrace}
+
+--snip--
+
+Please copy the detail between the --snip--'s above and raise a ticket - https://github.com/ashmckenzie/percheron/issues/new?labels=bug
+
+      EOS
+    end
+
+    private
+
+      attr_reader :exception
+
+      def exception_message
+        exception.inspect
+      end
+
+      def exception_backtrace
+        exception.backtrace ? exception.backtrace.join("\n") : ''
+      end
+
+  end
+end

data/lib/percheron/stack.rb

@@ -12,20 +12,17 @@ module Percheron
       self
     end
 
-    def self.all(config)
-      all = {}
-      config.stacks.each do |stack_name, _|
+    def self.get(config, stack_name=nil)
+      if stack_name
         stack = new(config, stack_name)
-        all[stack.name] = stack
-      end
-      all
-    end
-
-    def self.get(config, stack_name)
-      if stack = all(config)[stack_name]
-        { stack.name => stack }
+        stack ? { stack.name => stack } : {}
       else
-        {}
+        all = {}
+        config.stacks.each do |stack_name, _|
+          stack = new(config, stack_name)
+          all[stack.name] = stack
+        end
+        all
       end
     end
 
@@ -33,33 +30,52 @@ module Percheron
       stack_config.containers.to_hash_by_key(:name)
     end
 
-    def containers
-      containers = {}
-      stack_config.containers.each do |container|
-        container = Container::Main.new(config, self, container.name)
-        containers[container.name] = container
+    # FIXME: YUCK
+    def filter_containers(container_names=[])
+      container_names = !container_names.empty? ? container_names : filter_container_names
+      container_names.inject({}) do |all, container_name|
+        all[container_name] = Container.new(config, self, container_name)
+        all
       end
-      containers
     end
 
-    def stop!
-      exec_on_containers { |container| container.stop! }
+    def stop!(container_names: [])
+      container_names = dependant_containers(container_names).reverse
+      serial_processor(container_names) { |container| Actions::Stop.new(container).execute! }
     end
 
-    def start!
-      exec_on_containers { |container| container.start! }
+    def start!(container_names: [])
+      container_names = dependant_containers(container_names)
+      serial_processor(container_names) { |container| Actions::Start.new(container, container.dependant_containers.values).execute! }
     end
 
-    def restart!
-      exec_on_containers { |container| container.restart! }
+    def restart!(container_names: [])
+      container_names = dependant_containers(container_names).reverse
+      serial_processor(container_names) { |container| Actions::Restart.new(container).execute! }
     end
 
-    def create!
-      exec_on_containers { |container| container.create! }
+    def create!(container_names: [])
+      container_names = dependant_containers(container_names)
+      serial_processor(container_names) { |container| Actions::Create.new(container).execute! }
     end
 
-    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) }
+    def recreate!(container_names: [], force_recreate: false, delete: false)
+      current = container_names_final = filter_container_names(container_names)
+
+      # FIXME: make this suck less
+      while true
+        current = deps = containers_affected(current).uniq
+        break if deps.empty?
+        container_names_final += deps
+      end
+
+      serial_processor(container_names_final.uniq) do |container|
+        Actions::Recreate.new(container, force_recreate: force_recreate, delete: delete).execute!
+      end
+    end
+
+    def purge!
+      serial_processor(filter_container_names) { |container| Actions::Purge.new(container).execute! }
     end
 
     def valid?
@@ -71,13 +87,56 @@ module Percheron
       attr_reader :config, :stack_name
 
       def stack_config
-        @stack_config ||= config.stacks[stack_name] || Hashie::Mash.new({})
+        @stack_config ||= (config.stacks[stack_name] || Hashie::Mash.new({}))
       end
 
-      def exec_on_containers
-        containers.each do |container_name, container|
+      def filter_container_names(container_names=[])
+        stack_config.containers.map do |container_config|
+          if container_names.empty? || container_names.include?(container_config.name)
+            container_config.name
+          end
+        end.compact
+      end
+
+      def exec_on_containers(container_names)
+        filter_containers(container_names).each { |_, container| yield(container) }
+      end
+
+      def serial_processor(container_names)
+        exec_on_containers(container_names) do |container|
           yield(container)
+          container_names.delete(container.name)
+        end
+      end
+
+      def containers_affected(container_names)
+        deps = []
+        container_names.each do |container_name|
+          filter_containers.each do |_, container|
+            deps << container.name if container.dependant_container_names.include?(container_name)
+          end
+        end
+        deps
+      end
+
+      def containers_and_their_dependants(container_names)
+        all_containers = filter_containers
+         container_names.inject({}) do |all, container_name|
+          all[container_name] = all_containers[container_name].dependant_container_names
+          all
+        end
+      end
+
+      def dependant_containers(container_names)
+        container_names = filter_container_names(container_names)
+
+        wip_list = []
+        containers_and_their_dependants(container_names).each do |container_name, dependant_container_names|
+          wip_list += dependant_container_names unless dependant_container_names.empty?
+          wip_list << container_name
         end
+        wip_list.uniq
       end
+
   end
 end

data/lib/percheron/validators/container.rb

@@ -10,7 +10,7 @@ module Percheron
         message = rules.return { |rule| send(rule) }
 
         if message
-          raise Errors::ContainerInvalid.new(message)
+          raise Errors::ContainerInvalid.new(formatted_message(message))
         else
           true
         end
@@ -20,6 +20,14 @@ module Percheron
 
         attr_reader :container
 
+        def formatted_message(message)
+          if container.name
+            "Container config for '%s' is invalid: %s" % [ container.name, message ]
+          else
+            "Container config is invalid: %s" % [ message ]
+          end
+        end
+
         def rules
           [
             :validate_name,

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/percheron.gemspec

@@ -25,10 +25,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'naught', '~> 1.0'
   spec.add_runtime_dependency 'semantic', '~> 1.4'
   spec.add_runtime_dependency 'metastore', '~> 0.3'
+  spec.add_runtime_dependency 'highline', '~> 1.7.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'guard-rspec', '~> 4.5'
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'timecop', '~> 0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -191,18 +219,31 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - assets/percheron.png
 - bin/percheron
 - lib/percheron.rb
+- lib/percheron/actions.rb
+- lib/percheron/actions/base.rb
+- lib/percheron/actions/build.rb
+- lib/percheron/actions/create.rb
+- lib/percheron/actions/exec.rb
+- lib/percheron/actions/purge.rb
+- lib/percheron/actions/recreate.rb
+- lib/percheron/actions/rename.rb
+- lib/percheron/actions/restart.rb
+- lib/percheron/actions/start.rb
+- lib/percheron/actions/stop.rb
 - lib/percheron/cli.rb
 - lib/percheron/cli/abstract_command.rb
 - lib/percheron/cli/console_command.rb
 - lib/percheron/cli/create_command.rb
 - lib/percheron/cli/list_command.rb
 - lib/percheron/cli/main_command.rb
+- lib/percheron/cli/purge_command.rb
 - lib/percheron/cli/recreate_command.rb
 - lib/percheron/cli/restart_command.rb
 - lib/percheron/cli/start_command.rb
@@ -210,21 +251,14 @@ files:
 - lib/percheron/config.rb
 - lib/percheron/config_delegator.rb
 - lib/percheron/container.rb
-- lib/percheron/container/actions.rb
-- lib/percheron/container/actions/base.rb
-- lib/percheron/container/actions/build.rb
-- lib/percheron/container/actions/create.rb
-- lib/percheron/container/actions/recreate.rb
-- lib/percheron/container/actions/start.rb
-- lib/percheron/container/actions/stop.rb
-- lib/percheron/container/main.rb
-- lib/percheron/container/null.rb
 - lib/percheron/core_extensions.rb
 - lib/percheron/docker_connection.rb
 - lib/percheron/errors.rb
 - lib/percheron/formatters.rb
 - lib/percheron/formatters/stack.rb
 - lib/percheron/formatters/stack/table.rb
+- lib/percheron/null_container.rb
+- lib/percheron/oh_dear.rb
 - lib/percheron/stack.rb
 - lib/percheron/validators.rb
 - lib/percheron/validators/config.rb

data/lib/percheron/container/actions.rb

@@ -1,15 +0,0 @@
-require 'open3'
-
-require 'percheron/container/actions/base'
-require 'percheron/container/actions/stop'
-require 'percheron/container/actions/start'
-require 'percheron/container/actions/create'
-require 'percheron/container/actions/recreate'
-require 'percheron/container/actions/build'
-
-module Percheron
-  module Container
-    module Actions
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module Percheron
-  module Container
-    module Actions
-      module Base
-
-        private
-
-          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
-      end
-    end
-  end
-end

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

@@ -1,58 +0,0 @@
-module Percheron
-  module Container
-    module Actions
-      class Build
-
-        include Base
-
-        def initialize(container, nocache: false)
-          @container = container
-          @nocache = nocache
-        end
-
-        def execute!
-          build!
-        end
-
-        private
-
-          attr_reader :container, :nocache
-
-          def build_opts
-            {
-              'dockerfile'  => container.dockerfile.basename.to_s,
-              't'           => container.image_name,
-              'forcerm'     => true,
-              'nocache'     => nocache
-            }
-          end
-
-          def build!
-            in_working_directory(base_dir) do
-              execute_pre_build_scripts!
-
-              $logger.debug "Building '#{container.image_name}'"
-              Docker::Image.build_from_dir(base_dir, build_opts) do |out|
-                $logger.debug '%s' % [ out.strip ]
-              end
-            end
-          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 PRE build '#{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
-end