ServState 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78853b8c0e8801be6c3d102791077475493e17f8
-  data.tar.gz: 5b57356325c26b54c3ed78ce1947dc0bc1ddaccc
+  metadata.gz: 8094d6f2af00a90fddbe2526287dbddbd1ec7069
+  data.tar.gz: f959f046a02048c93d73907c8eef2a9d70cc1e56
 SHA512:
-  metadata.gz: 8718ae09e06c93252ed414af93c96c4d9bdb84d9a7103d90a85a5501ab38a2dbb6a2c5f7a2f0af7d80cb2ab5865b8ffec0d90abc426ff6051b254b147fc63a89
-  data.tar.gz: c636ef88de14aeda491a7f21031affd57f557d1435fc583f51af4a0b5ed6576258b8361f9a03d6c2cfce9061d306361e164dfcfa1da883dec3da8cc870cbbe5e
+  metadata.gz: b2c6665fcf7529da5af4e07232fe40d0d8881061dafe89e47a35f58d0bbf0abc709b49b702a5b82a8fb214c3ab707fb25c31aa478955a2f6552edfc6825fe08e
+  data.tar.gz: 710eeca9e4c2a74aec668421331b959ca9d127653b47982f778fa6616df8cbdadfb4638696ad046acb2002d6aa10eb79249cefb2f86b63549bb812270dea994c

data/README.md

@@ -1,6 +1,7 @@
 # ServState
 
