on_irc 2.0.0 → 2.0.1

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/examples/bot.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.join(File.dirname(__FILE__), '..', 'lib', 'on_irc')
 
-IRC.configure do
+bot = IRC.new do
   nick 'on_irc'
   ident 'on_irc'
   realname 'on_irc Ruby IRC library'
@@ -9,41 +9,32 @@ IRC.configure do
   server :eighthbit do
     address 'irc.eighthbit.net'
   end
-  
-  server :freenode do
-    address 'irc.freenode.org'
-  end
 end
 
 
-IRC[:freenode].on :'001' do |e|
-  IRC.send(e.server, :join, '#botters')
-end
-
-IRC[:eighthbit].on :'001' do |e|
-  IRC.send(e.server, :join, '#offtopic')
+bot[:eighthbit].on '001' do
+  join '#bots'
 end
 
-IRC.on :privmsg do |e|
-  case e.params[1]
+bot.on :privmsg do
+  case params[1]
   when '!ping'
-    IRC.send(e.server, :privmsg, e.params[0], e.prefix.split('!').first + ': pong')
+    msg(params[0], prefix.split('!').first + ': pong')
   when /^!echo (.*)/
-    s = $1
-    IRC.send(e.server, :privmsg, e.params[0], e.prefix.split('!').first + ': ' + s)
+    msg(params[0], prefix.split('!').first + ': ' + $1)
   when /^!join (.*)/
-    IRC.send(e.server, :join, $1)
+    join $1
   end
 end
 
-IRC.on :ping do |e|
-  IRC.send(e.server, :pong, e.params[0])
+bot.on :ping do
+  pong params[0]
 end
 
-IRC.on :all do |e|
-  prefix = "(#{e.prefix}) " unless e.prefix.empty?
-  puts "#{e.server}: #{prefix}#{e.command} #{e.params.inspect}"
+bot.on :all do
+  p = "(#{prefix}) " unless prefix.empty?
+  puts "#{server.name}: #{p}#{command} #{params.inspect}"
 end
 
-IRC.connect
+bot.connect
 

data/examples/regex_bot.rb

@@ -5,26 +5,26 @@ MAX_BANGS = 3
 CH_USER_MEMORY = {}
 CHANNEL_MEMORY = {}
 
-IRC.configure do
+bot = IRC.new do
   nick 'reggie'
   ident 'reggie'
   realname 'uses on_irc Ruby IRC library'
-  
+
   server :eighthbit do
     address 'irc.eighthbit.net'
   end
-  
+
 #  server :freenode do
 #    address 'irc.freenode.org'
 #  end
 end
 
-IRC[:eighthbit].on :'001' do
+bot[:eighthbit].on :'001' do
   join '#programming'
   join '#offtopic'
 end
 
-IRC.on :privmsg do
+bot.on :privmsg do
   next unless params[0][0,1] == '#' # make sure regex replace only happens in channels
   channel = params[0]
   nick = prefix.split('!').first
@@ -85,14 +85,14 @@ IRC.on :privmsg do
   end
 end
 
-IRC.on :ping do
+bot.on :ping do
   pong params[0]
 end
 
-IRC.on :all do
+bot.on :all do
   prefix_str = "(#{prefix}) " unless prefix.empty?
   puts "#{server}: #{prefix_str}#{command} #{params.inspect}"
 end
 
-IRC.connect
+bot.connect
 

data/examples/relay.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.join(File.dirname(__FILE__), '..', 'lib', 'on_irc')
 
-IRC.configure do
+bot = IRC.new do
   nick 'on_irc-relay'
   ident 'on_irc'
   realname 'on_irc Ruby IRC library - relay example'
@@ -16,32 +16,31 @@ IRC.configure do
 end
 
 
-IRC[:freenode].on :'001' do |e|
-  IRC.send(e.server, :join, '#botters')
+bot[:freenode].on '001' do
+  join '#botters'
 end
 
-IRC[:eighthbit].on :'001' do |e|
-  IRC.send(e.server, :join, '#offtopic')
+bot[:eighthbit].on '001' do
+  join '#offtopic'
 end
 
-IRC.on :privmsg do |e|
-  case e.params[1]
+bot.on :privmsg do
+  case params[1]
   when /^fn> (.*)/
