fate 0.2.18 → 0.2.20

data/lib/fate.rb

@@ -56,16 +56,11 @@ class Fate
   end
 
   def stop
-    ordered = @service.stop_order(manager.running)
-    ordered.each do |name|
-      manager.stop_command(name)
-    end
+    manager.stop_all
   end
 
   def restart
     stop
-    # FIXME: this is here to prevent redis-server from crying
-    sleep 0.5
     start
   end
 
@@ -82,7 +77,7 @@ class Fate
       if manager.start_group(commands)
         logger.green "All commands in '#{command_spec}' running."
       else
-        logger.red "Failed to start '#{command_spec}'."
+        logger.error "Failed to start '#{command_spec}'."
       end
     end
   end

data/lib/fate/process_manager.rb

@@ -19,14 +19,15 @@ class Fate
       @names_by_pid = {}
       @pids_by_name = {}
       at_exit do
-        shutdown
+        stop_all
       end
     end
 
-    def shutdown
+    def stop_all
       @mutex.synchronize do
-        @names_by_pid.each do |pid, name|
-          kill(name)
+        ordered = @service.stop_order(running)
+        ordered.each do |name|
+          term(name)
         end
       end
     end
@@ -52,22 +53,30 @@ class Fate
       end
     end
 
-    def kill(name)
+    def stop_command(name)
+      term(name)
+    end
+
+    def term(name)
       if pid = @pids_by_name[name]
         @names_by_pid.delete(pid)
         @pids_by_name.delete(name)
         @threads.delete(name)
         system "kill -s TERM #{pid}"
         logger.info "Sent a kill signal to '#{name}' running at #{pid}"
+        begin
+          # Signal 0 checks for the process, but sends no signal.
+          Process.kill(0, pid)
+        rescue
+          # TODO: limit number of retries, possibly issue kill -9?
+          sleep 0.01
+          retry
+        end
       else
         logger.error "Could not find pid for '#{name}'"
       end
     end
 
-    def stop_command(name)
-      kill(name)
-    end
-
     def spawn(name, command)
       return Thread.new do
 
@@ -155,7 +164,7 @@ class Fate
       end
       logger.info "Shutting down all processes."
 
-      shutdown
+      stop_all
       exit(1)
     end
 

data/lib/fate/repl.rb

@@ -36,7 +36,7 @@ class Fate
       self.restart_command(args.first)
     end
 
-    command("commands") do
+    command("processes") do
       puts self.service.names
     end
 

data/lib/fate/service.rb

@@ -86,10 +86,10 @@ class Fate
       @completions ||= Set.new
       hash.each_path do |path, value|
         key = path.join(".")
-        # add dot-delimited command names to the completions
-        @completions += path.map {|s| s.to_s }
-        @completions << key
-        # register each command under the dot-delimited name
+        # add dot-delimited process names to the completions
+        (path.size).times do |i|
+          @completions << path.slice(0..i).join(".")
+        end
         out[key] = value
       end
       out
@@ -104,8 +104,9 @@ class Fate
           targets += resolve_commands(gname)
         end
       else
+        regex = /^#{name}\..*/
         @commands.each do |cname, _command|
-          if cname.split(".").first == name
+          if cname =~ regex
             targets << cname
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fate
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: squeeze
   requirement: !ruby/object:Gem::Requirement