percheron 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2f1f9c52b7ccd444bd59daed1a2c5deeee49d1
-  data.tar.gz: efcdb60313993319297a27521355529e987fb664
+  metadata.gz: 9d54bd472d28eb6065b125a2b34afcaaa081339a
+  data.tar.gz: 61427858a0ac55ed4c9dbb01b4bff1c84a6be39f
 SHA512:
-  metadata.gz: 593dc6d5b9cc520eeaaf570d9a45a21b5c47a2a649a0537cd41f484460b1474575135fccefaa6c30fd3fc7fba25ac32771b4aa02f9fab9d7e20cfb202cedebfc
-  data.tar.gz: 30b83d1150ccde52bc2b5bbbb7c57a4db8566d5d55c325238b01e440886fe2d44c1c8480cab392de7fcb946f5a2aff32fde3d0fc2616646bc82d18f24c297152
+  metadata.gz: a776a8b5509c634cacac0669dd16cc7b6ac8a2ecccbba9caf577fe2901e07ce10e9e94b38e8f5457dc37f2a3d0354791c45884c6030b19cd719d4111d07113de
+  data.tar.gz: 922ef6301086e3c34d3e563a3f18a62b6dfdfbf7f67e8f2f0829139446924a37c2499c88b9fc51944ddcc37b60d06f4e6469285570d6c5e0043f50895fe559c6

data/lib/percheron/cli.rb

@@ -2,9 +2,12 @@ require 'clamp'
 
 require 'percheron/cli/abstract_command'
 require 'percheron/cli/list_command'
+require 'percheron/cli/restart_command'
 require 'percheron/cli/start_command'
 require 'percheron/cli/stop_command'
 require 'percheron/cli/console_command'
+require 'percheron/cli/create_command'
+require 'percheron/cli/recreate_command'
 require 'percheron/cli/main_command'
 
 module Percheron

data/lib/percheron/cli/create_command.rb

@@ -0,0 +1,12 @@
+module Percheron
+  module CLI
+    class CreateCommand < AbstractCommand
+
+      parameter 'STACK_NAME', 'stack name'
+
+      def execute
+        Percheron::Stack.new(config, stack_name).create!
+      end
+    end
+  end
+end

data/lib/percheron/cli/main_command.rb

@@ -5,6 +5,9 @@ module Percheron
       subcommand 'console', 'Start a pry console session', ConsoleCommand
       subcommand 'start', 'Start a stack', StartCommand
       subcommand 'stop', 'Stop a stack', StopCommand
+      subcommand 'restart', 'Restart a stack', RestartCommand
+      subcommand 'create', 'Create a stack', CreateCommand
+      subcommand 'recreate', 'Recreate a stack', RecreateCommand
     end
   end
 end

data/lib/percheron/cli/recreate_command.rb

@@ -0,0 +1,12 @@
+module Percheron
+  module CLI
+    class RecreateCommand < AbstractCommand
+
+      parameter 'STACK_NAME', 'stack name'
+
+      def execute
+        Percheron::Stack.new(config, stack_name).recreate!(bypass_auto_recreate: true)
+      end
+    end
+  end
+end

data/lib/percheron/cli/restart_command.rb

@@ -0,0 +1,12 @@
+module Percheron
+  module CLI
+    class RestartCommand < AbstractCommand
+
+      parameter 'STACK_NAME', 'stack name'
+
+      def execute
+        Percheron::Stack.new(config, stack_name).restart!
+      end
+    end
+  end
+end

data/lib/percheron/container/actions.rb

@@ -1,6 +1,7 @@
 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

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

