notifyme 1.0.1 → 1.0.2

data/lib/notifyme/check.rb

@@ -2,7 +2,7 @@ module NotifyMe
   class Check
     class << self
       def process(args = {})
-        unless %x{ps aux | grep #{args[:name]} | grep -v grep}.strip == ''
+        if %x{ps aux | grep #{args[:name]} | grep -v grep}.strip == ''
           raise "Process #{args[:name]} is not running!"
         end
       end

data/lib/notifyme/start.rb

@@ -1,6 +1,7 @@
 module NotifyMe
 
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
+  DEFAULT_CONFIG_FILE = "#{ENV['HOME']}/.notifyme/notifyme_config.rb"
 
   autoload :Task, 'notifyme/task'
   autoload :Log, 'notifyme/log'
@@ -12,15 +13,15 @@ module NotifyMe
       # log 
       @@log_args = [:stdout]
       @@log_format = :text
-      @@log_directory = "/tmp"
 
       # tasks list
       @@tasks = []
 
       def run!
-        puts 'NotifyMe v' + NotifyMe::VERSION
+        puts 'NotifyMe v' + VERSION
+        @@config_file = ARGV[0] || DEFAULT_CONFIG_FILE 
         load_custom_check_functions
-        start = new(ARGV[0])
+        start = new(@@config_file)
         load_custom_check_tasks
         start.run
       end
@@ -30,7 +31,7 @@ module NotifyMe
         if File.exists? file
           load file
           puts "Loaded custom check functions from #{file}."
-        end        
+        end
       end
 
       def load_custom_check_tasks
@@ -48,7 +49,47 @@ module NotifyMe
       end
 
       def custom_notifyme_dir
-        File.join(ENV['HOME'], ".notifyme")
+        notifyme_dir = File.join(ENV['HOME'], ".notifyme")
+        return notifyme_dir if File.directory?(notifyme_dir)
+
+        setup notifyme_dir
+      end
+
+      def setup(notifyme_dir)
+        FileUtils.mkdir_p notifyme_dir
+        FileUtils.mkdir_p File.join(notifyme_dir, 'check')
+
+        if @@config_file == DEFAULT_CONFIG_FILE 
+          default_config_file = File.expand_path(File.dirname(__FILE__) + '/../../notifyme_config.rb')
+          basic_config = File.read(default_config_file).split('# add some tasks').first
+          File.open("#{notifyme_dir}/notifyme_config.rb", "w") do |f|
+            f.write basic_config + "\nend"
+          end
+        end
+
+        File.open("#{notifyme_dir}/check.rb", "w") do |f|
+          f.write <<-EOF
+class NotifyMe::Check
+  class << self
+    # def something(args = {}) 
+    #  return "Something went wrong of your system" if not true 
+    # end 
+  end 
+end
+          EOF
+        end
+
+        File.open("#{notifyme_dir}/check/mytask.rb", "w") do |f|
+          f.write <<-EOF
+def check_mytask(t)
+  # t.sleep_time = 5
+  # t.command = lambda { check :something }
+  # t.restart_command = lambda { `/etc/init.d/something restart` }
+end
+          EOF
+        end
+
+        notifyme_dir
       end
 
       def config(&block)
@@ -86,8 +127,7 @@ module NotifyMe
       end
 
       def log_directory(directory)
-        FileUtils.mkdir_p directory unless File.directory? directory
-        @@log_directory = directory
+        $stderr.puts "Warn: the \"log_direcotry\" has been deprecated. You can find the error messages in the /var/log/ directory."
       end
     end
 
@@ -96,6 +136,7 @@ module NotifyMe
       @mutex = Mutex.new
       @@tasks.each do |task|
         tasks_thread << Thread.new(task) do
+          next if task.name.nil? || task.sleep_time.nil?
           loop do
             Thread.current[:name] = task.name
             sleep task.sleep_time
@@ -139,11 +180,7 @@ module NotifyMe
     end
 
     def log_error(task_name, command, msg)
-      return if @@log_directory.nil?
-      log_file = File.join(@@log_directory, '/', "#{task_name}.log")
-      File.open(log_file, 'a') do |f|
-        f.write "[#{Time.new.to_s}] #{command} : #{msg}\n"
-      end
+      Syslog.log Syslog::LOG_ERR, "[#{Time.new.to_s}] #{task_name} # #{command} : #{msg}"
     end
 
     def initialize(config_file)

data/lib/notifyme.rb

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

data/notifyme_config.rb

@@ -28,8 +28,6 @@ NotifyMe::Start.config do
   # :csv, :text, :xml, :json
   log_format :text
 
-  log_directory '/tmp/notifyme'
-
   # add some tasks
 
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifyme
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons