on_irc 2.0.1 → 2.1.0

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gemspec.email = "scott@scott-olson.org"
     gemspec.homepage = "http://github.com/tsion/on_irc"
     gemspec.authors = ["Scott Olson"]
+    gemspec.files = FileList["[A-Z]*", "lib/**/*"]
 
     gemspec.add_dependency "eventmachine"
   end

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/examples/bot.rb

@@ -5,7 +5,7 @@ bot = IRC.new do
   nick 'on_irc'
   ident 'on_irc'
   realname 'on_irc Ruby IRC library'
-  
+
   server :eighthbit do
     address 'irc.eighthbit.net'
   end
@@ -19,9 +19,9 @@ end
 bot.on :privmsg do
   case params[1]
   when '!ping'
-    msg(params[0], prefix.split('!').first + ': pong')
+    respond "#{sender.nick}: pong"
   when /^!echo (.*)/
-    msg(params[0], prefix.split('!').first + ': ' + $1)
+    respond "#{sender.nick}: #{$1}"
   when /^!join (.*)/
     join $1
   end
@@ -32,7 +32,7 @@ bot.on :ping do
 end
 
 bot.on :all do
-  p = "(#{prefix}) " unless prefix.empty?
+  p = "(#{sender}) " unless sender.empty?
   puts "#{server.name}: #{p}#{command} #{params.inspect}"
 end
 

data/examples/regex_bot.rb

@@ -27,12 +27,11 @@ end
 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
   message = params[1]
 
   CHANNEL_MEMORY[channel] ||= []
   CH_USER_MEMORY[channel] ||= {}
-  CH_USER_MEMORY[channel][nick] ||= []
+  CH_USER_MEMORY[channel][sender.nick] ||= []
 
   if params[1] =~ %r"^(!*)s/((?:[^\\/]|\\.)*)/((?:[^\\/]|\\.)*)/(?:(\w*))?"
     bangs   = $1
@@ -41,22 +40,22 @@ bot.on :privmsg do
     flags   = $4
 
     if bangs.length > MAX_BANGS
-      privmsg params[0], "#{nick}: I only support up to #{MAX_BANGS} !'s."
-      privmsg params[0], 'in bed' if rand(1000) == 42
+      respond "#{sender.nick}: I only support up to #{MAX_BANGS} !'s."
+      respond 'in bed' if rand(1000) == 42
       next
     end
 
     begin
       match = Regexp.new match
     rescue RegexpError => err
-      privmsg params[0], "RegexpError: #{err.message}"
+      respond "RegexpError: #{err.message}"
       next
     end
 
     target = if bangs.length == 0
       CHANNEL_MEMORY[channel][1] || ''
     else
-      CH_USER_MEMORY[channel][nick][-bangs.length] || ''
+      CH_USER_MEMORY[channel][sender.nick][-bangs.length] || ''
     end
 
     if flags.chars.include? 'g'
@@ -65,23 +64,23 @@ bot.on :privmsg do
       answer = target.sub(match, replace)
     end
 
-    if bangs.length > 0 || CHANNEL_MEMORY[channel][0] == nick
-      privmsg(params[0], nick + ' meant: ' + answer)
+    if bangs.length > 0 || CHANNEL_MEMORY[channel][0] == sender.nick
+      respond "#{sender.nick} meant: #{answer}"
     else
-      privmsg(params[0], nick + ' thinks ' + CHANNEL_MEMORY[channel][0] + ' meant: ' + answer)
+      respond "#{sender.nick} thinks #{CHANNEL_MEMORY[channel][0]} meant: #{answer}"
     end
 
   else
     if message =~ /^\x01(\S+) (.*)\x01$/
       next unless $1 == 'ACTION'
 
-      message = "* #{nick} #{$2}"
+      message = "* #{sender.nick} #{$2}"
     end
 
