cinch 2.0.3 → 2.0.4

data/lib/cinch/#syncable.rb#

@@ -0,0 +1,83 @@
+module Cinch
+  # Provide blocking access to user/channel information.
+  module Syncable
+    # Blocks until the object is synced.
+    #
+    # @return [void]
+    # @api private
+    def wait_until_synced(attr)
+      attr = attr.to_sym
+      waited = 0
+      while true
+        return if attribute_synced?(attr)
+        waited += 1
+
+        if waited % 100 == 0
+          bot.loggers.warn "A synced attribute ('%s' for %s) has not been available for %d seconds, still waiting" % [attr, self.inspect, waited / 10]
+          bot.loggers.warn caller.map {|s| "  #{s}"}
+
+          if waited / 10 >= 30
+            bot.loggers.warn "  Giving up..."
+            raise Exceptions::SyncedAttributeNotAvailable, "'%s' for %s" % [attr, self.inspect]
+          end
+        end
+        sleep 0.1
+      end
+    end
+
+    # @api private
+    # @return [void]
+    def sync(attribute, value, data = false)
+      if data
+        @data[attribute] = value
+      else
+        instance_variable_set("@#{attribute}", value)
+      end
+      @synced_attributes << attribute
+    end
+
+    # @return [Boolean]
+    # @api private
+    def attribute_synced?(attribute)
+      @synced_attributes.include?(attribute)
+    end
+
+    # @return [void]
+    # @api private
+    def unsync(attribute)
+      @synced_attributes.delete(attribute)
+    end
+
+    # @return [void]
+    # @api private
+    # @since 1.0.1
+    def unsync_all
+      @synced_attributes.clear
+    end
+
+    # @param [Symbol] attribute
+    # @param [Boolean] data
+    # @param [Boolean] unsync
+    # @api private
+    def attr(attribute, data = false, unsync = false)
+      unless unsync
+        if @when_requesting_synced_attribute
+          @when_requesting_synced_attribute.call(attribute)
+        end
+        wait_until_synced(attribute)
+      end
+
+      if data
+        return @data[attribute]
+      else
+        return instance_variable_get("@#{attribute}")
+      end
+    end
+
+    # @api private
+    # @return [void]
+    def mark_as_synced(attribute)
+      @synced_attributes << attribute
+    end
+  end
+end

data/lib/cinch/dcc/incoming/send.rb

@@ -90,7 +90,8 @@ module Cinch
         # of IO or String).
         #
         # @param [#<<] io The object to write the data to.
-        # @return [void]
+        # @return [Boolean] True if the transfer finished
+        #   successfully, false otherwise.
         # @note This method blocks.
         # @example Saving to a file
         #   f = File.open("/tmp/foo", "w")
@@ -103,12 +104,28 @@ module Cinch
         def accept(io)
           socket = TCPSocket.new(@ip, @port)
           total = 0
-          while buf = socket.read(1024)
+
+          while buf = socket.readpartial(8192)
             total += buf.bytesize
 
-            socket.write [total].pack("N")
+            begin
+              socket.write_nonblock [total].pack("N")
+            rescue Errno::EWOULDBLOCK, Errno::AGAIN
+              # Nobody cares about ACKs, really. And if the sender
+              # couldn't receive it at this point, he probably doesn't
+              # care, either.
+            end
             io << buf
+
+            # Break here in case the sender doesn't close the
+            # connection on the final ACK.
+            break if total == @size
           end
+
+          socket.close
+          return true
+        rescue EOFError
+          return false
         end
 
         # @return [Boolean] True if the DCC originates from a private ip

data/lib/cinch/irc.rb

@@ -544,8 +544,8 @@ module Cinch
       end
 
 
-      if msg.message =~ /^\001DCC SEND (\S+) (\d+) (\d+)(?: (\d+))?\001$/
-        process_dcc_send($1, $2, $3, $4, msg, events)
+      if msg.message =~ /^\001DCC SEND (?:"([^"]+)"|(\S+)) (\d+) (\d+)(?: (\d+))?\001$/
+        process_dcc_send($1 || $2, $3, $4, $5, msg, events)
       end
     end
 

data/lib/cinch/plugin_list.rb

@@ -24,6 +24,9 @@ module Cinch
 
     # @since 2.0.0
     def unregister_plugins(plugins)
+      if plugins == self
+        plugins = self.dup
+      end
       plugins.each { |plugin| unregister_plugin(plugin) }
     end
 

data/lib/cinch/rubyext/string.rb

@@ -26,7 +26,7 @@ class String
       self.tr("a-z", "A-Z")
     when :rfc1459
       self.tr("a-z{}|~", "A-Z[]\\\\^")
-    when :strict-rfc1459
+    when :"strict-rfc1459"
       self.tr("a-z{}|", "A-Z[]\\\\")
     end
   end

data/lib/cinch/sasl/dh_blowfish.rb

@@ -35,6 +35,12 @@ module Cinch
         # @param [String] payload
         # @return [String]
         def generate(user, password, payload)
+          # duplicate the passed strings because we are modifying them
+          # later and they might come from the configuration store or
+          # similar
+          user     = user.dup
+          password = password.dup
+
           data = Base64.decode64(payload).force_encoding("ASCII-8BIT")
 
           p, g, y = unpack_payload(data)

data/lib/cinch/user.rb

@@ -294,7 +294,7 @@ module Cinch
       if @bot.irc.isupport["MONITOR"] > 0
         @bot.irc.send "MONITOR - #@name"
       else
-        @monitored_timer.stop
+        @monitored_timer.stop if @monitored_timer
       end
 
       @monitored = false

data/lib/cinch/version.rb

@@ -1,4 +1,4 @@
 module Cinch
   # Version of the library
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies: []
 description: A simple, friendly DSL for creating IRC bots
 email:
@@ -47,6 +47,7 @@ files:
 - lib/cinch/isupport.rb
 - lib/cinch/helpers.rb
 - lib/cinch/handler.rb
+- lib/cinch/#syncable.rb#
 - lib/cinch/handler_list.rb
 - lib/cinch/rubyext/module.rb
 - lib/cinch/rubyext/float.rb