recreate.rb in percheron-0.7.0

- old
+ new
@@ -2,97 +2,47 @@
   module Actions
     class Recreate
 
       include Base
 
-      def initialize(container, force_recreate: false, delete: false)
+      def initialize(container, start: false)
         @container = container
-        @force_recreate = force_recreate
-        @delete = delete
+        @start = start
       end
 
       def execute!
         results = []
         if recreate?
           results << recreate!
+          results << start!
         else
-          unless dockerfile_md5s_match?
-            $logger.warn "Container '#{container.name}' MD5's do not match, consider recreating (bump the version!)"
-          else
-            $logger.info "Container '#{container.name}' does not need to be recreated"
-          end
+          inform!
         end
         results.compact.empty? ? nil : container
       end
 
       private
 
-        attr_reader :container, :force_recreate, :delete
+        attr_reader :container, :start
+        alias_method :start?, :start
 
-        alias_method :force_recreate?, :force_recreate
-        alias_method :delete?, :delete
-
-        def temporary_name
-          '%s_wip' % container.name
-        end
-
-        def stored_dockerfile_md5
-          container.dockerfile_md5 || container.current_dockerfile_md5
-        end
-
-        def temporary_container_exists?
-          !!Docker::Container.get(temporary_name)
-        rescue Docker::Error::NotFoundError
-          false
-        end
-
         def recreate?
-          force_recreate? || (!dockerfile_md5s_match? && versions_mismatch? && container.auto_recreate?)
+          !container.versions_match? || !container.dockerfile_md5s_match?
         end
 
-        def versions_mismatch?
-          container.version > container.built_version
+        def inform!
+          return nil unless container.dockerfile_md5s_match?
+          $logger.info "Container '#{container.name}' - No Dockerfile changes or version bump"
         end
 
-        def dockerfile_md5s_match?
-          stored_dockerfile_md5 == container.current_dockerfile_md5
-        end
-
         def recreate!
-          $logger.debug "Container '#{container.name}' exists and will be recreated"
-
-          unless temporary_container_exists?
-            delete_container_and_image! if delete?
-            create_container!
-            rename_container!
-          else
-            $logger.debug "Not recreating '#{container.name}' container because temporary container '#{temporary_name}' already exists"
-          end
+          $logger.debug "Container '#{container.name}' exists but will be recreated"
+          Purge.new(container).execute!
+          Create.new(container).execute!
         end
 
-        def delete_container_and_image!
-          delete_container!
-          delete_image!
-        end
-
-        def delete_container!
-          $logger.info "Deleting '#{container.name}' container"
-          stop_containers!([ container ])
-          container.docker_container.remove
-        end
-
-        def delete_image!
-          $logger.info "Deleting '#{container.name}' image"
-          container.image.remove
-        end
-
-        def create_container!
-          opts = { create: { 'name' => temporary_name } }
-          Create.new(container, recreate: true).execute!(opts)
-        end
-
-        def rename_container!
-          Rename.new(container, temporary_name, container.name).execute!
+        def start!
+          Start.new(container).execute! if start?
         end
 
     end
   end
 end