-    CH_USER_MEMORY[channel][nick] << message
-    CH_USER_MEMORY[channel][nick].unshift if CH_USER_MEMORY[channel][nick].length > MAX_BANGS
+    CH_USER_MEMORY[channel][sender.nick] << message
+    CH_USER_MEMORY[channel][sender.nick].unshift if CH_USER_MEMORY[channel][sender.nick].length > MAX_BANGS
 
-    CHANNEL_MEMORY[channel] = [nick, message]
+    CHANNEL_MEMORY[channel] = [sender.nick, message]
   end
 end
 
@@ -90,9 +89,8 @@ bot.on :ping do
 end
 
 bot.on :all do
-  prefix_str = "(#{prefix}) " unless prefix.empty?
-  puts "#{server}: #{prefix_str}#{command} #{params.inspect}"
+  p = "(#{sender}) " unless sender.empty?
+  puts "#{server.name}: #{p}#{command} #{params.inspect}"
 end
 
 bot.connect
-

data/examples/relay.rb

@@ -5,11 +5,11 @@ bot = IRC.new do
   nick 'on_irc-relay'
   ident 'on_irc'
   realname 'on_irc Ruby IRC library - relay example'
-  
+
   server :eighthbit do
     address 'irc.eighthbit.net'
   end
-  
+
   server :freenode do
     address 'irc.freenode.org'
   end
@@ -27,9 +27,9 @@ end
 bot.on :privmsg do
   case params[1]
   when /^fn> (.*)/
-    bot[:freenode].send_cmd(:privmsg, '#botters', "<8b:#{prefix.split('!').first}> #{$1}") if params[0] == '#offtopic' && server.name == :eighthbit
+    bot[:freenode].msg('#botters', "<8b:#{sender.nick}> #{$1}") if params[0] == '#offtopic' && server.name == :eighthbit
   when /^8b> (.*)/
-    bot[:eighthbit].send_cmd(:privmsg, '#offtopic', "<fn:#{prefix.split('!').first}> #{$1}") if params[0] == '#botters' && server.name == :freenode
+    bot[:eighthbit].msg('#offtopic', "<fn:#{sender.nick}> #{$1}") if params[0] == '#botters' && server.name == :freenode
   end
 end
 
@@ -38,7 +38,7 @@ bot.on :ping do
 end
 
 bot.on :all do
-  p = "(#{prefix}) " unless prefix.empty?
+  p = "(#{sender}) " unless sender.empty?
   puts "#{server.name}: #{p}#{command} #{params.inspect}"
 end
 

data/lib/on_irc.rb

@@ -1,5 +1,5 @@
 %w[rubygems eventmachine socket strscan].each { |lib| require lib }
-%w[event parser dsl_accessor config_accessor server config connection callback].each do |lib|
+%w[event commands parser dsl_accessor config_accessor server config connection sender callback].each do |lib|
   require File.join(File.dirname(__FILE__), 'on_irc', lib)
 end
 

data/lib/on_irc/callback.rb

@@ -20,8 +20,8 @@ class IRC
       end
 
       # @event accessors
-      def prefix
-        @event.prefix
+      def sender
+        @event.sender
       end
 
       def command
@@ -37,24 +37,19 @@ class IRC
       end
 
       # commands
+      include Commands
+
       def send_cmd(cmd, *args)
         @event.server.send_cmd(cmd, *args)
       end
 
-      def privmsg(target, message)
-        send_cmd(:privmsg, target, message)
-      end
-
-      alias msg privmsg
-
-      def join(channel)
-        send_cmd(:join, channel)
+      def respond(message)
+        if params[0].start_with? '#'
+          privmsg(params[0], message)
+        else
+          privmsg(sender.nick, message)
+        end
       end
-
-      def pong(msg)
-        send_cmd(:pong, msg)
-      end
-
     end
   end
 end

data/lib/on_irc/commands.rb

