omnibot 0.0.21 → 0.0.22

data/lib/omnibot/launcher.rb

@@ -1,83 +1,72 @@
 # encoding: utf-8
 
 module OmniBot
+  # entry point
+  class Launcher
+    def get_config_path(args)
+      return args[0] if args[0] && File.file?(args[0])
+      path = ENV['HOME'] + '/.local/share/omnibot/omnibot.yaml'
+      return path if File.file?(path)
+      raise 'No config file found, checked command line and ~/.local/share/omnibot/omnibot.yaml'
+    end
 
-	# entry point
-	class Launcher
-		def get_config_path args
-			return args[0] if args[0] && File.file?(args[0])
-			path = File.join(ENV['HOME'],'.omnibot.yaml')
-			return path if ENV['HOME'] && File.file?(path)
-			raise 'No config file found, checked command line and ~/.omnibot.yaml'
-		end
+    def ensure_omnidir
+      path = ENV['HOME'] + '/.local/share/omnibot'
+      FileUtils.mkdir path unless File.directory? path
+      path
+    end
 
-		def ensure_omnidir
-			path = ENV['HOME']+'/.omnibot'
-			FileUtils.mkdir path unless File.directory? path unless File.directory? path
-			path
-		end
+    def log_path(config)
+      return config['logpath'] unless (config['logpath'] || '').empty?
+      ensure_omnidir + '/omnibot.log'
+    end
 
-		def get_log_path config
-			return config['logpath'] unless (config['logpath'] or '').empty?
-			ensure_omnidir + '/omnibot.log' 
-		end
+    def create_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
+      db
+    end
 
-		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
-			db
-		end
+    def provide_handlers(config, db)
+      periodic_commands = [config['periodiccommands']].flatten.compact
 
-		def provide_handlers config, db
-			periodic_commands = [config['periodiccommands']].flatten.compact
-			
-			mails = [config['mails']].flatten.compact
-			mail_triggers = [config['mailtriggers']].flatten.compact
-			mail_triggers.each do |mt|
-				raise 'No mail found for a trigger' unless mails.find { |m| m['user'] == mt['for'] }
-				raise 'Not supported action' unless mt['action'] == 'unpack'
-			end
-			used_mails = mails.select { |m| mail_triggers.find { |mt| m['user'] == mt['for'] } }
-			raise 'Sorry but multiple mail addresses is not supported yet' if used_mails.size > 1
+      mails = [config['mails']].flatten.compact
+      mail_triggers = [config['mailtriggers']].flatten.compact
+      mail_triggers.each do |mt|
+        raise 'No mail found for a trigger' unless mails.find { |m| m['user'] == mt['for'] }
+        raise 'Not supported action' unless mt['action'] == 'unpack'
+      end
+      used_mails = mails.select { |m| mail_triggers.find { |mt| m['user'] == mt['for'] } }
+      raise 'Sorry but multiple mail addresses is not supported yet' if used_mails.size > 1
 
-			[] + 
-				periodic_commands.map do |command|
-					PeriodicCommand.new command
-				end +
-				mail_triggers.map do |trigger|
-					mail = mails.find { |m| m['user'] == trigger['for'] }
-					MailChecker.new mail, trigger, db
-				end
-		end
+      [] +
+        periodic_commands.map { |command| PeriodicCommand.new command } +
+        mail_triggers.map { |trigger| MailChecker.new(mails.find { |m| m['user'] == trigger['for'] }, trigger, db) }
+    end
 
-		def start args
-			config_path = get_config_path args
-			puts "Using config at #{config_path}"
-			config = YAML.load_file(config_path)["config"]
+    def start(args)
+      config_path = get_config_path args
+      puts "Using config at #{config_path}"
+      config = YAML.load_file(config_path)['config']
 
-			log_path = get_log_path config
-			puts "Using log at #{log_path}"
-			OmniLog::log = Logger.new(log_path) 
-			OmniLog::log.level = Logger::DEBUG
+      OmniLog::log = Logger.new(log_path(config))
+      OmniLog::log.level = Logger::DEBUG
 
-			db = get_db 
-			consumer = AMQPConsumer.new config
-			consumer.db = db
-			consumer.handlers = provide_handlers(config, db)
-			consumer.start 
+      db = create_db
+      consumer = AMQPConsumer.new config
+      consumer.db = db
+      consumer.handlers = provide_handlers(config, db)
+      consumer.start
 
-			OmniLog::log.close
-		end
-	end
+      OmniLog::log.close
+    end
+  end
 end
-
-
-

data/lib/omnibot/loggedcommand.rb

@@ -1,20 +1,19 @@
 # encoding: utf-8
 
 module OmniBot
-	module LoggedCommand
+  module LoggedCommand
+    def jabber_logged_command(banner, command)
+      body = `#{command}`
+      if $? != 0
+        @jabber_messenger.call "#{banner} command #{command} failed with an error #{$?}:\n" + body
+      end
+      if body.strip != ''
+        @jabber_messenger.call "#{banner} command #{command} succeeded with:\n" + body
+      end
+    end
 
