fiveruns-dash-ruby 0.8.5 → 0.8.6

data/lib/fiveruns/dash/exception_recorder.rb

@@ -8,6 +8,11 @@ module Fiveruns
     RULES = []
     
     class << self
+      
+      def host
+        ::Fiveruns::Dash.host
+      end
+      
       def replacements
         @replacements ||= begin
           paths = {
@@ -24,11 +29,11 @@ module Fiveruns
       end
 
       def system_gempaths
-        `gem environment gempath`
+        host.result :gem, 'environment gempath', :bat
       end
-    
+
       def system_paths
-        `ruby -e 'puts $:.reject{|p|p=="."}.join(":")'`
+        host.result :ruby, %(-e 'puts $:.reject { |p| p == "." }.join(":")'), :exe
       end
 
       def regexp_for_path(path)
@@ -46,6 +51,7 @@ module Fiveruns
       def add_ignore_rule(&rule)
         RULES << rule
       end
+      
     end
 
     def initialize(session)

data/lib/fiveruns/dash/host.rb

@@ -65,6 +65,15 @@ module Fiveruns::Dash
     def execute_on_windows(&block)
       block.call if RUBY_PLATFORM =~ /win32|i386-mingw32/
     end
+    
+    def result(command, args, windows_ext=nil)
+      name = if windows_ext && os_name_match?(:windows)
+        "#{command}.#{windows_ext}"
+      else
+        command.to_s
+      end
+      `#{name} #{args}`
+    end
 
     def hostname
       @hostname

data/recipes/ruby.rb

@@ -1,34 +1,41 @@
 Fiveruns::Dash.register_recipe :ruby, :url => 'http://dash.fiveruns.com' do |metrics|
-  metrics.absolute :vsz, 
-    "Virtual Memory Usage", "The amount of virtual memory used by this process", 
-    :unit => 'kbytes', :scope => :host do 
-    Integer(`ps -o vsz -p #{Process.pid}`[/(\d+)/, 1])
-  end
-  metrics.absolute :rss, "Resident Memory Usage", 
-    "The amount of physical memory used by this process", 
-    :unit => 'kbytes',
+  
+  # TODO: Support Windows
+  Fiveruns::Dash.host.execute_on_unix do
+  
+    metrics.absolute :vsz, 
+      "Virtual Memory Usage", "The amount of virtual memory used by this process", 
+      :unit => 'kbytes', :scope => :host do 
+      Integer(`ps -o vsz -p #{Process.pid}`[/(\d+)/, 1])
+    end
+    metrics.absolute :rss, "Resident Memory Usage", 
+      "The amount of physical memory used by this process", 
+      :unit => 'kbytes',
+      :scope => :host do
+      Integer(`ps -o rss -p #{Process.pid}`[/(\d+)/, 1])
+    end
+    metrics.percentage :pmem, 
+    "Resident Memory Usage", 
+    "Percentage of Resident Memory Usage", 
     :scope => :host do
-    Integer(`ps -o rss -p #{Process.pid}`[/(\d+)/, 1])
-  end
-  metrics.percentage :pmem, 
-  "Resident Memory Usage", 
-  "Percentage of Resident Memory Usage", 
-  :scope => :host do
-    Float(`ps -o pmem -p #{Process.pid}`[/(\d+\.\d+)/, 1])
-  end
+      Float(`ps -o pmem -p #{Process.pid}`[/(\d+\.\d+)/, 1])
+    end
 
-  if RUBY_PLATFORM == 'java'
-    Fiveruns::Dash.logger.warn "Cannot collect CPU usage data on JRuby"
-  else
-    metrics.percentage :cpu, 
-      'CPU Usage', 
-      'Percentage CPU Usage',
-      :scope => :host do
-      before = Thread.current[:dash_utime] ||= Process.times.utime
-      after = Process.times.utime
-      this_minute = after - before
-      Thread.current[:dash_utime] = after
-      (this_minute / 60) * 100.00
+    if RUBY_PLATFORM == 'java'
+      Fiveruns::Dash.logger.warn "Cannot collect CPU usage data on JRuby"
+    else
+      metrics.percentage :cpu, 
+        'CPU Usage', 
+        'Percentage CPU Usage',
+        :scope => :host do
+        before = Thread.current[:dash_utime] ||= Process.times.utime
+        after = Process.times.utime
+        this_minute = after - before
+        Thread.current[:dash_utime] = after
+        (this_minute / 60) * 100.00
+      end
     end
+    
   end
+  
 end

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 8
-:patch: 5
+:patch: 6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -07:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,8 +19,8 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - README.rdoc
 - Rakefile
@@ -32,6 +32,7 @@ files:
 - lib/fiveruns/dash/host.rb
 - lib/fiveruns/dash/instrument.rb
 - lib/fiveruns/dash/metric.rb
+- lib/fiveruns/dash/read
 - lib/fiveruns/dash/recipe.rb
 - lib/fiveruns/dash/reporter.rb
 - lib/fiveruns/dash/scm.rb