freelancing-god-riddle 0.9.8.1533.7 → 0.9.8.1533.8

data/README.textile

@@ -85,3 +85,4 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Xavier Noria
 * Henrik Nye
 * Kristopher Chambers
+* Rob Anderton

data/lib/riddle.rb

@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 7
+    Release = 8
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

data/lib/riddle/controller.rb

@@ -10,35 +10,40 @@ module Riddle
       cmd << " --rotate" if running?
       `#{cmd}`
     end
-
+    
     def start
       return if running?
-
+      
       cmd = "searchd --pidfile --config #{@path}"
-      `#{cmd}`    
-
+      cmd = "start /B #{cmd}" if RUBY_PLATFORM =~ /mswin/
+      `#{cmd}`
+      
       sleep(1)
-
+      
       unless running?
         puts "Failed to start searchd daemon. Check #{@configuration.searchd.log}."
       end
     end
-
+    
     def stop
       return unless running?
-      `kill #{pid}`
+      Process.kill('SIGTERM', pid.to_i)
+    rescue Errno::EINVAL
+      Process.kill('SIGKILL', pid.to_i)
     end
-
+    
     def pid
-      if File.exists?("#{@configuration.searchd.pid_file}")
-        `cat #{@configuration.searchd.pid_file}`[/\d+/]
+      if File.exists?(@configuration.searchd.pid_file)
+        File.read(@configuration.searchd.pid_file)[/\d+/]
       else
         nil
       end
     end
-
+    
     def running?
-      pid && `ps #{pid} | wc -l`.to_i > 1
+      !!pid && !!Process.kill(0, pid.to_i)
+    rescue
+      false
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-riddle
 version: !ruby/object:Gem::Version 
-  version: 0.9.8.1533.7
+  version: 0.9.8.1533.8
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: []