-		def jabber_logged_command banner, command
-			body = `#{command}`
-			if $? != 0
-				@jabber_messenger.call "#{banner} command #{command} failed with an error #{$?}:\n" + body
-			end
-			if body.strip != '' 
-				@jabber_messenger.call "#{banner} command #{command} succeeded with:\n" + body
-			end			
-		end
-
-		def set_jabber_messenger &block
-			@jabber_messenger = block
-		end
-	end
+    def jabber_messenger(&block)
+      @jabber_messenger = block
+    end
+  end
 end

data/lib/omnibot/mailchecker.rb

@@ -1,118 +1,110 @@
 # encoding: utf-8
 
 module OmniBot
-
-	class MailChecker
-
-		include LoggedCommand
-
-		def on_first_timer
-			on_periodic_timer
-			@timer_provider.add_periodic_timer(3600) { on_periodic_timer }
-		end
-
-		def match_condition m, condition_name, mail_name = condition_name
-			values = m.send(mail_name)
-			[values].flatten.any? do |value| 
-				@conditions[condition_name] && Regexp.new(@conditions[condition_name]).match(value.to_s)
-			end
-		end
-
-		def match_conditions m
-			@conditions.empty? || %w{ subject from to cc date}.any? { |condition| match_condition m, condition }
-		end
-
-		def on_periodic_timer
-			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\/(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
-						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
-					  
-					message_body = "Received an email '#{m.subject}' from '#{m.from.join(',')}' with "+
-							"an attachment #{attached.filename}. Successfully extracted an attachment to #{@unpack_to}."
-					@jabber_messenger.call message_body
-
-					jabber_logged_command 'Mail post-receive ', "#{@command_post} #{filename} #{@unpack_to}"
-				end
-			else
-				OmniLog::info "No attachment found" 
-			end
-		end
-		
-		def yaml_to_mailhash yaml_config
-		 { :address => yaml_config['host'],
-		 	 :port => yaml_config['port'],
-		 	 :user_name => yaml_config['user'],
-		 	 :password => yaml_config['password'],
-		 	 :enable_ssl => yaml_config['ssl']
-			}
-		end
-
-	public
-		attr_writer :timer_provider
-		attr_writer :startup_pause
-
-		def initialize mail_config, trigger_config, db
-			@startup_pause = 0
-			@mail_config = mail_config
-			@db = db
-			@conditions = (trigger_config['if'] or {})
-			@unpack_to = trigger_config['unpack_to']
-			@command_post = trigger_config['command_post']
-			@address = trigger_config['for']
-
-			mailhash = yaml_to_mailhash(mail_config)
-			Mail.defaults do
-				retriever_method :pop3, mailhash
-			end
-
-			raise 'Wrong command' if (@command_post or '') == ''
-			raise 'No dir to extract to' unless File.directory? @unpack_to
-		end
-		
-		def to_s
-			"Mail checker for #{@address}"
-		end
-
-		def start
-			@timer_provider.add_timer(@startup_pause) { on_first_timer }
-		end
-	end
-
+  class MailChecker
+    include LoggedCommand
+
+    def on_first_timer
+      on_periodic_timer
+      @timer_provider.add_periodic_timer(3600) { on_periodic_timer }
+    end
+
+    def match_condition(m, condition_name, mail_name = condition_name)
+      values = m.send(mail_name)
+      [values].flatten.any? do |value|
+        @conditions[condition_name] && Regexp.new(@conditions[condition_name]).match(value.to_s)
+      end
+    end
+
+    def match_conditions(m)
+      @conditions.empty? || %w( subject from to cc date).any? { |condition| match_condition m, condition }
+    end
+
+    def on_periodic_timer
+      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
+
+        next unless rows.empty?
+        is_new_mail = true
+        OmniLog::info "New message from #{m.from} about #{m.subject}; id #{m.message_id}"
+        handle_message(m) if match_conditions(m)
+        @db.execute 'insert into received_messages values(?, ?, ?)', @address, m.message_id, m.date.to_s
+      end
+      OmniLog::info 'No new mail' unless is_new_mail
+    rescue => e
+      OmniLog::error "MailChecker error: #{e.message}\ntrace:\n#{Helpers::backtrace e}"
+    end
+
+    def handle_message(m)
+      OmniLog::info 'Matched ' + m.inspect.to_s
+      attached = m.attachments.find { |a| a.mime_type =~ %r{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
+            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
+
+          message_body = "Received an email '#{m.subject}' from '#{m.from.join(',')}' with "\
+            "an attachment #{attached.filename}. Successfully extracted an attachment to #{@unpack_to}."
+          @jabber_messenger.call message_body
+
+          jabber_logged_command 'Mail post-receive ', "#{@command_post} #{filename} #{@unpack_to}"
+        end
+      else
+        OmniLog::info 'No attachment found'
+      end
+    end
+
+    def yaml_to_mailhash(yaml_config)
+      { address: yaml_config['host'],
+        port: yaml_config['port'],
+        user_name: yaml_config['user'],
+        password: yaml_config['password'],
+        enable_ssl: yaml_config['ssl']
+       }
+    end
+
+    public
+
+    attr_writer :timer_provider
+    attr_writer :startup_pause
+
+    def initialize(mail_config, trigger_config, db)
+      @startup_pause = 0
+      @mail_config = mail_config
+      @db = db
+      @conditions = (trigger_config['if'] || {})
+      @unpack_to = trigger_config['unpack_to']
+      @command_post = trigger_config['command_post']
+      @address = trigger_config['for']
+
+      mailhash = yaml_to_mailhash(mail_config)
+      Mail.defaults do
+        retriever_method :pop3, mailhash
+      end
+
+      raise 'Wrong command' if (@command_post || '') == ''
+      raise 'No dir to extract to' unless File.directory? @unpack_to
+    end
+
+    def to_s
+      "Mail checker for #{@address}"
+    end
+
+    def start
+      @timer_provider.add_timer(@startup_pause) { on_first_timer }
+    end
+  end
 end
-

data/lib/omnibot/omnisend.rb

@@ -1,27 +1,25 @@
 # encoding: utf-8
 
 module OmniBot
+  class OmniSend
+    def start(args)
+      if args.empty?
+        message = STDIN.readlines.join
+      else
+        message = args.join(' ')
+      end
+      puts "Sending message #{message}"
+      data = Base64.encode64(Marshal.dump(message))
 
-	class OmniSend
+      Signal.trap('INT') { AMQP.stop { EM.stop } }
 
-		def start args
-			if args.empty? 
-				message = STDIN.readlines.join
-			else
-				message = args.join(' ')
-			end
-			puts "Sending message #{message}"
-			data = Base64.encode64(Marshal.dump(message))
-
-			Signal.trap('INT') { AMQP.stop{ EM.stop } }
-
-			AMQP.start do |connection|
-				mq = AMQP::Channel.new(connection)
-				exchange = mq.direct(Helpers::amqp_exchange_name)
-				exchange.publish(data, :routing_key => Helpers::amqp_routing_key)
-				EM.add_timer(2.0) { connection.close { puts 'sent' ; EM.stop } }
-			end
-		end
-	end
+      AMQP.start do |connection|
+        mq = AMQP::Channel.new(connection)
+        exchange = mq.direct(Helpers::amqp_exchange_name)
+        exchange.publish(data, routing_key: Helpers::amqp_routing_key)
+        EM.add_timer(2.0) { connection.close { EM.stop } }
+      end
+      puts 'Sent'
+    end
+  end
 end
-

data/lib/omnibot/periodiccommand.rb

@@ -1,49 +1,44 @@
 # encoding: utf-8
 
 module OmniBot
-
-	# Send to jabber user result of a daily command
-	class PeriodicCommand
-
-		include OmniBot::LoggedCommand
-
-		def on_first_timer
-			on_periodic_timer
-			@timer_provider.add_periodic_timer(24*3600) { on_periodic_timer }
-		end
-
-		def on_periodic_timer
-			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
-		attr_writer :timer_provider
-		attr_writer :startup_pause
-
-		def initialize command 
-			@command = command
-			@startup_pause = 0
-
-			raise 'Wrong command' if (@command or '') == ''
-		end
-
-		def to_s
-			"Periodic command '#{@command}'"
-		end
-
-		def start
-			now = Time.now
-			tomorrow = DateTime.now+1
-			next_report_time = Time.local(tomorrow.year, tomorrow.month, tomorrow.day, 1, 0, 0)
-			next_report_time = next_report_time + @startup_pause
-			@timer_provider.add_timer(next_report_time - now) { on_first_timer }
-		end
-	end
-
+  # Send to jabber user result of a daily command
+  class PeriodicCommand
+    include OmniBot::LoggedCommand
+
+    def on_first_timer
+      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
+    rescue => e
+      OmniLog::error "PeriodicCommand error: #{e.message}\ntrace:\n#{Helpers::backtrace e}"
+    end
+
+    public
+
+    attr_writer :timer_provider
+    attr_writer :startup_pause
+
+    def initialize(command)
+      @command = command
+      @startup_pause = 0
+
+      raise 'Wrong command' if (@command || '') == ''
+    end
+
+    def to_s
+      "Periodic command '#{@command}'"
+    end
+
+    def start
+      now = Time.now
+      tomorrow = DateTime.now + 1
+      next_report_time = Time.local(tomorrow.year, tomorrow.month, tomorrow.day, 1, 0, 0)
+      next_report_time += @startup_pause
+      @timer_provider.add_timer(next_report_time - now) { on_first_timer }
+    end
+  end
 end
-