heartbeat-client 0.1.2 → 0.1.3

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 gem 'httparty'
 gem 'daemons'
+gem 'sys-cpu'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     daemons (1.1.4)
+    ffi (1.0.11)
     git (1.2.5)
     httparty (0.8.1)
       multi_json
@@ -15,6 +16,8 @@ GEM
     rake (0.9.2.2)
     rcov (0.9.11)
     shoulda (2.11.3)
+    sys-cpu (0.7.0)
+      ffi (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -26,3 +29,4 @@ DEPENDENCIES
   jeweler (~> 1.5.2)
   rcov
   shoulda
+  sys-cpu

data/Rakefile

@@ -21,7 +21,9 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ["Oliver Kiessler"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  gem.add_runtime_dependency 'daemons'
+  gem.add_runtime_dependency 'sys-cpu'
+  gem.add_runtime_dependency 'httparty'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/heartbeat-client.rb

@@ -1,10 +1,12 @@
 require 'rubygems'
 gem 'httparty'
 require 'httparty'
-require 'pp'
 require 'logger'
+require "sys/cpu"
+require 'pp'
 
 class Heartbeat
+  include Sys
   include HTTParty
   base_uri 'http://heartbeat-server.herokuapp.com'
 
@@ -22,10 +24,13 @@ class Heartbeat
   
   def self.create(apikey)
     cpu = 0; load_average = 0; memory_used = 0; memory_free = 0
-    output = is_mac? ? `top -l 1`.chomp : `top -n 1`.chomp
 
-    # puts output.split('\n').first.inspect
-    # TODO analyse output
+    if self.is_mac?
+      load_average = CPU.load_avg.first
+    elsif self.is_linux?
+      cpus = `iostat -c`.split
+      cpu = 100 - cpus.last.to_i
+    end
 
     options = {
       :body => {
@@ -43,7 +48,6 @@ class Heartbeat
       }
     }
 
-    pp Heartbeat.post('/heartbeat', options)    
-    # log.info("Heartbeat sent...")
+    pp Heartbeat.post('/heartbeat', options)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heartbeat-client
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 Z
+date: 2011-12-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -55,12 +55,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
+  name: sys-cpu
   prerelease: false
-  type: :development
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: shoulda
+  prerelease: false
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,9 +88,9 @@ dependencies:
   name: bundler
   prerelease: false
   type: :development
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,9 +104,9 @@ dependencies:
   name: jeweler
   prerelease: false
   type: :development
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,11 +118,53 @@ dependencies:
   name: rcov
   prerelease: false
   type: :development
-  requirement: *id006
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: daemons
+  prerelease: false
+  type: :runtime
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: sys-cpu
+  prerelease: false
+  type: :runtime
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: httparty
+  prerelease: false
+  type: :runtime
+  requirement: *id010
 description: Heartbeat Client in Ruby
 email: kiessler@inceedo.com
-executables: 
-- heartbeat_client
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -122,7 +178,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/heartbeat_client
 - lib/heartbeat-client.rb
 - lib/heartbeat_proc.rb
 - test/helper.rb

data/bin/heartbeat_client

@@ -1,2 +0,0 @@
-#!/bin/bash
-ruby `dirname "$0"`/../lib/heartbeat_proc.rb $1