-    msg = $1
-    IRC.send(:freenode, :privmsg, '#botters', "<8b:#{e.prefix.split('!').first}> #{msg}") if e.params[0] == '#offtopic' && e.server == :eighthbit
+    bot[:freenode].send_cmd(:privmsg, '#botters', "<8b:#{prefix.split('!').first}> #{$1}") if params[0] == '#offtopic' && server.name == :eighthbit
   when /^8b> (.*)/
-    msg = $1
-    IRC.send(:eighthbit, :privmsg, '#offtopic', "<fn:#{e.prefix.split('!').first}> #{msg}") if e.params[0] == '#botters' && e.server == :freenode
+    bot[:eighthbit].send_cmd(:privmsg, '#offtopic', "<fn:#{prefix.split('!').first}> #{$1}") if params[0] == '#botters' && server.name == :freenode
   end
 end
 
-IRC.on :ping do |e|
-  IRC.send(e.server, :pong, e.params[0])
+bot.on :ping do
+  pong params[0]
 end
 
-IRC.on :all do |e|
-  prefix = "(#{e.prefix}) " unless e.prefix.empty?
-  puts "#{e.server}: #{prefix}#{e.command} #{e.params.inspect}"
+bot.on :all do
+  p = "(#{prefix}) " unless prefix.empty?
+  puts "#{server.name}: #{p}#{command} #{params.inspect}"
 end
 
-IRC.connect
+bot.connect
+

data/lib/on_irc.rb

@@ -3,45 +3,45 @@
   require File.join(File.dirname(__FILE__), 'on_irc', lib)
 end
 
-module IRC
-  class << self
-    attr_accessor :config, :handlers
-    config_accessor :nick, :ident, :realname, :servers
-    
-    def configure(&block)
-      @config = ConfigDSL.run(&block)
-      @handlers = {}
-    end
+class IRC
+  attr_accessor :config, :handlers, :servers
+  config_accessor :nick, :ident, :realname
 
-    def on(event, &block)
-      @handlers[event.to_s.downcase.to_sym] = Callback.new(block)
-    end
-    
-    def [](server_id)
-      servers[server_id]
-    end
-    
-    def send(server, cmd, *args)
-      cmd = cmd.to_s.upcase
-      args[-1] = ':' + args[-1]
-      IRC[server].connection.command(cmd, *args)
+  def initialize(&block)
+    @config = ConfigDSL.run(&block)
+    @servers = {}
+    @config.servers.each do |server_id, server_conf|
+      @servers[server_id] = Server.new(self, server_id, server_conf)
     end
+    @handlers = {}
+  end
+
+  def on(event, &block)
+    @handlers[event.to_s.downcase.to_sym] = Callback.new(block)
+  end
 
-    def connect
-      EventMachine.run do
-        servers.each do |id, server|
-          server.connection = EM.connect(server.address, server.port, Connection, id)
-        end
+  def [](server_id)
+    servers[server_id]
+  end
+
+  def send_cmd(server_id, cmd, *args)
+    servers[server_id].send_cmd(cmd, *args)
+  end
+
+  def connect
+    EventMachine.run do
+      servers.values.each do |server|
+        server.connection = EM.connect(server.address, server.port, Connection, server)
       end
     end
-
-#   for ssl
-#      require 'openssl'
-#      ssl_context = OpenSSL::SSL::SSLContext.new
-#      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-#      @socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
-#      @socket.sync = true
-#      @socket.connect
   end
+
+  #   for ssl
+  #      require 'openssl'
+  #      ssl_context = OpenSSL::SSL::SSLContext.new
+  #      ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  #      @socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_context)
+  #      @socket.sync = true
+  #      @socket.connect
 end
 

data/lib/on_irc/callback.rb

@@ -1,21 +1,22 @@
-module IRC
+class IRC
   class Callback
     def initialize(block)
       @block = block
     end
 
-    def call(event)
-      CallbackDSL.run(event, @block)
+    def call(irc, event)
+      CallbackDSL.run(irc, event, @block)
     end
 
     class CallbackDSL
-      def self.run(event, block)
-        callbackdsl = self.new(event)
+      def self.run(irc, event, block)
+        callbackdsl = self.new(irc, event)
         block.arity < 1 ? callbackdsl.instance_eval(&block) : block.call(callbackdsl)
       end
 
