cinch 1.0.1 → 1.0.2

data/lib/cinch.rb

@@ -1,7 +1,7 @@
 require 'cinch/bot'
 
 module Cinch
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   # @return [String]
   # @todo Handle mIRC color codes more gracefully.

data/lib/cinch/PLANNED

@@ -0,0 +1,4 @@
+- advanced log levels
+- support for channel forwards
+- a mode-change parser
+- support for DCC

data/lib/cinch/bot.rb

@@ -110,7 +110,7 @@ module Cinch
                                                               :options => Hash.new {|h,k| h[k] = {}},
                                                             }),
                                  :channels => [],
-                                 :encoding => nil,
+                                 :encoding => Encoding.default_external,
                                })
 
       @semaphores_mutex = Mutex.new

data/lib/cinch/irc.rb

@@ -32,9 +32,6 @@ module Cinch
       else
         @socket = tcp_socket
       end
-      @socket.set_encoding(@bot.config.encoding || Encoding.default_external,
-                           Encoding.default_internal,
-                           {:invalid => :replace, :undef => :replace})
 
       @queue = MessageQueue.new(@socket, @bot)
       message "PASS #{@config.password}" if @config.password
@@ -45,6 +42,7 @@ module Cinch
         begin
           while line = @socket.gets
             begin
+              line.force_encoding(@bot.config.encoding).encode!({:invalid => :replace, :undef => :replace})
               parse line
             rescue => e
               @bot.logger.log_exception(e)

data/lib/cinch/message_queue.rb

@@ -55,7 +55,7 @@ module Cinch
         @bot.logger.log(message, :outgoing) if @bot.config.verbose
 
         @time_since_last_send = Time.now
-        @socket.print message + "\r\n"
+        @socket.print message.encode(@bot.config.encoding, {:invalid => :replace, :undef => :replace}) + "\r\n"
       end
     end
   end

data/lib/cinch/plugin.rb

@@ -114,20 +114,24 @@ module Cinch
           prefix = Regexp.escape(prefix)
         end
         @__cinch_patterns.each do |pattern|
+          pattern_to_register = nil
+
           if pattern.use_prefix && prefix
             case pattern.pattern
             when Regexp
-              pattern.pattern = /^#{prefix}#{pattern.pattern}/
+              pattern_to_register = /^#{prefix}#{pattern.pattern}/
             when String
-              pattern.pattern = prefix + pattern.pattern
+              pattern_to_register = prefix + pattern.pattern
             end
+          else
+            pattern_to_register = pattern.pattern
           end
 
           react_on = @__cinch_react_on || :message
 
-          bot.debug "[plugin] #{plugin_name}: Registering executor with pattern `#{pattern.pattern}`, reacting on `#{react_on}`"
+          bot.debug "[plugin] #{plugin_name}: Registering executor with pattern `#{pattern_to_register}`, reacting on `#{react_on}`"
 
-          bot.on(react_on, pattern.pattern, instance, pattern) do |message, plugin, pattern, *args|
+          bot.on(react_on, pattern_to_register, instance, pattern) do |message, plugin, pattern, *args|
             if plugin.respond_to?(pattern.method)
               method = plugin.method(pattern.method)
               arity = method.arity - 1

data/lib/cinch/user.rb

@@ -231,7 +231,7 @@ module Cinch
       }.merge(values).each do |attr, value|
         sync(attr, value, true)
       end
-      p [self, values, not_found]
+
       sync(:unknown?, false, true)
       @synced = true
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cinch
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Lee Jarvis
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -68,6 +71,7 @@ files:
 - lib/cinch/user.rb
 - lib/cinch/constants.rb
 - lib/cinch/callback.rb
+- lib/cinch/PLANNED
 - lib/cinch/syncable.rb
 - lib/cinch/message_queue.rb
 - lib/cinch/helpers.rb
@@ -108,25 +112,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 49
       segments: 
       - 1
       - 9
       - 1
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An IRC Bot Building Framework