notifyme 1.1.4 → 1.1.5

data/lib/notifyme.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'mail'
 require 'thread'
 require 'fileutils'
 require 'syslog'

data/lib/notifyme/log/mail.rb

@@ -2,74 +2,66 @@ module NotifyMe
   module Log
     class Mail < Logger
       def <<(task)
-        require 'vendor/smtp_add_tls_support.rb'
-
         param = @parameters
         param = {} unless param.is_a?(Hash)
 
         # some default settings
-
         default_host = 'localhost'
-        if param[:tls]
-          default_port = 587
-          Net::SMTP.enable_tls
-        else
-          default_port = 25
-          Net::SMTP.disable_tls
+        smtp_port = param[:port]
+        unless smtp_port
+          smtp_port = param[:tls] ? 587 : 25
         end
+        smtp_host = (param[:address] || param[:host]) || default_host
 
-        default_from_email = 'notifyme@' + default_host
+        default_from_email = 'notifyme@' + smtp_host
 
         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
+        from = if param[:from_name]
+                 "#{param[:from_name]} <#{param[:from_email]}>"
+               else
+                 param[:from_email]
+               end
 
         param[:body] = param[:body_header].to_s + 
           generate(task) +
           param[:body_footer].to_s
 
-        smtp = Net::SMTP.new(
-          (param[:address] || param[:host]) || default_host, 
-          param[:port] || default_port
-        )
-
         # go go go!
         recipients = if param[:to_email].is_a? Hash
-                       param[:to_email].values
+                       param[:to_email].collect{|name, email| "#{name} <#{email}>"}
                      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], 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
+        mail = ::Mail.new do
+          from from
+          to recipients
+          subject param[:subject]
+          body param[:body]
+        end
 
-        time = Time.now
-        "From: #{param[:from_name] || param[:from_email]} <#{param[:from_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" \
-          << "Message-Id: <notifyme.#{task.name}.#{time.to_i}@example.com>\r\n" \
-        << "\r\n" \
-          << param[:body]
+        if param[:host]
+          smtp_settings = {
+            :address => smtp_host,
+            :port => param[:port] || smtp_port,
+            :domain => param[:helo_domain] || default_host,
+            :user_name => param[:account] || param[:user_name],
+            :password => param[:password],
+            :authentication => param[:authentication] || :plain,
+            :openssl_verify_mode => param[:openssl_verify_mode],
+            :enable_starttls_auto => param[:enable_starttls_auto] || true,
+            :tls => param[:tls],
+            :ssl => param[:ssl]
+          }
+          mail.delivery_method :smtp, smtp_settings
+        else
+          mail.delivery_method :sendmail
+        end
+        mail.deliver
       end
     end
   end

data/lib/notifyme/start.rb

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

data/notifyme_config.rb

@@ -5,20 +5,19 @@ NotifyMe::Start.config do
   log :mail, 
     :host => 'smtp.gmail.com',
     :helo_domain => 'gmail.com',
-    :tls => true,
 
     :account => 'xxx@gmail.com', 
     :password => '***',
 
     :from_email => 'from@gmail.com',
-    :from_name => 'from name',
+    :from_name => 'From Name',
 
     :to_email => 'to@gmail.com',
-    :to_name => 'to name'
+    :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'] 
+    :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'
@@ -30,8 +29,10 @@ NotifyMe::Start.config do
 
   # set nagios directory
   # nagios_directory "/usr/lib/nagios/plugins"
+  #
 
-  # add some tasks
+  ## !! NOTICE: for new installation,
+  ## !!         It's not recommended that to put "check tasks" in the notifyme_config.rb file.
 
   #
   # check disk space usage every 60 seconds, 
