fate 0.2.10 → 0.2.11

data/lib/fate/logger.rb

@@ -28,6 +28,7 @@ class Fate
 
       # duck typing for IO
       def write(string)
+        return 0 unless string
         num = @io.write(@master.format(@name, string))
         @io.flush
         num

data/lib/fate/process_manager.rb

@@ -1,14 +1,4 @@
-require "fileutils"
 require "pp"
-# Cross-VM compatibility
-# thanks to http://ku1ik.com/2010/09/18/open3-and-the-pid-of-the-spawn.html
-if IO.respond_to?(:popen4)
-  def open4(*args)
-    IO.popen4(*args)
-  end
-else
-  require 'open4'
-end
 
 class Fate
 
@@ -18,6 +8,7 @@ class Fate
 
     attr_reader :logger, :output_handlers
     def initialize(service)
+      @mutex = Mutex.new
       @service = service
       @output_handlers = @service.output_handlers
       @logger = @service.logger["Fate Manager"]
@@ -32,7 +23,6 @@ class Fate
     end
 
     def stop
-      # FIXME: race condition involving spawn and stop at the same time
       @names_by_pid.each do |pid, name|
         kill(name)
       end
@@ -74,30 +64,28 @@ class Fate
     end
 
     def spawn(name, command)
-      # TODO: check to see if command is already running
       return Thread.new do
 
-        pid, stdin, stdout, stderr = open4(command)
+        handler = output_handlers[name]
+        pipe = IO.popen(command, "r", :err => :out)
+        pid = pipe.pid
         logger.info "Starting '#{name}' (pid #{pid})"
-        @names_by_pid[pid] = name
-        @pids_by_name[name] = pid
-
-        io = output_handlers[name]
-        Thread.new do
-          IO.copy_stream(stderr, io)
-        end
-
-        # First line written to STDOUT is interpreted as the service
+        # First line written to STDOUT is assumed to be the service
         # signalling that it is ready.
-        line = stdout.gets
+        line = pipe.gets
         logger.info "#{name} is running."
+        handler.write(line)
 
-        io.write(line)
-        @threads[name] = Thread.current
+        @mutex.synchronize do
+          @names_by_pid[pid] = name
+          @pids_by_name[name] = pid
+          @threads[name] = Thread.current
+        end
 
-        IO.copy_stream(stdout, io)
+        IO.copy_stream(pipe, handler)
         pid, status = Process.wait2(pid)
         handle_child_termination(pid, status)
+
       end
     end
 

data/lib/fate/repl.rb

@@ -12,7 +12,7 @@ class Fate
       puts "* Available commands: " << commands.sort.join(" ")
     end
 
-    command("quit") do
+    command("quit", :alias => "q") do
       exit
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fate
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -43,22 +43,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.7
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: squeeze
   requirement: !ruby/object:Gem::Requirement