@@ -11,7 +11,7 @@ puts "irccat 0.2 (http://irccat.rubyforge.org/)" Thread.new { @bot = IrcCat::Bot.new(:host => @config['irc']['host'], :port => @config['irc']['port'], - :nick => @config['irc']['nick'], :channel => @config['irc']['channel']) + :nick => @config['irc']['nick'], :channel => @config['irc']['channel']) } Thread.new { lib/irc_cat.rb @@ -6,121 +6,121 @@ module IrcCat # The IRC bot class Bot - attr_accessor :socket, :host, :port, :nick, :channel - - # Initialize the bot with default values - def initialize(constructor = H.new) - @realname = 'irccat - http://irccat.rubyforge.org/' - @refresh_rate = 10 - - constructor.each do |key, val| - if val.is_a?(String) - instance_eval("@#{key} = '#{val}'") - elsif val.is_a?(Array) - instance_eval("@#{key} = []") - val.each do |v| instance_eval("@#{key}.push('#{v}')") end - end - end - puts "Connecting to IRC #{@host}:#{@port} #{@channel}" - end - - def run - @socket = TCPSocket.open(@host, @port) - login - + attr_accessor :socket, :host, :port, :nick, :channel + + # Initialize the bot with default values + def initialize(constructor = H.new) + @realname = 'irccat - http://irccat.rubyforge.org/' + @refresh_rate = 10 + + constructor.each do |key, val| + if val.is_a?(String) + instance_eval("@#{key} = '#{val}'") + elsif val.is_a?(Array) + instance_eval("@#{key} = []") + val.each do |v| instance_eval("@#{key}.push('#{v}')") end + end + end + puts "Connecting to IRC #{@host}:#{@port} #{@channel}" + end + + def run + @socket = TCPSocket.open(@host, @port) + login + + + threads=[] + + threads << Thread.new { + begin + while line = @socket.gets do + # Remove all formatting + line.gsub!(/[\x02\x1f\x16\x0f]/,'') + # Remove CTCP ASCII + line.gsub!(/\001/,'') + # Send to event handler + handle line + # Handle Pings from Server + sendln "PONG #{$1}" if /^PING\s(.*)/ =~ line + end + rescue EOFError + err 'Server Reset Connection' + rescue Exception => e + err e + end + } + threads << Thread.new { + } + threads.each { |th| th.join } - threads=[] - - threads << Thread.new { - begin - while line = @socket.gets do - # Remove all formatting - line.gsub!(/[\x02\x1f\x16\x0f]/,'') - # Remove CTCP ASCII - line.gsub!(/\001/,'') - # Send to event handler - handle line - # Handle Pings from Server - sendln "PONG #{$1}" if /^PING\s(.*)/ =~ line - end - rescue EOFError - err 'Server Reset Connection' - rescue Exception => e - err e - end - } - threads << Thread.new { - } - threads.each { |th| th.join } - - - end - - # Announces states - def announce(msg) - @channels.each do |channel| - say(channel, msg) - end - end - - # Say something funkeh - def say(chan,msg) - sendln "PRIVMSG #{chan} :#{msg}" - end - - private - - # Sends a message to the server - - def sendln(cmd) - if cmd.size <= 510 - @socket.write("#{cmd}\r\n") - STDOUT.flush - else - end - end - - # Handle a received message - - def handle(line) - if line =~ /^:.+\s376/ - join_channels - elsif line =~ /^:.+KICK #([^\s]+)/ - auto_rejoin($1) - end - end - - # Automatic events - - def join_channels - sendln "JOIN #{@channel}" - end - - - def auto_rejoin(channel) - sendln "JOIN ##{channel}" - end - - def login - begin - #user = @mail.split("@") - sendln "NICK #{@nick}" - sendln "USER irc_cat . . :#{@realname}" - rescue Exception => e - err e - end - end - - # Loggin methods - - def log(str) - $stdout.puts "DEBUG: #{str}" - end - - def err(exception) - $stderr.puts "ERROR: #{exception}" - $stderr.puts "TRACE: #{exception.backtrace}" - end - + + end + + # Announces states + def announce(msg) + @channels.each do |channel| + say(channel, msg) + end + end + + # Say something funkeh + def say(chan,msg) + sendln "PRIVMSG #{chan} :#{msg}" + end + + private + + # Sends a message to the server + + def sendln(cmd) + if cmd.size <= 510 + @socket.write("#{cmd}\r\n") + STDOUT.flush + else + end + end + + # Handle a received message + + def handle(line) + if line =~ /^:.+\s376/ + join_channels + elsif line =~ /^:.+KICK #([^\s]+)/ + auto_rejoin($1) + end + end + + # Automatic events + + def join_channels + sendln "JOIN #{@channel}" + end + + + def auto_rejoin(channel) + sendln "JOIN ##{channel}" + end + + def login + begin + #user = @mail.split("@") + sendln "NICK #{@nick}" + sendln "USER irc_cat . . :#{@realname}" + rescue Exception => e + err e + end + end + + # Loggin methods + + def log(str) + $stdout.puts "DEBUG: #{str}" + end + + def err(exception) + $stderr.puts "ERROR: #{exception}" + $stderr.puts "TRACE: #{exception.backtrace}" + end + end end \ No newline at end of file lib/irc_cat/bot.rb @@ -5,25 +5,25 @@ require 'json' require 'json/add/rails' class Index < Mongrel::HttpHandler - def process(request, response) - response.start(200) do |head,out| - head["Content-Type"] = "text/html" - out.write("Welcome to irc_cat This irc_cat is ready to use:) Just send a GET to : <code>/send/your message</code>. byekthx") - end - end + def process(request, response) + response.start(200) do |head,out| + head["Content-Type"] = "text/html" + out.write("Welcome to irc_cat This irc_cat is ready to use:) Just send a GET to : <code>/send/your message</code>. byekthx") + end + end end class Send < Mongrel::HttpHandler - def initialize(bot, config); @bot = bot; @config = config; end + def initialize(bot, config); @bot = bot; @config = config; end - def process(request, response) - response.start(200) do |head,out| - head["Content-Type"] = "text/plain" - message = CGI::unescape("#{request.params['PATH_INFO'].gsub('/','')}") - @bot.say(@config['irc']['channel'],"#{message}") - end - end + def process(request, response) + response.start(200) do |head,out| + head["Content-Type"] = "text/plain" + message = CGI::unescape("#{request.params['PATH_INFO'].gsub('/','')}") + @bot.say(@config['irc']['channel'],"#{message}") + end + end end class Github < Mongrel::HttpHandler @@ -33,8 +33,8 @@ class Github < Mongrel::HttpHandler def process(request, response) response.start(200) do |head,out| head["Content-Type"] = "text/plain" - js = CGI.parse(request.body.read) - json = JSON.parse(js['payload'].join(',')) + post = CGI.parse(request.body.read) + json = JSON.parse(post['payload'].join(',')) json['commits'].each do |c| @bot.say(@config['irc']['channel'],"[#{json['repository']['name']}] New commit by #{c.last['author']['name']} : #{c.last['message'].gsub(/\n(.*)/, '...')} - #{c.last['url']}") end @@ -43,16 +43,16 @@ class Github < Mongrel::HttpHandler end module IrcCat - class HttpServer - def initialize(bot, config, ip, port) - @bot = bot - @config = config - puts "Starting HTTP (#{ip}:#{port})" - h = Mongrel::HttpServer.new(ip, port) - h.register("/", Index.new) - h.register("/send", Send.new(@bot, @config)) - h.register("/github", Github.new(@bot, @config)) if @config['http']['github'] == true - h.run.join - end - end # HttpServer + class HttpServer + def initialize(bot, config, ip, port) + @bot = bot + @config = config + puts "Starting HTTP (#{ip}:#{port})" + h = Mongrel::HttpServer.new(ip, port) + h.register("/", Index.new) + h.register("/send", Send.new(@bot, @config)) + h.register("/github", Github.new(@bot, @config)) if @config['http']['github'] == true + h.run.join + end + end # HttpServer end # IrcCat \ No newline at end of file lib/irc_cat/http_server.rb @@ -1,23 +1,23 @@ # The TCP Server module IrcCat - class TcpServer - - def initialize(bot,config,ip='127.0.0.1',port='8080') - @socket = TCPserver.new(ip,port) - puts "Starting TCP (#{ip}:#{port})" - - loop do - Thread.start(@socket.accept) do |s| - str = s.recv( 400 ) - sstr = str.split(/\n/) - sstr.each do |l| - bot.say(config['irc']['channel'],"#{l}") - end - s.close - end # |s| - end # loop - - end # initialize - - end # TcpServer + class TcpServer + + def initialize(bot,config,ip='127.0.0.1',port='8080') + @socket = TCPserver.new(ip,port) + puts "Starting TCP (#{ip}:#{port})" + + loop do + Thread.start(@socket.accept) do |s| + str = s.recv( 400 ) + sstr = str.split(/\n/) + sstr.each do |l| + bot.say(config['irc']['channel'],"#{l}") + end + s.close + end # |s| + end # loop + + end # initialize + + end # TcpServer end # IrcCat \ No newline at end of file lib/irc_cat/tcp_server.rb 7e7ab974c7e6fb1eabbc8b60f915884e568ee6da Jordan Bracco jordan@bracco.name http://github.com/webs/irccat/commit/9ece269782343746239ab2ea539702f1360a316e 9ece269782343746239ab2ea539702f1360a316e

2008-02-16T18:54:36-08:00

removed \t :p 780696e3cf8cd32b02ee8c6f4ebf573bc24ec7bd Jordan Bracco jordan@bracco.name