percy 1.4.1 → 1.4.2

data/README.md

@@ -1,4 +1,4 @@
-# Percy 1.4.1
+# Percy 1.4.2
 
 ## Installing Percy
 `sudo gem install percy`
@@ -41,7 +41,8 @@ No variables.
     end
 Variables:
 
-<tt>env[:nick]<br />
+<tt>env[:type]<br />
+env[:nick]<br />
 env[:user]<br />
 env[:host]<br />
 env[:channel]<br />
@@ -53,7 +54,8 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]<br />
+<tt>env[:type]<br />
+env[:nick]<br />
 env[:user]<br />
 env[:host]<br />
 env[:message]</tt>
@@ -64,7 +66,8 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]<br />
+<tt>env[:type]<br />
+env[:nick]<br />
 env[:user]<br />
 env[:host]<br />
 env[:channel]</tt>
@@ -75,7 +78,8 @@ env[:channel]</tt>
     end
 Variables:
 
-<tt>env[:nick]<br />
+<tt>env[:type]<br />
+env[:nick]<br />
 env[:user]<br />
 env[:host]<br />
 env[:channel]<br />
@@ -87,7 +91,8 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]<br />
+<tt>env[:type]<br />
+env[:nick]<br />
 env[:user]<br />
 env[:host]<br />
 env[:message]</tt>
@@ -98,7 +103,8 @@ env[:message]</tt>
     end
 Variables:
 
-<tt>env[:nick]<br />
+<tt>env[:type]<br />
+env[:nick]<br />
 env[:user]<br />
 env[:host]<br />
 env[:new_nick]</tt>
@@ -109,7 +115,8 @@ env[:new_nick]</tt>
     end
 Variables:
 
-<tt>env[:nick]<br />
+<tt>env[:type]<br />
+env[:nick]<br />
 env[:user]<br />
 env[:host]<br />
 env[:channel]<br />
@@ -122,7 +129,21 @@ env[:reason]</tt>
     end
 Variables:
 
-<tt>env[:params]</tt>
+<tt>env[:type]<br />
+env[:params]</tt>
+
+### Multiple event handling
+You can gather types:
+
+    on [:channel, :query], /foo/ do |env|
+      message (env[:channel] || env[:nick]), 'bar!'
+    end
+
+    on ['353', '372'] do |env|
+      message '#that_cool_channel', "I just got a #{env[:type]}."
+    end
+
+You can get the type of event with `env[:type]`, which will be a Symbol like `:channel?`, `:query`, `:quit` or `:"353"`.
 
 ## Availabe Class Methods
 
@@ -222,6 +243,8 @@ Availabe colors through the `COLORS` hash:
 ## Reloading
 You can reload your source files with `Percy::IRC.reload` (or just `reload`) without restarting the bot. It is a simple `load $0` where all events are erased and added from the sources again.
 
+You can check for a reloading process with `Percy::IRC.reloading?` (or just `reloading?`) which is `false` by default, `true` while and `false` after reloading.
+
 ## License
 Copyright (c) 2009, 2010 Tobias Bühlmann
 

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/percy.rb

@@ -5,7 +5,7 @@ require 'percy/formatting'
 Thread.abort_on_exception = true
 
 module Percy
-  VERSION = 'Percy 1.4.1 (http://github.com/tbuehlmann/percy)'
+  VERSION = 'Percy 1.4.2 (http://github.com/tbuehlmann/percy)'
   
   # set the percy root directory
   Object::const_set(:PERCY_ROOT, Pathname.new($0).dirname.expand_path)
@@ -23,4 +23,4 @@ end
 
 delegate :action, :channel_limit, :configure, :connect, :is_online, :join, :kick, :message,
          :mode, :nick, :notice, :on, :part, :quit, :raw, :topic, :users_on, :users_with_status_on,
-         :reload
+         :reload, :reloading?

data/lib/percy/irc.rb

@@ -25,6 +25,7 @@ module Percy
     @temp_socket = []
     
     @connected = false
+    @reloading = false
     
     # user methods
     @events = Hash.new []
@@ -250,17 +251,30 @@ module Percy
     end
     
     # on method
-    def self.on(type = :channel, match = //, &block)
-      unless @listened_types.include?(type) || type =~ /^\d\d\d$/
-        raise ArgumentError, "#{type} is not a supported type"
+    def self.on(type = [:channel], match = //, &block)
+      if (type.is_a?(Symbol) || type.is_a?(String))
+        type = [type]
       end
       
-      @events[type] = [] if @events[type].empty? # @events' default value is [], but it's not possible to add elements to it (weird!)
-      case type
-      when :channel || :query
-        @events[type] << {:match => match, :proc => block}
-      else
-        @events[type] << block
+      if type.is_a? Array
+        type.each do |t|
+          unless @listened_types.include?(t) || t =~ /^\d\d\d$/
+            raise ArgumentError, "#{t} is not a supported type"
+          end
+          
+          if @events[t].empty?
+            @events[t] = [] # @events' default value is [], but it's not possible to add elements to it (weird!)
+          end
+          
+          case t
+          when :channel
+            @events[t] << {:match => match, :proc => block}
+          when :query
+            @events[t] << {:match => match, :proc => block}
+          else
+            @events[t] << block
+          end
+        end
       end
     end
     
@@ -283,6 +297,10 @@ module Percy
       @reloading = false
     end
     
+    def self.reloading?
+      @reloading
+    end
+    
     private
     
     # add observer
@@ -487,28 +505,28 @@ module Percy
         self.raw message.chomp.gsub('PING', 'PONG')
       
       when /^:\S+ (\d\d\d) /
-        self.parse_type($1, :params => $')
+        self.parse_type($1, :type => $1.to_sym, :params => $')
       
       when /^:(\S+)!(\S+)@(\S+) PRIVMSG #(\S+) :/
-        self.parse_type(:channel, :nick => $1, :user => $2, :host => $3, :channel => "##{$4}", :message => $')
+        self.parse_type(:channel, :type => :channel, :nick => $1, :user => $2, :host => $3, :channel => "##{$4}", :message => $')
       
       when /^:(\S+)!(\S+)@(\S+) PRIVMSG \S+ :/
-        self.parse_type(:query, :nick => $1, :user => $2, :host => $3, :message => $')
+        self.parse_type(:query, :type => :query, :nick => $1, :user => $2, :host => $3, :message => $')
       
       when /^:(\S+)!(\S+)@(\S+) JOIN :*(\S+)$/
-        self.parse_type(:join, :nick => $1, :user => $2, :host => $3, :channel => $4)
+        self.parse_type(:join, :type => :join, :nick => $1, :user => $2, :host => $3, :channel => $4)
       
       when /^:(\S+)!(\S+)@(\S+) PART (\S+)/
-        self.parse_type(:part, :nick => $1, :user => $2, :host => $3, :channel => $4, :message => $'.sub(' :', ''))
+        self.parse_type(:part, :type => :part, :nick => $1, :user => $2, :host => $3, :channel => $4, :message => $'.sub(' :', ''))
       
       when /^:(\S+)!(\S+)@(\S+) QUIT/
-        self.parse_type(:quit, :nick => $1, :user => $2, :host => $3, :message => $'.sub(' :', ''))
+        self.parse_type(:quit, :type => :quit, :nick => $1, :user => $2, :host => $3, :message => $'.sub(' :', ''))
       
       when /^:(\S+)!(\S+)@(\S+) NICK :/
-        self.parse_type(:nickchange, :nick => $1, :user => $2, :host => $3, :new_nick => $')
+        self.parse_type(:nickchange, :type => :nickchange, :nick => $1, :user => $2, :host => $3, :new_nick => $')
       
       when /^:(\S+)!(\S+)@(\S+) KICK (\S+) (\S+) :/
-        self.parse_type(:kick, :nick => $1, :user => $2, :host => $3, :channel => $4, :victim => $5, :reason => $')
+        self.parse_type(:kick, :type => :kick, :nick => $1, :user => $2, :host => $3, :channel => $4, :victim => $5, :reason => $')
       end
       
       if @observers > 0

data/percy.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = 'percy'
-  s.version = '1.4.1'
+  s.version = '1.4.2'
   s.summary = '(DSL, EventMachine) IRC Bot Framework inspired by isaac'
   s.description = 'Percy is an IRC Bot framework inspired by isaac with various changes.'
   s.homepage = 'http://github.com/tbuehlmann/percy'
-  s.date = '17.03.2010'
+  s.date = '18.03.2010'
   
   s.author = 'Tobias Bühlmann'
   s.email = 'tobias.buehlmann@gmx.de'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - "Tobias B\xC3\xBChlmann"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +01:00
+date: 2010-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency