pimon 0.1.5 → 0.1.6

data/Gemfile

@@ -1,17 +1,17 @@
 source :rubygems
 
-gem 'capistrano'
-gem 'haml'
-gem 'sinatra', :require => 'sinatra/base'
+gem 'capistrano', '~> 2.13.5'
+gem 'haml', '~> 3.1.7'
+gem 'sinatra', '~> 1.3.3', :require => 'sinatra/base'
 gem 'sinatra-websocket', '~> 0.2.0'
 gem 'thin', '~> 1.5.0'
 
 gem 'pry', :group => [:development, :test]
 
 group :test do
-  gem 'rack-test'
-  gem 'rspec', '~> 2.11.0'
-  gem 'simplecov', :require => false
-  gem 'simplecov-rcov'
-  gem 'timecop'
+  gem 'rack-test', '~> 0.6.2'
+  gem 'rspec', '~> 2.12.0'
+  gem 'simplecov', '~> 0.7.1', :require => false
+  gem 'simplecov-rcov', '~> 0.2.3'
+  gem 'timecop', '~> 0.5.4'
 end

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.2)
-    capistrano (2.13.4)
+    capistrano (2.13.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -17,15 +17,13 @@ GEM
     eventmachine (1.0.0)
     haml (3.1.7)
     highline (1.6.15)
-    jruby-pageant (1.1.1)
     method_source (0.8)
-    multi_json (1.3.6)
+    multi_json (1.5.0)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.6.0)
-      jruby-pageant (>= 1.1.1)
+    net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     pry (0.9.10)
@@ -37,18 +35,18 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    simplecov (0.6.4)
+    rspec-mocks (2.12.0)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
     sinatra (1.3.3)
@@ -65,20 +63,20 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    timecop (0.5.2)
+    timecop (0.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano
-  haml
+  capistrano (~> 2.13.5)
+  haml (~> 3.1.7)
   pry
-  rack-test
-  rspec (~> 2.11.0)
-  simplecov
-  simplecov-rcov
-  sinatra
+  rack-test (~> 0.6.2)
+  rspec (~> 2.12.0)
+  simplecov (~> 0.7.1)
+  simplecov-rcov (~> 0.2.3)
+  sinatra (~> 1.3.3)
   sinatra-websocket (~> 0.2.0)
   thin (~> 1.5.0)
-  timecop
+  timecop (~> 0.5.4)

data/README.md

@@ -66,8 +66,6 @@ cap deploy:cold
 ```
 
 This will setup your raspberry pi and deploy the application.  
-The username and password for the basic_auth in the production environment will be asked in the
-first deploy.
 To start and stop the application you have the usual:  
 ```
 cap deploy:start

data/bin/pimon

@@ -78,6 +78,7 @@ begin
     if File.file?(pid_file)
       pid = `cat #{pid_file}`.to_i
       Process.kill("KILL", pid)
+      File.delete(pid_file) if File.exists?(pid_file)
       puts 'Pimon stopped...'
     else
       puts "Pid file not found at #{pid_file}, please supply a valid pid_file using -p or --pid"

data/config/default.yml

@@ -11,4 +11,4 @@ chart:
     color: '#3CB371'
 stats_collector:
   number_of_stats: 6
-  time_period_in_secs: 30
+  time_period_in_secs: 10

data/lib/pimon/stats_collector.rb

@@ -40,16 +40,15 @@ class StatsCollector
     time = @stats.range(:time)
     
     stats = {
-              :time => { :stats => time.map { |t| (/\d\d:\d\d:\d\d/.match(t))[0] } }
-            }
+      :time => { :stats => time.map { |t| (/\d\d:\d\d:\d\d/.match(t))[0] } }
+    }
     
     @probes.each do |probe|
-      stats[probe.symbol] =
-       { 
-         :stats => @stats.range(probe.symbol).map(&:to_i),
-         :color => @config.chart[probe.symbol][:color],
-         :unit => probe.unit
-       } unless probe.symbol == :time
+      stats[probe.symbol] = {
+        :stats => @stats.range(probe.symbol),
+        :color => @config.chart[probe.symbol][:color],
+        :unit => probe.unit
+      } unless probe.symbol == :time
     end
     
     stats.to_json

data/lib/pimon/version.rb

@@ -1,3 +1,3 @@
 module Pimon
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/pimon.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   
   s.add_runtime_dependency     'haml',              '~> 3.1.7'
-  s.add_runtime_dependency     'sinatra',           '~> 1.3.2'
+  s.add_runtime_dependency     'sinatra',           '~> 1.3.3'
   s.add_runtime_dependency     'sinatra-websocket', '~> 0.2.0'
   s.add_runtime_dependency     'thin',              '~> 1.5.0'
   
-  s.add_development_dependency 'rack-test',  '~> 0'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'simplecov-rcov'
-  s.add_development_dependency 'timecop'
+  s.add_development_dependency 'rack-test',  '~> 0.6.2'
+  s.add_development_dependency 'simplecov', '~> 0.7.1'
+  s.add_development_dependency 'simplecov-rcov', '~> 0.2.3'
+  s.add_development_dependency 'timecop', '~> 0.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pimon
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: sinatra-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,55 +90,55 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 description: Pimon is a simple server monitor designed for the Raspberry Pi.
 email:
 - pedro.carrico@gmail.com