lib/org-converge/engine.rb in org-converge-0.0.7 vs lib/org-converge/engine.rb in org-converge-0.0.8

@@ -14,12 +14,13 @@
 
     RAINBOW = ["#622e90", "#2d3091", "#00aaea", "#02a552", "#fdea22", "#eb443b", "#f37f5a"]
 
     def initialize(options={})
       super(options)
-      @logger = options[:logger] || Logger.new(STDOUT)
-      @babel  = options[:babel]
+      @logger  = options[:logger] || Logger.new(STDOUT)
+      @babel   = options[:babel]
+      @runmode = options[:runmode]
     end
 
     # We allow other processes to exit with 0 status
     # to continue with the runlist
     def start
@@ -35,15 +36,20 @@
     # Overriden: we do not consider process formations
     def spawn_processes
       @processes.each do |process|
         reader, writer = create_pipe
         begin
+          # In case of spec mode, we need to redirect the output to a results file instead
+          writer = File.open(process.options[:results], 'a') if @runmode == 'spec'
           pid = process.run(:output => writer)
           @names[process] = "#{@names[process]}.#{pid}"
-          writer.puts "started with pid #{pid}"
+
+          # NOTE: In spec mode we need to be more strict on what is flushed by the engine
+          # because we will be comparing the output
+          writer.puts "started with pid #{pid}" unless @runmode == 'spec'
         rescue Errno::ENOENT
-          writer.puts "unknown command: #{process.command}"
+          writer.puts "unknown command: #{process.command}" unless @runmode == 'spec'
         end
         @running[pid] = [process]
         @readers[pid] = reader
       end
     end
@@ -61,12 +67,13 @@
         # FIXME: In case the process has finished before its lines where flushed
         ps, pid = name.empty? ? '<defunct>' : name.split('.')
         output  = "#{pad_process_name(ps)}(#{pid})".fg get_color_for_pid(pid.to_i)
         output += " -- "
         output += message
-        # FIXME: When the process has stopped already,
-        # the name of the process does not appear
+
+        # FIXME: When the process has stopped already, the name of the process does not appear
+        #        (which means that this approach is wrong from the beginning probably)
         logger.info output
       end
     rescue Errno::EPIPE
       terminate_gracefully
     end
@@ -84,9 +91,23 @@
     end
 
     def get_color_for_pid(pid)
       RAINBOW[pid % 7]
     end
+
+    def watch_for_termination
+      pid, status = Process.wait2
+      output_with_mutex name_for(pid), termination_message_for(status) unless @runmode == 'spec'
+      @running.delete(pid)
+      yield if block_given?
+      pid
+    rescue Errno::ECHILD
+    end
   end
 
-  class CodeBlockProcess < Foreman::Process; end
+  # Need to expose the options to make the process be aware
+  # of the possible running mode (specially spec mode)
+  # and where to put the results output
+  class CodeBlockProcess < Foreman::Process
+    attr_reader :options
+  end
 end