ServState 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2FjZGFiMjAzMjY2ZGQ4NWFjNjA5MmZlYzU1MDQ0YjczOTVkODI0Ng==
-  data.tar.gz: !binary |-
-    N2QwOGUzMjc1Yjk4MTI0ZWM3NDA4MWI0YTAyMWU1ZTcyNDIwN2FmNw==
+SHA1:
+  metadata.gz: 529a49b8bedc8e071ed6a120e07d6bcaa44ad3d9
+  data.tar.gz: f4b002504fbba84101f00bea3fae9b5e3f4fe0e6
 SHA512:
-  metadata.gz: !binary |-
-    NTI2Y2I4N2Y1MzczZjRhMDE5NjEwODdkMWFmNWJmNjU1OGM4NThlOTI1OGU0
-    NTBlY2M2MDc2NDU0ZjRhMmZiZGRjOGM1OTc1YWQzMmU3ODdjOTU5NjQ1ZmRl
-    MmExNzQ5YTFmNGIwYjcwMTA5NDkyZDFjMWYwZjQ2YWM3NGMzNjI=
-  data.tar.gz: !binary |-
-    OTRmM2E5ODM5N2VmOGY3ZWM5Y2Y3OWM1Nzc4ODk3YmQxYzhhYjc1YTFjNWI3
-    NDM1ZjFjMmI3OWU4ZmQ0YTRkNGM1ZDFmMmNhOTc4ODE2MzYwYjBhMzdiZjZh
-    MTZhYTQ1MTg4YTA5OWI5MDk0YTVjYWVhMzQyMzRhNzMxYWQ1ZjM=
+  metadata.gz: 1be86332f46fff982e08026bad4a4b264f3ac283aa405a1fc91defc8b97fbcc6005764c2b902bb1fb807f2c56d9b29ee22bf3668caec559a3c1dca7ca6927590
+  data.tar.gz: c751cac2008021a2c1df9c9b1ec0c2d0239717fdface8096e8bbcf4dd08757dfb3fe1e1c6618a291a818dc0012951ddd5cd5eb114b3b8d8a676196a059ba2a2e

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -5,7 +5,6 @@
 .yardoc
 .rspec
 .rvmrc
-.coveralls.yml
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -18,5 +17,3 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-
-

data/.travis.yml

@@ -1,8 +1,8 @@
 bundler_args: --without dev
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1.0
-  - 1.9.3
 
 branches:
   only:

data/README.md

