spoonsix-dognotgod 0.1.4 → 0.1.5

data/app/models/disk.rb

@@ -6,7 +6,6 @@ class Disk < Sequel::Model
 		set_schema do
 			primary_key :id
 			integer :file_system_id
-			string :mounted_on
 			integer :used
 			integer :available
 			timestamp :created_at

data/app/models/file_system.rb

@@ -21,7 +21,7 @@ class FileSystem < Sequel::Model
 	def size_in_Gb
 	  last_entry = DB[:disks].filter(:file_system_id => self.id).reverse_order(:created_at).last
 	  if last_entry
-      (last_entry[:available] + last_entry[:used]) / 1024 / 1024
+      (last_entry[:available].to_i + last_entry[:used].to_i) / 1024 / 1024
     else
       0
     end

data/client.rb

@@ -1,24 +1,29 @@
 require 'rubygems'
 require 'optparse'
 require 'restclient'
+require 'lib/base.rb'
+require 'lib/client_commands.rb'
 
 module DogNotGod
 
   class Client
-
+    
+    capture [:load_stats, :disk_stats, :memory_stats]
+    
     def initialize(argv)
+      
       @argv = argv
       
       # Default options values
       @options = {
         :server_addr                => "127.0.0.1",
         :server_port                => "4567",
-        :timeout                    => 5
+        :timeout                    => 10
       }
       
       parse!
       
-      @endpoint = "http://#{@options[:server_addr]}:#{@options[:server_port]}"
+      @resource = RestClient::Resource.new("http://#{@options[:server_addr]}:#{@options[:server_port]}")
     end
     
     def parser
@@ -45,39 +50,16 @@ module DogNotGod
     end
 
     def run!
-      hostname = %x[hostname].split("\n")[0]
-      uptime = %x[uptime]
-      avgs = uptime.scan(/(\d+\.\d\d)/)
-      
       
-      # the 'free' command is not available on Mac OSX
-      mem = %x[free].split("\n")
-      mem.shift # lose column headers
-      mem_available = mem[0].split(" ")[3]
-      mem_used = mem[0].split(" ")[2]
-      swap_available = mem[2].split(" ")[3]
-      swap_used = mem[2].split(" ")[2]
-      
-      
-      df = %x[df -ak].split("\n")
-      df.shift # lose column headers
-      
-      begin
-       RestClient.post("#{@endpoint}/load_stats", :load_5_min => avgs[0], :load_10_min => avgs[1], :load_15_min => avgs[2], :hostname => hostname)
-        puts "Load info sent successfully."
-        
-        df.each do |line|
-          info = line.split(" ")
-          RestClient.post("#{@endpoint}/file_system_stats", :file_system_name => info[0], :mounted_on => info[-1], :used => info[2], :available => info[3], :hostname => hostname)
+      @@command_symbols.each do |command_name_symbol|
+        begin
+          command = DogNotGod::Commands.factory(command_name_symbol)
+          command.run!(@resource)
+        rescue
+          raise
         end
-        puts "Filesystem info sent successfully."
-        
-        RestClient.post("#{@endpoint}/mem_stats", :hostname => hostname, :mem_available => mem_available, :mem_used => mem_used, :swap_available => swap_available, :swap_used => swap_used)
-        puts "Memory and swap info sent successfully."
-        
-      rescue
-        puts "There was a problem connecting to the server on #{@endpoint}."
       end
+      
     end
     
   end

data/server.rb

@@ -98,7 +98,7 @@ post "/file_system_stats" do
     host = get_host_or_create_if_not_exist(params[:hostname])
     fs   = get_fs_or_create_if_not_exist(host[:id], params[:file_system_name], params[:mounted_on])
     
-    disk_stats = Disk.new({:file_system_id => fs[:id], :mounted_on => params[:mounted_on], :used => params[:used], :available => params[:available]})
+    disk_stats = Disk.new({:file_system_id => fs[:id], :used => params[:used], :available => params[:available]})
     disk_stats.save
     status(201)
   rescue

data/views/layout.haml

@@ -3,9 +3,6 @@
   %head
     %title dog not god
     %link{:rel=>'stylesheet', :href=>'/stylesheets/style.css', :type => "text/css"}
-    %script{:src => "http://www.google.com/jsapi"}
-    %script google.load("jquery", "1");
-    %script{:src => "/javascripts/flot/jquery.flot.pack.js"}
 
   
   %body
@@ -15,7 +12,7 @@
       =yield
     #footer
       %p 
-        %a{ :href => "http://github.com/luiscorreadalmeida/dog" } dog not god
+        %a{ :href => "http://github.com/spoosix/dognotgod" } dog not god
         is released under the 
         %a{ :href => "http://www.gnu.org/licenses/gpl.html" } GPL license
       

data/views/main.haml

@@ -20,8 +20,6 @@
         %td= "#{host.available_disk_space_in_Gb}Gb out of #{host.total_disk_space_in_Gb}Gb (#{sprintf('%.2f', (host.available_disk_space_in_Gb.to_f / host.total_disk_space_in_Gb) * 100)}%)" if host.total_disk_space_in_Gb > 0
         %td= "#{host.available_memory_in_Mb}Mb out of #{host.total_memory_in_Mb}Mb (#{sprintf('%.2f', (host.available_memory_in_Mb.to_f / host.total_memory_in_Mb) * 100)}%)" if host.total_memory_in_Mb > 0
         %td= "#{host.available_swap_in_Mb}Mb out of #{host.total_swap_in_Mb}Mb (#{sprintf('%.2f', (host.available_swap_in_Mb.to_f / host.total_swap_in_Mb) * 100)}%)" if host.total_swap_in_Mb > 0
-      
-
 
 %table{:id => "section-table"}
   %tr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spoonsix-dognotgod
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Luis Correa d'Almeida
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
+date: 2009-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,8 @@ files:
 - app/models/host.rb
 - app/models/load.rb
 - app/models/memory.rb
+- lib/base.rb
+- lib/client_commands.rb
 - config.ru
 - README.md
 - views/layout.haml