notifyme 1.1.3 → 1.1.4

data/lib/notifyme/log/mail.rb

@@ -20,8 +20,8 @@ module NotifyMe
 
         default_from_email = 'notifyme@' + default_host
 
-        param[:subject] = "NotifyMe report: %s" 
-        param[:subject] = param[:subject] % task.name
+        param[:subject] = "NotifyMe report (#{fact(:hostname)} # #{fact(:ipaddress)}): #{task.name}"
+        param[:subject] = param[:subject] % 
 
         param[:from_email] ||= param[:account]
         param[:from_email] ||= default_from_email

data/lib/notifyme/log.rb

@@ -35,6 +35,10 @@ module NotifyMe
         @parameters = parameters
       end
 
+      def fact(name)
+        Facter.fact(name).value
+      end
+
       def can_log?(task)
         history = @@log_history[task.name]
         return true if history.nil?
@@ -73,6 +77,13 @@ module NotifyMe
       def to_xml(task)
         require 'rexml/document'
         xml = REXML::Element.new 'task'
+
+        extra_task_info.each do |k, v|
+          el = REXML::Element.new k.to_s
+          el.text = v.to_s 
+          xml.add_element el
+        end
+
         fields.each do |f|
           el = REXML::Element.new f.to_s
           el.text = task.send(f)
@@ -83,7 +94,7 @@ module NotifyMe
 
       def to_csv(task)
         require 'csv'
-        row = []
+        row = extra_task_info.values 
         fields.each do |f|
           row << task.send(f)
         end
@@ -92,6 +103,11 @@ module NotifyMe
 
       def to_text(task)
         output = ''
+        output << "\nSystem info:\n---------------\n"
+        extra_task_info.each do |k, v|
+          output << "#{k}: #{v}\n"
+        end
+        output << "\nTask info:\n---------------\n"
         fields.each do |f|
           output << "#{f}: #{task.send(f)}\n"
         end
@@ -99,7 +115,7 @@ module NotifyMe
       end
 
       def to_hash(task)
-        hash = {}
+        hash = extra_task_info
         fields.each do |f|
           hash[f] = task.send(f)
         end
@@ -109,6 +125,14 @@ module NotifyMe
       def fields
         [:name, :sleep_time, :start_run_time, :end_run_time, :result]
       end
+
+      def extra_task_info
+        {
+          :hostname => fact(:hostname),
+          :ipaddress => fact(:ipaddress),
+          :system => fact(:lsbdistdescription)
+        }
+      end
     end
   end
 end

data/lib/notifyme/start.rb

@@ -1,6 +1,6 @@
 module NotifyMe
 
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
   DEFAULT_CONFIG_FILE = "/root/.notifyme/notifyme_config.rb"
 
   autoload :Task, 'notifyme/task'

data/lib/notifyme.rb

@@ -2,4 +2,5 @@ require 'rubygems'
 require 'thread'
 require 'fileutils'
 require 'syslog'
+require 'facter'
 require 'notifyme/start'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifyme
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.13
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.17
 description: NotifyMe takes care more than one tasks and process their results for
   you, it's similar to *NIX's cronjob but can do more.
 email: xianhua.zhou@gmail.com