usagewatch_ext 0.0.3 → 0.0.4.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTg1NWQ4NGFkY2I4YWQ5YmQwNTE3YjllYmNhMjI4M2IyZjIyZDIzNA==
+    N2FkYjUyZGI1ZmE1NDJiNmI2MTk2NWM3MWM0YTI5YzRjNTdmZmNjYw==
   data.tar.gz: !binary |-
-    NTRiNzQwZmQ0YmVkMzBmODIxNDQ1YTlmZDc4YjZhZjc1YjNlYzNjOA==
+    Y2I3NDNkMzQ0YmYyNjA1NGI1ZjJkMDBjOTUyY2ZhMWI2ZDBhZWU4OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzQzZTA3OGFlNTJmODg0ZGQwNzVmNjVkOWI4MGVmMzA5ZThjY2I2ZDFiYjll
-    ZDI4ZGUwZTUzMWI4NzJhM2JlMzc0YzhlZGIwMTFiZjAwODZlNjUxYTI5NjI4
-    ZTc0MTM5MTFiZDc3NjZjODJhYTU1ZjlmMTYyMTQyNjM0MzEyZTQ=
+    Y2Q4MjNmMjJiNmUyMjYzODcxNzlkZTE0MmNiMjhlNjA3ODlkYmM3MmRhMzBj
+    MTU1ZTM1ZmU2MTU3Mzk3YjRlZjdhNWQ0ZjY0N2JiZGVhY2IxNGU0MWY2MDg0
+    MGViOWY0NjZjNjAxNjZjNGFhYTkxMWJiMTQyMjliODk1MDBlYTQ=
   data.tar.gz: !binary |-
-    MGEyYmZjMjI2MDA3N2MyM2M0NzVkNWM0YzA3MzQ1NzRhM2ZjZWU2NTNkZTQ4
-    YzkyZjYxMGNiNzA0NDA4MDdkOWZiMjNmN2Y2Yzk5NTEyMmQ1MmYyYTZlYzc1
-    YzRiYTcyNjMxYTcwY2UxOWJmM2VmNDFlZWYwN2Q5YWEzNDViNjI=
+    YTBkNzA0ZWY2NjIzYjJmMjFlZmUzOGRlYTliNDI5NDRlMThjYmYwNzM1ZmI1
+    ZTMzMzFhZWZkYTljMjIxZDk5MjA4MjMwMGIzZjgyNjcxZTNhOWQyYmE1MDg1
+    NGQ1ZmI2NTViMTYxNTE1Yzk4OGZmMzlmZjlhMTRkZjQyMTZmZjc=

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in usagewatch_ext.gemspec
 gemspec
-gem 'usagewatch', '~> 0.0.6'
+gem 'usagewatch'
 gem 'rspec'
 gem 'coveralls', :require => false
 

data/README.md

@@ -1,15 +1,18 @@
 [![Coverage Status](https://coveralls.io/repos/rderoldan1/usagewatch_ext/badge.png)](https://coveralls.io/r/rderoldan1/usagewatch_ext)
 [![Gem Version](https://badge.fury.io/rb/usagewatch_ext.png)](http://badge.fury.io/rb/usagewatch_ext)
 [![Build Status](https://travis-ci.org/rderoldan1/usagewatch_ext.png?branch=master)](https://travis-ci.org/rderoldan1/usagewatch_ext)
+[![Code Climate](https://codeclimate.com/github/rderoldan1/usagewatch_ext.png)](https://codeclimate.com/github/rderoldan1/usagewatch_ext)
 
 # usagewatch extended version
 
-License: (MIT) Copyright (C) 2013 Author Ruben Espinosa.
+License: (MIT) Copyright (C) 2013 Authors Ruben Espinosa, Phil Chen.
 
 ## DESCRIPTION:
-This project is based in [Usagewatch](https://github.com/rderoldan1/nethacker/usagewatch) gem written by Phil Chen, I try to expand the OS version, first with mac OS,
+This project is based in [Usagewatch](https://github.com/rderoldan1/nethacker/usagewatch) gem written by Phil Chen, I try to expand the OS support, first with mac OS,
 in future versions Windows will be include.
 
+Also I am writing a testing library for the original gem.
+
 This is Ruby Gem with methods to find usage statistics on your system such as CPU, Disk, TCP/UDP Connections, Load,
 Bandwidth, Disk I/O, and Memory, top processes by memory and cpu consumption
 
@@ -20,7 +23,7 @@ gem install usagewatch_ext
 ```ruby
 require 'usagewatch_ext'
 
-usw = UsagewatchExt
+usw = Usagewatch
 
 usw.uw_diskused
 usw.uw_diskused_perc
@@ -35,6 +38,7 @@ usw.uw_diskioreads
 usw.uw_diskiowrites
 usw.uw_cputop
 usw.uw_memtop
+usw.uw_apacheconns
 ```
 
 ## Example
@@ -97,6 +101,7 @@ Top Ten Processes By Memory Consumption: [["WebProcess", "8.3"], ["rubymine", "6
     uw_diskiowrites
     uw_cputop
     uw_memtop
+    uw_httpconns
 
 ##### Mac
     uw_diskused
@@ -106,29 +111,33 @@ Top Ten Processes By Memory Consumption: [["WebProcess", "8.3"], ["rubymine", "6
     uw_load
     uw_cpuused
     uw_memused
+    usw.uw_httpconns
 
 
 ## Notes
 
-Disk Used is a sum of all partitions calculated in Gigabytes
+* Disk Used is a sum of all partitions calculated in Gigabytes
+
+* Disk Used Percentage is a total percentage of all disk partitions used
+
+* CPU Used is a percentage of current CPU being used
 
-Disk Used Percentage is a total percentage of all disk partitions used
+* TCP/UDP Connections Used is a total count of each respectively
 
-CPU Used is a percentage of current CPU being used
+* Active Memory Used is a percentage of active system memory being used
 
-TCP/UDP Connections Used is a total count of each respectively
+* Load is the average load of the past minute
 
-Active Memory Used is a percentage of active system memory being used
+* Bandwidth is current received and transmitted in Megabits
 
-Load is the average load of the past minute
+* Disk IO is current disk reads and writes completed per second
 
-Bandwidth is current received and transmitted in Megabits
+* Top Ten Processes By CPU Consumption are based on percent CPU used
 
-Disk IO is current disk reads and writes completed per second
+* Top Ten Processes By Memory Consumption are base on percent Memory used
 
-Top Ten Processes By CPU Consumption are based on percent CPU used
+* HTTP Conns is the number of connections on 80 port
 
-Top Ten Processes By Memory Consumption are base on percent Memory used
 
 ## Tested Using
 

data/examples/linux_example.rb

@@ -19,3 +19,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}"
+puts "#{usw.uw_httpconns} Connections in 80 Port"

data/examples/mac_example.rb

@@ -13,3 +13,4 @@ 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}"
+puts "#{usw.uw_httpconns} Connections in 80 Port"

data/lib/usagewatch_ext.rb

@@ -1,16 +1,16 @@
 require "usagewatch_ext/version"
 
 module UsagewatchExt
-  os = RUBY_PLATFORM
   text =  "OS is not supported in this version."
 
-  if os.include? "darwin"
+  if OS.include? "darwin"
     require "usagewatch_ext/mac"
     puts "Mac version is under development"
-  elsif os.include? "linux"
+  elsif OS.include? "linux"
     require "usagewatch/linux"
+    require "usagewatch_ext/linux"
     UsagewatchExt = Usagewatch
-  elsif os =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+  elsif OS =~ /cygwin|mswin|mingw|bccwin|wince|emx/
     puts "Windows" + text
   else
     puts "This" + text

data/lib/usagewatch_ext/linux.rb

@@ -0,0 +1,6 @@
+module Usagewatch
+  # Show the current http connections on 80 port
+  def self.uw_httpconns
+    `netstat -an | grep :80 |wc -l`.to_i
+  end
+end

data/lib/usagewatch_ext/mac.rb

@@ -15,15 +15,12 @@ module Usagewatch
 
   # Show the percentage of disk used.
   def self.uw_diskused_perc
-    df = `df -kl`
-    total = 0.0
-    used = 0.0
+    df, total, used  = `df -kl`, 0.0, 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
+      next if line_index.eql? 0 or line[0] =~ /localhost/ #ignore backup filesystem
+      total  += to_gb line[3].to_f
+      used   += to_gb line[2].to_f
     end
     ((used/total) * 100).round(2)
   end
@@ -38,13 +35,7 @@ module Usagewatch
   # 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
+    top %w"$11 $3"
   end
 
   # todo
@@ -60,13 +51,7 @@ module Usagewatch
   # 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
+    top %w"$11 $4"
   end
 
   # Percentage of mem used
@@ -106,4 +91,26 @@ module Usagewatch
   #def uw_diskiowrites
   #
   #end
+
+  # Show the current http connections on 80 port
+  def self.uw_httpconns
+    `netstat -an | grep :80 |wc -l`.to_i
+  end
+
+  private
+
+
+  def self.top(lines)
+    ps = `ps aux | awk '{print #{lines.join(", ")}}' | 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
+
+  def self.to_gb(bytes)
+    (bytes/1024)/1024
+  end
 end

data/lib/usagewatch_ext/version.rb

@@ -1,3 +1,4 @@
 module UsagewatchExt
-  VERSION = "0.0.3"
+  VERSION = "0.0.4.pre1"
+  OS = RUBY_PLATFORM
 end

data/spec/general_spec.rb

@@ -0,0 +1,80 @@
+require 'rspec'
+require 'spec_helper'
+
+describe 'IncludeLibrary' do
+  it 'should include the library' do
+    a = Usagewatch
+    a.should be Usagewatch
+  end
+end
+
+describe 'DiskUsage' do
+  it "should be the GB of disk used" do
+    a = Usagewatch.uw_diskused
+    a.class.should be(Float)
+    a.should_not be_nil
+    a.should be >= 0
+  end
+end
+
+describe 'CPUUsage' do
+  it "should be the percentage of cpu used" do
+    a = Usagewatch.uw_cpuused
+    a.class.should be(Float)
+    a.should_not be_nil
+    a.should be <= 100
+    a.should be >= 0
+  end
+end
+
+describe 'PercentageDiskUsage' do
+  it "should be the percentage of GB of disk used" do
+    a = Usagewatch.uw_diskused_perc
+    a.class.should be(Float)
+    a.should_not be_nil
+    a.should be <= 100
+    a.should be >= 0
+  end
+end
+
+describe 'LoadAverage' do
+  it "should be the average load of the past minute" do
+    a = Usagewatch.uw_load
+    a.class.should be(Float)
+    a.should_not be_nil
+    a.should be >= 0
+  end
+end
+
+describe 'TopCPUUsage' do
+  it "should be an array of top cpu consumption proccesses " do
+    a = Usagewatch.uw_cputop
+    a.class.should be(Array )
+    a.should_not be_nil
+    a[0][0].class.should be String
+    a[0][1].class.should be String
+    a.count.should be == 10
+  end
+end
+
+describe 'TopMEMUsage' do
+  it "should be an array of top mem consumption proccesses " do
+    a = Usagewatch.uw_cputop
+    a.class.should be(Array )
+    a.should_not be_nil
+    a[0][0].class.should be String
+    a[0][1].class.should be String
+    a.count.should be == 10
+  end
+end
+
+describe 'HTTPConns' do
+  it 'should be the number of current apache connections' do
+    a = Usagewatch.uw_httpconns
+    a.class.should be Fixnum
+    a.should_not be_nil
+    a.should be >= 0
+  end
+end
+
+

data/spec/linux_spec.rb

@@ -1,75 +1,7 @@
 require 'rspec'
 require 'spec_helper'
 
-os = RUBY_PLATFORM
-if os.include? "linux"
-  describe 'IncludeLibrary' do
-    it 'should include the library' do
-      a = Usagewatch
-      a.should be Usagewatch
-    end
-  end
-
-  describe 'DiskUsage' do
-    it "should be the GB of disk used" do
-      a = Usagewatch.uw_diskused
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be >= 0
-    end
-  end
-
-  describe 'CPUUsage' do
-    it "should be the percentage of cpu used" do
-      a = Usagewatch.uw_cpuused
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be <= 100
-      a.should be >= 0
-    end
-  end
-
-  describe 'PercentageDiskUsage' do
-    it "should be the percentage of GB of disk used" do
-      a = Usagewatch.uw_diskused_perc
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be <= 100
-      a.should be >= 0
-    end
-  end
-
-  describe 'LoadAverage' do
-    it "should be the average load of the past minute" do
-      a = Usagewatch.uw_load
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be >= 0
-    end
-  end
-
-  describe 'TopCPUUsage' do
-    it "should be an array of top cpu consumption proccesses " do
-      a = Usagewatch.uw_cputop
-      a.class.should be(Array )
-      a.should_not be_nil
-      a[0][0].class.should be String
-      a[0][1].class.should be String
-      a.count.should be == 10
-    end
-  end
-
-  describe 'TopMEMUsage' do
-    it "should be an array of top mem consumption proccesses " do
-      a = Usagewatch.uw_cputop
-      a.class.should be(Array )
-      a.should_not be_nil
-      a[0][0].class.should be String
-      a[0][1].class.should be String
-      a.count.should be == 10
-    end
-  end
-
+if OS.include? "linux"
   describe 'TCPConnectios' do
     it 'should TCP Connections Used' do
       a = Usagewatch.uw_tcpused

data/spec/spec_helper.rb

@@ -3,13 +3,14 @@ require 'bundler/setup'
 require 'coveralls'
 Coveralls.wear!
 
-os = RUBY_PLATFORM
-if os.include? "darwin"
+OS = RUBY_PLATFORM
+if OS.include? "darwin"
   require "usagewatch_ext"
   puts "Testing Mac Version"
-elsif os.include? "linux"
+elsif OS.include? "linux"
   require "usagewatch"
   puts "Testing Linux Version"
+  puts `uname -a`
 end
 
 RSpec.configure do |config|

data/spec/version_spec.rb

@@ -7,4 +7,22 @@ describe 'Version' do
     a.class.should be(String)
     a.should_not be_nil
   end
+end
+
+describe 'OSVersion' do
+  it 'should be the OS version' do
+    a = UsagewatchExt::OS
+    a.class.should be(String)
+    a.should_not be_nil
+  end
+end
+
+if OS.include? "linux"
+  describe 'Version' do
+    it 'should be the version number of usagewatch' do
+      a = Usagewatch::VERSION
+      a.class.should be(String)
+      a.should_not be_nil
+    end
+  end
 end

data/usagewatch_ext.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.rdoc_options << '--main' << 'README'
 
+  spec.post_install_message = "* Usagewatch Gem for linux are covered for our test.\n* Mac OS version is in development\nThanks for installing!"
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usagewatch_ext
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.pre1
 platform: ruby
 authors:
 - Ruben Espinosa, Phil Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: usagewatch
@@ -84,10 +84,11 @@ files:
 - examples/linux_example.rb
 - examples/mac_example.rb
 - lib/usagewatch_ext.rb
+- lib/usagewatch_ext/linux.rb
 - lib/usagewatch_ext/mac.rb
 - lib/usagewatch_ext/version.rb
+- spec/general_spec.rb
 - spec/linux_spec.rb
-- spec/mac_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb
 - usagewatch_ext.gemspec
@@ -95,7 +96,11 @@ homepage: https://github.com/rderoldan1/usagewatch_ext
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: ! '* Usagewatch Gem for linux are covered for our test.
+
+  * Mac OS version is in development
+
+  Thanks for installing!'
 rdoc_options:
 - --main
 - README
@@ -108,9 +113,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -118,7 +123,7 @@ signing_key:
 specification_version: 4
 summary: Extended version of usagewatch
 test_files:
+- spec/general_spec.rb
 - spec/linux_spec.rb
-- spec/mac_spec.rb
 - spec/spec_helper.rb
 - spec/version_spec.rb

data/spec/mac_spec.rb

@@ -1,74 +0,0 @@
-require 'rspec'
-require 'spec_helper'
-
-os = RUBY_PLATFORM
-if os.include? "darwin"
-  describe 'IncludeLibrary' do
-    it 'should include the library' do
-      a = Usagewatch
-      a.should be Usagewatch
-    end
-  end
-
-  describe 'DiskUsage' do
-    it "should be the GB of disk used" do
-      a = Usagewatch.uw_diskused
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be >= 0
-    end
-  end
-
-  describe 'CPUUsage' do
-    it "should be the percentage of cpu used" do
-      a = Usagewatch.uw_cpuused
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be <= 100
-      a.should be >= 0
-    end
-  end
-
-  describe 'PercentageDiskUsage' do
-    it "should be the percentage of GB of disk used" do
-      a = Usagewatch.uw_diskused_perc
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be <= 100
-      a.should be >= 0
-    end
-  end
-
-  describe 'LoadAverage' do
-    it "should be the average load of the past minute" do
-      a = Usagewatch.uw_load
-      a.class.should be(Float)
-      a.should_not be_nil
-      a.should be >= 0
-    end
-  end
-
-  describe 'TopCPUUsage' do
-    it "should be an array of top cpu consumption proccesses " do
-      a = Usagewatch.uw_cputop
-      a.class.should be(Array )
-      a.should_not be_nil
-      a[0][0].class.should be String
-      a[0][1].class.should be String
-      a.count.should be == 10
-    end
-  end
-
-  describe 'TopMEMUsage' do
-    it "should be an array of top mem consumption proccesses " do
-      a = Usagewatch.uw_cputop
-      a.class.should be(Array )
-      a.should_not be_nil
-      a[0][0].class.should be String
-      a[0][1].class.should be String
-      a.count.should be == 10
-    end
-  end
-
-end
-