irc 0.0.2 → 0.0.3

data/README.markdown

@@ -1,7 +1,16 @@
+Installation
+============
+
+Simply install the gem:
+
+`gem install irc`
+
 Usage
 =====
 
-## Quickstart
+Quickstart
+----------
+
 ``` ruby
 require 'irc'
 
@@ -16,17 +25,27 @@ end
 
 # Tell the time and date:
 match /^!(?:time|now)/ do
-  reply Time.now.strftime("it is %l:%M %P on %A, %B %-d, %Y.").gsub(/[ ]+/, ' ' )
+  reply Time.now
+end
+
+# mention_match requires messages to start with the name of the bot
+mention_match /join (?<chan>.+)/ do
+  channels = chan.split(/[, ]+/)
+  connection.join channels
+  reply "I joined #{channels.to_sentence}."
 end
 
 start!
 ```
-Then, `ruby newbot.rb`
+Then, run with `ruby bot.rb`
+
 
+Subclass
+--------
 
-## Subclass
+Polluting the global namespace is bad.
+Instead, you can `require 'irc/base'` and subclass `IRC::Bot`:
 
-You can also `require 'irc/base'` and subclass `IRC::Bot`:
 ``` ruby
 require 'irc/base'
 
@@ -40,8 +59,8 @@ end
 ```
 
 You can re-load the bot to update its callbacks without disconnecting:
+
 ``` ruby
-# mention_match requires messages to start with the name of the bot
 mention_match /reload!/ do
   self.class.reset!
 

data/lib/irc.rb

@@ -1,7 +1,7 @@
 require 'irc/base'
 
 class NewBot < IRC::Bot
-
+  on(:ping) { connection.pong params}
 end
 
 module IRC

data/lib/irc/base.rb

@@ -1,5 +1,7 @@
 require 'irc/extensions'
+require 'irc/helpers'
 
+require 'irc/job'
 require 'irc/connection'
 require 'irc/callback'
 require 'irc/message'

data/lib/irc/callback.rb

@@ -4,32 +4,32 @@ module IRC
 
     def initialize action, regex = nil, factory = nil, &block
       @action  = action
-      @regex   = regex || //
+      @regex = regex || //
       @block   = block
       @factory = factory
     end
 
     def call! message
-      if match = @regex.match(message.content)
-        (class << message; self; end).send :attr_accessor, *@regex.names
-        @regex.names.each do |name|
-          message.instance_variable_set("@#{name}", match[name])
-        end
+      match = regex.match(message.content)
+      return if !match
+
+      (class << message; self; end).send :attr_accessor, *@regex.names
 
-        Thread.new do
-        # begin
-          if @factory
-            @factory.new(message).instance_eval(&@block)
-          else
-            puts "calling #{@block}"
-            @block.call(message, match)
-          end
+      match.names.each do |name|
+        message.instance_variable_set("@#{name}", match[name])
+      end
+
+      Job.schedule do
+        if @factory
+          @factory.new(message).instance_eval(&@block)
+        else
+          @block.call(message, match)
         end
       end
     end
 
     class << self
-      attr_accessor :callbacks
+      attr_accessor :callbacks, :filters
 
       def handle message
         callbacks[message.action].each do |callback|
@@ -43,12 +43,11 @@ module IRC
         callbacks[action] << callback
         callbacks[:all]   << callback
       end
-
       def callbacks
         @callbacks ||= Hash.new {|hash,key| hash[key] = []}
       end
 
-      def reset!
+      def clear!
         @callbacks = nil
         callbacks
       end

data/lib/irc/connection.rb

@@ -1,17 +1,17 @@
 require 'socket'
 require 'thread'
+require 'monitor'
 
 module IRC
   class Connection
+    include MonitorMixin
+
+    attr_accessor :host, :port
     def initialize host = nil, port = 6667
       @host = host
       @port = port
     end
 
-    def mutex
-      @mutex ||= Mutex.new
-    end
-
     def disconnected?
       !@socket || @socket.closed?
     end
@@ -21,12 +21,10 @@ module IRC
     end
 
     def write *strings
-      # mutex do
-        strings.each do |string|
-          puts '-> ' + string
-          socket.print string + "\r\n"
-        end
-      # end
+      strings.each do |string|
+        puts '-> ' + string
+        socket.print string + "\r\n"
+      end
     end
 
     def join *channels

data/lib/irc/helpers.rb

@@ -0,0 +1,12 @@
+module IRC
+  module Helpers
+    def inflect noun, lookup = nil
+      lookup ||= {
+        'me'  => nick, 
+        'you' => self.class.nick,
+        nick  => 'you'
+      }
+      noun.gsub /[\w]+/i, lookup
+    end
+  end
+end

data/lib/irc/job.rb

@@ -0,0 +1,55 @@
+require 'thread'
+
+module IRC
+  class Job
+    def initialize *args, &block
+      @args, @block = args, block
+    end
+
+    def call
+      @block.call(*@args)
+    end
+
+    class << self
+      attr_accessor :safe_mode
+      def schedule *args, &block
+        run!
+        jobs << new(*args, &block)
+      end
+
+      def size
+        @size ||= 1
+      end
+
+      def size= _size
+        _size = _size.to_i
+        _size = 1 if _size < 1
+
+        @size = _size
+      end
+
+      def jobs
+        @jobs ||= Queue.new
+      end
+
+      def run!
+        @pool ||= Array.new(size) do |i|
+          Thread.new do
+            catch :exit do
+              loop do
+                jobs.pop.call
+              end
+            end
+          end
+        end
+      end # def run!
+
+      def shutdown
+        size.times do
+          schedule { throw :exit }
+        end
+      end # def shutdown
+    end # class << Job
+    at_exit { shutdown }
+  end # class Job
+end # module IRC

data/lib/irc/message.rb

@@ -1,13 +1,14 @@
 module IRC
   class Message
+    special_characters = Regexp.escape('-[]\^{}|`_')
     REGEX = /^
       (:
         (?<prefix>
           (
-            (?<servername>(?<nick>[a-z][a-z0-9_\-\[\]\\`\^\{\}\.\|]*))
+            (?<servername>(?<nick>[a-z#{special_characters}][a-z0-9#{special_characters}]*))
           )
           (!(?<user>[a-z0-9~\.]+))?
-          (@(?<host>[a-z0-9\.]+))?
+          (@(?<host>[a-z0-9\.\-_]{1,255}))?
         )
         [\ ]+
       )?
@@ -23,7 +24,7 @@ module IRC
     attr_accessor :connection
     attr_accessor *REGEX.names
 
-    def initialize message_string, connection
+    def initialize message_string, connection = nil
       @raw = message_string
 
       @connection = connection
@@ -39,6 +40,10 @@ module IRC
       @action ||= (command || '').downcase.intern
     end
 
+    def target
+      middle
+    end
+
     def content
       @content ||= trailing || middle
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
-dependencies: []
+date: 2013-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: serialport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: a simple ruby irc (bot) framework
 email: jeff@petersonj.com
 executables: []
@@ -24,6 +40,8 @@ files:
 - lib/irc/callback.rb
 - lib/irc/connection.rb
 - lib/irc/extensions.rb
+- lib/irc/helpers.rb
+- lib/irc/job.rb
 - lib/irc/message.rb
 - lib/irc/store.rb
 homepage: http://github.com/jeffpeterson/irc