-      def initialize(event)
+      def initialize(irc, event)
         @event = event
+        @irc = irc
       end
 
       # @event accessors
@@ -36,28 +37,22 @@ module IRC
       end
 
       # commands
-      def send(*args)
-        if args[0].is_a?(Symbol) && args[1].is_a?(String)
-          IRC.send(@event.server, *args) # now we don't have to do send(e.server, ...) all the time
-        else
-          IRC.send(*args)
-        end
+      def send_cmd(cmd, *args)
+        @event.server.send_cmd(cmd, *args)
       end
 
-      alias raw send
-
       def privmsg(target, message)
-        send(:privmsg, target, message)
+        send_cmd(:privmsg, target, message)
       end
 
       alias msg privmsg
 
       def join(channel)
-        send(:join, channel)
+        send_cmd(:join, channel)
       end
 
       def pong(msg)
-        send(:pong, msg)
+        send_cmd(:pong, msg)
       end
 
     end

data/lib/on_irc/config.rb

@@ -1,4 +1,4 @@
-module IRC  
+class IRC
   class ConfigError < StandardError; end
 
   Config = Struct.new(:nick, :ident, :realname, :servers)
@@ -6,29 +6,55 @@ module IRC
   class ConfigDSL
     dsl_accessor :nick, :ident, :realname
     attr_accessor :servers
-    
+
     def self.run(&block)
       confdsl = self.new
       block.arity < 1 ? confdsl.instance_eval(&block) : block.call(confdsl)
-      
+
       raise ConfigError, 'no nick' unless confdsl.nick
       raise ConfigError, 'no servers' unless confdsl.servers
-      
+
       conf = Config.new
-      
+
       conf.nick = confdsl.nick
       conf.ident = confdsl.ident || confdsl.nick
       conf.realname = confdsl.realname || confdsl.nick
       conf.servers = confdsl.servers
-      
+
       conf
     end
-    
+
     def server(id, &block)
       @servers ||= {}
-      @servers[id] = Server.new Server::ConfigDSL.run(&block)
+      @servers[id] = ServerConfigDSL.run(&block)
       @servers[id]
     end
   end
+  
+  ServerConfig = Struct.new(:address, :port, :nick, :ident, :realname, :ssl)
+  
+  class ServerConfigDSL
+    dsl_accessor :address, :port, :nick, :ident, :realname
+    bool_dsl_accessor :ssl
+
+    def self.run(&block)
+      confdsl = self.new
+      block.arity < 1 ? confdsl.instance_eval(&block) : block.call(confdsl)
+
+      raise ConfigError, 'no address' unless confdsl.address
+
+      conf = ServerConfig.new
+
+      conf.address = confdsl.address
+      # If not supplied, the port defaults to 6667, or 6697 if ssl is used
+      conf.port = confdsl.port || (confdsl.ssl? ? 6697 : 6667)
+      conf.ssl = confdsl.ssl?
+      conf.nick = confdsl.nick
+      conf.ident = confdsl.ident
+      conf.realname = confdsl.realname
+
+      conf
+    end
+  end
 end
 

data/lib/on_irc/connection.rb

@@ -1,51 +1,25 @@
-module IRC
+class IRC
   class Connection < EventMachine::Connection
     include EventMachine::Protocols::LineText2
-    
-    def initialize(server_id)
-      @server = server_id
-    end
-    
-    def config
-      IRC[@server].config
-    end
-    
-    def command(*cmd)
-      send_data(cmd.join(' ') + "\r\n")
-    end
-    
-    def handle_event(event)
-      if IRC[@server].handlers[:all]
-        IRC[@server].handlers[:all].call(event)
-      elsif IRC.handlers[:all]
-        IRC.handlers[:all].call(event)
-      end
-      
-      if IRC[@server].handlers[event.command]
-        IRC[@server].handlers[event.command].call(event)
-      elsif IRC.handlers[event.command]
-        IRC.handlers[event.command].call(event)
-      end
+
+    def initialize(server)
+      @server = server
     end
-    
+
     ## EventMachine callbacks
     def post_init
