cpu 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/VERSION +1 -1
- data/bin/coretemp +19 -17
- data/cpu.gemspec +8 -8
- data/lib/cpu.rb +2 -2
- data/lib/cpu/version.rb +1 -1
- metadata +11 -11
data/Rakefile
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.0.
|
1
|
+
0.0.4
|
data/bin/coretemp
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
|
3
3
|
require 'cpu'
|
4
|
-
require '
|
5
|
-
include
|
4
|
+
require 'tins/go'
|
5
|
+
include Tins::GO
|
6
6
|
require 'more_math'
|
7
7
|
|
8
8
|
class ParseCommands
|
@@ -23,26 +23,29 @@ class ParseCommands
|
|
23
23
|
File.expand_path(filename)
|
24
24
|
end
|
25
25
|
|
26
|
-
def
|
26
|
+
def measure_data(opts)
|
27
27
|
set_t_j_max opts['t']
|
28
|
-
CPU.
|
28
|
+
CPU.usage(@duration || 1)
|
29
29
|
end
|
30
30
|
|
31
31
|
def simple
|
32
32
|
opts = go 't', @argv
|
33
|
-
puts
|
33
|
+
puts measure_data(opts).map(&:temperature) * ' '
|
34
34
|
end
|
35
35
|
|
36
36
|
def collect
|
37
|
-
opts = go '
|
37
|
+
opts = go 'tfn:', @argv
|
38
|
+
@duration = (opts['n'] || 1).to_f
|
38
39
|
filename = create_history_path opts['f']
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
o
|
40
|
+
begin
|
41
|
+
temperatures = measure_data(opts).map(&:temperature)
|
42
|
+
line = ([ Time.now.to_f ] + temperatures) * ' '
|
43
|
+
if filename
|
44
|
+
open(filename, 'a') do |o|
|
45
|
+
o.puts line
|
46
|
+
end
|
44
47
|
end
|
45
|
-
end
|
48
|
+
end while @duration > 0
|
46
49
|
end
|
47
50
|
|
48
51
|
def clear
|
@@ -65,11 +68,11 @@ class ParseCommands
|
|
65
68
|
}
|
66
69
|
measurements_last = history.last[1..-1]
|
67
70
|
times, *measurements = history.transpose
|
68
|
-
|
69
|
-
puts " min: %s" % (
|
71
|
+
sequences = measurements.map { |m| MoreMath::Sequence.new(m) }
|
72
|
+
puts " min: %s" % (sequences.map { |a| a.min } * ' ')
|
70
73
|
puts "last: %s" % (measurements_last * ' ')
|
71
|
-
puts " max: %s" % (
|
72
|
-
puts "mean: %s" % (
|
74
|
+
puts " max: %s" % (sequences.map { |a| a.max } * ' ')
|
75
|
+
puts "mean: %s" % (sequences.map { |a| a.mean.round } * ' ')
|
73
76
|
end
|
74
77
|
end
|
75
78
|
|
@@ -78,7 +81,6 @@ class ParseCommands
|
|
78
81
|
when 'collect' then collect
|
79
82
|
when 'clear' then clear
|
80
83
|
when 'stats' then stats
|
81
|
-
when 'collect_stats' then collect; stats
|
82
84
|
else simple
|
83
85
|
end
|
84
86
|
end
|
data/cpu.gemspec
CHANGED
@@ -2,11 +2,11 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = "cpu"
|
5
|
-
s.version = "0.0.
|
5
|
+
s.version = "0.0.4"
|
6
6
|
|
7
7
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
8
8
|
s.authors = ["Florian Frank"]
|
9
|
-
s.date = "2011-09-
|
9
|
+
s.date = "2011-09-25"
|
10
10
|
s.description = "Library to gather CPU information (load averages, usage, temperature) in Ruby on Linux"
|
11
11
|
s.email = "flori@ping.de"
|
12
12
|
s.executables = ["coretemp"]
|
@@ -23,17 +23,17 @@ Gem::Specification.new do |s|
|
|
23
23
|
s.specification_version = 3
|
24
24
|
|
25
25
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
26
|
-
s.add_development_dependency(%q<gem_hadar>, ["~> 0.0
|
27
|
-
s.add_runtime_dependency(%q<
|
26
|
+
s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.0"])
|
27
|
+
s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
|
28
28
|
s.add_runtime_dependency(%q<more_math>, ["~> 0.0"])
|
29
29
|
else
|
30
|
-
s.add_dependency(%q<gem_hadar>, ["~> 0.0
|
31
|
-
s.add_dependency(%q<
|
30
|
+
s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
|
31
|
+
s.add_dependency(%q<tins>, ["~> 0.3"])
|
32
32
|
s.add_dependency(%q<more_math>, ["~> 0.0"])
|
33
33
|
end
|
34
34
|
else
|
35
|
-
s.add_dependency(%q<gem_hadar>, ["~> 0.0
|
36
|
-
s.add_dependency(%q<
|
35
|
+
s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
|
36
|
+
s.add_dependency(%q<tins>, ["~> 0.3"])
|
37
37
|
s.add_dependency(%q<more_math>, ["~> 0.0"])
|
38
38
|
end
|
39
39
|
end
|
data/lib/cpu.rb
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
require '
|
1
|
+
require 'tins/uniq_by'
|
2
2
|
require 'cpu/shared'
|
3
3
|
require 'cpu/processor'
|
4
4
|
require 'cpu/msr'
|
@@ -51,7 +51,7 @@ module CPU
|
|
51
51
|
processor_id =~ /\A\d+\Z/ or next ps
|
52
52
|
ps << processor_id.to_i
|
53
53
|
end
|
54
|
-
processors.extend
|
54
|
+
processors.extend Tins::UniqBy
|
55
55
|
processors.sort!
|
56
56
|
@num_processors = processors.size
|
57
57
|
@num_cores = cpu_cores.invert.size
|
data/lib/cpu/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cpu
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.4
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,33 +9,33 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-09-
|
12
|
+
date: 2011-09-25 00:00:00.000000000Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: gem_hadar
|
16
|
-
requirement: &
|
16
|
+
requirement: &2156221100 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 0.0
|
21
|
+
version: 0.1.0
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *2156221100
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
|
-
name:
|
27
|
-
requirement: &
|
26
|
+
name: tins
|
27
|
+
requirement: &2156219760 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: 0.
|
32
|
+
version: '0.3'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2156219760
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: more_math
|
38
|
-
requirement: &
|
38
|
+
requirement: &2156217880 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
version: '0.0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2156217880
|
47
47
|
description: Library to gather CPU information (load averages, usage, temperature)
|
48
48
|
in Ruby on Linux
|
49
49
|
email: flori@ping.de
|