cinch 0.2.5 → 0.2.6

data/README.rdoc

@@ -126,7 +126,7 @@ This would provide the following output on IRC
 Cinch also supports custom named parameter patterns. That's right, you can define you own 
 pattern. Just like this:
 
- bot.add_custom_pattern(:friends, "(injekt|lee|john|bob)")
+ bot.add_custom_pattern(:friends, "injekt|lee|john|bob")
 
  bot.plugin("I like :friend-friends", :prefix => false) do |m|
    m.reply "I like #{m.args[:friend]} too!"
@@ -139,7 +139,7 @@ Which would provide the following output on IRC:
  injekt> I like bob
  Cinch> I like bob too!
 
-Note though that you must wrap your type regexp in capturing parenthesis and escape it yourself
+Note though that although Cinch adds the capturing parenthesis for you, you must escape it yourself
 
 == Authors
 Just me at the moment, sad poor lonely me...

data/examples/custom_patterns.rb

@@ -5,8 +5,8 @@ bot = Cinch.setup do
   channels %w{ #cinch }
 end
 
-bot.add_custom_pattern(:friends, "(injekt|lee|john|bob)")
-bot.add_custom_pattern(:hex, "([\\dA-Fa-f]+?)")
+bot.add_custom_pattern(:friends, "injekt|lee|john|bob")
+bot.add_custom_pattern(:hex, "[\\dA-Fa-f]+")
 
 bot.plugin("I like :person-friends", :prefix => false) do |m|
   m.reply "I like #{m.args[:person]} too!"

data/lib/cinch.rb

@@ -9,7 +9,7 @@ require 'cinch/rules'
 require 'cinch/base'
 
 module Cinch
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 
   # Setup bot options and return a new Cinch::Base instance
   def self.setup(ops={}, &blk)

data/lib/cinch/base.rb

@@ -36,6 +36,7 @@ module Cinch
       :realname => "Cinch IRC Microframework",
       :prefix => '!',
       :usermode => 0,
+      :password => nil
     }
 
     # Options can be passed via a hash, a block, or on the instance
@@ -220,13 +221,13 @@ module Cinch
     #   port 6667
     # end
     #
-    # bot.add_custom_pattern(:number, "([0-9])")
+    # bot.add_custom_pattern(:number, "[0-9]")
     #
     # bot.plugin("getnum :foo-number") do |m|
     #   m.reply "Your number was: #{m.args[:foo]}"
     # end
     def add_custom_pattern(name, pattern)
-      @custom_patterns[name.to_s] = pattern.to_s
+      @custom_patterns[name.to_s] = "(#{pattern.to_s})"
     end
     alias :add_custom_type :add_custom_pattern # backwards
     alias :add_pattern :add_custom_pattern 
@@ -234,6 +235,7 @@ module Cinch
     # Run run run
     def run      
       @irc.connect options.server, options.port
+      @irc.pass options.password if options.password
       @irc.nick options.nick
       @irc.user options.username, options.usermode, '*', options.realname
         
@@ -265,10 +267,12 @@ module Cinch
         # of loose checking should be put in place
         rules.each do |rule|
           unless rule.options.key?(:prefix) || options.prefix == false
-            rule.to_s.insert(1, options.prefix) unless rule.to_s[1].chr == options.prefix
+            unless rule.to_s[1..options.prefix.size] == options.prefix
+              rule.to_s.insert(1, options.prefix)
+            end
           end
 
-          if message.text && mdata = message.text.match(Regexp.new(rule.to_s))
+          if message.text && mdata = message.text.rstrip.match(Regexp.new(rule.to_s))
             unless rule.keys.empty? || mdata.captures.empty?
               args = Hash[rule.keys.map {|k| k.to_sym}.zip(mdata.captures)]
               message.args = args

data/spec/base_spec.rb

@@ -108,7 +108,7 @@ describe "Cinch::Base" do
     end
 
     it "should convert a custom pattern" do
-      @base.add_custom_pattern(:people, "(foo|bar|baz)")
+      @base.add_custom_pattern(:people, "foo|bar|baz")
       rule, keys = @base.compile(":foo-people")
       rule.should == "^(foo|bar|baz)$"    
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Lee 'injekt' Jarvis