omnibot 0.0.11 → 0.0.12

data/README.md

@@ -4,6 +4,8 @@ OmniBot
 Simple XMPP bot for server monitoring.
 Works with AMQP for sending messages at server side.
 Sends notifications to a user via XMPP.
+Checks e-mail and extracts attachments to a specified
+directory.
 
 Dependencies
 ------------
@@ -12,6 +14,8 @@ Dependencies
  * amqp 
  * xmpp4r 
  * eventmachine
+ * mail
+ * sqlite3
 
 Installation
 ------------
@@ -28,4 +32,4 @@ Send messages to omnibot by AMQP by running:
 Support
 -------
 
-Tested on Mac OS X 10.6 with Ruby 1.8
+Tested with ruby 1.8.6 and 1.9.2, rabbitmq as an AMQP server, at OS X 10.6 and Debian Linux.

data/examples/config.yaml

@@ -4,7 +4,7 @@ config:
   notifyjid: owner@example.com
   notifyresource: Adium.*
   periodiccommands: [ 'vnstat' ]
-	logpath: '/tmp/omnibot.log'
+	#logpath: '/tmp/omnibot.log'
   mails:
     - user: foobar@example.com
       password: secret

data/lib/omnibot.rb

@@ -7,6 +7,7 @@ require 'xmpp4r'
 require 'xmpp4r/client'
 require 'xmpp4r/roster'
 require 'mail'
+require 'sqlite3'
 require 'socket'
 require 'date'
 require 'tmpdir'

data/lib/omnibot/amqpconsumer.rb

@@ -4,6 +4,7 @@ module OmniBot
 	class AMQPConsumer
 
 		attr_accessor :handlers
+		attr_accessor :db
 
 		def send_message message
 			begin
@@ -39,7 +40,7 @@ module OmniBot
 					handler.start
 				end
 
-			rescue Object => e
+			rescue => e
 				OmniLog::error "Sending message error: #{e.message}\ntrace:\n#{Helpers::backtrace e}\nExiting..."
 				AMQP.stop{ EM.stop }
 			end

data/lib/omnibot/launcher.rb

@@ -9,22 +9,32 @@ module OmniBot
 			raise 'No config file found, checked command line and ~/.omnibot.yaml'
 		end
 
+		def ensure_omnidir
+			path = ENV['HOME']+'/.omnibot'
+			FileUtils.mkdir path unless File.directory? path unless File.directory? path
+			path
+		end
+
 		def get_log_path config
 			return config['logpath'] unless (config['logpath'] or '').empty?
-			return '/var/log/omnibot.log' if File.directory? '/var/log/'
-			return 'omnibot.log'
+			ensure_omnidir + '/omnibot.log' 
 		end
 
-		def get_store config
-			store_path = config['storepath']
-			unless File.directory? store_path
-				store_path = ENV['HOME']+'/.omnibot'
-				FileUtils.mkdir store_path unless File.directory? store_path
+		def get_db 
+			db = SQLite3::Database.new(ensure_omnidir + '/omnibot.sqlite3')
+			if db.execute("select * from sqlite_master where type='table' and name='received_messages'").empty?
+				db.execute <<-SQL
+					create table received_messages (
+						account TEXT,
+						message TEXT,
+						date TEXT
+					);
+				SQL
 			end
-			store_path + '/omnibot.store'
+			db
 		end
 
-		def provide_handlers config
+		def provide_handlers config, db
 			periodic_commands = ([config['periodiccommands']].flatten or [])
 			
 			mails = ([config['mails']].flatten or [])
@@ -42,7 +52,7 @@ module OmniBot
 				end +
 				mail_triggers.map do |trigger|
 					mail = mails.find { |m| m['user'] == trigger['for'] }
-					MailChecker.new mail, trigger
+					MailChecker.new mail, trigger, db
 				end
 		end
 
@@ -56,8 +66,10 @@ module OmniBot
 			OmniLog::log = Logger.new(log_path) 
 			OmniLog::log.level = Logger::DEBUG
 
+			db = get_db 
 			consumer = AMQPConsumer.new config
-			consumer.handlers = provide_handlers(config)
+			consumer.db = db
+			consumer.handlers = provide_handlers(config, db)
 			consumer.start 
 
 			OmniLog::log.close

data/lib/omnibot/loggedcommand.rb

@@ -7,7 +7,7 @@ module OmniBot
 				@jabber_messenger.call "#{banner} command #{command} failed with an error #{$?}:\n" + body
 			end
 			if body.strip != '' 
-				@jabber_messenger.call "#{banner} command #{command_str} succeeded with:\n" + body
+				@jabber_messenger.call "#{banner} command #{command} succeeded with:\n" + body
 			end			
 		end
 

data/lib/omnibot/mailchecker.rb

@@ -5,7 +5,6 @@ module OmniBot
 		include LoggedCommand
 
 		def on_first_timer
-			OmniLog::debug "Okay, it's near of midnight"
 			on_periodic_timer
 			@timer_provider.add_periodic_timer(3600) { on_periodic_timer }
 		end
@@ -18,27 +17,47 @@ module OmniBot
 		end
 
 		def match_conditions m
-			%w{ subject from to cc date}.any? { |condition| match_condition m, condition }
+			@conditions.empty? || %w{ subject from to cc date}.any? { |condition| match_condition m, condition }
 		end
 
 		def on_periodic_timer
-			OmniLog::info "Checking mail #{@mail_config['address']}"
-			Mail.all.each do |m|
-				OmniLog::info "   look at message from #{m.from} about #{m.subject}"
-				handle_message(m) if match_conditions m
+			begin
+				OmniLog::info "Checking mail #{@address}"
+				is_new_mail = false
+				Mail.all.each do |m|
+					rows = @db.execute "select message from received_messages where account=? and message=?", @address, m.message_id
+						
+					if rows.empty?
+						is_new_mail = true
+						OmniLog::info "New message from #{m.from} about #{m.subject}; id #{m.message_id}"
+						if match_conditions m
+							handle_message(m) 
+						end
+						@db.execute "insert into received_messages values(?, ?, ?)", @address, m.message_id, m.date.to_s
+					end
+				end
+				OmniLog::info "No new mail" unless is_new_mail
+			rescue => e
+				OmniLog::error "MailChecker error: #{e.message}\ntrace:\n#{Helpers::backtrace e}"
 			end
 		end
 
 		def handle_message m
 			OmniLog::info "Matched " + m.inspect.to_s
-			attached = m.attachments.find { |a| a.mime_type =~ /application\/x-zip.*/ }
+			attached = m.attachments.find { |a| a.mime_type =~ /application\/(zip|x-zip|rar|x-rar).*/ }
 			if attached
 				Dir.mktmpdir('omniatt') do |tmpdir|
 					filename = tmpdir + '/' + attached.filename
 					OmniLog::info "Writing attachment to #{filename}"
 					File.open(filename,'w') { |f| f.write attached.read }
 					Dir.chdir(@unpack_to) do
-						system("unzip -oq '#{filename}'")
+						if filename =~ /\.zip$/
+							system("unzip -oq '#{filename}'")
+						elsif filename =~ /\.rar$/
+							system("unrar x -y '#{filename}'")
+						else
+							raise "Wrong filetype"
+						end
 						raise "Error extracting file #{filename} to #{@unpack_to}" if $? != 0
 					end
 					  
@@ -66,13 +85,14 @@ module OmniBot
 		attr_writer :timer_provider
 		attr_writer :startup_pause
 
-		def initialize mail_config, trigger_config 
+		def initialize mail_config, trigger_config, db
 			@startup_pause = 0
 			@mail_config = mail_config
-			@conditions = trigger_config['if']
+			@db = db
+			@conditions = (trigger_config['if'] or {})
 			@unpack_to = trigger_config['unpack_to']
 			@command_post = trigger_config['command_post']
-			@send_to = trigger_config['send_to']
+			@address = trigger_config['for']
 
 			mailhash = yaml_to_mailhash(mail_config)
 			Mail.defaults do
@@ -84,7 +104,7 @@ module OmniBot
 		end
 		
 		def to_s
-			"Mail checker for #{@send_to}"
+			"Mail checker for #{@address}"
 		end
 
 		def start

data/lib/omnibot/periodiccommand.rb

@@ -6,14 +6,17 @@ module OmniBot
 		include OmniBot::LoggedCommand
 
 		def on_first_timer
-			OmniLog::debug "Okay, it's near of midnight"
 			on_periodic_timer
 			@timer_provider.add_periodic_timer(24*3600) { on_periodic_timer }
 		end
 
 		def on_periodic_timer
-			OmniLog::info "Reporting command #{@command}"
-			jabber_logged_command 'Periodic command', @command
+			begin
+				OmniLog::info "Reporting command #{@command}"
+				jabber_logged_command 'Periodic command', @command
+			rescue => e
+				OmniLog::error "PeriodicCommand error: #{e.message}\ntrace:\n#{Helpers::backtrace e}"
+			end
 		end
 
 	public

data/lib/omnibot/version.rb

@@ -1,3 +1,3 @@
 module OmniBot
-	VERSION = '0.0.11'
+	VERSION = '0.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnibot
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &70163940523880 !ruby/object:Gem::Requirement
+  requirement: &70295142817300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163940523880
+  version_requirements: *70295142817300
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70163940523040 !ruby/object:Gem::Requirement
+  requirement: &70295142815520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163940523040
+  version_requirements: *70295142815520
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70163936528020 !ruby/object:Gem::Requirement
+  requirement: &70295142814260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163936528020
+  version_requirements: *70295142814260
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70163936526040 !ruby/object:Gem::Requirement
+  requirement: &70295142813420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163936526040
+  version_requirements: *70295142813420
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70295142812580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70295142812580
 description: Works with AMQP for sending messages at server side.Sends notifications
   to an user via XMPP.Can monitor system by performing daily commands.
 email: theirix@gmail.com
@@ -99,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2655669642277178237
+      hash: 1612202538999953127
 requirements:
 - AMQP-compatible server (for example, RabbitMQ)
 rubyforge_project: nowarning