pimon 0.1.9 → 0.1.10

data/Gemfile

@@ -1,17 +1,20 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'haml', '~> 4.0.0'
-gem 'sinatra', '~> 1.4.1', :require => 'sinatra/base'
+gem 'rake', '~> 10.1.0'
+gem 'haml', '~> 4.0.3'
+gem 'sinatra', '~> 1.4.3', :require => 'sinatra/base'
 gem 'em-websocket', '= 0.3.8'
 gem 'sinatra-websocket', '~> 0.2.1'
-gem 'thin', '~> 1.5.0'
+gem 'sys-uptime', '~> 0.6.1'
+gem 'thin', '~> 1.5.1'
 
-gem 'pry', '~> 0.9.12' , :group => [:development, :test]
+gem 'pry', '~> 0.9.12.2' , :group => [:development, :test]
 
 group :test do
   gem 'rack-test', '~> 0.6.2'
-  gem 'rspec', '~> 2.13.0'
+  gem 'rspec', '~> 2.14.1'
   gem 'simplecov', '~> 0.7.1', :require => false
   gem 'simplecov-rcov', '~> 0.2.3'
   gem 'timecop', '~> 0.6.1'
+  gem 'coveralls', '~> 0.6.7', require: false
 end

data/Gemfile.lock

@@ -1,19 +1,28 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     addressable (2.3.3)
     coderay (1.0.9)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
     daemons (1.1.9)
-    diff-lcs (1.2.1)
+    diff-lcs (1.2.4)
     em-websocket (0.3.8)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
     eventmachine (1.0.3)
-    haml (4.0.0)
+    ffi (1.4.0)
+    haml (4.0.3)
       tilt
     method_source (0.8.1)
+    mime-types (1.23)
     multi_json (1.6.1)
-    pry (0.9.12)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -22,48 +31,57 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (1.4.1)
-      rack (~> 1.5, >= 1.5.2)
+    sinatra (1.4.3)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     sinatra-websocket (0.2.1)
       em-websocket (~> 0.3.6)
       eventmachine
       thin (>= 1.3.1)
