vmstat 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c680412d4bf38d53b7b34a35b40708520fcaa521
-  data.tar.gz: e3e5033a0556c82cfbf7f0d23e876a96c55d7065
+  metadata.gz: 9755d74fe2f9659eb01e1cb582a44cce556bda4a
+  data.tar.gz: 0d846e1cd3eb12d3fafbc1dd93f1472ffc6ab2bc
 SHA512:
-  metadata.gz: 6070e29648a1274fe62a498f2ef4972d8f4e1fb3898e4226277eca39a82131771ac4fa21810accb082686b01f44847571409f285a95996d59cfe807a9bd73b64
-  data.tar.gz: 4d725d090de11fbf164203d6b787f6f357dbdf8973c79633db2a4d0125b8c91946444d28eea410caf3b03a51d7051c272c87dd89d9e0456f7c06b1a75fa09281
+  metadata.gz: 4629bcb7856759da7f79684f50eeb5bff64e76ed1962b7b2cc91dd3203bf58eacee6608beadca990e8359f402aed0168530c9f4d345722dc688b0b6df193f63a
+  data.tar.gz: bfc607c69789a069fdf9c370af456f8d89b6d8adc1465ab7d8df424b8263324af818d81623860e732ac8cd7c49ceabc70cf9316c843a2d584b215c2ce81b6761

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.2.3

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
+os:
+  - linux
+  - osx
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2.3
+env:
+  - TRAVIS=true

data/README.md

@@ -18,9 +18,12 @@ This is a focused and fast library to get system information like:
 
 *It might support (but not tested):*
 
+* Older versions of linux
+
+*It doesn't support:*
+
 * OpenBSD
 * NetBSD
-* Older versions of linux
 
 ## Installation
 
@@ -136,6 +139,7 @@ Just require the library and make a snapshot or use the distinct methods to just
 * Swap information
 * Support more platforms (hp ux, aix, solaris, ...)
 * Server performance/system information (open file handles, cache sizes, number of inodes ...)
+* Add support for (Open|Net)BSD using UVM (http://cvsweb.netbsd.org/bsdweb.cgi/src/external/bsd/top/dist/machine/) and remove sysctlbyname references where possible to make it compatible
 
 ## Contributing
 

data/examples/rtop

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'vmstat'
+
+last = Vmstat.snapshot
+
+system 'clear'
+WIDTH = 60
+
+class String
+def black;          "\033[30m#{self}\033[0m" end
+def red;            "\033[31m#{self}\033[0m" end
+def green;          "\033[32m#{self}\033[0m" end
+def brown;          "\033[33m#{self}\033[0m" end
+def blue;           "\033[34m#{self}\033[0m" end
+def magenta;        "\033[35m#{self}\033[0m" end
+def cyan;           "\033[36m#{self}\033[0m" end
+def gray;           "\033[37m#{self}\033[0m" end
+def bg_black;       "\033[40m#{self}\033[0m" end
+def bg_red;         "\033[41m#{self}\033[0m" end
+def bg_green;       "\033[42m#{self}\033[0m" end
+def bg_brown;       "\033[43m#{self}\033[0m" end
+def bg_blue;        "\033[44m#{self}\033[0m" end
+def bg_magenta;     "\033[45m#{self}\033[0m" end
+def bg_cyan;        "\033[46m#{self}\033[0m" end
+def bg_gray;        "\033[47m#{self}\033[0m" end
+def bold;           "\033[1m#{self}\033[22m" end
+def reverse_color;  "\033[7m#{self}\033[27m" end
+end
+
+MB = 1024 ** 2
+
+loop do
+  current = Vmstat.snapshot
+  memory = current.memory
+  free = (memory.free_bytes + memory.inactive_bytes) / MB
+  used = (memory.active_bytes + memory.wired_bytes) / MB
+
+  print "\033[0;0H"
+  print "Memory Free: #{free.to_s.bg_gray.black} MB"
+  print "\tUsed: #{used.to_s.bg_gray.black} MB"
+  print "\tWired: #{(memory.wired_bytes / MB).to_s.bg_gray.black} MB"
+  puts "\tTotal: #{(memory.total_bytes / MB).to_s.bg_gray.black} MB"
+  current.cpus.each_with_index do |cpu, i|
+    user = cpu.user - last.cpus[i].user
+    system = cpu.system - last.cpus[i].system
+    idle = cpu.idle - last.cpus[i].idle
+
+    print "CPU #{i + 1} "
+    print " ".bg_red * (system.to_f / 100.0 * WIDTH)
+    print " ".bg_green * (user.to_f / 100.0 * WIDTH)
+    print " " * (idle.to_f / 100.0 * WIDTH)
+    puts
+  end
+  last = current
+  sleep 1
+end

data/ext/vmstat/hw/bsd.h

@@ -6,7 +6,7 @@
 
 // helper methods
 int system_int(const char *);
-unsigned long long system_ull(const char *);
+unsigned int system_uint(const char *);
 
 typedef struct {
   long user;
@@ -56,18 +56,18 @@ int system_int(const char * name) {
 #define VMSTAT_MEMORY
 VALUE vmstat_memory(VALUE self) {
   VALUE memory = rb_funcall(rb_path2class("Vmstat::Memory"),
-                 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")));
+                 rb_intern("new"), 7, ULL2NUM(system_uint("vm.stats.vm.v_page_size")),
+                                      ULL2NUM(system_uint("vm.stats.vm.v_active_count")),
+                                      ULL2NUM(system_uint("vm.stats.vm.v_wire_count")),
+                                      ULL2NUM(system_uint("vm.stats.vm.v_inactive_count")),
+                                      ULL2NUM(system_uint("vm.stats.vm.v_free_count")),
+                                      ULL2NUM(system_uint("vm.stats.vm.v_vnodepgsin")),
+                                      ULL2NUM(system_uint("vm.stats.vm.v_vnodepgsout")));
   return memory;
 }
 
-unsigned long long system_ull(const char * name) {
-  long number;
+unsigned int system_uint(const char * name) {
+  unsigned int number;
   size_t number_size = sizeof(number);
   if (sysctlbyname(name, &number, &number_size, NULL, 0) == -1) {
     perror("sysctlbyname");

data/lib/vmstat/version.rb

@@ -1,3 +1,3 @@
 module Vmstat
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/spec_helper.rb

@@ -9,6 +9,10 @@ require 'vmstat'
 require 'ostruct'
 require 'timecop'
 
+def travis?
+  ENV['TRAVIS'] == 'true'
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

data/spec/vmstat_spec.rb

@@ -14,8 +14,10 @@ describe Vmstat do
   end
   
   context "Vmstat#filter_devices" do
-    it "should filter ethernet devices" do
-      Vmstat.ethernet_devices.size.should >= 1
+    unless travis? # no external ethernet devices on travis ci
+      it "should filter ethernet devices" do
+        Vmstat.ethernet_devices.size.should >= 1
+      end
     end
 
     it "should filter loopback devices" do

data/vmstat.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.extensions    = ["ext/vmstat/extconf.rb"]
 
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec')
+  gem.add_development_dependency('rspec', "~> 2.9.0")
   gem.add_development_dependency('rake-compiler')
   gem.add_development_dependency('guard-rspec')
   gem.add_development_dependency('timecop')

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: vmstat
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Vincent Landgraf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: "\n    A focused and fast library to gather memory, \n    cpu, network,
@@ -89,16 +89,17 @@ extensions:
 - ext/vmstat/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/rtop
 - ext/vmstat/extconf.rb
 - ext/vmstat/hw/bsd.h
 - ext/vmstat/hw/mach.h
@@ -146,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A focused and fast library to gather system information