-      command "USER #{config.ident || IRC.config.ident} * * :#{config.realname || IRC.config.realname}"
-      command "NICK #{config.nick || IRC.config.nick}"
+      send_data("USER #{@server.ident || @server.irc.ident} * * #{@server.realname || @server.irc.realname}\r\n")
+      send_data("NICK #{@server.nick || @server.irc.nick}\r\n")
+    rescue => e
+      p e
     end
-    
+
     def receive_line(line)
-      parsed_line = Parser.parse(line)
-      event = Event.new(@server, parsed_line[:prefix], parsed_line[:command].downcase.to_sym, parsed_line[:params])
-      
-      handle_event(event)
+      @server.receive_line(line)
     end
-    
+
     def unbind
-      EM.add_timer(3) do
-        reconnect(config.address, config.port)
-        post_init
-      end
+      @server.unbind
     end
   end
 end

data/lib/on_irc/event.rb

@@ -1,4 +1,4 @@
-module IRC
+class IRC
   class Event
     attr_accessor :server, :prefix, :command, :params
   

data/lib/on_irc/parser.rb

@@ -1,4 +1,4 @@
-module IRC
+class IRC
   module Parser  
     def self.parse(line)      
       prefix = ''

data/lib/on_irc/server.rb

@@ -1,40 +1,52 @@
-module IRC
+class IRC
   class Server
-    attr_accessor :config, :connection, :handlers
+    attr_accessor :config, :connection, :handlers, :name, :irc
     config_accessor :address, :port, :nick, :ident, :realname, :ssl
-    
-    def initialize(config)
+
+    def initialize(irc, name, config)
+      @irc = irc
+      @name = name
       @config = config
       @handlers = {}
     end
-    
+
+    def send_cmd(cmd, *args)
+      # prepend last arg with : only if it exists. it's really ugly
+      args[-1] = ":#{args[-1]}" if args[-1]
+      connection.send_data(cmd.to_s.upcase + ' ' + args.join(' ') + "\r\n")
+    end
+
     def on(event, &block)
       @handlers[event.to_s.downcase.to_sym] = Callback.new(block)
     end
-    
-    Config = Struct.new(:address, :port, :nick, :ident, :realname, :ssl)
-    
-    class ConfigDSL
-      dsl_accessor :address, :port, :nick, :ident, :realname
-      bool_dsl_accessor :ssl
-      
-      def self.run(&block)
-        confdsl = self.new
-        block.arity < 1 ? confdsl.instance_eval(&block) : block.call(confdsl)
-        
-        raise ConfigError, 'no address' unless confdsl.address
-        
-        conf = Config.new
-        
-        conf.address = confdsl.address
-        # If not supplied, the port defaults to 6667, or 6697 if ssl is used
-        conf.port = confdsl.port || (confdsl.ssl? ? 6697 : 6667)
-        conf.ssl = confdsl.ssl?
-        conf.nick = confdsl.nick
-        conf.ident = confdsl.ident
-        conf.realname = confdsl.realname
-        
-        conf
+
+    def handle_event(event)
+      if @handlers[:all]
+        @handlers[:all].call(@irc, event)
+      elsif @irc.handlers[:all]
+        @irc.handlers[:all].call(@irc, event)
+      end
+
+      if @handlers[event.command]
+        @handlers[event.command].call(@irc, event)
+      elsif @irc.handlers[event.command]
+        @irc.handlers[event.command].call(@irc, event)
+      end
+    end
+
+    # Eventmachine callbacks
+    def receive_line(line)
+      parsed_line = Parser.parse(line)
+      event = Event.new(self, parsed_line[:prefix],
+                        parsed_line[:command].downcase.to_sym,
+                        parsed_line[:params])
+      handle_event(event)
+    end
+
+    def unbind
+      EM.add_timer(3) do
+        connection.reconnect(config.address, config.port)
+        connection.post_init
       end
     end
   end

data/on_irc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{on_irc}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Olson"]
-  s.date = %q{2009-12-13}
+  s.date = %q{2009-12-27}
   s.description = %q{An event driven IRC library with an easy to use DSL}
   s.email = %q{scott@scott-olson.org}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: on_irc
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Scott Olson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-13 00:00:00 -06:00
+date: 2009-12-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency