vmstat 1.1.0 → 2.0.0

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.md

@@ -1,4 +1,4 @@
-# Vmstat
+# Vmstat [![Build Status](https://secure.travis-ci.org/threez/ruby-vmstat.png)](http://travis-ci.org/threez/ruby-vmstat) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/threez/ruby-vmstat)
 
 This is a focused and fast library to get system information like:
 
@@ -7,8 +7,8 @@ This is a focused and fast library to get system information like:
 * _CPU_ (user, system, nice, idle)
 * _Load_ Average
 * _Disk_ (type, disk path, free bytes, total bytes, ...)
-* _Boot time_
-* _Current Task_ (used bytes and usage time *MAC OS X ONLY*)
+* _Boot Time_
+* _Current Task_ (used bytes and usage time *MAC OS X / Linux ONLY*)
 
 *It currently supports:*
 
@@ -45,7 +45,7 @@ Just require the library and make a snapshot or use the distinct methods to just
 	Vmstat.snapshot # => #<Vmstat::Snapshot:0x007fe5f22df660
 	#	 @at=2012-10-09 21:48:57 +0200,
 	#	 @boot_time=2012-10-09 18:42:37 +0200,
-	#	 @cpu=
+	#	 @cpus=
 	#	  [#<struct Vmstat::Cpu
 	#	    num=0,
 	#	    user=187167,
@@ -81,15 +81,7 @@ Just require the library and make a snapshot or use the distinct methods to just
 	#	   inactive=484694,
 	#	   free=470582,
 	#	   pageins=102438,
-	#	   pageouts=0,
-	#	   zero_filled=930821373,
-	#	   reactivated=33,
-	#	   purgeable=88184,
-	#	   purged=0,
-	#	   faults=90277275,
-	#	   copy_on_write_faults=668693,
-	#	   lookups=516021,
-	#	   hits=17>,
+	#	   pageouts=0>,
 	#	 @network_interfaces=
 	#	  [#<struct Vmstat::NetworkInterface
 	#	    name=:lo0,
@@ -142,9 +134,8 @@ Just require the library and make a snapshot or use the distinct methods to just
 ## Todo
 
 * Swap information
-* Reduce the number of memory information gatherd
 * Support more platforms (hp ux, aix, solaris, ...)
-* Server performance information (open file handles, cache sizes, ...)
+* Server performance/system information (open file handles, cache sizes, number of inodes ...)
 
 ## Contributing
 

data/Rakefile

@@ -8,7 +8,7 @@ Rake::ExtensionTask.new(:vmstat) do |ext|
 end
 
 desc "Run specs"
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec => :compile)
 
 desc "Open an irb session preloaded with smartstat"
 task :console do

data/ext/vmstat/hw/bsd.h

@@ -43,37 +43,29 @@ VALUE vmstat_cpu(VALUE self) {
   
   return cpus;
 }
+
+int system_int(const char * name) {
+  int number;
+  size_t number_size = sizeof(number);
+  sysctlbyname(name, &number, &number_size, NULL, 0);
+  return number;
+}
 #endif
 
 #ifndef VMSTAT_MEMORY
 #define VMSTAT_MEMORY
 VALUE vmstat_memory(VALUE self) {
   VALUE memory = rb_funcall(rb_path2class("Vmstat::Memory"),
-                 rb_intern("new"), 15, ULL2NUM(system_ull("vm.stats.vm.v_page_size")),
-                                       ULL2NUM(system_ull("vm.stats.vm.v_active_count")),
-                                       ULL2NUM(system_ull("vm.stats.vm.v_wire_count")),
-                                       ULL2NUM(system_ull("vm.stats.vm.v_inactive_count")),
-                                       ULL2NUM(system_ull("vm.stats.vm.v_free_count")),
-                                       ULL2NUM(Qnil),
-                                       ULL2NUM(Qnil),
-                                       ULL2NUM(system_ull("vm.stats.misc.zero_page_count")),
-                                       ULL2NUM(system_ull("vm.stats.vm.v_reactivated")),
-                                       ULL2NUM(Qnil),
-                                       ULL2NUM(Qnil),
-                                       ULL2NUM(system_ull("vm.stats.vm.v_vm_faults")),
-                                       ULL2NUM(system_ull("vm.stats.vm.v_cow_faults")),
-                                       ULL2NUM(Qnil),
-                                       ULL2NUM(Qnil));
+                 rb_intern("new"), 7, ULL2NUM(system_ull("vm.stats.vm.v_page_size")),
+                                      ULL2NUM(system_ull("vm.stats.vm.v_active_count")),
+                                      ULL2NUM(system_ull("vm.stats.vm.v_wire_count")),
+                                      ULL2NUM(system_ull("vm.stats.vm.v_inactive_count")),
+                                      ULL2NUM(system_ull("vm.stats.vm.v_free_count")),
+                                      ULL2NUM(system_ull("vm.stats.vm.v_vnodepgsin")),
+                                      ULL2NUM(system_ull("vm.stats.vm.v_vnodepgsout")));
   return memory;
 }
 
