usagewatch 0.0.6.beta2 → 0.0.6.beta3

data/lib/usagewatch/linux.rb

@@ -133,50 +133,51 @@ module Usagewatch
     end
   end
 
-  def self.uw_bandrx
-
-    def bandrx
+  def self.bandrx
 
-      if File.exists?("/proc/net/dev")
-        File.open("/proc/net/dev", "r") do |file|
-          @result = file.read
-        end
+    if File.exists?("/proc/net/dev")
+      File.open("/proc/net/dev", "r") do |file|
+        @result = file.read
       end
+    end
 
-      @arrRows = @result.split("\n")
+    @arrRows = @result.split("\n")
 
-      @arrEthLoRows = @arrRows.grep(/eth|lo/)
+    @arrEthLoRows = @arrRows.grep(/eth|lo/)
 
-      rowcount = (@arrEthLoRows.count - 1)
+    rowcount = (@arrEthLoRows.count - 1)
 
-      for i in (0..rowcount)
-        @arrEthLoRows[i] = @arrEthLoRows[i].gsub(/\s+/m, ' ').strip.split(" ")
-      end
+    for i in (0..rowcount)
+      @arrEthLoRows[i] = @arrEthLoRows[i].gsub(/\s+/m, ' ').strip.split(" ")
+    end
 
-      @arrColumns = Array.new
-      for l in (0..rowcount)
-        @temp = Array.new
-        @temp[0] = @arrEthLoRows[l][1]
-        @temp[1] = @arrEthLoRows[l][9]
-        @arrColumns << @temp
-      end
+    @arrColumns = Array.new
+    for l in (0..rowcount)
+      @temp = Array.new
+      @temp[0] = @arrEthLoRows[l][1]
+      @temp[1] = @arrEthLoRows[l][9]
+      @arrColumns << @temp
+    end
 
-      columncount = (@arrColumns[0].count - 1)
+    columncount = (@arrColumns[0].count - 1)
 
-      @arrTotal = Array.new
-      for p in (0..columncount)
-        @arrTotal[p] = 0
-      end
+    @arrTotal = Array.new
+    for p in (0..columncount)
+      @arrTotal[p] = 0
+    end
 
-      for j in (0..columncount)
-        for k in (0..rowcount)
-          @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
-        end
+    for j in (0..columncount)
+      for k in (0..rowcount)
+        @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
       end
-
-      @bandrxtx= @arrTotal
     end
 
+    @bandrxtx = @arrTotal
+  end
+
+
+  def self.uw_bandrx
+
     @new0 = bandrx
     sleep 1
     @new1 = bandrx
@@ -186,153 +187,155 @@ module Usagewatch
     @megabitsreceived = (@bitsreceived.to_f / 1024 / 1024).round(3)
   end
 
-  def self.uw_bandtx
-
-    def bandtx
+  def self.bandtx
 
-      if File.exists?("/proc/net/dev")
-        File.open("/proc/net/dev", "r") do |file|
-          @result = file.read
-        end
+    if File.exists?("/proc/net/dev")
+      File.open("/proc/net/dev", "r") do |file|
+        @result = file.read
       end
+    end
 
-      @arrRows = @result.split("\n")
+    @arrRows = @result.split("\n")
 
-      @arrEthLoRows = @arrRows.grep(/eth|lo/)
+    @arrEthLoRows = @arrRows.grep(/eth|lo/)
 
-      rowcount = (@arrEthLoRows.count - 1)
+    rowcount = (@arrEthLoRows.count - 1)
 
-      for i in (0..rowcount)
-        @arrEthLoRows[i] = @arrEthLoRows[i].gsub(/\s+/m, ' ').strip.split(" ")
-      end
+    for i in (0..rowcount)
+      @arrEthLoRows[i] = @arrEthLoRows[i].gsub(/\s+/m, ' ').strip.split(" ")
+    end
 
-      @arrColumns = Array.new
-      for l in (0..rowcount)
-        @temp = Array.new
-        @temp[0] = @arrEthLoRows[l][1]
-        @temp[1] = @arrEthLoRows[l][9]
-        @arrColumns << @temp
-      end
+    @arrColumns = Array.new
+    for l in (0..rowcount)
+      @temp = Array.new
+      @temp[0] = @arrEthLoRows[l][1]
+      @temp[1] = @arrEthLoRows[l][9]
+      @arrColumns << @temp
+    end
 
-      columncount = (@arrColumns[0].count - 1)
+    columncount = (@arrColumns[0].count - 1)
 
-      @arrTotal = Array.new
-      for p in (0..columncount)
-        @arrTotal[p] = 0
-      end
+    @arrTotal = Array.new
+    for p in (0..columncount)
+      @arrTotal[p] = 0
+    end
 
-      for j in (0..columncount)
-        for k in (0..rowcount)
-          @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
-        end
+    for j in (0..columncount)
+      for k in (0..rowcount)
+        @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
       end
-
-      @bandrxtx = @arrTotal
     end
 
-    @new0 = bandtx
+    @bandrxtx = @arrTotal
+  end
+
+  def self.uw_bandtx
+
+    @new0 = Usagewatch.bandtx
     sleep 1
