cpu 0.0.3 → 0.0.4

data/Rakefile

@@ -17,7 +17,7 @@ GemHadar do
   readme      'README.rdoc'
   executables 'coretemp'
 
-  dependency  'spruz',          '~>0.2.2'
+  dependency  'tins',           '~>0.3'
   dependency  'more_math',      '~>0.0'
 
   install_library do

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/coretemp

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
 require 'cpu'
-require 'spruz/go'
-include Spruz::GO
+require 'tins/go'
+include Tins::GO
 require 'more_math'
 
 class ParseCommands
@@ -23,26 +23,29 @@ class ParseCommands
     File.expand_path(filename)
   end
 
-  def measure_temps(opts)
+  def measure_data(opts)
     set_t_j_max opts['t']
-    CPU.each_core.map(&:temperature)
+    CPU.usage(@duration || 1)
   end
 
   def simple
     opts = go 't', @argv
-    puts measure_temps(opts) * ' '
+    puts measure_data(opts).map(&:temperature) * ' '
   end
 
   def collect
-    opts = go 'tf', @argv
+    opts = go 'tfn:', @argv
+    @duration = (opts['n'] || 1).to_f
     filename = create_history_path opts['f']
-    temperatures = measure_temps(opts)
-    line = ([ Time.now.to_f ] + temperatures) * ' '
-    if filename
-      open(filename, 'a') do |o|
-        o.puts line
+    begin
+      temperatures = measure_data(opts).map(&:temperature)
+      line = ([ Time.now.to_f ] + temperatures) * ' '
+      if filename
+        open(filename, 'a') do |o|
+          o.puts line
+        end
       end
-    end
+    end while @duration > 0
   end
 
   def clear
@@ -65,11 +68,11 @@ class ParseCommands
       }
       measurements_last = history.last[1..-1]
       times, *measurements = history.transpose
-      analyses = measurements.map { |m| MoreMath::Sequence.new(m) }
-      puts " min: %s" % (analyses.map { |a| a.min  } * ' ')
+      sequences = measurements.map { |m| MoreMath::Sequence.new(m) }
+      puts " min: %s" % (sequences.map { |a| a.min  } * ' ')
       puts "last: %s" % (measurements_last * ' ')
-      puts " max: %s" % (analyses.map { |a| a.max  } * ' ')
-      puts "mean: %s" % (analyses.map { |a| a.mean.round } * ' ')
+      puts " max: %s" % (sequences.map { |a| a.max  } * ' ')
+      puts "mean: %s" % (sequences.map { |a| a.mean.round } * ' ')
     end
   end
 
@@ -78,7 +81,6 @@ class ParseCommands
     when 'collect'       then collect
     when 'clear'         then clear
     when 'stats'         then stats
-    when 'collect_stats' then collect; stats
     else                      simple
     end
   end

data/cpu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cpu"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-09-02"
+  s.date = "2011-09-25"
   s.description = "Library to gather CPU information (load averages, usage, temperature) in Ruby on Linux"
   s.email = "flori@ping.de"
   s.executables = ["coretemp"]
@@ -23,17 +23,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.0.12"])
-      s.add_runtime_dependency(%q<spruz>, ["~> 0.2.2"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+      s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
       s.add_runtime_dependency(%q<more_math>, ["~> 0.0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.0.12"])
-      s.add_dependency(%q<spruz>, ["~> 0.2.2"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+      s.add_dependency(%q<tins>, ["~> 0.3"])
       s.add_dependency(%q<more_math>, ["~> 0.0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.0.12"])
-    s.add_dependency(%q<spruz>, ["~> 0.2.2"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+    s.add_dependency(%q<tins>, ["~> 0.3"])
     s.add_dependency(%q<more_math>, ["~> 0.0"])
   end
 end

data/lib/cpu.rb

@@ -1,4 +1,4 @@
-require 'spruz/uniq_by'
+require 'tins/uniq_by'
 require 'cpu/shared'
 require 'cpu/processor'
 require 'cpu/msr'
@@ -51,7 +51,7 @@ module CPU
         processor_id =~ /\A\d+\Z/ or next ps
         ps << processor_id.to_i
       end
-      processors.extend Spruz::UniqBy
+      processors.extend Tins::UniqBy
       processors.sort!
       @num_processors = processors.size
       @num_cores      = cpu_cores.invert.size

data/lib/cpu/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+date: 2011-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2157565060 !ruby/object:Gem::Requirement
+  requirement: &2156221100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *2157565060
+  version_requirements: *2156221100
 - !ruby/object:Gem::Dependency
-  name: spruz
-  requirement: &2157564560 !ruby/object:Gem::Requirement
+  name: tins
+  requirement: &2156219760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2157564560
+  version_requirements: *2156219760
 - !ruby/object:Gem::Dependency
   name: more_math
-  requirement: &2157564100 !ruby/object:Gem::Requirement
+  requirement: &2156217880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157564100
+  version_requirements: *2156217880
 description: Library to gather CPU information (load averages, usage, temperature)
   in Ruby on Linux
 email: flori@ping.de