#10 create solaris module for testing

Author: Vincent Landgraf

lib/vmstat.rb

@@ -20,6 +20,7 @@ module Vmstat
   autoload :ProcFS,           "vmstat/procfs"
   autoload :Stub,             "vmstat/stub"
   autoload :Snapshot,         "vmstat/snapshot"
+  autoload :Solaris,          "vmstat/solaris"
   extend Stub # the default empty implementation
 
   # @!method self.boot_time
@@ -103,5 +104,5 @@ def self.loopback_devices
   require "vmstat/netopenbsd"
 elsif RUBY_PLATFORM =~ /solaris|smartos/
   # command based implementation of mem, net, cpu
-  require "vmstat/solaris"
+  Vmstat.send(:include, Vmstat::Solaris)
 end

lib/vmstat/solaris.rb

@@ -1,61 +1,75 @@
 module Vmstat
-  def self.cpu
-    kstat = `kstat -p "cpu_stat:::/idle|kernel|user/"`
-    cpus = Hash.new { |h, k| h[k] = Hash.new }
+  module Solaris
+    module ClassMethods
+      def cpu
+        kstat = `kstat -p "cpu_stat:::/idle|kernel|user/"`
+        cpus = Hash.new { |h, k| h[k] = Hash.new }
 
-    kstat.lines.each do |line|
-      _, _, cpu, key, value = line.strip.split(/:|\s+/)
-      values[cpu] = value
-    end
+        kstat.lines.each do |line|
+          _, cpu, _, key, value = line.strip.split(/:|\s+/)
+          cpus[cpu.to_i][key] = value
+        end
 
-    cpus.map do |k, v|
-      name = k.gsub(/cpu_stat/, "").to_i
-      Cpu.new(name, v["user"].to_i, v["kernel"].to_i, 0, v["idle"].to_i)
-    end
-  end
+        cpus.map do |num, v|
+          Cpu.new(num, v["user"].to_i, v["kernel"].to_i, 0, v["idle"].to_i)
+        end
+      end
 
-  def self.boot_time
-    Time.at(`kstat -p unix:::boot_time`.strip.split(/\s+/).last.to_i)
-  end
+      def boot_time
+        Time.at(`kstat -p unix:::boot_time`.strip.split(/\s+/).last.to_i)
+      end
 
-  def self.memory
-    kstat = `kstat -p -n system_pages`
-    values = Hash.new
+      def memory
+        kstat = `kstat -p -n system_pages`
+        values = Hash.new
 
-    kstat.lines.each do |line|
-      _, _, _, key, value = line.strip.split(/:|\s+/)
-      values[key] = value
-    end
+        kstat.lines.each do |line|
+          _, _, _, key, value = line.strip.split(/:|\s+/)
+          values[key] = value
+        end
 
-    total = values['pagestotal'].to_i
-    free = values['pagesfree'].to_i
-    locked = values['pageslocked'].to_i
-
-    Memory.new(pagesize,
-               locked, # wired
-               total - free - locked, # active
-               0, # inactive
-               free, # free
-               0, #pageins
-               0) #pageouts
-  end
+        total = values['pagestotal'].to_i
+        free = values['pagesfree'].to_i
+        locked = values['pageslocked'].to_i
+
+        Memory.new(pagesize,
+                   locked, # wired
+                   total - free - locked, # active
+                   0, # inactive
+                   free, # free
+                   0, #pageins
+                   0) #pageouts
+      end
 
-  def self.network_interfaces
-    kstat = `kstat -p link:::`
-    itfs = Hash.new { |h, k| h[k] = Hash.new }
+      def network_interfaces
+        kstat = `kstat -p link:::`
+        itfs = Hash.new { |h, k| h[k] = Hash.new }
 
-    kstat.lines.each do |line|
-      _, _, name, key, value = line.strip.split(/:|\s+/)
-      itfs[name][key] = value
+        kstat.lines.each do |line|
+          _, _, name, key, value = line.strip.split(/:|\s+/)
+          itfs[name.to_sym][key] = value
+        end
+
+        itfs.map do |k, v|
+          NetworkInterface.new(k, v['rbytes64'].to_i,
+                                  v['ierrors'].to_i,
+                                  0,
+                                  v['obytes64'].to_i,
+                                  v['oerrors'].to_i,
+                                  NetworkInterface::ETHERNET_TYPE)
+        end
+      end
     end
 
-    itfs.map do |k, v|
-      NetworkInterface.new(k, v['rbytes64'].to_i,
-                              v['ierrors'].to_i,
-                              0,
-                              v['obytes64'].to_i,
-                              v['oerrors'].to_i,
-                              NetworkInterface::ETHERNET_TYPE)
+    extend ClassMethods
+
+    def self.included base
+      base.instance_eval do
+        def cpu; Vmstat::Solaris.cpu end
+        def boot_time; Vmstat::Solaris.boot_time end
+        def memory; Vmstat::Solaris.memory end
+        def network_interfaces; Vmstat::Solaris.network_interfaces end
+      end
     end
   end
 end