usagewatch 0.0.6.beta3 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,17 @@
+License: (MIT) Copyright (C) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa.
+
+0.0.6 July 23 2013
+====
+* Removed Mac OS methods which will become a different Gem
+* Call methods like a method class
+* Validation to work only in Linux OS
+* Added methods for top ten processes by CPU consumption
+* Added methods for top ten processes by Memory consumption
+
+0.0.6.beta3 July 22 2013
+====
+* Fixed a issue causing Disk I/O and Bandwidth methods to break
+
 0.0.6.beta2 July 22 2013
 ====
 * Added methods for Mac OS

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Author Phil Chen, Contributor Ruben Espinosa
+Copyright (c) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa
 
 MIT License
 

data/README.md

@@ -1,6 +1,6 @@
 # usagewatch
 
-License: (MIT) Copyright (C) 2013 Author Phil Chen, Contributor Ruben Espinosa.
+License: (MIT) Copyright (C) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa.
 
 ## DESCRIPTION:
 
@@ -36,7 +36,7 @@ usw.uw_memtop
 ```bash
 Run:
 
-linux_example.rb
+ruby example.rb
 
 Example Output:
 
@@ -60,7 +60,6 @@ Top Ten Processes By Memory Consumption:
 
 ## Methods available
 
-##### Linux
     uw_diskused
     uw_diskused_perc
     uw_cpuused
@@ -75,16 +74,6 @@ Top Ten Processes By Memory Consumption:
     uw_cputop
     uw_memtop
 
-##### Mac
-    uw_diskused
-    uw_diskused_perc
-    uw_cputop
-    uw_memtop
-    uw_load
-    uw_cpuused
-    uw_memused
-
-
 ## Notes
 
 Disk Used is a sum of all partitions calculated in Gigabytes
@@ -113,4 +102,4 @@ RUBY VERSIONS:
 ruby 1.9.3p429 (2013-05-15) [x86_64-linux]
 
 OS VERSIONS:
-CENTOS 5x 6x, Ubuntu 12.04, Fedora 18, Mountain Lion 10.8.4
+CENTOS 5x 6x, Ubuntu 12.04, Fedora 18

data/examples/{linux_example.rb → example.rb}

@@ -1,9 +1,8 @@
 #!/usr/bin/ruby
 
-#License: (MIT), Copyright (C) 2013 Author Phil Chen, Contributor Ruben Espinosa
+# License: (MIT), Copyright (C) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa
 
 require 'usagewatch'
-
 usw =  Usagewatch
 
 puts "#{usw.uw_diskused} Gigabytes Used"
@@ -19,3 +18,4 @@ puts "#{usw.uw_diskioreads}/s Current Disk Reads Completed"
 puts "#{usw.uw_diskiowrites}/s Current Disk Writes Completed"
 puts "Top Ten Processes By CPU Consumption: #{usw.uw_cputop}"
 puts "Top Ten Processes By Memory Consumption: #{usw.uw_memtop}"
+

data/lib/usagewatch.rb

@@ -1,20 +1,12 @@
-#License: (MIT), Copyright (C) 2013 Author Phil Chen, Contributor Ruben Espinosa
+# License: (MIT), Copyright (C) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa
 
 require "usagewatch/version"
 
 os = RUBY_PLATFORM
-text =  "OS is not supported in this version."
+text =  "Unsupported OS!"
 
-if os.include? "darwin"
-  require "usagewatch/mac"
-  puts "Mac version is under development"
-elsif os.include? "linux"
+if os.include? "linux"
   require "usagewatch/linux"
-elsif os =~ /cygwin|mswin|mingw|bccwin|wince|emx/
-  puts "Windows" + text
 else
-   puts "This" + text
+   puts text
 end
-
-
-

data/lib/usagewatch/linux.rb

@@ -1,4 +1,7 @@
+# License: (MIT), Copyright (C) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa
+
 module Usagewatch
+  # Show the amount of total disk used in Gigabytes
   def self.uw_diskused
     @df = `df`
     @parts = @df.split(" ").map { |s| s.to_i }
@@ -16,6 +19,7 @@ module Usagewatch
     df.split(" ").last.to_f.round(2)
   end
 
+  # Show the percentage of CPU used
   def self.uw_cpuused
     @proc0 = File.readlines('/proc/stat').grep(/^cpu /).first.split(" ")
     sleep 1
@@ -51,7 +55,7 @@ module Usagewatch
     array
   end
 
-
+  # Show the number of TCP connections used
   def self.uw_tcpused
     if File.exists?("/proc/net/sockstat")
       File.open("/proc/net/sockstat", "r") do |ipv4|
@@ -75,6 +79,7 @@ module Usagewatch
     @totaltcpused = @tcp4count.to_i + @tcp6count.to_i
   end
 
+  # Show the number of UDP connections used
   def self.uw_udpused
     if File.exists?("/proc/net/sockstat")
       File.open("/proc/net/sockstat", "r") do |ipv4|
@@ -97,6 +102,7 @@ module Usagewatch
     @totaludpused = @udp4count.to_i + @udp6count.to_i
   end
 
+  # Show the percentage of Active Memory used
   def self.uw_memused
     if File.exists?("/proc/meminfo")
       File.open("/proc/meminfo", "r") do |file|
@@ -123,6 +129,7 @@ module Usagewatch
     array
   end
 
+  # Show the average system load of the past minute
   def self.uw_load
     if File.exists?("/proc/loadavg")
       File.open("/proc/loadavg", "r") do |file|
@@ -133,6 +140,7 @@ module Usagewatch
     end
   end
 
+  # Bandwidth Received Method
   def self.bandrx
 
     if File.exists?("/proc/net/dev")
@@ -175,7 +183,7 @@ module Usagewatch
     @bandrxtx = @arrTotal
   end
 
-
+  # Current Bandwidth Received Calculation in Mbit/s
   def self.uw_bandrx
 
     @new0 = bandrx
@@ -187,6 +195,7 @@ module Usagewatch
     @megabitsreceived = (@bitsreceived.to_f / 1024 / 1024).round(3)
   end
 
+  # Bandwidth Transmitted Method
   def self.bandtx
 
     if File.exists?("/proc/net/dev")
@@ -229,17 +238,19 @@ module Usagewatch
     @bandrxtx = @arrTotal
   end
 
+  # Current Bandwidth Transmitted in Mbit/s
   def self.uw_bandtx
 
-    @new0 = Usagewatch.bandtx
+    @new0 = bandtx
     sleep 1
-    @new1 = Usagewatch.bandtx
+    @new1 = bandtx
 
     @bytestransmitted = @new1[1].to_i - @new0[1].to_i
     @bitstransmitted = (@bytestransmitted * 8)
     @megabitstransmitted = (@bitstransmitted.to_f / 1024 / 1024).round(3)
   end
 
+  # Disk Usage Method
   def self.diskio
 
     if File.exists?("/proc/diskstats")
@@ -280,62 +291,22 @@ module Usagewatch
     @diskiorw= @arrTotal
   end
 
-
+  # Current Disk Reads Completed
   def self.uw_diskioreads
 
-    @new0 = Usagewatch.diskio
+    @new0 = diskio
     sleep 1
-    @new1 = Usagewatch.diskio
+    @new1 = diskio
 
     @diskreads = @new1[0].to_i - @new0[0].to_i
   end
 
-  def self.diskio
-
-    if File.exists?("/proc/diskstats")
-      File.open("/proc/diskstats", "r") do |file|
-        @result = file.read
-      end
-    end
-
-    @arrRows = @result.split("\n")
-
-    rowcount = (@arrRows.count - 1)
-
-    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
-
-    columncount = (@arrColumns[0].count - 1)
-
-    @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
-    end
-
-    @diskiorw= @arrTotal
-  end
-
-
+  # Current Disk Writes Completed
   def self.uw_diskiowrites
 
-    @new0 = Usagewatch.diskio
+    @new0 = diskio
     sleep 1
-    @new1 = Usagewatch.diskio
+    @new1 = diskio
 
     @diskwrites = @new1[1].to_i - @new0[1].to_i
   end

data/lib/usagewatch/version.rb

@@ -1,3 +1,5 @@
+# License: (MIT), Copyright (C) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa
+
 module Usagewatch
-  VERSION = "0.0.6.beta3"
+  VERSION = "0.0.6"
 end

data/usagewatch.gemspec

@@ -1,3 +1,4 @@
+# License: (MIT), Copyright (C) 2013 usagewatch Author Phil Chen, contributor Ruben Espinosa
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -21,5 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.post_install_message = "* Linux version are covered for our test.\n* Mac OS version is in development\nThanks for installing!"
+  spec.post_install_message = "* Linux version are covered for our test.\nThanks for installing!"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: usagewatch
 version: !ruby/object:Gem::Version
-  version: 0.0.6.beta3
-  prerelease: 6
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - Phil Chen, Ruben Espinosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,11 +57,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- examples/linux_example.rb
-- examples/mac_example.rb
+- examples/example.rb
 - lib/usagewatch.rb
 - lib/usagewatch/linux.rb
-- lib/usagewatch/mac.rb
 - lib/usagewatch/version.rb
 - usagewatch.gemspec
 homepage: https://github.com/nethacker/usagewatch
@@ -69,8 +67,6 @@ licenses:
 - MIT
 post_install_message: ! '* Linux version are covered for our test.
 
-  * Mac OS version is in development
-
   Thanks for installing!'
 rdoc_options:
 - --main
@@ -86,9 +82,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/examples/mac_example.rb

@@ -1,15 +0,0 @@
-#!/usr/bin/ruby
-
-#License: (MIT), Copyright (C) 2013 Author Phil Chen, Contributor Ruben Espinosa
-
-require 'usagewatch'
-
-usw =  Usagewatch
-
-puts "#{usw.uw_diskused} Gigabytes Used"
-puts "#{usw.uw_diskused_perc} Percentage of Gigabytes Used"
-puts "#{usw.uw_memused}% Active Memory Used"
-puts "#{usw.uw_cpuused}% CPU Used"
-puts "#{usw.uw_load} Average System Load Of The Past Minute"
-puts "Top Ten Processes By CPU Consumption: #{usw.uw_cputop}"
-puts "Top Ten Processes By Memory Consumption: #{usw.uw_memtop}"

data/lib/usagewatch/mac.rb

@@ -1,109 +0,0 @@
-module Usagewatch
-
-  # Show disk used in GB
-  def self.uw_diskused
-    df = `df -kl`
-    sum = 0.00
-    df.each_line.with_index do |line, line_index|
-      next if line_index.eql? 0
-      line = line.split(" ")
-      next if line[0] =~ /localhost/  #ignore backup filesystem
-      sum += ((line[2].to_f)/1024)/1024
-    end
-    sum.round(2)
-  end
-
-  # Show the percentage of disk used.
-  def self.uw_diskused_perc
-    df = `df -kl`
-    total = 0.0
-    used = 0.0
-    df.each_line.with_index do |line, line_index|
-      next if line_index.eql? 0
-      line = line.split(" ")
-      next if line[0] =~ /localhost/ #ignore backup filesystem
-      total  += ((line[3].to_f)/1024)/1024
-      used   +=((line[2].to_f)/1024)/1024
-    end
-    ((used/total) * 100).round(2)
-  end
-
-  # Show the percentage of cpu used
-  def self.uw_cpuused
-    top = `top -l1 | awk '/CPU usage/'`
-    top = top.gsub(/[\,a-zA-Z:]/, "").split(" ")
-    top[0].to_f
-  end
-
-  # return hash of top ten proccesses by cpu consumption
-  # example [["apache2", 12.0], ["passenger", 13.2]]
-  def self.uw_cputop
-    ps = `ps aux | awk '{print $11, $3}' | sort -k2nr  | head -n 10`
-    array = []
-    ps.each_line do |line|
-      line = line.chomp.split(" ")
-      array << [line.first.gsub(/[\[\]]/, "").split("/").last, line.last]
-    end
-    array
-  end
-
-  # todo
-  #def uw_tcpused
-  #
-  #end
-
-  # todo
-  #def uw_udpused
-  #
-  #end
-
-  # return hash of top ten proccesses by mem consumption
-  # example [["apache2", 12.0], ["passenger", 13.2]]
-  def self.uw_memtop
-    ps = `ps aux | awk '{print $11, $4}' | sort -k2nr  | head -n 10`
-    array = []
-    ps.each_line do |line|
-      line = line.chomp.split(" ")
-      array << [line.first.gsub(/[\[\]]/, "").split("/").last, line.last]
-    end
-    array
-  end
-
-  # Percentage of mem used
-  def self.uw_memused
-    top = `top -l1 | awk '/PhysMem/'`
-    top = top.gsub(/[\.\,a-zA-Z:]/, "").split(" ").reverse
-    ((top[1].to_f / (top[0].to_f + top[1].to_f)) * 100).round(2)
-  end
-
-  # Show the average of load in the last minute
-  def self.uw_load
-    iostat = `iostat -w1 -c 2 | awk '{print $7}'`
-    cpu = 0.0
-    iostat.each_line.with_index do |line, line_index|
-      next if line_index.eql? 0 or  line_index.eql? 1 or  line_index.eql? 2
-      cpu = line.split(" ").last.to_f.round(2)
-    end
-    cpu
-  end
-
-  #todo
-  #def uw_bandrx
-  #
-  #end
-
-  #todo
-  #def uw_bandtx
-  #
-  #end
-
-  #todo
-  #def uw_diskioreads
-  #
-  #end
-
-  #todo
-  #def uw_diskiowrites
-  #
-  #end
-end