warcorrespondent 0.2.1 → 0.2.3

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+warcorrespondent.gemspec

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/bin/warcorrespondent

@@ -9,8 +9,19 @@ end
 
 require 'daemons'
 
-Daemons.run_proc('warcorrespondent.rb') do
-  WarCorrespondent::setup
-  WarCorrespondent::run
+if !WarCorrespondent::config_file
+  WarCorrespondent::Installer::install
+  exit
+end
+
+if WarCorrespondent::config_file
+  Daemons.run_proc('warcorrespondent.rb') do
+    WarCorrespondent::setup
+    WarCorrespondent::run
+  end
+else
+  puts "Could not find config file although it should have been installed."
+  puts "Maybe you should try it manually, see documentation."
+  puts "I'm bailing out now..."
 end
 

data/lib/warcorrespondent/installer.rb

@@ -0,0 +1,74 @@
+module WarCorrespondent
+  module Installer
+    
+    TEXT_INTRO = <<-EOT
+warcorrespondent could not find your config file and will now guide you
+through the setup process.
+
+Do you want to install system-wide (1) or in your home directory(2)? [1]
+EOT
+
+    TEXT_TARGET = <<-EOT
+Where do you want warcorrespondent to report to?
+If you want to report to warroom, just press enter [http://warroom.tliff.de/reports]
+EOT
+
+    TEXT_SECRET = <<-EOT
+What is the secret this warcorrespondent instance will
+use to authenticate to warroom?
+EOT
+
+    TEXT_BASIC_SETUP = <<-EOT
+warcorrespondent can now set up basic reporting for this host.
+Would you like to have that set up for you(y/n)[y]?
+EOT
+
+    TEXT_TEMPLATE = <<-EOT
+WarCorrespondent::Reporters::CPU.new(:identifier => 'hosts:@@HOST@@:stats')
+WarCorrespondent::Reporters::LoadAvg.new(:identifier => 'hosts::@@HOST@@:stats')
+WarCorrespondent::Reporters::Memory.new(:identifier => 'hosts::@@HOST@@:stats')
+WarCorrespondent::Reporters::Net.new(:identifier => 'hosts::@@HOST@@:stats')
+EOT
+
+    TEXT_DONE = <<-EOT
+Setup is now complete.
+EOT
+
+
+    def self.install
+      puts TEXT_INTRO
+      basepath = nil
+      while (cmd = gets.strip) && !['1', '2', ''].member?(cmd) do end
+      if cmd == '1' || cmd == '' then
+        basepath = '/etc/warcorrespondent'
+      elsif cmd == '2'
+        basepath = File.expand_path('~/.warcorrespondent')
+      end
+      #create the directory if necessary
+      if !File.exists?(basepath) then Dir.mkdir(basepath) end
+      if !File.exists?(basepath+"/reporters") then Dir.mkdir(basepath+"/reporters") end
+      config = {}
+      puts TEXT_TARGET
+      url = gets.strip
+      config['url'] = url.empty? ? "http://warroom.tliff.de/reports" : url
+      puts TEXT_SECRET
+      while (config['secret'] = gets.strip) && config['secret'].empty? do end
+      File.open( "#{basepath}/warcorrespondent.yml", 'w+' ) do |f|
+        YAML.dump(config, f)
+      end
+
+      puts TEXT_BASIC_SETUP
+      while (cmd = gets.strip) && !['y', 'n', ''].member?(cmd) do end
+      if cmd == 'y' || cmd == '' then
+        hostname = `hostname`.strip
+
+        File.open("#{basepath}/reporters/basic.rb", "w+") do |f|
+          f.write(TEXT_TEMPLATE.gsub(/@@HOST@@/, hostname))
+        end
+      end
+
+      puts TEXT_DONE
+
+    end    
+  end
+end

data/lib/warcorrespondent/reporter.rb

@@ -39,6 +39,6 @@ module WarCorrespondent
   
 end
 
-Dir.glob(File.dirname(__FILE__) + "/reporters/*.rb") do |i| 
-  require i 
+Dir.glob(File.dirname(__FILE__) + "/reporters/*.rb") do |i|
+  require i
 end

data/lib/warcorrespondent/reporters/loadavg.rb

@@ -5,11 +5,11 @@ module WarCorrespondent
         @block = Proc.new do
           load = SystemInformation::load
           [
-            {:identifier => "load:1", :type => "float", :value => load[:load_1]},
-            {:identifier => "load:5", :type => "float", :value => load[:load_5]},
-            {:identifier => "load:15", :type => "float", :value => load[:load_15]},
-            {:identifier => "processes:running", :type => "integer", :value => load[:procs_running]},
-            {:identifier => "processes:total", :type => "integer", :value => load[:procs_total]}
+            {:identifier => "load:1", :value => load[:load_1]},
+            {:identifier => "load:5", :value => load[:load_5]},
+            {:identifier => "load:15", :value => load[:load_15]},
+            {:identifier => "processes:running", :value => load[:procs_running]},
+            {:identifier => "processes:total", :value => load[:procs_total]}
           ]
         end
         super(args)

data/lib/warcorrespondent.rb

@@ -1,26 +1,46 @@
 require 'warcorrespondent/reporter.rb'
 require 'warcorrespondent/uplink.rb'
+require 'warcorrespondent/installer.rb'
 require 'json'
 require 'systeminformation'
 require 'yaml'
 
 module WarCorrespondent
-  CONFIG_FILE = '/etc/warcorrespondent/warcorrespondent.yml'
-  REPORTERS_DIRECTORIES = '/etc/warcorrespondent/reporters'
+
+  def self.config_base_directory
+    [ '/etc/warcorrespondent', '~/.warcorrespondent'].each do |f|
+      if File.exists?(File.expand_path(f))
+        return File.expand_path(f)
+      end
+    end
+    nil
+  end
+
+  def self.config_file
+    config_base_directory+"/warcorrespondent.yml" if config_base_directory
+  end
   
+  def self.reporters_directory
+    config_base_directory+"/reporters" if config_base_directory
+  end
+
   def self.setup
     @@reporters ||= []
     @@uplink = Uplink.new
     begin
-      @@config = YAML.load_file(CONFIG_FILE)
+      @@config = YAML.load_file(config_file)
       @@uplink.url = @@config['url']
       @@uplink.secret = @@config['secret']
     rescue
-      raise "Could not load config file #{CONFIG_FILE}"
+      raise "Could not load config file #{config_file}"
       exit
     end
-    Dir.glob("#{REPORTERS_DIRECTORIES}/*.rb").each do |i| 
-      require i 
+    Dir.glob("#{reporters_directory}/*.rb").each do |i| 
+      begin
+        require i 
+      rescue
+        puts "Parse error in #{i}. Bailing out."
+      end
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Stefan Maier
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +02:00
+date: 2010-06-14 00:00:00 +02:00
 default_executable: warcorrespondent
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -33,6 +34,7 @@ dependencies:
   name: daemons
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -45,6 +47,7 @@ dependencies:
   name: systeminformation
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -70,7 +73,9 @@ files:
 - Rakefile
 - VERSION
 - bin/warcorrespondent
+- dev
 - lib/warcorrespondent.rb
+- lib/warcorrespondent/installer.rb
 - lib/warcorrespondent/reporter.rb
 - lib/warcorrespondent/reporters/cpu.rb
 - lib/warcorrespondent/reporters/loadavg.rb
@@ -78,7 +83,6 @@ files:
 - lib/warcorrespondent/reporters/net.rb
 - lib/warcorrespondent/reporters/users.rb
 - lib/warcorrespondent/uplink.rb
-- warcorrespondent.gemspec
 has_rdoc: true
 homepage: http://github.com/tliff/warcorrespondent
 licenses: []
@@ -89,6 +93,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -96,6 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -105,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: warcorrespondent reports to the warroom.

data/warcorrespondent.gemspec

@@ -1,64 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{warcorrespondent}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Stefan Maier"]
-  s.date = %q{2010-06-10}
-  s.default_executable = %q{warcorrespondent}
-  s.description = %q{warcorrespondent collects data and reports it back to warroom.}
-  s.email = %q{stefanmaier@gmail.com}
-  s.executables = ["warcorrespondent"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/warcorrespondent",
-     "lib/warcorrespondent.rb",
-     "lib/warcorrespondent/reporter.rb",
-     "lib/warcorrespondent/reporters/cpu.rb",
-     "lib/warcorrespondent/reporters/loadavg.rb",
-     "lib/warcorrespondent/reporters/memory.rb",
-     "lib/warcorrespondent/reporters/net.rb",
-     "lib/warcorrespondent/reporters/users.rb",
-     "lib/warcorrespondent/uplink.rb",
-     "warcorrespondent.gemspec"
-  ]
-  s.homepage = %q{http://github.com/tliff/warcorrespondent}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{warcorrespondent reports to the warroom.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_runtime_dependency(%q<systeminformation>, [">= 0"])
-    else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<systeminformation>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<systeminformation>, [">= 0"])
-  end
-end
-