-	Very simple tool to watch your LINUX server status.
+Very simple tool to watch your LINUX server status.
+[Demo page](http://162.243.90.233:8080/)
 
 ## Installation
 
@@ -8,8 +9,27 @@
 
 ## Usage
 
+Defaults:
+port is 8080
+without password
+
+Default: 
+
 	$ servstate
 
+Set port:
+
+	$ servstate -port 8081
+
+Set password:
+
+	$ servstate -pass mypass
+
+Show help:
+
+	$ servstate -h
+
+
 ## Contributing
 
 1. Fork it

data/ServState.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_dependency "sinatra"
-  spec.add_dependency "rack"
-  spec.add_dependency "sass"
+  spec.add_dependency "sinatra", "~>1.4"
+  spec.add_dependency "rack", "~>1.5"
+  spec.add_dependency "sass", "~>3.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/bin/servstate

@@ -1,9 +1,38 @@
 #!/usr/bin/env ruby
 require "rack"
 APP_ROOT = File.expand_path(File.dirname(__FILE__)) #пригодится
+
+pass=false
+port=8080
+
+if ARGV.size==1 and (ARGV[0]=='-h' or ARGV[0]=='--help')
+	puts "ServState usage\nDefault port: 8080\nDefault password: no password\nSet port: -port XXXX\nSet password: -pass *****"
+	exit
+end
+
+if ARGV.size.odd? 
+	puts "Something wrong with params"
+	exit
+end
+
+ARGV.each_slice(2) { |slice|
+	case slice[0]
+		when '-port'
+			port=slice[1].to_i
+		when '-pass'
+			pass=slice[1]
+		end
+}
+
+APP_OPTIONS={
+	password: pass,
+	port: port
+}
+
 require_relative "./../lib/ServState.rb"
 
 #добавить настройки порта и прочее
+
 Thread.new{ # thread for calculate cpu and network load and other long time operations 
 	while true
 		Info.update
@@ -11,11 +40,18 @@ Thread.new{ # thread for calculate cpu and network load and other long time oper
 	end
 }
 
+
 puts " ____                   ____  _        _       "
 puts "/ ___|  ___ _ ____   __/ ___|| |_ __ _| |_ ___ "
 puts "\\___ \\ / _ \\ '__\\ \\ / /\\___ \\| __/ _` | __/ _ \\"
 puts " ___) |  __/ |   \\ V /  ___) | || (_| | ||  __/"
 puts "|____/ \\___|_|    \\_/  |____/ \\__\\__,_|\\__\\___|"
+puts "\nPORT: #{port}"
+if(pass)
+	puts "PASSWORD: #{pass}"
+else
+	puts "WITHOUT PASSWORD"
+end
 puts "\n"*3
 
-Rack::Handler::WEBrick.run ServStateApp
+Rack::Handler::WEBrick.run(ServStateApp,:Port => APP_OPTIONS[:port])

data/lib/ServState/info.rb

@@ -3,6 +3,8 @@ class Info
 	@@old_total_usage=0
 	@@old_traffic=Hash.new
 	@@old_time_for_traffic=Time.now
+	@@cpu_stat_value=0
+	@@traffic_speed_value=0
 	def self.hostname
 		`hostname`.chomp
 	end

data/lib/ServState/main.rb

@@ -12,17 +12,50 @@ require_relative 'info'
 
 class ServStateApp < Sinatra::Base
 
+	enable :sessions
 
 	get '/' do
-		@name=Info.hostname
-		erb :index
+		if  session[:login] or not APP_OPTIONS[:password]
+			@name=Info.hostname
+			erb :index
+		else
+			redirect '/login'
+		end
 	end
 
 	get("/style.css") do 
 		scss "css/style".to_sym
 	end
 	get '/renew.json' do
-		content_type :json
-  		{ :cpu => Info.get_cpu_stat, :uptime => Info.uptime, :mem_usage => Info.ram_usage, :disks_usage => Info.disk_usage, :network => Info.get_traffic_speed }.to_json
+		if  session[:login] or not APP_OPTIONS[:password]
+			content_type :json
+	  		{ :cpu => Info.get_cpu_stat,
+	  		:uptime => Info.uptime,
+	  		:mem_usage => Info.ram_usage,
+	  		:disks_usage => Info.disk_usage,
+	  		:interfaces => Info.interfaces, 
+	  		:network => Info.get_traffic_speed }.to_json
+	  	end
+	end
+
+	get '/login' do
+		unless(APP_OPTIONS[:password]) 
+			redirect '/'
+		end
+		session[:login]=false;
+		@name=Info.hostname
+		erb :login
+	end
+
+	post '/login' do
+		unless(APP_OPTIONS[:password]) 
+			redirect '/'
+		end
+		if(params[:pass])==APP_OPTIONS[:password]
+			session[:login]=true;
+			redirect '/'
+ 		else 
+			redirect '/login'
+		end
 	end
 end

data/lib/ServState/public/js/app.js

@@ -21,29 +21,32 @@ $(document).ready(function() {
 function renew(){
 	$.getJSON("renew.json",function(data){
 		console.log(data);
-		$('#uptime').text(data.uptime.days+' days '+data.uptime.hours+':'+data.uptime.minutes);
+		$('#uptime').text(data.uptime.days+' days '+data.uptime.hours+'h '+data.uptime.minutes+'m');
 		
 		$('#cpu_total').css('width',data.cpu+'%');
 		$('#cpu_total').text(data.cpu+'%');
 		danger('#cpu_total_handler',data.cpu);
 
 		danger('#ram_usage_handler',data.mem_usage.ram_per);
+		$('#ram').text('('+data.mem_usage.ram[1]+'/'+data.mem_usage.ram[0]+')');
 		$('#ram_usage').css('width',data.mem_usage.ram_per+'%');
 		$('#ram_usage').text(data.mem_usage.ram_per+'%');
 
 		danger('#swap_usage_handler',data.mem_usage.swap_per);
+		$('#swap').text('('+data.mem_usage.swap[1]+'/'+data.mem_usage.swap[0]+')');
 		$('#swap_usage').css('width',data.mem_usage.swap_per+'%');
 		$('#swap_usage').text(data.mem_usage.swap_per+'%');
 
 		var disks=[]
 		$.each(data.disks_usage, function(key, value){
-			disks.push('<div class="uk-width-medium-1-2"><p>'+key+'</p><div class="uk-progress"><div class="uk-progress-bar" style="width: '+value[0]+'%">'+value[0]+'%</div></div></div>');
+			disks.push('<div class="uk-width-medium-1-2"><p>'+key+' <span class="uk-text-muted">('+value[2]+'/'+value[1]+')</span></p><div class="uk-progress"><div class="uk-progress-bar" style="width: '+value[0]+'%">'+value[0]+'%</div></div></div>');
 		});
 		$('#disks').html(disks.join(''));
 
 		var interfaces=[]
 		$.each(data.network, function(key, value){
-			interfaces.push('<div class="uk-width-medium-1-4"><div class="uk-panel uk-panel-box"><p class="uk-text-bold">'+key+'</p><p class="uk-text-info">Down: '+value[0]+'Mbps</p><p class="uk-text-success">Up: '+value[1]+'Mbps</p></div></div>');
+			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]+'Mbps</p><p class="uk-text-success">Up: '+value[1]+'Mbps</p></div></div>');
 		});
 		$('#traffic').html(interfaces.join(''));
 	});

data/lib/ServState/version.rb

@@ -1,3 +1,3 @@
 module ServState
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ServState/views/css/custom.scss

@@ -13,3 +13,8 @@
 .uk-panel {
 	margin-bottom: 10px;
 }
+.login {
+	width: 200px;
+	height: 100px;
+	margin: 0 auto;
+}

data/lib/ServState/views/index.erb

@@ -1,9 +1,9 @@
 <!doctype html>
 <html>
 <head>
-	<title>Test Wrapper Page</title>
+	<title><%=@name %></title>
 	<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
-	<script type="text/javascript" src="js/uikit.js"></script>
+	<script type="text/javascript" src="js/uikit.min.js"></script>
 	<link rel="stylesheet" href="css/uikit.gradient.min.css">
 
 	<!-- Custom includes -->
@@ -21,8 +21,6 @@
 					<div class="uk-width-medium-1-2">
 						<h4>Uptime</h4>
 						<p id="uptime"></p>
-					</div>
-					<div class="uk-width-medium-1-2">
 						<h4>CPU usage</h4>
 						<div class="uk-progress" id="cpu_total_handler">
 							<div class="uk-progress-bar"  id="cpu_total" style="width: 0%"></div>
@@ -30,11 +28,11 @@
 					</div>
 					<div class="uk-width-medium-1-2">
 						<h4>Memory usage</h4>
-						<p>Ram</p>
+						<p>RAM <span id="ram" alt="(used/total)" class="uk-text-muted"></span></p>
 						<div class="uk-progress" id="ram_usage_handler">
 							<div class="uk-progress-bar"  id="ram_usage" style="width: 0%"></div>
 						</div>
-						<p>Swap</p>
+						<p>Swap <span id="swap" class="uk-text-muted"></span></p>
 						<div class="uk-progress">
 							<div class="uk-progress-bar"  id="swap_usage" style="width: 0%"></div>
 						</div>

data/lib/ServState/views/login.erb

@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<head>
+	<title><%=@name %> login</title>
+	<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
+	<script type="text/javascript" src="js/uikit.min.js"></script>
+	<link rel="stylesheet" href="css/uikit.gradient.min.css">
+
+	<!-- Custom includes -->
+	<script type="text/javascript" src="js/app.js"></script>
+	<link rel="stylesheet" href="style.css">	
+</head>
+<body>
+
+	<div class="login uk-panel uk-panel-box">
+		<form class="uk-form" method="post">
+			<legend>Login to ServState</legend>
+			<fieldset>
+				<input type="password" name="pass" class="uk-width-1-1 uk-form-large" placeholder="password">
+			</fieldset>
+		</form>
+	</div>
+
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ServState
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Denis Sergienko
@@ -9,50 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,24 +100,19 @@ files:
 - lib/ServState.rb
 - lib/ServState/info.rb
 - lib/ServState/main.rb
-- lib/ServState/public/css/uikit.almost-flat.css
-- lib/ServState/public/css/uikit.almost-flat.min.css
-- lib/ServState/public/css/uikit.css
-- lib/ServState/public/css/uikit.gradient.css
 - lib/ServState/public/css/uikit.gradient.min.css
-- lib/ServState/public/css/uikit.min.css
 - lib/ServState/public/fonts/FontAwesome.otf
 - lib/ServState/public/fonts/fontawesome-webfont.eot
 - lib/ServState/public/fonts/fontawesome-webfont.ttf
 - lib/ServState/public/fonts/fontawesome-webfont.woff
 - lib/ServState/public/js/app.js
-- lib/ServState/public/js/uikit.js
 - lib/ServState/public/js/uikit.min.js
 - lib/ServState/version.rb
 - lib/ServState/views/css/base.scss
 - lib/ServState/views/css/custom.scss
 - lib/ServState/views/css/style.scss
 - lib/ServState/views/index.erb
+- lib/ServState/views/login.erb
 homepage: http://github.com/ololyay/ServState
 licenses:
 - MIT