lib/percheron/actions/start.rb in percheron-0.6.4 vs lib/percheron/actions/start.rb in percheron-0.7.0

@@ -2,45 +2,48 @@
   module Actions
     class Start
 
       include Base
 
-      def initialize(container, dependant_containers: [], exec_scripts: true)
+      def initialize(container, dependant_containers: [], cmd: false, exec_scripts: true)
         @container = container
         @dependant_containers = dependant_containers
+        @cmd = cmd
         @exec_scripts = exec_scripts
       end
 
       def execute!
         results = []
-        results << create! unless container.exists?
+        results << create!
         unless container.running?
           results << start!
-          results << execute_post_start_scripts! if exec_scripts?
+          results << execute_post_start_scripts!
         end
         results.compact.empty? ? nil : container
       end
 
       private
 
-        attr_reader :container, :dependant_containers, :exec_scripts
+        attr_reader :container, :dependant_containers, :cmd, :exec_scripts
 
         def exec_scripts?
           !container.post_start_scripts.empty? && exec_scripts
         end
 
         def create!
-          $logger.info "Creating '#{container.name}' container as it doesn't exist"
-          Create.new(container).execute!
+          return nil if container.exists?
+          Create.new(container, cmd: cmd, exec_scripts: exec_scripts).execute!
         end
 
         def start!
+          return nil if !container.startable? || container.running?
           $logger.info "Starting '#{container.name}' container"
           container.docker_container.start!
         end
 
         def execute_post_start_scripts!
-          Exec.new(container, dependant_containers, container.post_start_scripts, 'POST start').execute!
+          scripts = container.post_start_scripts
+          Exec.new(container, dependant_containers, scripts, 'POST start').execute! if exec_scripts?
         end
 
     end
   end
 end