@@ -41,7 +42,7 @@ NotifyMe::Start.config do
     t.sleep_time = 60
     t.command = lambda {
       if %x{df -h}.scan(/\s+(\d+)%\s+/).find {|pcent| pcent.first.to_i > 95}
-        "Warning: at least 1 disk space usage > 95%"
+        raise "Warning: at least 1 disk space usage > 95%"
       else
         nil
       end

metadata

@@ -1,124 +1,120 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: notifyme
-version: !ruby/object:Gem::Version
-  version: 1.1.4
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.1.5
 platform: ruby
-authors:
+authors: 
 - xianhua.zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-03-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json_pure
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: http_request.rb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.13
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: http_request.rb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.13
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: facter
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.17
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mail
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !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.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.5.3
+  type: :runtime
+  version_requirements: *id005
+description: NotifyMe is a monitoring script, it can monitor processes, services etc. with ruby scripts.
 email: xianhua.zhou@gmail.com
-executables:
+executables: 
 - notifyme_daemon
 - notifyme
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/vendor/smtp_add_tls_support.rb
-- lib/notifyme/check.rb
-- lib/notifyme/log/file.rb
+
+files: 
+- lib/notifyme.rb
+- lib/notifyme/log.rb
 - lib/notifyme/log/mail.rb
 - lib/notifyme/log/stdout.rb
-- lib/notifyme/log.rb
+- lib/notifyme/log/file.rb
 - lib/notifyme/start.rb
+- lib/notifyme/check.rb
 - lib/notifyme/task.rb
-- lib/notifyme.rb
 - INSTALL
 - notifyme_config.rb
 - bin/notifyme_daemon
 - bin/notifyme
 homepage: http://github.com/xianhuazhou/NotifyMe
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: notifyme
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: It's a kind of cronjob.
 test_files: []
+

data/lib/vendor/smtp_add_tls_support.rb

@@ -1,113 +0,0 @@
-# http://happiness-is-slavery.net/wp-content/rails-plugins/smtp_add_tls_support/lib/smtp_add_tls_support.rb
-
-require 'net/smtp'
-require 'timeout'
-
-begin
-  require 'openssl'
-rescue LoadError
-end
-
-Net::SMTP.class_eval do
-
-  alias_method :old_initialize, :initialize
-  def initialize(hostname, port)
-    @usetls = @@usetls
-    old_initialize hostname, port
-  end
-
-  @@usetls = false
-
-  def self.enable_tls()
-    @@usetls = true
-  end
-
-  def self.disable_tls()
-    @@usetls = false
-  end
-
-  def self.use_tls?()
-    @@usetls
-  end
-
-  def use_tls?()
-    @usetls
-  end
-
-  def enable_tls()
-    @usetls = true
-  end
-
-  def disable_tls()
-    @usetls = false
-  end
-
-  def use_tls?()
-    @usetls
-  end
-
-  private
-  def do_start(helodomain, user, secret, authtype)
-    raise IOError 'SMTP session already started' if @started
-    check_auth_args user, secret if user or secret
-
-    sock = timeout(@open_timeout) {
-      TCPSocket.open(@address, @port)
-    }
-    @socket = Net::InternetMessageIO.new(sock)
-    @socket.read_timeout = @read_timeout
-    @socket.debug_output = nil
-
-    check_response(critical{
-      recv_response()
-    })
-    do_helo(helodomain)
-
-    if @usetls 
-      raise 'openssl is not installed' unless defined?(OpenSSL)
-      ssl = OpenSSL::SSL::SSLSocket.new(sock)
-      starttls
-      ssl.sync_close = true
-      ssl.connect
-
-      @socket = Net::InternetMessageIO.new(ssl)
-      @socket.read_timeout = @read_timeout
-      @socket.debug_output = nil
-      do_helo(helodomain)
-    end
-
-    authenticate user, secret, authtype if user
-    @started = true
-  ensure
-    @socket.close if not @started and @socket and not @socket.closed?
-  end
-
-  def do_helo(helodomain)
-    begin
-      if @esmtp
-        ehlo helodomain
-      else
-        helo helodomain
-      end
-    rescue Net::ProtocolError
-      if @esmtp
-        @esmtp = false
-        @error_occured = false
-        retry
-      end
-      raise
-    end
-  end
-
-  def starttls
-    getok('STARTTLS')
-  end
-
-  def quit
-    begin
-      getok('QUIT')
-    rescue EOFError
-      # gmail sucks
-    end
-  end
-end