@@ -0,0 +1,112 @@
+module Percheron
+  module Container
+    module Actions
+      class Recreate
+
+        def initialize(container)
+          @container = container
+        end
+
+        def execute!
+          unless temporary_container_exists?
+            create_image!
+            create_container!
+            rename!
+          else
+            $logger.warn "Not recreating '#{container.name}' container as '#{temporary_name}' because '#{temporary_name}' already exists"
+          end
+        end
+
+        private
+
+          attr_reader :container
+
+          def create_opts
+            {
+              'name'          => temporary_name,
+              'Image'         => container.image,
+              'Hostname'      => container.name,
+              'Env'           => container.env,
+              'ExposedPorts'  => container.exposed_ports,
+              'VolumesFrom'   => container.volumes
+            }
+          end
+
+          def temporary_name
+            '%s_wip' % container.name
+          end
+
+          # FIXME
+          def temporary_container_exists?
+            temporary_container.info.empty?
+          rescue Docker::Error::NotFoundError
+            false
+          end
+
+          def create_image!
+            unless image_exists?
+              $logger.debug "Creating '#{container.image}' image"
+              Container::Actions::Build.new(container).execute!
+            end
+          end
+
+          def create_container!
+            $logger.debug "Recreating '#{container.name}' container as '#{temporary_name}'"
+            Docker::Container.create(create_opts)
+          end
+
+          def rename!
+            save_current_running_state!
+            stop_current! if container.running?
+            rename_current_to_old!
+            rename_wip_to_current!
+            start_new! if container_was_running?
+          end
+
+          def rename_current_new_name
+            '%s_%s' % [ container.name, now_timestamp ]
+          end
+
+          def now_timestamp
+            Time.now.strftime('%Y%m%d%H%M%S')
+          end
+
+          def temporary_container
+            Docker::Container.get(temporary_name)
+          end
+
+          def save_current_running_state!
+            @container_was_running = container.running?
+          end
+
+          def stop_current!
+            Container::Actions::Stop.new(container).execute!
+          end
+
+          def rename_current_to_old!
+            $logger.debug "Renaming '#{container.name}' container to '#{rename_current_new_name}'"
+            container.docker_container.rename(rename_current_new_name)
+          end
+
+          def rename_wip_to_current!
+            # FIXME
+            $logger.debug "Renaming '#{temporary_name}' container to '#{container.name}'"
+            Docker::Container.get(temporary_name).rename(container.name)
+          end
+
+          def start_new!
+            container.start!
+          end
+
+          def image_exists?
+            Docker::Image.exist?(container.image)
+          end
+
+          def container_was_running?
+            @container_was_running
+          end
+
+      end
+    end
+  end
+end

data/lib/percheron/container/main.rb

@@ -66,16 +66,48 @@ module Percheron
       end
 
       def start!
-        Container::Actions::Create.new(self).execute! unless exists?
+        create!
+        recreate!
         Container::Actions::Start.new(self).execute!
       end
 
+      def restart!
+        stop!
+        start!
+      end
+
+      def create!
+        unless exists?
+          $logger.debug "Container '#{name}' does not exist, creating"
+          Container::Actions::Create.new(self).execute!
+        else
+          $logger.warn "Not creating '#{name}' container as it already exists"
+        end
+      end
+
+      def recreate!(bypass_auto_recreate: false)
+        if exists?
+          if recreate?(bypass_auto_recreate: bypass_auto_recreate)
+            $logger.warn "Container '#{name}' exists and will be recreated"
+            Container::Actions::Recreate.new(self).execute!
+          else
+            if recreatable?
+              $logger.warn "Container '#{name}' MD5's do not match, consider recreating"
+            else
+              $logger.debug "Container '#{name}' does not need to be recreated"
+            end
+          end
+        else
+          $logger.warn "Not recreating '#{name}' container as it does not exist"
+        end
+      end
+
       def recreatable?
-        exists? && !md5s_match?
+        !dockerfile_md5s_match?
       end
 
-      def recreate?
-        recreatable? && versions_mismatch? && auto_recreate?
+      def recreate?(bypass_auto_recreate: false)
+        recreatable? && versions_mismatch? && (bypass_auto_recreate || auto_recreate?)
       end
 
       def running?
@@ -94,7 +126,7 @@ module Percheron
 
         attr_reader :config, :stack, :container_name
 
-        def md5s_match?
+        def dockerfile_md5s_match?
           stored_dockerfile_md5 == current_dockerfile_md5
         end
 

data/lib/percheron/stack.rb

@@ -45,6 +45,18 @@ module Percheron
       exec_on_containers { |container| container.start! }
     end
 
+    def restart!
+      exec_on_containers { |container| container.restart! }
+    end
+
+    def create!
+      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) }
+    end
+
     def valid?
       Validators::Stack.new(self).valid?
     end

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/percheron.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'timecop', '~> 0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Ash McKenzie
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: 
 email:
 - ash@the-rebellion.net
@@ -171,8 +185,11 @@ files:
 - 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/recreate_command.rb
+- lib/percheron/cli/restart_command.rb
 - lib/percheron/cli/start_command.rb
 - lib/percheron/cli/stop_command.rb
 - lib/percheron/config.rb
@@ -181,6 +198,7 @@ files:
 - lib/percheron/container/actions.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