-int system_int(const char * name) {
-  int number;
-  size_t number_size = sizeof(number);
-  sysctlbyname(name, &number, &number_size, NULL, 0);
-  return number;
-}
-
 unsigned long long system_ull(const char * name) {
   long number;
   size_t number_size = sizeof(number);

data/ext/vmstat/hw/mach.h

@@ -53,21 +53,13 @@ VALUE vmstat_memory(VALUE self) {
                           (host_info_t)&vm_stat, &host_count);
     if (err == KERN_SUCCESS) {
       memory = rb_funcall(rb_path2class("Vmstat::Memory"),
-               rb_intern("new"), 15, ULL2NUM(pagesize),
-                                     ULL2NUM(vm_stat.active_count),
-                                     ULL2NUM(vm_stat.inactive_count),
-                                     ULL2NUM(vm_stat.wire_count),
-                                     ULL2NUM(vm_stat.free_count),
-                                     ULL2NUM(vm_stat.pageins),
-                                     ULL2NUM(vm_stat.pageouts),
-                                     ULL2NUM(vm_stat.zero_fill_count),
-                                     ULL2NUM(vm_stat.reactivations),
-                                     ULL2NUM(vm_stat.purgeable_count),
-                                     ULL2NUM(vm_stat.purges),
-                                     ULL2NUM(vm_stat.faults),
-                                     ULL2NUM(vm_stat.cow_faults),
-                                     ULL2NUM(vm_stat.lookups),
-                                     ULL2NUM(vm_stat.hits));
+               rb_intern("new"), 7, ULL2NUM(pagesize),
+                                    ULL2NUM(vm_stat.active_count),
+                                    ULL2NUM(vm_stat.inactive_count),
+                                    ULL2NUM(vm_stat.wire_count),
+                                    ULL2NUM(vm_stat.free_count),
+                                    ULL2NUM(vm_stat.pageins),
+                                    ULL2NUM(vm_stat.pageouts));
     }
 
     err = vm_deallocate(mach_task_self(), (vm_address_t)pagesize,
@@ -92,8 +84,7 @@ VALUE vmstat_task(VALUE self) {
   err = task_info(mach_task_self(), TASK_BASIC_INFO, (task_info_t)&info, &size);
   if (err == KERN_SUCCESS) {
     task = rb_funcall(rb_path2class("Vmstat::Task"),
-           rb_intern("new"), 5, LONG2NUM(info.suspend_count),
-                                LONG2NUM(info.virtual_size),
+           rb_intern("new"), 4, LONG2NUM(info.virtual_size),
                                 LONG2NUM(info.resident_size),
                                 LONG2NUM(info.user_time.seconds * 1000 + info.user_time.microseconds),
                                 LONG2NUM(info.system_time.seconds * 1000 + info.system_time.microseconds));

data/lib/vmstat.rb

@@ -1,5 +1,14 @@
 require "vmstat/version"
 
+# This is a focused and fast library to get system information like:
+# 
+# * _Memory_ (free, active, ...)
+# * _Network_ _Interfaces_ (name, in bytes, out bytes, ...)
+# * _CPU_ (user, system, nice, idle)
+# * _Load_ Average
+# * _Disk_ (type, disk path, free bytes, total bytes, ...)
+# * _Boot_ _Time_
+# * _Current_ _Task_ (used bytes and usage time *MACOSX* or *LINUX* *ONLY*)
 module Vmstat
   autoload :Cpu,              "vmstat/cpu"
   autoload :NetworkInterface, "vmstat/network_interface"
@@ -11,7 +20,7 @@ module Vmstat
   autoload :ProcFS,           "vmstat/procfs"
   autoload :Stub,             "vmstat/stub"
   autoload :Snapshot,         "vmstat/snapshot"
-  extend Stub # the default null implementation
+  extend Stub # the default empty implementation
 
   # @!method self.boot_time
   # Fetches the boot time of the system.
@@ -64,7 +73,7 @@ module Vmstat
   #   Vmstat.task # => #<struct Vmstat::Task ...>
 
   # Creates a full snapshot of the systems hardware statistics.
-  # @param [Array<String>] the paths to the disks to snapshot.
+  # @param [Array<String>] paths the paths to the disks to snapshot.
   # @return [Vmstat::Snapshot] a snapshot of all statistics.
   # @example
   #   Vmstat.snapshot # => #<struct Vmstat::Snapshot ...>

data/lib/vmstat/cpu.rb

@@ -1,4 +1,15 @@
 module Vmstat
+  # Gathered cpu performance statistics snapshot.
+  # @attr [Fixnum] num
+  #   The number of the cpu starting at 0 for the first cpu.
+  # @attr [Fixnum] user
+  #   Current counter of ticks spend in user. The counter can overflow.
+  # @attr [Fixnum] system
+  #   Current counter of ticks spend in system. The counter can overflow.
+  # @attr [Fixnum] nice
+  #   Current counter of ticks spend in nice. The counter can overflow.
+  # @attr [Fixnum] idle
+  #   Current counter of ticks spend in idle. The counter can overflow.
   class Cpu < Struct.new(:num, :user, :system, :nice, :idle)
   end
 end

data/lib/vmstat/disk.rb

@@ -1,18 +1,42 @@
 module Vmstat
+  # Gathered disk statistics snapshot.
+  # @attr [Symbol] type
+  #   The file system name e. g. *hfs*.
+  # @attr [String] origin
+  #   The location of the device e.g. */dev/disk0*.
+  # @attr [String] mount
+  #   The mount point of the device e.g. */mnt/store*.
+  # @attr [Fixnum] block_size
+  #   Size of file system blocks in bytes.
+  # @attr [Fixnum] free_blocks
+  #   Free blocks in the file system.
+  # @attr [Fixnum] available_blocks
+  #   Available blocks in the file system.
+  # @attr [Fixnum] total_blocks
+  #   Total number of blocks in the file system.
   class Disk < Struct.new(:type, :origin, :mount, :block_size, 
                           :free_blocks, :available_blocks, :total_blocks)
+    # Calculates the number of free bytes for the file system.
+    # @return [Fixnum] number of free bytes
     def free_bytes
       free_blocks * block_size
     end
 
+    # Calculates the number of available bytes for the file system.
+    # @return [Fixnum] number of available bytes
     def available_bytes
       available_blocks * block_size
     end
 
+    # Calculates the number of used bytes for the file system.
+    # @return [Fixnum] number of used bytes
     def used_bytes
       (total_blocks - free_blocks) * block_size
     end
 
+    # Calculates the number of total bytes for the file system. This is the max.
+    # number of bytes possible on the device.
+    # @return [Fixnum] number of total bytes
     def total_bytes
       total_blocks * block_size
     end

data/lib/vmstat/linux_disk.rb

@@ -22,9 +22,16 @@ module Vmstat
     }.freeze
 
     # Mainly a wrapper for the {Vmstat::Disk} class constructor. This constructor
-    # handles the file system type mapping.
-    def initialize(fs = nil, path = nil, block_size = nil, 
-                   free_blocks = nil, available_blocks = nil, total_blocks = nil)
+    # handles the file system type mapping (based on the magic codes defined in
+    # {LinuxDisk::FS_CODES}).
+    # @param [Fixnum] fs the type or magix number of the disk.
+    # @param [String] path the path to the disk
+    # @param [Fixnum] block_size size of a file system block
+    # @param [Fixnum] free_blocks the number of free blocks
+    # @param [Fixnum] available_blocks the number of available blocks
+    # @param [Fixnum] total_blocks the number of total blocks
+    def initialize(fs = nil, path = nil, block_size = nil, free_blocks = nil,
+                   available_blocks = nil, total_blocks = nil)
       @fs = fs
       super FS_CODES[@fs], path, path, block_size, 
             free_blocks, available_blocks, total_blocks

data/lib/vmstat/load_average.rb

@@ -1,4 +1,11 @@
 module Vmstat
+  # In UNIX computing, the system load is a measure of the amount of
+  # computational work that a computer system performs. The load average 
+  # represents the average system load over a period of time.
+  # Source: wikipedia(en).
+  # @attr [Float] one_minute The load for the last minute.
+  # @attr [Float] five_minutes The load for the last five minutes.
+  # @attr [Float] fifteen_minutes The load for the last fifteen minutes.
   class LoadAverage < Struct.new(:one_minute, :five_minutes, :fifteen_minutes)
   end
 end

data/lib/vmstat/memory.rb

@@ -1,22 +1,41 @@
 module Vmstat
-  class Memory < Struct.new(:pagesize,
-                            :wired, :active, :inactive, :free,
-                            :pageins, :pageouts,
-                            :zero_filled, :reactivated, :purgeable,
-                            :purged, :faults,
-                            :copy_on_write_faults, :lookups, :hits)
+  # Gathered memory data snapshot.
+  # @attr [Fixnum] pagesize
+  #   The page size of the memory in bytes.
+  # @attr [Fixnum] wired
+  #   The number of wired pages in the system.
+  # @attr [Fixnum] active
+  #   The number of active pages in the system.
+  # @attr [Fixnum] inactive
+  #   The number of inactive pages in the system.
+  # @attr [Fixnum] free
+  #   The number of free pages in the system.
+  # @attr [Fixnum] pageins
+  #   The number of pageins.
+  # @attr [Fixnum] pageouts
+  #   The number of pageouts.
+  class Memory < Struct.new(:pagesize, :wired, :active, :inactive, :free,
+                            :pageins, :pageouts)
+    # Calculate the wired bytes based of the wired pages.
+    # @return [Fixnum] wired bytes
     def wired_bytes
       wired *  pagesize
     end
 
+    # Calculate the active bytes based of the active pages.
+    # @return [Fixnum] active bytes
     def active_bytes
       active * pagesize
     end
 
+    # Calculate the inactive bytes based of the inactive pages.
+    # @return [Fixnum] inactive bytes
     def inactive_bytes
       inactive * pagesize
     end
 
+    # Calculate the free bytes based of the free pages.
+    # @return [Fixnum] free bytes
     def free_bytes
       free * pagesize
     end

data/lib/vmstat/network_interface.rb

@@ -1,4 +1,12 @@
 module Vmstat
+  # Gathered the network interface information.
+  # @attr [Symbol] name the system name for the network interface.
+  # @attr [Fixnum] in_bytes the number od bytes that where received inbound.
+  # @attr [Fixnum] in_errors the number of errors that where received inbound.
+  # @attr [Fixnum] in_drops the number of drops that where received inbound.
+  # @attr [Fixnum] out_bytes the number od bytes that where send outbound.
+  # @attr [Fixnum] out_errors the number od errors that where send outbound.
+  # @attr [Fixnum] type the type of the interface (bsd numbers)
   class NetworkInterface < Struct.new(:name, :in_bytes, :in_errors, :in_drops,
                                       :out_bytes, :out_errors, :type)
 
@@ -8,10 +16,16 @@ module Vmstat
     # The type of loopback devices on freebsd/mac os x
     LOOPBACK_TYPE = 0x18
 
+    # Checks if this network interface is a loopback device.
+    # @return [TrueClass, FalseClass] true if it is a loopback device, false
+    #   otherwise.
     def loopback?
       type == LOOPBACK_TYPE
     end
 
+    # Checks if this network interface is a ethernet device.
+    # @return [TrueClass, FalseClass] true if it is a ethernet device, false
+    #   otherwise.
     def ethernet?
       type == ETHERNET_TYPE
     end

data/lib/vmstat/procfs.rb

@@ -1,4 +1,6 @@
 module Vmstat
+  # Implementation of performance metrics gathering for linux and other os with
+  # the proc file system.
   module ProcFS
     # Grep from the man procfs about cpu data in stat file:
     # @example Format
@@ -84,14 +86,32 @@ module Vmstat
       netifcs = []
       procfs_file("net", "dev") do |file|
         file.read.scan(NET_DATA) do |columns|
+          type = case columns[0]
+            when /^eth/ then NetworkInterface::ETHERNET_TYPE
+            when /^lo/  then NetworkInterface::LOOPBACK_TYPE
+          end
+
           netifcs << NetworkInterface.new(columns[0].to_sym, columns[1].to_i, 
                                           columns[3].to_i,   columns[4].to_i, 
-                                          columns[9].to_i,   columns[11].to_i)
+                                          columns[9].to_i,   columns[11].to_i,
+                                          type)
         end
       end
       netifcs
     end
 
+    # Fetches the current process cpu and memory data.
+    # @return [Vmstat::Task] the task data for the current process
+    def task
+      @pagesize ||= Vmstat.pagesize
+
+      procfs_file("self", "stat") do |file|
+        data = file.read.split(/ /)
+        Task.new(data[22].to_i / @pagesize, data[23].to_i, 
+                 data[13].to_i * 1000, data[14].to_i * 1000)
+      end
+    end
+
     # Fetches the boot time of the system.
     # @return [Time] the boot time as regular time object.
     # @example

data/lib/vmstat/snapshot.rb

@@ -1,12 +1,28 @@
 module Vmstat
+  # Snapshots help to gather information about the whole system quickly.
+  # @attr [Time] at the timestamp, when the snapshot was created.
+  # @attr [Time] boot_time the timestamp, when the system booted.
+  # @attr [Array<Vmstat::Cpu>] cpus the data of each and every cpu.
+  # @attr [Array<Vmstat::Disk>] disks the disks that are part of the snapshot.
+  # @attr [Vmstat::LoadAverage] load_average current load average at the time
+  #   when the snapshot toke place.
+  # @attr [Vmstat::Memory] memory the memory data snapshot.
+  # @attr [Array<Vmstat::NetworkInterface>] network_interfaces the network
+  #   interface data snapshots per network interface.
+  # @attr [Vmstat::Task] task optionally the information for the current task
+  # @example Creating a snapshot
+  #   snapshop = Vmstat::Snapshop.new(["/dev/disk0", "/dev/disk1"])
   class Snapshot
-    attr_reader :at, :boot_time, :cpu, :disks, :load_average,
+    attr_reader :at, :boot_time, :cpus, :disks, :load_average,
                 :memory, :network_interfaces, :task
 
+    # Create a new snapshot for system informations. The passed paths array,
+    # should contain the disk paths to create a snapshot for.
+    # @param [Array<String>] paths the paths to create snapshots for
     def initialize(paths = [])
       @at = Time.now
       @boot_time = Vmstat.boot_time
-      @cpu = Vmstat.cpu
+      @cpus = Vmstat.cpu
       @disks = paths.map { |path| Vmstat.disk(path) }
       @load_average = Vmstat.load_average
       @memory = Vmstat.memory

data/lib/vmstat/stub.rb

@@ -1,4 +1,7 @@
 module Vmstat
+  # This is a stub module that should be replaced by system specific
+  # implementations of the different functions. This can either be native or
+  # with other modules like {ProcFS}.
   module Stub
     # Fetches the boot time of the system.
     # @return [Time] the boot time as regular time object.

data/lib/vmstat/task.rb

@@ -1,6 +1,14 @@
 module Vmstat
-  class Task < Struct.new(:suspend_count, :virtual_size, :resident_size,
+  # Per task performance metrics snapshot.
+  # @attr [Fixnum] virtual_size
+  #   The number of virtual pages for the task.
+  # @attr [Fixnum] resident_size
+  #   The number of resident pages for the task
+  # @attr [Fixnum] user_time_ms
+  #   The total user run time for terminated threads within the task.
+  # @attr [Fixnum] system_time_ms
+  #   The total system run time for terminated threads within the task.
+  class Task < Struct.new(:virtual_size, :resident_size,
                           :user_time_ms, :system_time_ms)
   end
 end
- 

data/lib/vmstat/version.rb

@@ -1,3 +1,3 @@
 module Vmstat
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/spec/procfs/self/stat

@@ -0,0 +1 @@
+1587 (bash) S 1586 1587 1492 34816 1662 4202496 1405 6289 0 2 2 0 0 7 20 0 1 0 7017 19689472 515 18446744073709551615 4194304 5082140 140736936765952 140736936764896 139925747992062 0 65536 3686404 1266761467 0 0 0 17 0 0 0 0 0 0

data/spec/vmstat/cpu_spec.rb

@@ -13,7 +13,7 @@ describe Vmstat::Cpu do
       subject { first_cpu }
 
       it "should return a vmstat cpu object" do
-        should be_a(Vmstat::Cpu)
+        should be_a(described_class)
       end
 
       context "methods" do

data/spec/vmstat/disk_spec.rb

@@ -1,12 +1,32 @@
 require 'spec_helper'
 
 describe Vmstat::Disk do
+  context "sample" do
+    let(:disk) { described_class.new :hfs, "/dev/disk0", "/mnt/test",
+                                     4096, 100, 200, 600 }
+    subject { disk }
+
+    its(:type) { should == :hfs }
+    its(:origin) { should == "/dev/disk0" }
+    its(:mount) { should == "/mnt/test" }
+
+    its(:block_size) { should == 4096 }
+    its(:free_blocks) { should == 100 }
+    its(:available_blocks) { should == 200 }
+    its(:total_blocks) { should == 600 }
+
+    its(:free_bytes) { should == 409600 }
+    its(:available_bytes) { should == 819200 }
+    its(:used_bytes) { should == 2048000 }
+    its(:total_bytes) { should == 2457600 }
+  end
+
   context "Vmstat#disk" do
     let(:disk) { Vmstat.disk("/") }
     subject { disk }
 
     it "should be a vmstat disk object" do
-      should be_a(Vmstat::Disk)
+      should be_a(described_class)
     end
 
     context "methods" do

data/spec/vmstat/load_average_spec.rb

@@ -5,7 +5,7 @@ describe Vmstat::LoadAverage do
     subject { Vmstat.load_average }
 
     it "should be an vmstat load average object" do
-      should be_a(Vmstat::LoadAverage)
+      should be_a(described_class)
     end
 
     context "methods" do

data/spec/vmstat/memory_spec.rb

@@ -1,12 +1,33 @@
 require 'spec_helper'
 
 describe Vmstat::Memory do
+  context "sample" do
+    let(:disk) { described_class.new 4096, 775581, 196146, 437495, 685599,
+                                     1560532, 0 }
+    subject { disk }
+
+    its(:pagesize) { should == 4096 }
+
+    its(:wired) { should == 775581 }
+    its(:active) { should == 196146 }
+    its(:inactive) { should == 437495 }
+    its(:free) { should == 685599 }
+
+    its(:wired_bytes) { should == 3176779776 }
+    its(:active_bytes) { should == 803414016 }
+    its(:inactive_bytes) { should == 1791979520 }
+    its(:free_bytes) { should == 2808213504 }
+
+    its(:pageins) { should == 1560532 }
+    its(:pageouts) { should == 0 }
+  end
+
   context "Vmstat#memory" do
     let(:memory) { Vmstat.memory }
     subject { memory }
 
     it "should be a vmstat memory object" do
-      should be_a(Vmstat::Memory)
+      should be_a(described_class)
     end
 
     context "methods" do
@@ -15,14 +36,13 @@ describe Vmstat::Memory do
       it { should respond_to(:active) }
       it { should respond_to(:inactive) }
       it { should respond_to(:free) }
+      it { should respond_to(:pageins) }
+      it { should respond_to(:pageouts) }
+
       it { should respond_to(:wired_bytes) }
       it { should respond_to(:active_bytes) }
       it { should respond_to(:inactive_bytes) }
       it { should respond_to(:free_bytes) }
-      it { should respond_to(:zero_filled) }
-      it { should respond_to(:reactivated) }
-      it { should respond_to(:faults) }
-      it { should respond_to(:copy_on_write_faults) }
     end
 
     context "content" do
@@ -31,14 +51,13 @@ describe Vmstat::Memory do
       its(:active) { should be_a_kind_of(Numeric) }
       its(:inactive) { should be_a_kind_of(Numeric) }
       its(:free) { should be_a_kind_of(Numeric) }
+      its(:pageins) { should be_a_kind_of(Numeric) }
+      its(:pageouts) { should be_a_kind_of(Numeric) }
+
       its(:wired_bytes) { should be_a_kind_of(Numeric) }
       its(:active_bytes) { should be_a_kind_of(Numeric) }
       its(:inactive_bytes) { should be_a_kind_of(Numeric) }
       its(:free_bytes) { should be_a_kind_of(Numeric) }
-      its(:zero_filled) { should be_a_kind_of(Numeric) }
-      its(:reactivated) { should be_a_kind_of(Numeric) }
-      its(:faults) { should be_a_kind_of(Numeric) }
-      its(:copy_on_write_faults) { should be_a_kind_of(Numeric) }
     end
   end
-end
+end

data/spec/vmstat/network_spec.rb

@@ -13,7 +13,7 @@ describe Vmstat::NetworkInterface do
       subject { loopback }
 
       it "should be a vmstat network interface object" do
-        should be_a(Vmstat::NetworkInterface)
+        should be_a(described_class)
       end
 
       context "methods" do

data/spec/vmstat/procfs_spec.rb

@@ -53,10 +53,20 @@ describe Vmstat::ProcFS do
     it { should be_a(Array) }
     it do
       should == [
-        Vmstat::NetworkInterface.new(:lo, 3224, 0, 0, 3224, 0),
-        Vmstat::NetworkInterface.new(:eth1, 0, 1, 2, 0, 3),
-        Vmstat::NetworkInterface.new(:eth0, 33660, 0, 0, 36584, 0)
+        Vmstat::NetworkInterface.new(:lo, 3224, 0, 0, 3224, 0,
+                                     Vmstat::NetworkInterface::LOOPBACK_TYPE),
+        Vmstat::NetworkInterface.new(:eth1, 0, 1, 2, 0, 3,
+                                     Vmstat::NetworkInterface::ETHERNET_TYPE),
+        Vmstat::NetworkInterface.new(:eth0, 33660, 0, 0, 36584, 0,
+                                     Vmstat::NetworkInterface::ETHERNET_TYPE)
       ]
     end
   end
+
+  context "#task" do
+    subject { procfs.task }
+
+    it { should be_a(Vmstat::Task) }
+    it { should == Vmstat::Task.new(4807, 515, 2000, 0) }
+  end
 end

data/spec/vmstat/snapshot_spec.rb

@@ -6,13 +6,13 @@ describe Vmstat::Snapshot do
     subject { snapshot }
 
     it "should be an vmstat load snapshot object" do
-      should be_a(Vmstat::Snapshot)
+      should be_a(described_class)
     end
 
     context "methods" do
       it { should respond_to(:at) }
       it { should respond_to(:boot_time) }
-      it { should respond_to(:cpu) }
+      it { should respond_to(:cpus) }
       it { should respond_to(:disks) }
       it { should respond_to(:load_average) }
       it { should respond_to(:memory) }
@@ -23,7 +23,7 @@ describe Vmstat::Snapshot do
     context "content" do
       its(:at) { should be_a(Time) }
       its(:boot_time) { should be_a(Time) }
-      its(:cpu) { should be_a(Array) }
+      its(:cpus) { should be_a(Array) }
       its(:disks) { should be_a(Array) }
       its(:load_average) { should be_a(Vmstat::LoadAverage) }
       its(:memory) { should be_a(Vmstat::Memory) }
@@ -31,7 +31,7 @@ describe Vmstat::Snapshot do
       its(:task) { should be_a(Vmstat::Task) }
 
       context "first of cpu" do
-        subject { snapshot.cpu.first }
+        subject { snapshot.cpus.first }
         it { should be_a(Vmstat::Cpu) }
       end
       

data/spec/vmstat/task_spec.rb

@@ -6,11 +6,10 @@ describe Vmstat::Task do
     subject { task }
 
     it "should be a vmstat task object" do
-      should be_a(Vmstat::Task)
+      should be_a(described_class)
     end
 
     context "methods" do
-      it { should respond_to(:suspend_count) }
       it { should respond_to(:virtual_size) }
       it { should respond_to(:resident_size) }
       it { should respond_to(:user_time_ms) }
@@ -18,7 +17,6 @@ describe Vmstat::Task do
     end
     
     context "content" do
-      its(:suspend_count) { should be_a_kind_of(Numeric) }
       its(:virtual_size) { should be_a_kind_of(Numeric) }
       its(:resident_size) { should be_a_kind_of(Numeric) }
       its(:user_time_ms) { should be_a_kind_of(Numeric) }

data/spec/vmstat_spec.rb

@@ -15,7 +15,7 @@ describe Vmstat do
   
   context "Vmstat#filter_devices" do
     it "should filter ethernet devices" do
-      Vmstat.ethernet_devices.size.should == 2
+      Vmstat.ethernet_devices.size.should >= 1
     end
 
     it "should filter loopback devices" do

data/vmstat.gemspec

@@ -9,10 +9,10 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Vincent Landgraf"]
   gem.email         = ["vilandgr@googlemail.com"]
   gem.description   = %q{
-    A focused and fast library t gather memory, 
+    A focused and fast library to gather memory, 
     cpu, network, load avg and disk information
   }
-  gem.summary       = %q{A focused and fast library t gather system information}
+  gem.summary       = %q{A focused and fast library to gather system information}
   gem.homepage      = "http://threez.github.com/ruby-vmstat/"
 
   gem.files         = `git ls-files`.split($/)
@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.extensions    = ["ext/vmstat/extconf.rb"]
 
+  gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('rake-compiler')
   gem.add_development_dependency('guard-rspec')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmstat
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +91,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "\n    A focused and fast library t gather memory, \n    cpu, network,
+description: ! "\n    A focused and fast library to gather memory, \n    cpu, network,
   load avg and disk information\n  "
 email:
 - vilandgr@googlemail.com
@@ -87,6 +103,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -115,6 +132,7 @@ files:
 - spec/procfs/loadavg
 - spec/procfs/meminfo
 - spec/procfs/net/dev
+- spec/procfs/self/stat
 - spec/procfs/stat
 - spec/procfs/uptime
 - spec/procfs/vmstat
@@ -143,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3233054199977223520
+      hash: -3973347779729246928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,17 +170,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3233054199977223520
+      hash: -3973347779729246928
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A focused and fast library t gather system information
+summary: A focused and fast library to gather system information
 test_files:
 - spec/procfs/loadavg
 - spec/procfs/meminfo
 - spec/procfs/net/dev
+- spec/procfs/self/stat
 - spec/procfs/stat
 - spec/procfs/uptime
 - spec/procfs/vmstat