-    slop (3.4.4)
-    thin (1.5.0)
+    slop (3.4.5)
+    sys-uptime (0.6.1)
+      ffi (>= 1.0.0)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    tilt (1.3.5)
+    thor (0.18.1)
+    tilt (1.4.1)
     timecop (0.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls (~> 0.6.7)
   em-websocket (= 0.3.8)
-  haml (~> 4.0.0)
-  pry (~> 0.9.12)
+  haml (~> 4.0.3)
+  pry (~> 0.9.12.2)
   rack-test (~> 0.6.2)
-  rspec (~> 2.13.0)
+  rake (~> 10.1.0)
+  rspec (~> 2.14.1)
   simplecov (~> 0.7.1)
   simplecov-rcov (~> 0.2.3)
-  sinatra (~> 1.4.1)
+  sinatra (~> 1.4.3)
   sinatra-websocket (~> 0.2.1)
-  thin (~> 1.5.0)
+  sys-uptime (~> 0.6.1)
+  thin (~> 1.5.1)
   timecop (~> 0.6.1)

data/README.md

@@ -1,6 +1,6 @@
 # Pimon
 
-[![Build Status](https://secure.travis-ci.org/pedrocarrico/pimon.png)](http://travis-ci.org/pedrocarrico/pimon) [![Dependency Status](https://gemnasium.com/pedrocarrico/pimon.png?travis)](https://gemnasium.com/pedrocarrico/pimon) [![Gem Version](https://badge.fury.io/rb/pimon.png)](http://badge.fury.io/rb/pimon) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/pedrocarrico/pimon)
+[![Build Status](https://secure.travis-ci.org/pedrocarrico/pimon.png)](http://travis-ci.org/pedrocarrico/pimon) [![Dependency Status](https://gemnasium.com/pedrocarrico/pimon.png?travis)](https://gemnasium.com/pedrocarrico/pimon) [![Gem Version](https://badge.fury.io/rb/pimon.png)](http://badge.fury.io/rb/pimon) [![Code Climate](https://codeclimate.com/github/pedrocarrico/pimon.png)](https://codeclimate.com/github/pedrocarrico/pimon) [![Coverage Status](https://coveralls.io/repos/pedrocarrico/pimon/badge.png?branch=master)](https://coveralls.io/r/pedrocarrico/pimon)
 
 ![Pimon](http://pedrocarrico.net/pimon.jpg "Pimon")
 
@@ -58,27 +58,11 @@ The temperature stat is only available with the latest Raspbian distro (2012-09-
 not work if you're developing on other systems.  
 Pimon only works with Ruby 1.9+, please refer to [my blog](http://blog.pedrocarrico.net/post/29478085586/compiling-and-installing-ruby-on-the-raspberry-pi-using "Compiling and installing ruby on the raspberry pi using rbenv…") for a way to install Ruby 1.9.3 on your Raspberry Pi.
 
-## Deployment with capistrano
-To deploy on your raspberry pi you just have to have ssh enabled and your keys authorized.  
-Then you can deploy with capistrano using:  
-```
-cap deploy:setup
-cap deploy:cold
-```
-
-This will setup your raspberry pi and deploy the application.  
-To start and stop the application you have the usual:  
-```
-cap deploy:start
-cap deploy:stop
-```
-I would recommend installing as a gem and tweak your own configuration file instead of deploying with capistrano as
-this feature will probably be discontinued in the future.
-
 ## TODO
 1. Improve disk stats, have a way of having custom mount points
-2. Show uptime
-3. Change configuration in realtime
+2. Change configuration in realtime
+3. Cpu frequency probe
+4. Persist stats
 
 ## Copyright
 Licensed under the [WTFPL](http://en.wikipedia.org/wiki/WTFPL "Do What The Fuck You Want To Public License") license.

data/lib/pimon.rb

@@ -39,7 +39,6 @@ class Pimon < Sinatra::Base
   end
   
   configure :test do
-    
     config = PimonConfig.create_new("#{File.dirname(__FILE__)}/../config/test.yml")
     
     set :config, config

data/lib/pimon/probe/uptime.rb

@@ -0,0 +1,13 @@
+require 'pimon/probe/probe'
+require 'sys/uptime'
+
+class Probe::Uptime < Probe
+  
+  def self.check
+    Sys::Uptime.dhms
+  end
+  
+  def self.symbol
+    :uptime
+  end
+end

data/lib/pimon/public/index.js

@@ -1,120 +1,154 @@
 $(function () {
-    var i = 0,
-        titleStats,
-        rotateFaviconInterval;
+  var i = 0,
+      titleStats,
+      rotateFaviconInterval,
+      ws;
+  
+  function changeFavicon(o) {
+    titleStats = [
+      { 'legend' : 'CPU', 'stat' : o.cpu.stats[o.cpu.stats.length - 1], 'color' : o.cpu.color, 'unit' : o.cpu.unit } ,
+      { 'legend' : 'MEM', 'stat' : o.mem.stats[o.mem.stats.length - 1], 'color' : o.mem.color, 'unit' : o.mem.unit } ,
+      { 'legend' : 'SWAP', 'stat' : o.swap.stats[o.swap.stats.length - 1], 'color' : o.swap.color, 'unit' : o.swap.unit},
+      { 'legend' : 'DISK', 'stat' : o.disk.stats[o.disk.stats.length - 1], 'color' : o.disk.color, 'unit' : o.disk.unit},
+      { 'legend' : 'TEMP', 'stat' : o.temp.stats[o.temp.stats.length - 1], 'color' : o.temp.color, 'unit' : o.temp.unit} ];
+    i = 0;
+    if (rotateFaviconInterval === undefined) {
+      rotateFavicon(titleStats);
+      rotateFaviconInterval = setInterval(function() { rotateFavicon(titleStats); }, 3000);
+    }
+  }
+  
+  function rotateFavicon(titleStats) {
+    Piecon.setOptions({
+      color: titleStats[i].color, // Pie chart color
+      background: '#bbb', // Empty pie chart color
+      shadow: '#fff', // Outer ring color
+      fallback: 'force' // Toggles displaying percentage in the title bar (possible values - true, false, 'force')
+    });
+    Piecon.setProgress(titleStats[i].stat);
     
-    function changeFavicon(o) {
-        titleStats = [
-            { 'legend' : 'CPU', 'stat' : o.cpu.stats[o.cpu.stats.length - 1], 'color' : o.cpu.color, 'unit' : o.cpu.unit } ,
-            { 'legend' : 'MEM', 'stat' : o.mem.stats[o.mem.stats.length - 1], 'color' : o.mem.color, 'unit' : o.mem.unit } ,
-            { 'legend' : 'SWAP', 'stat' : o.swap.stats[o.swap.stats.length - 1], 'color' : o.swap.color, 'unit' : o.swap.unit},
-            { 'legend' : 'DISK', 'stat' : o.disk.stats[o.disk.stats.length - 1], 'color' : o.disk.color, 'unit' : o.disk.unit},
-            { 'legend' : 'TEMP', 'stat' : o.temp.stats[o.temp.stats.length - 1], 'color' : o.temp.color, 'unit' : o.temp.unit} ];
-        i = 0;
-        if (rotateFaviconInterval === undefined) {
-            rotateFavicon(titleStats);
-            rotateFaviconInterval = setInterval(function() { rotateFavicon(titleStats); }, 3000);
+    $('title').text(titleStats[i].stat + titleStats[i].unit + ' ' + titleStats[i].legend);
+    i++;
+    if (i >= titleStats.length) {
+      i = 0;
+    }
+  }
+  
+  function drawChart(o) {
+    new Highcharts.Chart({
+      chart: {
+        renderTo: 'chart',
+        type: 'line',
+        marginRight: 130,
+        marginBottom: 25
+      },
+      title: {
+        text: 'Pimon',
+        x: -20
+      },
+      subtitle: {
+        text: o.hostname,
+        x: -20
+      },
+      xAxis: {
+        categories: o.time.stats
+      },
+      yAxis: {
+        title: {
+            text: 'Usage'
+        },
+        plotLines: [{
+            value: 0,
+            width: 1,
+            color: '#808080'
+        }],
+        max: 100,
+        min: 0
+      },
+      tooltip: {
+        formatter: function() {
+          return '<b>'+ this.series.name +'</b><br/>'+
+          this.x +': '+ this.y + (this.series.name === 'temp' ? o.temp.unit : '%');
         }
+      },
+      legend: {
+        layout: 'vertical',
+        align: 'right',
+        verticalAlign: 'top',
+        x: -10,
+        y: 100,
+        borderWidth: 0
+      },
+      series: [{
+        name: 'cpu',
+        color: o.cpu.color,
+        data: o.cpu.stats
+      },
+      {
+        name: 'mem',
+        color: o.mem.color,
+        data: o.mem.stats
+      },
+      {
+        name: 'swap',
+        color: o.swap.color,
+        data: o.swap.stats
+      },
+      {
+        name: 'disk',
+        color: o.disk.color,
+        data: o.disk.stats
+      },
+      {
+        name: 'temp',
+        color: o.temp.color,
+        data: o.temp.stats
+      }],
+      credits: {
+        enabled: false
+      }
+    });
+  }
+  
+  function maybeInsertWordConnector(text, connector) {
+    return text !== '' ? text + connector : text;
+  }
+  
+  function pluralize(count, word) {
+    return ((count === '1') ? ' ' + word : ' ' + word + 's');
+  }
+  
+  function formatUptime(uptimeArray) {
+    var uptime = '',
+        days =    uptimeArray[0],
+        hours =   uptimeArray[1],
+        minutes = uptimeArray[2],
+        seconds = uptimeArray[3];
+    
+    if (days !== '0') {
+      uptime =  + ' ' + pluralize(days, 'day');
     }
     
-    function rotateFavicon(titleStats) {
-      Piecon.setOptions({
-          color: titleStats[i]['color'], // Pie chart color
-          background: '#bbb', // Empty pie chart color
-          shadow: '#fff', // Outer ring color
-          fallback: 'force' // Toggles displaying percentage in the title bar (possible values - true, false, 'force')
-      });
-      Piecon.setProgress(titleStats[i]['stat']);
-      
-      $('title').text(titleStats[i]['stat'] + titleStats[i]['unit'] + ' ' + titleStats[i]['legend']);
-      i++;
-      if (i >= titleStats.length) {
-          i = 0;
-      }
+    if (hours !== '0') {
+      uptime = maybeInsertWordConnector(uptime, ', ') + hours + ' ' + pluralize(hours, 'hour');
     }
     
-    function drawChart(o) {
-        new Highcharts.Chart({
-            chart: {
-                renderTo: 'chart',
-                type: 'line',
-                marginRight: 130,
-                marginBottom: 25
-            },
-            title: {
-                text: 'Pimon',
-                x: -20
-            },
-            subtitle: {
-                text: o.hostname,
-                x: -20
-            },
-            xAxis: {
-                categories: o.time.stats
-            },
-            yAxis: {
-                title: {
-                    text: 'Usage'
-                },
-                plotLines: [{
-                    value: 0,
-                    width: 1,
-                    color: '#808080'
-                }],
-                max: 100,
-                min: 0
-            },
-            tooltip: {
-                formatter: function() {
-                        return '<b>'+ this.series.name +'</b><br/>'+
-                        this.x +': '+ this.y + (this.series.name === 'temp' ? o.temp.unit : '%');
-                }
-            },
-            legend: {
-                layout: 'vertical',
-                align: 'right',
-                verticalAlign: 'top',
-                x: -10,
-                y: 100,
-                borderWidth: 0
-            },
-            series: [{
-                name: 'cpu',
-                color: o.cpu.color,
-                data: o.cpu.stats
-            },
-            {
-                name: 'mem',
-                color: o.mem.color,
-                data: o.mem.stats
-            },
-            {
-                name: 'swap',
-                color: o.swap.color,
-                data: o.swap.stats
-            },
-            {
-                name: 'disk',
-                color: o.disk.color,
-                data: o.disk.stats
-            },
-            {
-                name: 'temp',
-                color: o.temp.color,
-                data: o.temp.stats
-            }],
-            credits: {
-                enabled: false
-            }
-        });
+    if (minutes !== '0') {
+      uptime = maybeInsertWordConnector(uptime, ', ') + minutes + ' ' + pluralize(minutes, 'minute');
     }
     
-    var ws = new WebSocket('ws://' + window.location.host + window.location.pathname);
-    //ws.onopen = function()  { console.log('opened socket'); };
-    ws.onclose = function()  { alert('Connection to Pimon server lost...'); };
-    ws.onmessage = function(m) {
-        var o = $.parseJSON(m.data);
-        drawChart(o);
-        changeFavicon(o);
-    };
+    if (seconds !== '0') {
+      uptime = maybeInsertWordConnector(uptime, ' and ') + seconds + ' ' + pluralize(seconds, 'second');
+    }
+    return uptime;
+  }
+  
+  ws = new WebSocket('ws://' + window.location.host + window.location.pathname);
+  ws.onclose = function()  { alert('Connection to Pimon server lost...'); };
+  ws.onmessage = function(m) {
+    var o = $.parseJSON(m.data);
+    drawChart(o);
+    changeFavicon(o);
+    $('#uptime .up').text(formatUptime(o.uptime.slice(-1)[0]));
+  };
 });

data/lib/pimon/public/piecon.min.js

@@ -0,0 +1,5 @@
+(function(){var i={},j=null,k=null,f=null,g=null,h={},l={color:"#ff0084",background:"#bbb",shadow:"#fff",fallback:!1},c,o=navigator.userAgent.toLowerCase();c=function(e){return-1!==o.indexOf(e)};var p=c("msie");c("chrome");c("chrome")||c("safari");var q=c("safari")&&!c("chrome");c("mozilla")&&!c("chrome")&&c("safari");var m=function(e){for(var a=document.getElementsByTagName("link"),c=document.getElementsByTagName("head")[0],f=0,h=a.length;f<h;f++)("icon"===a[f].getAttribute("rel")||"shortcut icon"===
+a[f].getAttribute("rel"))&&c.removeChild(a[f]);a=document.createElement("link");a.type="image/x-icon";a.rel="icon";a.href=e;document.getElementsByTagName("head")[0].appendChild(a)},n=function(){g||(g=document.createElement("canvas"),g.width=16,g.height=16);return g};i.setOptions=function(e){h={};for(var a in l)h[a]=e.hasOwnProperty(a)?e[a]:l[a];return this};i.setProgress=function(e){f||(f=document.title);if(!k||!j){var a;a:{a=document.getElementsByTagName("link");for(var c=0,i=a.length;c<i;c++)if("icon"===
+a[c].getAttribute("rel")||"shortcut icon"===a[c].getAttribute("rel")){a=a[c];break a}a=!1}k=j=a?a.getAttribute("href"):"/favicon.ico"}if(!isNaN(parseFloat(e))&&isFinite(e))if(!n().getContext||p||q||!0==h.fallback)document.title=0<e?"("+e+"%) "+f:f;else{"force"===h.fallback&&(document.title=0<e?"("+e+"%) "+f:f);var g=e,b=n(),d=b.getContext("2d"),g=g||0,e=j;a=new Image;a.onload=function(){if(d){d.clearRect(0,0,16,16);d.beginPath();d.moveTo(b.width/2,b.height/2);d.arc(b.width/2,b.height/2,Math.min(b.width/
+2,b.height/2),0,Math.PI*2,false);d.fillStyle=h.shadow;d.fill();d.beginPath();d.moveTo(b.width/2,b.height/2);d.arc(b.width/2,b.height/2,Math.min(b.width/2,b.height/2)-2,0,Math.PI*2,false);d.fillStyle=h.background;d.fill();if(g>0){d.beginPath();d.moveTo(b.width/2,b.height/2);d.arc(b.width/2,b.height/2,Math.min(b.width/2,b.height/2)-2,-0.5*Math.PI,(-0.5+2*g/100)*Math.PI,false);d.lineTo(b.width/2,b.height/2);d.fillStyle=h.color;d.fill()}m(b.toDataURL())}};e.match(/^data/)||(a.crossOrigin="anonymous");
+a.src=e}else return!1};i.reset=function(){f&&(document.title=f);k&&(j=k,m(j))};i.setOptions(l);window.Piecon=i})();

data/lib/pimon/stats.rb

@@ -10,7 +10,7 @@ class Stats
   def index(queue, index)
     @stats[queue][index]
   end
-
+  
   def push(queue, value)
     @stats[queue].push(value)
   end

data/lib/pimon/stats_collector.rb

@@ -6,6 +6,7 @@ require 'pimon/probe/memory_usage'
 require 'pimon/probe/swap_usage'
 require 'pimon/probe/time_check'
 require 'pimon/probe/temperature'
+require 'pimon/probe/uptime'
 require 'pimon/stats'
 
 class StatsCollector
@@ -17,7 +18,8 @@ class StatsCollector
       Probe::MemoryUsage,
       Probe::SwapUsage,
       Probe::DiskUsage,
-      Probe::Temperature
+      Probe::Temperature,
+      Probe::Uptime
     ]
     @stats = Stats.new(@probes.map(&:symbol).concat([:time]))
   end
@@ -38,10 +40,12 @@ class StatsCollector
   
   def show_stats
     time = @stats.range(:time)
+    uptime = @stats.range(:uptime)
     
     stats = {
       :time => { :stats => time.map { |t| (/\d\d:\d\d:\d\d/.match(t))[0] } },
-      :hostname => @config.hostname
+      :hostname => @config.hostname,
+      :uptime => uptime
     }
     
     @probes.each do |probe|

data/lib/pimon/version.rb

@@ -1,3 +1,3 @@
 module Pimon
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.1.10'.freeze
 end

data/lib/pimon/views/index.haml

@@ -3,8 +3,10 @@
     %title Pimon
     %script{ :src => '//cdnjs.cloudflare.com/ajax/libs/jquery/1.8.0/jquery-1.8.0.min.js' }
     %script{ :src => '//cdnjs.cloudflare.com/ajax/libs/highcharts/2.3.1/highcharts.js' }
-    %script{ :src => '//lipka.github.com/piecon/piecon.min.js' }
+    %script{ :src => '/piecon.min.js' }
     %script{ :src => '/index.js' }
   %body
     #chart
     #uptime
+      Uptime: 
+      %strong.up

data/pimon.gemspec

@@ -20,15 +20,16 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/pimon`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
   
-  s.add_runtime_dependency     'haml',              '~> 4.0.0'
-  s.add_runtime_dependency     'sinatra',           '~> 1.4.1'
+  s.add_runtime_dependency     'haml',              '~> 4.0.3'
+  s.add_runtime_dependency     'sinatra',           '~> 1.4.3'
   s.add_runtime_dependency     'em-websocket',      '= 0.3.8'
   s.add_runtime_dependency     'sinatra-websocket', '~> 0.2.1'
-  s.add_runtime_dependency     'thin',              '~> 1.5.0'
+  s.add_runtime_dependency     'sys-uptime',        '~> 0.6.1'
+  s.add_runtime_dependency     'thin',              '~> 1.5.1'
   
-  s.add_development_dependency 'rack-test',  '~> 0.6.2'
-  s.add_development_dependency 'rspec',  '~> 2.13.0'
-  s.add_development_dependency 'simplecov', '~> 0.7.1'
-  s.add_development_dependency 'simplecov-rcov', '~> 0.2.3'
-  s.add_development_dependency 'timecop', '~> 0.6.1'
+  s.add_development_dependency 'rack-test',       '~> 0.6.2'
+  s.add_development_dependency 'rspec',           '~> 2.14.1'
+  s.add_development_dependency 'simplecov',       '~> 0.7.1'
+  s.add_development_dependency 'simplecov-rcov',  '~> 0.2.3'
+  s.add_development_dependency 'timecop',         '~> 0.6.1'
 end

data/spec/spec_helper.rb

@@ -2,16 +2,16 @@
 # Check http://richardconroy.blogspot.pt/2010/01/issues-testing-sinatra-datamapper-app.html
 ENV['RACK_ENV'] = 'test'
 
-if ENV['COVERAGE']
+if ENV['COVERAGE'] || ENV['TRAVIS']
   require 'simplecov'
+  require 'coveralls'
+  Coveralls.wear!
   require 'simplecov-rcov'
-  class SimpleCov::Formatter::MergedFormatter
-    def format(result)
-      SimpleCov::Formatter::HTMLFormatter.new.format(result)
-      SimpleCov::Formatter::RcovFormatter.new.format(result)
-    end
-  end
-  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::RcovFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
   SimpleCov.start do
     add_filter 'spec'
   end

data/spec/stats_collector_spec.rb

@@ -16,6 +16,7 @@ describe 'StatsCollector' do
       Probe::MemoryUsage.should_receive(:check)
       Probe::SwapUsage.should_receive(:check)
       Probe::Temperature.should_receive(:check)
+      Probe::Uptime.should_receive(:check)
       
       @stats_collector.collect_stats
     end
@@ -24,6 +25,7 @@ describe 'StatsCollector' do
                         should == {
                           :time => { :stats => [] },
                           :hostname => 'test_hostname',
+                          :uptime => [],
                           :cpu => { :stats => [], :color => '#D2691E', :unit => '%' },
                           :mem => { :stats => [], :color => '#87CEFA', :unit => '%' },
                           :swap => {:stats => [], :color => '#3CB371', :unit => '%' },
@@ -41,6 +43,7 @@ describe 'StatsCollector' do
         Probe::MemoryUsage.should_receive(:check).any_number_of_times.and_return(78)
         Probe::SwapUsage.should_receive(:check).any_number_of_times.and_return(50)
         Probe::Temperature.should_receive(:check).any_number_of_times.and_return(40)
+        Probe::Uptime.should_receive(:check).any_number_of_times.and_return([1,2,3,4])
         
         7.times do
           @stats_collector.collect_stats
@@ -51,6 +54,7 @@ describe 'StatsCollector' do
                           should == {
                             :time => { :stats => ['12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00']},
                             :hostname => 'test_hostname',
+                            :uptime => [[1,2,3,4],[1,2,3,4],[1,2,3,4],[1,2,3,4],[1,2,3,4],[1,2,3,4]],
                             :cpu => {:stats => [50, 50, 50, 50, 50, 50], :color => '#D2691E', :unit => '%'},
                             :mem => { :stats => [78, 78, 78, 78, 78, 78], :color =>'#87CEFA', :unit => '%'},
                             :swap=>{ :stats => [50, 50, 50, 50, 50, 50], :color => '#3CB371', :unit => '%'},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pimon
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: sys-uptime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +197,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
-- Capfile
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -194,12 +209,9 @@ files:
 - bin/random.h
 - bin/vmstat.c
 - config/config.ru
-- config/config_dev.ru
 - config/default.yml
-- config/deploy.rb
 - config/test.yml
 - config/test_broken.yml
-- config/thin/config.yml
 - lib/pimon.rb
 - lib/pimon/hash_extensions.rb
 - lib/pimon/pimon_config.rb
@@ -211,8 +223,10 @@ files:
 - lib/pimon/probe/system_memory.rb
 - lib/pimon/probe/temperature.rb
 - lib/pimon/probe/time_check.rb
+- lib/pimon/probe/uptime.rb
 - lib/pimon/public/favicon.ico
 - lib/pimon/public/index.js
+- lib/pimon/public/piecon.min.js
 - lib/pimon/stats.rb
 - lib/pimon/stats_collector.rb
 - lib/pimon/version.rb

data/Capfile

@@ -1,2 +0,0 @@
-load 'deploy' if respond_to?(:namespace)
-load 'config/deploy'

data/config/config_dev.ru

@@ -1,11 +0,0 @@
-require 'sinatra'
-require './pimon'
-
-root_dir = File.dirname(__FILE__) + "/.."
-
-set :environment, :development
-set :root,  root_dir
-set :app_file, File.join(root_dir, 'pimon.rb')
-disable :run
-
-run Pimon

data/config/deploy.rb

@@ -1,43 +0,0 @@
-set :application, "pimon"
-set :user, "pi"
-
-set :scm, :git
-
-set :repository, "git://github.com/pedrocarrico/pimon.git"
-
-set :deploy_to, '/home/pi/app/pimon'
-set :deploy_via, :remote_cache # quicker checkouts from github
-
-set :domain, 'raspberrypi'
-role :app, domain
-role :web, domain
-
-set :runner, user
-set :use_sudo, false
-
-after 'deploy:update_code', 'deploy:bundle_install'
-
-namespace :deploy do
-  task :start, :roles => [:web, :app] do
-    run "cd #{deploy_to}/current && PIMON_CONFIG=#{deploy_to}/shared/production.yml nohup thin -C config/thin/config.yml -R config/config.ru start"
-  end
-  
-  task :stop, :roles => [:web, :app] do
-    run "cd #{deploy_to}/current && nohup thin -C config/thin/config.yml -R config/config.ru stop"
-  end
-  
-  task :restart, :roles => [:web, :app] do
-    deploy.stop
-    deploy.start
-  end
-  
-  task :cold do
-    deploy.update
-    deploy.start
-  end
-  
-  desc "run 'bundle install' to install Bundler's packaged gems for the current deploy"
-  task :bundle_install, :roles => :app do
-    run "cd #{deploy_to}/current && bundle install --without test development"
-  end
-end

data/config/thin/config.yml

@@ -1,13 +0,0 @@
-environment: production
-chdir: /home/pi/app/pimon/current
-address: 127.0.0.1
-user: pi
-group: pi
-port: 4567
-pid: /home/pi/app/pimon/shared/pids/thin.pid
-rackup: /home/pi/app/pimon/current/config/config.ru
-log: /home/pi/app/pimon/shared/log/thin.log
-max_conns: 1024
-timeout: 30
-max_persistent_conns: 512
-daemonize: true