pimon 0.1.6 → 0.1.7

data/Gemfile

@@ -1,6 +1,5 @@
 source :rubygems
 
-gem 'capistrano', '~> 2.13.5'
 gem 'haml', '~> 3.1.7'
 gem 'sinatra', '~> 1.3.3', :require => 'sinatra/base'
 gem 'sinatra-websocket', '~> 0.2.0'
@@ -13,5 +12,5 @@ group :test do
   gem 'rspec', '~> 2.12.0'
   gem 'simplecov', '~> 0.7.1', :require => false
   gem 'simplecov-rcov', '~> 0.2.3'
-  gem 'timecop', '~> 0.5.4'
+  gem 'timecop', '~> 0.5.9'
 end

data/Gemfile.lock

@@ -2,12 +2,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.2)
-    capistrano (2.13.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
     coderay (1.0.8)
     daemons (1.1.9)
     diff-lcs (1.1.3)
@@ -16,16 +10,8 @@ GEM
       eventmachine (>= 0.12.9)
     eventmachine (1.0.0)
     haml (3.1.7)
-    highline (1.6.15)
     method_source (0.8)
     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.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -63,13 +49,12 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    timecop (0.5.4)
+    timecop (0.5.9.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano (~> 2.13.5)
   haml (~> 3.1.7)
   pry
   rack-test (~> 0.6.2)
@@ -79,4 +64,4 @@ DEPENDENCIES
   sinatra (~> 1.3.3)
   sinatra-websocket (~> 0.2.0)
   thin (~> 1.5.0)
-  timecop (~> 0.5.4)
+  timecop (~> 0.5.9)

data/README.md

@@ -17,8 +17,9 @@ Optionally you may install it as a gem and run it, please check "Installing as a
 ## Configuration
 Configuration is done through a YAML file, you may check some examples on the config directory.
 
-2. chart - colors for each chart
-4. stats_collector - configure number of stats and time period between them
+1. chart - colors for each chart
+2. hostname - optional hostname to show on the chart subtitle, defaults to `hostname` if not set
+3. stats_collector - configure number of stats and time period between them
 
 ## Installing as a gem
 ```

data/bin/pimon

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$: << "#{File.dirname(__FILE__)}/../lib"
 require 'optparse'
 
 options = {}
@@ -43,6 +44,12 @@ Options:
           'File to store PID (default: /tmp/pimon.pid)') do |pid_file|
     options[:pid_file] = pid_file
   end
+  
+  opts.on('-v',
+          '--version',
+          'Display Pimon version') do |pid_file|
+    ARGV[0] = 'version'
+  end
 end
 
 begin
@@ -83,6 +90,9 @@ begin
     else
       puts "Pid file not found at #{pid_file}, please supply a valid pid_file using -p or --pid"
     end
+  when 'version'
+    require 'pimon/version'
+    puts "Pimon version is #{Pimon::VERSION}"
   else
     STDERR.puts option_parser
   end

data/config/test.yml

@@ -1,7 +1,3 @@
-basic_auth:
-  enabled: true
-  username: pimon
-  password: pimon
 chart:
   cpu:
     color: '#D2691E'
@@ -13,13 +9,7 @@ chart:
     color: '#FF9B04'
   swap:
     color: '#3CB371'
-queues:
-  time: pimon_time
-  cpu:  pimon_cpu
-  disk: pimon_disk
-  mem:  pimon_mem
-  swap: pimon_swap
-  temp: pimon_temp
+hostname: 'test_hostname'
 stats_collector:
   number_of_stats: 6
   time_period_in_min: 10

data/lib/pimon/pimon_config.rb

@@ -14,6 +14,10 @@ class PimonConfig
     @config[:stats_collector]
   end
   
+  def hostname
+    @hostname ||= @config[:hostname].nil? ? `hostname` : @config[:hostname]
+  end
+  
   private
   
   def initialize(filename)

data/lib/pimon/public/index.js

@@ -46,7 +46,7 @@ $(function () {
                 x: -20
             },
             subtitle: {
-                text: 'My raspberry PI',
+                text: o.hostname,
                 x: -20
             },
             xAxis: {

data/lib/pimon/stats_collector.rb

@@ -40,7 +40,8 @@ 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] } },
+      :hostname => @config.hostname
     }
     
     @probes.each do |probe|

data/lib/pimon/version.rb

@@ -1,3 +1,3 @@
 module Pimon
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'.freeze
 end

data/pimon.gemspec

@@ -4,7 +4,7 @@ require 'pimon/version'
 
 Gem::Specification.new do |s|
   s.name        = "pimon"
-  s.version     = Pimon::VERSION
+  s.version     = Pimon::VERSION.dup
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Pedro Carriço' ]
   s.email       = [ 'pedro.carrico@gmail.com' ]
@@ -28,5 +28,5 @@ Gem::Specification.new do |s|
   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'
+  s.add_development_dependency 'timecop', '~> 0.5.9'
 end

data/spec/pimon_config_spec.rb

@@ -6,6 +6,7 @@ describe 'PimonConfig' do
     
     its(:chart) { should == { :cpu => { :color => '#D2691E' }, :disk => { :color => '#CDC673' }, :mem => { :color => '#87CEFA' }, :temp => {:color=>"#FF9B04"}, :swap => { :color => '#3CB371' } } }
     its(:stats) { should == { :number_of_stats => 6, :time_period_in_min => 10 } }
+    its(:hostname) { should == 'test_hostname' }
   end
   
   context 'when created with an invalid environment' do

data/spec/stats_collector_spec.rb

@@ -23,6 +23,7 @@ describe 'StatsCollector' do
     its(:show_stats) { 
                         should == {
                           :time => { :stats => [] },
+                          :hostname => 'test_hostname',
                           :cpu => { :stats => [], :color => '#D2691E', :unit => '%' },
                           :mem => { :stats => [], :color => '#87CEFA', :unit => '%' },
                           :swap => {:stats => [], :color => '#3CB371', :unit => '%' },
@@ -49,6 +50,7 @@ describe 'StatsCollector' do
       its(:show_stats) {
                           should == {
                             :time => { :stats => ['12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00', '12:00:00']},
+                            :hostname => 'test_hostname',
                             :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.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.9
 description: Pimon is a simple server monitor designed for the Raspberry Pi.
 email:
 - pedro.carrico@gmail.com