@@ -5,13 +5,28 @@ Very simple tool to watch your LINUX server status.
 
 [![Gem Version](https://badge.fury.io/rb/ServState.png)](http://badge.fury.io/rb/ServState)
 [![Build Status](https://travis-ci.org/ololyay/ServState.png?branch=master)](https://travis-ci.org/ololyay/ServState)
+[![Coverage Status](https://coveralls.io/repos/ololyay/ServState/badge.png?branch=master)](https://coveralls.io/r/ololyay/ServState?branch=master)
 
 ## Installation
 
     $ gem install ServState
 
+## Requirements
+ - Ruby 1.9.3 or greater
+ - __ip__ util
+
+##Tested on
+
+* Debian 7
+* Ubuntu server 10.04
+* Ubuntu server 12.04
+* Ubuntu server 13.10
+* CentOS 6
+* Fedora 19
+
 ## Usage
 
+
 Defaults:
 port is 8080
 without password
@@ -28,10 +43,6 @@ Set password:
 
 	$ servstate -pass mypass
 
-Show help:
-
-	$ servstate -h
-
 Also you can write code like this:
 ```ruby
   require 'ServState'

data/lib/ServState.rb

@@ -5,41 +5,46 @@ require_relative "ServState/application"
 
 module ServState
   def self.run!
+
+    defaults = {
+      port: 8080,
+      pass: nil
+    }
     
-    options = Slop.parse(help: true) do
+    cl_options = Slop.parse(help: true) do
       banner 'Usage: servstate [options]'
       on 'pass=', 'Password to login.'
       on 'port=', 'Set port.'
     end
 
-    app_port = options.port? ? options[:port] : 8080
-    app_pass = options.pass? ? options[:pass] : nil
-    options.inspect
+    cl_hash = cl_options.to_hash.reject {|k,v| v.nil? }
+
+    options = defaults.merge(cl_hash)
+
+    greeting(options)
+
+    run do
+      port options[:port]
+      password options[:pass]
+    end
+  end
 
+  def self.greeting(options)
     puts " ____                   ____  _        _       "
     puts "/ ___|  ___ _ ____   __/ ___|| |_ __ _| |_ ___ "
     puts "\\___ \\ / _ \\ '__\\ \\ / /\\___ \\| __/ _` | __/ _ \\"
     puts " ___) |  __/ |   \\ V /  ___) | || (_| | ||  __/"
     puts "|____/ \\___|_|    \\_/  |____/ \\__\\__,_|\\__\\___|"
-    puts "\nPORT: #{app_port}"
-    if(app_pass)
-      puts "PASSWORD: #{app_pass}"
+    puts "\nPORT: #{options[:port]}"
+    if(options[:pass])
+      puts "PASSWORD: #{options[:pass]}"
     else
       puts "WITHOUT PASSWORD"
     end
     puts "\n"*3
-
-    #Rack::Handler::WEBrick.run(Application,{:Port => port, :Password => pass, :AccessLog => []})
-    Application.set_settings do
-      port app_port
-      password app_pass
-    end
-    Application.run!
-    
   end
 
   def self.run &block
-    p block
     Application.set_settings &block
     Application.run!
   end

data/lib/ServState/application.rb

@@ -19,6 +19,7 @@ module ServState
       enable :sessions
       set :environment, :test
       set :run, true
+      set :logging, false
       set :show_exceptions, false
       set :raise_errors, false
       set :hostname, ServicesManager.hostname
@@ -81,12 +82,12 @@ module ServState
       end
     end
 
-    error do
-      @name = settings.hostname
-      @header = 'Error!'
-      @text   = "Sorry, but something went wrong."
-      erb :error
-    end
+    # error do
+    #   @name = settings.hostname
+    #   @header = 'Error!'
+    #   @text   = "Sorry, but something went wrong."
+    #   erb :error
+    # end
 
     not_found do
       @name = settings.hostname

data/lib/ServState/log_manager.rb

@@ -35,7 +35,6 @@ module ServState
         end
         def normalize(data)
           result = Hash.new
-          p data
           result[:cpu]  = data.inject(0){ |sum, n| sum + n[0] } / data.size
           result[:ram]  = data.inject(0){ |sum, n| sum + n[1] } / data.size
           result[:down] = data.inject(0){ |sum, n| sum + n[2] } / data.size

data/lib/ServState/network_usage.rb

@@ -9,7 +9,7 @@ module ServState
       time_diff = Time.new - @old_time
       @old_time = Time.new
 
-      data = net_dev_data
+      data = net_data
       
       data.each do |interface, values|
         down = values[0] - @old_traffic[interface][0]
@@ -29,17 +29,23 @@ module ServState
     def initialize
       @speeds      = Hash.new
       @old_time    = Time.new
-      @old_traffic = net_dev_data
+      @old_traffic = net_data
+      update
     end
 
     # returns hash with hash[:interface] = [total download bytes, total upload bytes]
-    def net_dev_data 
-      lines = IO.readlines('/proc/net/dev').grep(/:/)
+    def net_data 
+      # now we have two problems
+      output = `ip -s link`.split("\n").grep(/([0-9]:\ )|(([0-9]+\ +){6})/)
       data  = Hash.new
 
-      lines.each do |line|
-        splited = line.split
-        data[splited[0].chop.to_sym] = [splited[1].to_i, splited[9].to_i]
+      output.each_cons(3) do |lines|
+        if lines[0] =~ /^[0-9]:/
+          name = lines[0].split[1].chop
+          down = lines[1].split[0].to_i
+          up   = lines[2].split[0].to_i
+          data[name] = [down, up]
+        end
       end
 
       data

data/lib/ServState/public/js/dashboard.js

@@ -31,7 +31,7 @@ function renew(){
 		var interfaces=[]
 		$.each(data.network, function(key, value){
 			ip=(data.interfaces[key])?(data.interfaces[key]):('');
-			interfaces.push('<div class="uk-width-medium-1-4"><div class="uk-panel uk-panel-box"><p><span class="uk-text-bold">'+key+' </span><span id="ram" class="uk-text-muted">'+ip+'</span></p><p class="uk-text-info">Down: '+value[0]+'Kbps</p><p class="uk-text-success">Up: '+value[1]+'Kbps</p></div></div>');
+			interfaces.push('<div class="uk-width-medium-1-4"><div class="uk-panel uk-panel-box"><p><span class="uk-text-bold">'+key+' </span><span id="ram" class="uk-text-muted">'+ip+'</span></p><p class="uk-text-info">Down: '+value[0]+'KB/s</p><p class="uk-text-success">Up: '+value[1]+'KB/s</p></div></div>');
 		});
 		$('#traffic').html(interfaces.join(''));
 		removeNotify($('#notification'));

data/lib/ServState/services_manager.rb

@@ -1,4 +1,3 @@
-require 'objspace'
 module ServState
   class ServicesManager
     class << self
@@ -15,7 +14,6 @@ module ServState
                                 ram:  @usage.ram_usage[:ram_per],
                                 down: average_down,
                                 up:   average_up })
-            GC.start
             sleep(5)
           end
         end

data/lib/ServState/usage_manager.rb

@@ -12,18 +12,16 @@ module ServState
     # this function use ifconfig.
     # TODO: rewrite without using ifconfig
     def interfaces
-      ifconfig_output = `ifconfig -a`
-      ifconfig_lines = ifconfig_output.split("\n").map{ |line| line.chomp }
+      ip_output = `ip addr`
+      ip_lines = ip_output.split("\n").grep(/([0-9]:\ )|(inet\ )/)
 
       faces = Hash.new
-      name = ''
 
-      ifconfig_lines.each do |line|
-        if line.include? 'Link encap:' # line with interface name
-          name = line.split[0] # get first word - name of interface
-        end
-        if line.include? 'inet addr:' # line with ip
-          faces[name] = line.scan( /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/).first # get ip
+      ip_lines.each_cons(2) do |lines|
+        if lines[0] =~ /[0-9]:\ /
+          name = lines[0].split[1].chop
+          ip = lines[1].scan(/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/).first
+          faces[name] = ip
         end
       end
 

data/lib/ServState/version.rb

@@ -1,3 +1,3 @@
 module ServState
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/spec_helper.rb

@@ -3,11 +3,10 @@ Coveralls.wear!
 require 'capybara/rspec'
 require 'capybara-webkit'
 require './lib/ServState'
+Thread.abort_on_exception=true
 
-ServState::Application.set_settings do
-  password nil
-  port 8080
-end
+Thread.new { ServState.run! }
+sleep 5
+Capybara.app_host = "http://localhost:8080"
 
-Capybara.app = ServState::Application
 Capybara.default_driver = :webkit

data/spec/unit/cpu_usage_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe ServState::CpuUsage do
+
+  let(:instance){ ServState::CpuUsage.new }
+
+  it 'should has 0 usage at start' do
+    expect(instance.usage).to eq(0)
+  end
+  it 'should has right value' do
+    instance.update
+    expect(instance.usage).to be_between(0, 100)
+  end
+end

data/spec/unit/log_manager_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe ServState::LogManager do
+  let(:manager) { described_class }
+  let(:params) { { cpu: 10, ram: 20, down: 30, up: 40 } }
+
+  it 'should append data to 10min rotator' do
+    manager.start
+    manager.update(params)
+
+    output = manager.data('10min')
+
+    params.each do |key, val|
+      expect(output[key].last[:y]).to eq(val)
+    end
+  end
+
+  it 'should append data to 1day rotator' do
+    manager.start
+    150.times { manager.update(params) }
+
+    output = manager.data('1day')
+
+    params.each do |key, val|
+      expect(output[key].last[:y]).to eq(val)
+    end
+  end
+end

data/spec/unit/network_usage_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+describe ServState::NetworkUsage do
+  let(:net) { described_class.new }
+
+  it 'should has at least lo interface in statistic' do
+    expect(net.speeds['lo']).to_not be_nil
+  end
+  
+  it 'should has right array on each interface' do
+    net.speeds.each do |k, val|
+      expect(val).to be_a Array
+      expect(val.size).to eq(2)
+    end
+  end
+
+  it 'should contain array of not negative numbers' do
+    net.speeds.each do |k, val|
+      val.each { |x| expect(x).to be >=0 }
+    end
+  end
+end

data/spec/unit/rotator_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe ServState::Rotator do
+  let(:size) { 10 }
+  let(:rotator) { described_class.new(size) }
+
+  it 'should create array with right size' do
+    expect(rotator.data.size).to eq(size)
+  end
+
+  it 'should create right array structure' do
+    expect(rotator.data.first).to eq([0, 0, 0, 0])
+  end
+
+  context 'when add value' do
+    let(:params) { { cpu: 1, ram: 2, down: 3, up: 4} }
+
+    it 'should save array size' do
+      rotator.append(params)
+      expect(rotator.data.size).to eq(size)
+    end
+
+    it 'should add value' do
+      rotator.append(params)
+      expect(rotator.data.last).to eq([1, 2, 3, 4])
+      expect(rotator.data.first).to eq([0, 0, 0, 0])
+    end
+
+    it 'should rotate values' do
+      9.times { rotator.append(params) }
+      expect(rotator.data.first).to eq([0, 0, 0, 0])
+      rotator.append(params)
+      expect(rotator.data.first).to eq([1, 2 ,3 ,4])
+    end
+  end
+end

data/spec/unit/usage_manager_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe ServState::UsageManager do
+  let(:manager) { described_class.new }
+
+  context 'interfaces' do
+
+    it 'should return hash' do
+      expect(manager.interfaces).to be_a Hash
+    end
+
+    it 'hash should contain at least lo interface' do
+      expect(manager.interfaces.keys).to include 'lo'
+    end
+
+    it 'lo interface should has ip' do
+      expect(manager.interfaces['lo']).to eq('127.0.0.1')
+    end
+  end
+
+  context 'uptime' do
+
+    it 'should return hash' do
+      expect(manager.uptime).to be_a Hash
+    end
+
+    context 'should has right' do
+      let(:upt) { manager.uptime }
+
+      it 'total_sec value' do
+        expect(upt[:total_sec]).to be > 0
+      end
+
+      it 'days value' do
+        expect(upt[:days]).to be >= 0
+      end
+
+      it 'hours value' do
+        expect(upt[:hours]).to be_between(0, 23)
+      end
+
+      it 'minutes value' do
+        expect(upt[:minutes]).to be_between(0, 59)
+      end
+
+      it 'seconds value' do
+        expect(upt[:seconds]).to be_between(0, 59)
+      end
+
+    end
+  end
+
+  context 'disk_usage' do
+    let(:hash) { manager.disk_usage }
+
+    it 'should has right types of values' do
+
+      hash.each do |key, value|
+
+        expect(key).to be_a String
+        expect(value.size).to eq(5)
+        expect(value[4]).to be_a String
+        expect(value[0]).to be_between(0, 100)
+
+      end
+    end
+
+    it 'should has total as sum of used and available' do
+      hash.each do |key, value|
+        expect(value[1]).to be >= value[2] + value[3]
+      end
+    end
+  end
+
+  context 'ram usage' do
+    let(:hash) { manager.ram_usage }
+
+    it 'should has right values types' do
+      expect(hash[:ram].size).to eq(2)
+      expect(hash[:swap].size).to eq(2)
+
+      expect(hash[:ram_per]).to be_between(0, 100)
+      expect(hash[:swap_per]).to be_between(0, 100)
+    end
+
+    it 'should has right values' do
+      ram_values = hash[:ram]
+      expect(ram_values[1]).to be < ram_values[0]
+
+      swap_values = hash[:swap]
+      expect(swap_values[1]).to be < swap_values[0]
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ServState
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Denis Sergienko
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple tool to watch your linux server state
@@ -145,8 +145,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -181,9 +182,14 @@ files:
 - lib/ServState/views/error.erb
 - lib/ServState/views/index.erb
 - lib/ServState/views/login.erb
-- spec/charts_json_spec.rb
-- spec/dashboard_spec.rb
+- spec/integration/charts_json_spec.rb
+- spec/integration/dashboard_spec.rb
 - spec/spec_helper.rb
+- spec/unit/cpu_usage_spec.rb
+- spec/unit/log_manager_spec.rb
+- spec/unit/network_usage_spec.rb
+- spec/unit/rotator_spec.rb
+- spec/unit/usage_manager_spec.rb
 homepage: http://github.com/ololyay/ServState
 licenses:
 - MIT
@@ -194,12 +200,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -209,6 +215,11 @@ signing_key:
 specification_version: 4
 summary: http://github.com/ololyay/ServState
 test_files:
-- spec/charts_json_spec.rb
-- spec/dashboard_spec.rb
+- spec/integration/charts_json_spec.rb
+- spec/integration/dashboard_spec.rb
 - spec/spec_helper.rb
+- spec/unit/cpu_usage_spec.rb
+- spec/unit/log_manager_spec.rb
+- spec/unit/network_usage_spec.rb
+- spec/unit/rotator_spec.rb
+- spec/unit/usage_manager_spec.rb