cpu 0.0.1 → 0.0.2

data/CHANGES

@@ -1,3 +1,6 @@
+2011-07-04 (0.0.2)
+  * Raise NoSampleDataError if temperature couldn't be read, also catch it in
+    sum_processor_usage method.
 2011-07-03 (0.0.1)
   * Add documentation and license information.
 2011-07-03 (0.0.0)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cpu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cpu}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Florian Frank}]
-  s.date = %q{2011-07-03}
+  s.date = %q{2011-07-04}
   s.description = %q{Library to gather CPU information (load averages, usage, temperature) in Ruby on Linux}
   s.email = %q{flori@ping.de}
   s.executables = [%q{coretemp}]

data/lib/cpu.rb

@@ -5,6 +5,7 @@ require 'cpu/msr'
 require 'cpu/load'
 require 'cpu/usage_sampler'
 require 'cpu/usage'
+require 'cpu/version'
 
 # This module provides (read) access to the Model Specific Registers of Intel
 # CPUs on Linux.
@@ -121,7 +122,11 @@ module CPU
       processors = usage(interval, &block)
       processor = Processor.new -1, -1
       processor.num_processors = processor.num_cores = 1
-      processor.temperature = processors.map(&:temperature).max
+      begin
+        processor.temperature = processors.map(&:temperature).max
+      rescue NoSampleDataError
+        processor.temperature = nil
+      end
       processor.usage = processors.map(&:usage).inject { |s, u| s + u }
       processor.usage.num_processors = processor.usage.num_cores = 1
       processor.freeze

data/lib/cpu/msr.rb

@@ -17,9 +17,12 @@ module CPU
     def initialize(processor_id)
       self.class.available? or self.class.load_module
       begin
-        @io = IO.new IO.sysopen('/dev/cpu/%d/msr' % processor_id, 'rb')
+        name = '/dev/cpu/%d/msr' % processor_id
+        @io = IO.new IO.sysopen(name, 'rb')
       rescue Errno::ENOENT
         raise InvalidProcessorIdError, "'#{processor_id}' is not a valid processor_id on this machine"
+      rescue StandardError => e
+        raise NoSampleDataError, "could not read temperature from #{name}: #{e}"
       end
     end
 

data/lib/cpu/version.rb

@@ -1,6 +1,6 @@
 module CPU
   # CPU version
-  VERSION         = '0.0.1'
+  VERSION         = '0.0.2'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cpu
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Florian Frank
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 Z
+date: 2011-07-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spruz