Merge pull request #7 from j8r/master

Enhance the CPU implementation

Author: bararchy

shard.yml

@@ -1,5 +1,5 @@
 name: hardware
-version: 0.2.0
+version: 0.2.1
 
 authors:
   - bararchy <[email protected]>

spec/cpu_spec.cr

@@ -6,6 +6,6 @@ describe Hardware::CPU do
   end
 
   it "checks the percentage used" do
-    (0 < Hardware::CPU.used <= 100).should be_true
+    (0 <= Hardware::CPU.used <= 100).should be_true
   end
 end

src/hardware.cr

@@ -1,5 +1,5 @@
 require "./hardware/*"
 
 module Hardware
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

src/hardware/cpu.cr

@@ -1,10 +1,11 @@
 module Hardware::CPU
   def self.info
     cpu = File.read("/proc/stat").lines.first[5..-1].split(' ').map &.to_i
+    # Array: user nice system idle iowait irq softirq steal guest guest_nice
     {
-      used:  cpu[0] + cpu[1] + cpu[2],
-      idle:  cpu[3],
-      total: cpu[0] + cpu[1] + cpu[2] + cpu[3],
+      used:  used = cpu[0] + cpu[1] + cpu[2] + cpu[5] + cpu[6] + cpu[7],
+      idle:  idle = cpu[3] + cpu[4],
+      total: used + idle,
     }
   end
 
@@ -14,6 +15,6 @@ module Hardware::CPU
     proc1 = info
 
     # 100 * Usage / Total
-    100 * ((proc1[:used] - proc0[:used]).to_f32 / (proc1[:total] - proc0[:total]).to_f32)
+    (100 * ((proc1[:used] - proc0[:used]).to_f32 / (proc1[:total] - proc0[:total]))).round
   end
 end