@@ -0,0 +1,25 @@
+class IRC
+  module Commands
+    def privmsg(target, message)
+      send_cmd(:privmsg, target, message)
+    end
+
+    alias msg privmsg
+
+    def notice(target, message)
+      send_cmd(:notice, target, message)
+    end
+
+    def join(channel)
+      send_cmd(:join, channel)
+    end
+
+    def part(channel, message=nil)
+      send_cmd(:part, channel, message)
+    end
+
+    def pong(msg)
+      send_cmd(:pong, msg)
+    end
+  end
+end

data/lib/on_irc/connection.rb

@@ -15,7 +15,7 @@ class IRC
     end
 
     def receive_line(line)
-      @server.receive_line(line)
+      @server.receive_line(line.force_encoding('utf-8'))
     end
 
     def unbind

data/lib/on_irc/event.rb

@@ -1,15 +1,15 @@
 class IRC
   class Event
-    attr_accessor :server, :prefix, :command, :params
-  
+    attr_accessor :server, :sender, :command, :params
+
     def initialize(server, prefix, command, params)
       @server = server
-      @prefix = prefix
+      @sender = Sender.new(prefix)
       @command = command
       @params = params
     end
-    
-    
+
+
   end
 end
 

data/lib/on_irc/sender.rb

@@ -0,0 +1,31 @@
+class IRC
+  class Sender
+    attr_accessor :nick, :user, :host
+
+    def initialize(string)
+      if string =~ /^([^!]+)!([^@]+)@(.+)$/
+        @nick, @user, @host = $1, $2, $3
+        @server = false
+      else
+        @host = string
+        @server = true
+      end
+    end
+
+    def server?
+      @server
+    end
+
+    def user?
+      !@server
+    end
+
+    def to_s
+      @server ? @host : @nick + '!' + @user + '@' + @host
+    end
+
+    def empty?
+      to_s.empty?
+    end
+  end
+end

data/lib/on_irc/server.rb

@@ -11,11 +11,16 @@ class IRC
     end
 
     def send_cmd(cmd, *args)
+      # remove nil entries
+      args.compact!
       # 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
 
+    # basic IRC commands
+    include Commands
+
     def on(event, &block)
       @handlers[event.to_s.downcase.to_sym] = Callback.new(block)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: on_irc
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors: 
 - Scott Olson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 -06:00
+date: 2010-01-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,23 +31,20 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 files: 
-- .gitignore
 - LICENSE
 - Rakefile
 - VERSION
-- examples/bot.rb
-- examples/regex_bot.rb
-- examples/relay.rb
 - lib/on_irc.rb
 - lib/on_irc/callback.rb
+- lib/on_irc/commands.rb
 - lib/on_irc/config.rb
 - lib/on_irc/config_accessor.rb
 - lib/on_irc/connection.rb
 - lib/on_irc/dsl_accessor.rb
 - lib/on_irc/event.rb
 - lib/on_irc/parser.rb
+- lib/on_irc/sender.rb
 - lib/on_irc/server.rb
-- on_irc.gemspec
 has_rdoc: true
 homepage: http://github.com/tsion/on_irc
 licenses: []

data/.gitignore

@@ -1,3 +0,0 @@
-doc/
-pkg/
-.*.swp

data/on_irc.gemspec

@@ -1,61 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{on_irc}
-  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-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 = [
-    "LICENSE"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "Rakefile",
-     "VERSION",
-     "examples/bot.rb",
-     "examples/regex_bot.rb",
-     "examples/relay.rb",
-     "lib/on_irc.rb",
-     "lib/on_irc/callback.rb",
-     "lib/on_irc/config.rb",
-     "lib/on_irc/config_accessor.rb",
-     "lib/on_irc/connection.rb",
-     "lib/on_irc/dsl_accessor.rb",
-     "lib/on_irc/event.rb",
-     "lib/on_irc/parser.rb",
-     "lib/on_irc/server.rb",
-     "on_irc.gemspec"
-  ]
-  s.homepage = %q{http://github.com/tsion/on_irc}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{An event driven IRC library with an easy to use DSL}
-  s.test_files = [
-    "examples/regex_bot.rb",
-     "examples/relay.rb",
-     "examples/bot.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0"])
-  end
-end
-