cpu 0.0.2 → 0.0.3

data/.gitignore

@@ -0,0 +1,3 @@
+.*.sw[pon]
+Gemfile.lock
+pkg

data/Gemfile

@@ -3,11 +3,3 @@
 source :rubygems
 
 gemspec
-
-group :development do
-  gem 'rake', '~>0.9.2'
-  gem 'sdoc', '~>0.2.20'
-  gem 'rcov', '~>0.9.9'
-  gem 'test-unit', '~>2.3.0'
-  gem 'mocha', '~>0.9.12'
-end

data/Rakefile

@@ -1,121 +1,37 @@
 # vim: set filetype=ruby et sw=2 ts=2:
 
-begin
-  require 'rubygems/package_task'
-rescue LoadError
-end
-begin
-  require 'rcov/rcovtask'
-rescue LoadError
-end
-require 'rake/clean'
-require 'rake/testtask'
-require 'rbconfig'
-include Config
-
-PKG_NAME    = 'cpu'
-PKG_VERSION = File.read('VERSION').chomp
-PKG_FILES   = FileList[*`git ls-files`.split(/\n/)].exclude '.gitignore'
-CLEAN.include 'coverage', 'doc'
-CLOBBER.include 'pkg'
-
-desc "Install executable/library into site_ruby directories"
-task :install  do
-  bindir = CONFIG['bindir']
-  libdir = CONFIG['sitelibdir']
-  cd 'lib' do
-    for file in Dir['**/*.rb']
-      dest = File.join(libdir, file)
-      mkdir_p File.dirname(dest)
-      install file, dest, :verbose => true
-    end
-  end
-  install('bin/coretemp', bindir, :verbose => true, :mode => 0755)
-end
-
-desc "Create documentation"
-task :doc do
-  sh "sdoc -m README.rdoc -t 'CPU' README.rdoc #{Dir['lib/**/*.rb'] * ' '}"
-end
-
-namespace :gems do
-  desc "Install all gems from the Gemfile"
-  task :install  do
-    sh 'bundle install'
-  end
-end
-
-if defined? Gem
-  spec = Gem::Specification.new do |s|
-    s.name = PKG_NAME
-    s.version = PKG_VERSION
-    s.summary = "CPU information in Ruby/Linux"
-    s.description = "Library to gather CPU information (load averages, usage,"\
-      " temperature) in Ruby on Linux"
-
-    s.executables = 'coretemp'
-    s.files = PKG_FILES
-
-    s.require_path = 'lib'
-
-    s.add_dependency 'spruz', '~>0.2.2'
-
-    s.rdoc_options << '--main' <<  'README.rdoc' << '--title' << 'CPU'
-    s.extra_rdoc_files << 'README.rdoc'
-    s.test_files.concat Dir['tests/test_*.rb']
-
-    s.author = "Florian Frank"
-    s.email = "flori@ping.de"
-    s.homepage = "http://flori.github.com/#{PKG_NAME}"
-    s.rubyforge_project = PKG_NAME
-  end
-
-  desc 'Create a gemspec file'
-  task :gemspec => :version do
-    File.open('cpu.gemspec', 'w') do |gemspec|
-      gemspec.write spec.to_ruby
+require 'gem_hadar'
+
+GemHadar do
+  name        'cpu'
+  path_module 'CPU'
+  author      'Florian Frank'
+  email       'flori@ping.de'
+  homepage    "http://flori.github.com/#{name}"
+  summary     'CPU information in Ruby/Linux'
+  description 'Library to gather CPU information (load averages, usage,'\
+              ' temperature) in Ruby on Linux'
+
+  test_dir    'tests'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
+  readme      'README.rdoc'
+  executables 'coretemp'
+
+  dependency  'spruz',          '~>0.2.2'
+  dependency  'more_math',      '~>0.0'
+
+  install_library do
+    libdir = CONFIG["sitelibdir"]
+    cd 'lib' do
+      dst = File.join(libdir, 'cpu')
+      mkdir_p dst
+      cd 'cpu' do
+        for file in Dir['*.rb']
+          install file, File.join(dst, file)
+        end
+      end
+      install 'cpu.rb', libdir
     end
-  end
-
-  Gem::PackageTask.new(spec) do |pkg|
-    pkg.need_tar = true
-    pkg.package_files += PKG_FILES
+    install('bin/coretemp', bindir, :verbose => true, :mode => 0755) 
   end
 end
-
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList['tests/**/*_test.rb']
-  t.verbose    = true
-end
-
-if defined? Rcov
-  Rcov::RcovTask.new do |t|
-    t.test_files = FileList['tests/**/*_test.rb']
-    t.verbose    = true
-    t.rcov_opts = %w[-x '\\btests\/' -x '\\bgems\/']
-  end
-end
-
-desc m = "Writing version information for #{PKG_VERSION}"
-task :version do
-  puts m
-  File.open(File.join('lib', 'cpu', 'version.rb'), 'w') do |v|
-    v.puts <<EOT
-module CPU
-  # CPU version
-  VERSION         = '#{PKG_VERSION}'
-  VERSION_ARRAY   = VERSION.split(/\\./).map { |x| x.to_i } # :nodoc:
-  VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
-  VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
-  VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
-end
-EOT
-  end
-end
-
-desc "Run the tests by default"
-task :default => [ :version, :test ]
-
-desc "Prepare release of the library"
-task :release => [ :clean, :gemspec, :package ]

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/coretemp

@@ -3,7 +3,7 @@
 require 'cpu'
 require 'spruz/go'
 include Spruz::GO
-require 'bullshit'
+require 'more_math'
 
 class ParseCommands
   def self.parse(argv)
@@ -65,7 +65,7 @@ class ParseCommands
       }
       measurements_last = history.last[1..-1]
       times, *measurements = history.transpose
-      analyses = measurements.map { |m| Bullshit::Analysis.new(m) }
+      analyses = measurements.map { |m| MoreMath::Sequence.new(m) }
       puts " min: %s" % (analyses.map { |a| a.min  } * ' ')
       puts "last: %s" % (measurements_last * ' ')
       puts " max: %s" % (analyses.map { |a| a.max  } * ' ')

data/cpu.gemspec

@@ -1,33 +1,39 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cpu}
-  s.version = "0.0.2"
+  s.name = "cpu"
+  s.version = "0.0.3"
 
   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-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}]
-  s.extra_rdoc_files = [%q{README.rdoc}]
-  s.files = [%q{CHANGES}, %q{COPYING}, %q{Gemfile}, %q{README.rdoc}, %q{Rakefile}, %q{VERSION}, %q{bin/coretemp}, %q{cpu.gemspec}, %q{lib/cpu.rb}, %q{lib/cpu/load.rb}, %q{lib/cpu/msr.rb}, %q{lib/cpu/processor.rb}, %q{lib/cpu/shared.rb}, %q{lib/cpu/usage.rb}, %q{lib/cpu/usage_sampler.rb}, %q{lib/cpu/version.rb}, %q{munin/coretemp}, %q{tests/load_test.rb}, %q{tests/msr_test.rb}, %q{tests/usage_test.rb}]
-  s.homepage = %q{http://flori.github.com/cpu}
-  s.rdoc_options = [%q{--main}, %q{README.rdoc}, %q{--title}, %q{CPU}]
-  s.require_paths = [%q{lib}]
-  s.rubyforge_project = %q{cpu}
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{CPU information in Ruby/Linux}
+  s.authors = ["Florian Frank"]
+  s.date = "2011-09-02"
+  s.description = "Library to gather CPU information (load averages, usage, temperature) in Ruby on Linux"
+  s.email = "flori@ping.de"
+  s.executables = ["coretemp"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/cpu.rb", "lib/cpu/version.rb", "lib/cpu/usage.rb", "lib/cpu/processor.rb", "lib/cpu/load.rb", "lib/cpu/msr.rb", "lib/cpu/usage_sampler.rb", "lib/cpu/shared.rb"]
+  s.files = [".gitignore", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "bin/coretemp", "cpu.gemspec", "lib/cpu.rb", "lib/cpu/load.rb", "lib/cpu/msr.rb", "lib/cpu/processor.rb", "lib/cpu/shared.rb", "lib/cpu/usage.rb", "lib/cpu/usage_sampler.rb", "lib/cpu/version.rb", "munin/coretemp", "tests/load_test.rb", "tests/msr_test.rb", "tests/usage_test.rb"]
+  s.homepage = "http://flori.github.com/cpu"
+  s.rdoc_options = ["--title", "Cpu - CPU information in Ruby/Linux", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "CPU information in Ruby/Linux"
+  s.test_files = ["tests/msr_test.rb", "tests/load_test.rb", "tests/usage_test.rb"]
 
   if s.respond_to? :specification_version then
     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_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<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<more_math>, ["~> 0.0"])
   end
 end

data/lib/cpu/version.rb

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

data/tests/usage_test.rb

@@ -5,7 +5,7 @@ require 'cpu'
 module CPU
   class UsageTest < Test::Unit::TestCase
     def test_sum_usage
-      @processor = CPU.sum_usage 0.1
+      @processor = CPU.sum_usage_processor 1
       assert_kind_of Processor, @processor
       assert_operator @processor.usage.percentage, :>, 0
     end

metadata

@@ -1,47 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cpu
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: spruz
+date: 2011-09-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: gem_hadar
+  requirement: &2157565060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.12
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2157565060
+- !ruby/object:Gem::Dependency
+  name: spruz
+  requirement: &2157564560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.2.2
   type: :runtime
-  version_requirements: *id001
-description: Library to gather CPU information (load averages, usage, temperature) in Ruby on Linux
+  prerelease: false
+  version_requirements: *2157564560
+- !ruby/object:Gem::Dependency
+  name: more_math
+  requirement: &2157564100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157564100
+description: Library to gather CPU information (load averages, usage, temperature)
+  in Ruby on Linux
 email: flori@ping.de
-executables: 
+executables:
 - coretemp
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+- lib/cpu.rb
+- lib/cpu/version.rb
+- lib/cpu/usage.rb
+- lib/cpu/processor.rb
+- lib/cpu/load.rb
+- lib/cpu/msr.rb
+- lib/cpu/usage_sampler.rb
+- lib/cpu/shared.rb
+files:
+- .gitignore
 - CHANGES
 - COPYING
 - Gemfile
@@ -64,39 +84,33 @@ files:
 - tests/usage_test.rb
 homepage: http://flori.github.com/cpu
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
+- --title
+- Cpu - CPU information in Ruby/Linux
 - --main
 - README.rdoc
-- --title
-- CPU
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: cpu
-rubygems_version: 1.8.5
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CPU information in Ruby/Linux
-test_files: []
-
+test_files:
+- tests/msr_test.rb
+- tests/load_test.rb
+- tests/usage_test.rb