notifyme 0.3 → 0.4

data/README.rdoc

@@ -22,7 +22,60 @@ $ notifyme_daemon stop
 
 == Example
 
-Please check the notifyme_config.rb file.
+== Check HTTP Server (e.g. Nginx)
+
+  require 'socket'
+
+  NotifyMe::Start.config do
+    # output to the console
+    log :stdout
+
+    # output format is text
+    log_format :text
+
+    # define the task 
+    task :checking_http_server do |t| 
+
+      # running every 5 seconds
+      t.sleep_time = 5 
+
+      # checking command
+      t.command = lambda { 
+        begin
+          TCPSocket.new('localhost', 80) 
+          nil 
+        rescue Exception => e
+          e.to_s
+        end 
+      }   
+
+      # if the server is not running, the restart_command will be executed
+      t.restart_command = lambda { %x{/etc/init.d/nginx start} }
+    end 
+
+  end
+
+== Check the "cupsd" process (from "ps -e")
+
+  NotifyMe::Start.config do
+    log :stdout
+    log_format :json 
+    task :checking_cupsd do |t| 
+      t.sleep_time = 5 
+      t.command = lambda {
+        if %x{ps -e}.include? " cupsd"
+          nil 
+        else
+          "Warnning: the process cupsd is not running!"
+        end 
+      }   
+      t.restart_command = lambda {
+         `/etc/init.d/cups start`
+      }   
+    end 
+  end
+
+More please check the notifyme_config.rb file.
 
 == Output
 
@@ -30,8 +83,8 @@ The output from every task's command will be processed (send to endpoint) only i
 
 == Version
 
-v 0.3
+v 0.4
 
-== Author
+== TODO
 
-xianhua.zhou@gmail.com
+Add some SPECS

data/lib/notifyme/log/mail.rb

@@ -36,19 +36,34 @@ module NotifyMe
         )
 
         # go go go!
+        recipients = if param[:to_email].is_a? Hash
+                       param[:to_email].values
+                     else
+                       param[:to_email]
+                     end
         smtp.start(param[:helo_domain] || default_host, 
                    param[:account], 
                    param[:password], 
-                   param[:authtype] || :plain) do |mail|
-          mail.send_message message(param, task), param[:from_email], param[:to_email]
-                   end
+                   param[:authtype] || :plain
+                  ) do |mail|
+                    mail.send_message message(param, task), param[:from_email], recipients 
+                  end
       end
 
       private
       def message(param, task)
+        to = case param[:to_email]
+             when Hash
+               param[:to_email].collect{|k, v| "#{k} <#{v}>" }.join(', ')
+             when Array
+               param[:to_email].collect{|v| "#{v.split('@').first} <#{v}>"}.join(", ")
+             else
+               "#{param[:to_name] || param[:to_email].split('@').first} <#{param[:to_email]}>"
+             end
+
         time = Time.now
         "From: #{param[:from_name] || param[:from_email]} <#{param[:from_email]}>\r\n" \
-        << "To: #{param[:to_name] || param[:to_email]} <#{param[:to_email]}>\r\n" \
+        << "To: #{to}\r\n" \
         << "Subject: #{param[:subject]}\r\n" \
         << "Date: #{time.to_s}\r\n" \
         << "Content-type: text/plain; charset=UTF-8\r\n" \

data/lib/notifyme/start.rb

@@ -3,7 +3,7 @@ require 'notifyme/log'
 
 module NotifyMe
 
-  VERSION = '0.3'
+  VERSION = '0.4'
 
   class Start
     class << self

data/notifyme_config.rb

@@ -1,9 +1,3 @@
-class MyTask
-  def call
-    Time.now.to_s
-  end
-end
-
 NotifyMe::Start.config do
   log :stdout
 
@@ -18,8 +12,13 @@ NotifyMe::Start.config do
 
     :from_email => 'from@gmail.com',
     :from_name => 'from name',
+
     :to_email => 'to@gmail.com',
     :to_name => 'to name'
+
+    # or
+    :to_email => {'User a' => 'a@gmail.com', 'User b' => 'b@gmail.com'}
+    :to_email => ['User a <a@gmail.com>', 'User b<b@gmail.com'] 
 =end
 
   # log :file, '/tmp/test.txt'
@@ -33,14 +32,32 @@ NotifyMe::Start.config do
 
   # add some tasks
 
-  task :checking_disk do |t|
-    t.sleep_time = 3
-    t.command = Proc.new { %x{df -h} }
+  #
+  # check disk space usage every 60 seconds, 
+  # if one of the disks' space usage > 95%, notification will be sent.
+  #
+  task :checking_disk_usage do |t|
+    t.sleep_time = 60 
+    t.command = lambda {
+      if %x{df -h}.scan(/\s+(\d+)%\s+/).find {|pcent| pcent.first.to_i > 95} 
+        "Warnning: at least 1 disk space usage > 95%"
+      else
+        nil 
+      end
+    } 
   end
 
-  task :checking_date do |t|
-    t.sleep_time = 2
-    t.command = MyTask
-    t.restart_command = Proc.new { %x{dates} }
+  task :checking_localhost_http do |t|
+    t.sleep_time = 5
+    t.command = lambda { 
+      require 'socket'
+      begin
+        TCPSocket.new('localhost', 80)
+        nil
+      rescue Exception => e
+        e.to_s
+      end
+    } 
+    t.restart_command = lambda { %x{/etc/init.d/httpd start} }
   end
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - xianhua.zhou
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +08:00
+date: 2011-09-03 00:00:00 +08:00
 default_executable: notifyme_daemon
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,20 +56,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/notifyme.rb
 - lib/vendor/smtp_add_tls_support.rb
-- lib/notifyme/log/stdout.rb
+- lib/notifyme/log.rb
+- lib/notifyme/task.rb
 - lib/notifyme/log/mail.rb
+- lib/notifyme/log/stdout.rb
 - lib/notifyme/log/file.rb
-- lib/notifyme/task.rb
 - lib/notifyme/start.rb
-- lib/notifyme/log.rb
-- lib/notifyme.rb
 - README.rdoc
 - CHANGELOG
 - INSTALL
 - notifyme_config.rb
-- bin/notifyme
 - bin/notifyme_daemon
+- bin/notifyme
 has_rdoc: true
 homepage: http://github.com/xianhuazhou/NotifyMe
 licenses: []