-    @new1 = bandtx
+    @new1 = Usagewatch.bandtx
 
     @bytestransmitted = @new1[1].to_i - @new0[1].to_i
     @bitstransmitted = (@bytestransmitted * 8)
     @megabitstransmitted = (@bitstransmitted.to_f / 1024 / 1024).round(3)
   end
 
-  def self.uw_diskioreads
+  def self.diskio
 
-    def diskio
-
-      if File.exists?("/proc/diskstats")
-        File.open("/proc/diskstats", "r") do |file|
-          @result = file.read
-        end
+    if File.exists?("/proc/diskstats")
+      File.open("/proc/diskstats", "r") do |file|
+        @result = file.read
       end
+    end
 
-      @arrRows = @result.split("\n")
+    @arrRows = @result.split("\n")
 
-      rowcount = (@arrRows.count - 1)
+    rowcount = (@arrRows.count - 1)
 
-      for i in (0..rowcount)
-        @arrRows[i] = @arrRows[i].gsub(/\s+/m, ' ').strip.split(" ")
-      end
+    for i in (0..rowcount)
+      @arrRows[i] = @arrRows[i].gsub(/\s+/m, ' ').strip.split(" ")
+    end
 
-      @arrColumns = Array.new
-      for l in (0..rowcount)
-        @temp = Array.new
-        @temp[0] = @arrRows[l][3]
-        @temp[1] = @arrRows[l][7]
-        @arrColumns << @temp
-      end
+    @arrColumns = Array.new
+    for l in (0..rowcount)
+      @temp = Array.new
+      @temp[0] = @arrRows[l][3]
+      @temp[1] = @arrRows[l][7]
+      @arrColumns << @temp
+    end
 
-      columncount = (@arrColumns[0].count - 1)
+    columncount = (@arrColumns[0].count - 1)
 
-      @arrTotal = Array.new
-      for p in (0..columncount)
-        @arrTotal[p] = 0
-      end
+    @arrTotal = Array.new
+    for p in (0..columncount)
+      @arrTotal[p] = 0
+    end
 
-      for j in (0..columncount)
-        for k in (0..rowcount)
-          @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
-        end
+    for j in (0..columncount)
+      for k in (0..rowcount)
+        @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
       end
-
-      @diskiorw= @arrTotal
     end
 
-    @new0 = diskio
+    @diskiorw= @arrTotal
+  end
+
+
+  def self.uw_diskioreads
+
+    @new0 = Usagewatch.diskio
     sleep 1
-    @new1 = diskio
+    @new1 = Usagewatch.diskio
 
     @diskreads = @new1[0].to_i - @new0[0].to_i
   end
 
-  def self.uw_diskiowrites
+  def self.diskio
 
-    def diskio
-
-      if File.exists?("/proc/diskstats")
-        File.open("/proc/diskstats", "r") do |file|
-          @result = file.read
-        end
+    if File.exists?("/proc/diskstats")
+      File.open("/proc/diskstats", "r") do |file|
+        @result = file.read
       end
+    end
 
-      @arrRows = @result.split("\n")
+    @arrRows = @result.split("\n")
 
-      rowcount = (@arrRows.count - 1)
+    rowcount = (@arrRows.count - 1)
 
-      for i in (0..rowcount)
-        @arrRows[i] = @arrRows[i].gsub(/\s+/m, ' ').strip.split(" ")
-      end
+    for i in (0..rowcount)
+      @arrRows[i] = @arrRows[i].gsub(/\s+/m, ' ').strip.split(" ")
+    end
 
-      @arrColumns = Array.new
-      for l in (0..rowcount)
-        @temp = Array.new
-        @temp[0] = @arrRows[l][3]
-        @temp[1] = @arrRows[l][7]
-        @arrColumns << @temp
-      end
+    @arrColumns = Array.new
+    for l in (0..rowcount)
+      @temp = Array.new
+      @temp[0] = @arrRows[l][3]
+      @temp[1] = @arrRows[l][7]
+      @arrColumns << @temp
+    end
 
-      columncount = (@arrColumns[0].count - 1)
+    columncount = (@arrColumns[0].count - 1)
 
-      @arrTotal = Array.new
-      for p in (0..columncount)
-        @arrTotal[p] = 0
-      end
+    @arrTotal = Array.new
+    for p in (0..columncount)
+      @arrTotal[p] = 0
+    end
 
-      for j in (0..columncount)
-        for k in (0..rowcount)
-          @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
-        end
+    for j in (0..columncount)
+      for k in (0..rowcount)
+        @arrTotal[j] = @arrColumns[k][j].to_i + @arrTotal[j]
       end
-
-      @diskiorw= @arrTotal
     end
 
-    @new0 = diskio
+    @diskiorw= @arrTotal
+  end
+
+
+  def self.uw_diskiowrites
+
+    @new0 = Usagewatch.diskio
     sleep 1
-    @new1 = diskio
+    @new1 = Usagewatch.diskio
 
     @diskwrites = @new1[1].to_i - @new0[1].to_i
   end

data/lib/usagewatch/version.rb

@@ -1,3 +1,3 @@
 module Usagewatch
-  VERSION = "0.0.6.beta2"
+  VERSION = "0.0.6.beta3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usagewatch
 version: !ruby/object:Gem::Version
-  version: 0.0.6.beta2
+  version: 0.0.6.beta3
   prerelease: 6
 platform: ruby
 authors: