god 0.7.6 → 0.7.7

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.7 / TBD
+  * Bug Fixes
+    * Fix detection of proc file system [raggi]
+
 == 0.7.6 / 2008-05-13
   * Major Enhancements
     * Implement System::Process methods for Linux based on /proc [Kevin Clark]

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('god', '0.7.6') do |p|
+Hoe.new('god', '0.7.7') do |p|
   p.rubyforge_name = 'god'
   p.author = 'Tom Preston-Werner'
   p.email = 'tom@rubyisawesome.com'

data/lib/god.rb

@@ -133,7 +133,7 @@ class Module
 end
 
 module God
-  VERSION = '0.7.6'
+  VERSION = '0.7.7'
   
   LOG_BUFFER_SIZE_DEFAULT = 100
   PID_FILE_DIRECTORY_DEFAULTS = ['/var/run/god', '~/.god/pids']

data/lib/god/system/process.rb

@@ -30,7 +30,7 @@ module God
       private
       
       def fetch_system_poller
-        if test(?d, '/proc')
+        if SlashProcPoller.usable?
           SlashProcPoller
         else
           PortablePoller

data/lib/god/system/slash_proc_poller.rb

@@ -5,11 +5,25 @@ module God
       @@hertz = 100
       @@total_mem = nil
       
+      MeminfoPath = '/proc/meminfo'
+      UptimePath = '/proc/uptime'
+      
+      RequiredPaths = [MeminfoPath, UptimePath]
+      
+      # FreeBSD has /proc by default, but nothing mounted there!
+      # So we should check for the actual required paths!
+      # Returns true if +RequiredPaths+ are readable.
+      def self.usable?
+        RequiredPaths.all? do |path|
+          test(?r, path)
+        end
+      end
+      
       def initialize(pid)
         super(pid)
         
         unless @@total_mem # in K
-          File.open("/proc/meminfo") do |f|
+          File.open(MeminfoPath) do |f|
             @@total_mem = f.gets.split[1]
           end
         end
@@ -39,7 +53,7 @@ module God
       
       # in seconds
       def uptime
-        File.read('/proc/uptime').split[0].to_f
+        File.read(UptimePath).split[0].to_f
       end
       
       def stat

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
-date: 2008-05-21 00:00:00 -07:00
+  version: 0.7.7
+date: 2008-06-17 00:00:00 -07:00
 summary: Like monit, only awesome
 require_paths: 
 - lib