ruby-redis 0.0.1 → 0.0.2

data/lib/redis/protocol.rb

@@ -1,63 +1,6 @@
-require File.expand_path '../redis', File.dirname(__FILE__)
-require 'eventmachine'
-require_relative 'reader'
-require_relative 'sender'
-
-class Redis
-  
-  # Use to respond with raw protocol
-  #  Response["+",data,"\n\r"]
-  #  Response::OK
-  #  Response[]
-  class Response < Array
-    OK = self["+OK\r\n".freeze].freeze
-    PONG = self["+PONG\r\n".freeze].freeze
-    NIL_MB = self["*-1\r\n".freeze].freeze
-    QUEUED = self["+QUEUED\r\n".freeze].freeze
-  end
-
-  class Watcher
-    include EventMachine::Deferrable
-    
-    attr_reader :bound
-    
-    def initialize
-      @watched = []
-      @bound = true
-      errback { unbind }
-      callback { unbind }
-    end
-    
-    def bind database, *keys
-      return unless @bound
-      keys.each do |key|
-        entry = [database, key]
-        next if @watched.include? entry
-        @watched << entry
-        (database.watchers[key] ||= []).push self
-      end
-    end
-    
-    def unbind
-      return unless @bound
-      @watched.each do |database, key|
-        key_df_list = database.watchers[key]
-        next unless key_df_list
-        key_df_list.delete_if { |e| e == self }
-      end
-      @bound = false
-    end
-    
-  end
-  
+module Redis
   module Protocol
     
-    include Sender
-
-    # Typically raised by redis_QUIT
-    class CloseConnection < Exception
-    end
-  
     def initialize *args
       @reader = Reader.new
       @multi = nil
@@ -69,28 +12,46 @@ class Redis
     def unbind
       @deferred.unbind if @deferred
       @watcher.unbind if @watcher
+      super
     end
     
-    # Companion to send_data.
-    def send_redis data
-      if EventMachine::Deferrable === data
-        @deferred.unbind if @deferred and @deferred != data
-        @deferred = data
-      elsif Response === data
-        data.each do |item|
-          send_data item
+    # Process incoming redis protocol
+    def receive_data data
+      return unless @reader
+      @reader.feed data
+      until (strings = @reader.gets) == false
+        if @multi and !%w{WATCH DISCARD MULTI EXEC DEBUG}.include?(strings[0].upcase)
+          @multi << strings
+          send_redis :'+QUEUED'
+        else
+          result = __send__ "redis_#{strings[0].upcase}", *strings[1..-1]
+          if Integer === result
+            send_data ":#{result}\r\n"
+          elsif EventMachine::Deferrable === result
+            @deferred.unbind if @deferred and @deferred != result
+            @deferred = result
+          elsif result == :quit
+            @reader = nil
+            close_connection_after_writing
+            break
+          elsif result != :exec
+            send_redis result
+          end
         end
-      elsif Integer === data
-        send_data ":#{data}\r\n"
-      else
-        super
       end
+    rescue Exception => e
+      raise e if Interrupt === e
+      # This sometimes comes in handy for the TCL tests
+      # @logger.warn "#{e.class}:/#{e.backtrace[0]} #{e.message}"
+      # e.backtrace[1..-1].each {|bt| @logger.warn bt}
+      send_data "-ERR #{e.class.name}: #{e.message}\r\n" 
     end
-    
+
     def redis_WATCH *keys
-      @watcher ||= Watcher.new
+      raise 'WATCH inside MULTI is not allowed' if @multi
+      @watcher ||= Database::Watcher.new
       @watcher.bind @database, *keys
-      Response::OK
+      :'+OK'
     end
     
     def redis_UNWATCH
@@ -98,19 +59,19 @@ class Redis
         @watcher.unbind
         @watcher = nil
       end
-      Response::OK
+      :'+OK'
     end
 
     def redis_MULTI
       raise 'MULTI nesting not allowed' if @multi
       @multi = []
-      Response::OK
+      :'+OK'
     end
     
     def redis_DISCARD
       redis_UNWATCH
       @multi = nil
-      Response::OK
+      :'+OK'
     end
 
     def redis_EXEC
@@ -119,51 +80,29 @@ class Redis
         redis_UNWATCH
         unless still_bound
           @multi = nil
-          return Response::NIL_MB 
+          return :'*-1' 
         end
       end
       send_data "*#{@multi.size}\r\n"
       response = []
-      @multi.each do |strings| 
-        result = call_redis *strings
+      @multi.each do |strings|
+        begin
+          result = __send__ "redis_#{strings[0].upcase}", *strings[1..-1]
+        rescue Exception => e
+          raise e if Interrupt === e
+          result = e
+        end
         if EventMachine::Deferrable === result
           result.unbind
           send_redis nil
+        elsif Exception === result
+          send_data "-ERR #{result.class.name}: #{result.message}"
         else
           send_redis result
         end
       end
       @multi = nil
-      Response[]
-    end
-    
-    def call_redis command, *arguments
-      send "redis_#{command.upcase}", *arguments
-    rescue Exception => e
-      raise e if CloseConnection === e
-      # Redis.logger.warn "#{command.dump}: #{e.class}:/#{e.backtrace[0]} #{e.message}"
-      # e.backtrace[1..-1].each {|bt|Redis.logger.warn bt}
-      Response["-ERR #{e.class.name}: #{e.message}\r\n" ]
-    end
-  
-    # Process incoming redis protocol
-    def receive_data data
-      @reader.feed data
-      until (strings = @reader.gets) == false
-        # Redis.logger.warn "#{strings.collect{|a|a.dump}.join ' '}"
-        if @multi and !%w{MULTI EXEC DEBUG DISCARD}.include?(strings[0].upcase)
-          @multi << strings
-          send_redis Response::QUEUED
-        else
-          send_redis call_redis *strings
-        end
-      end
-    rescue Exception => e
-      if CloseConnection === e
-        close_connection_after_writing
-      else
-        send_data "-ERR #{e.class.name}: #{e.message}\r\n" 
-      end
+      :exec
     end
 
   end

data/lib/redis/protocol.rbc

@@ -1,6 +1,6 @@
 !RBIX
-6235178746665710376
-x
+8948944263761558646
+18
 M
 1
 n
@@ -9,84 +9,32 @@ x
 10
 __script__
 i
-81
-5
-45
-0
-1
-7
-2
-64
-45
-0
-3
-65
-49
-4
-0
-49
-5
-1
-49
-6
-2
-47
-49
-7
-1
-15
-5
-7
-8
-64
-47
-49
-7
-1
-15
-5
-7
-9
-64
-47
-49
-10
-1
-15
-5
-7
-11
-64
-47
-49
-10
-1
-15
+29
 99
 7
-12
+0
 1
 65
 49
-13
+1
 3
 13
 99
 12
 7
-14
+2
 12
 7
-15
+3
 12
 65
 12
 49
-16
+4
 4
 15
 49
-14
+2
 0
 15
 2
@@ -99,41 +47,11 @@ I
 0
 I
 0
+I
+0
 n
 p
-17
-x
-4
-File
-n
-s
-8
-../redis
-n
-x
-11
-active_path
-x
-7
-dirname
-x
-11
-expand_path
-x
-7
-require
-s
-12
-eventmachine
-s
-6
-reader
-x
-16
-require_relative
-s
-6
-sender
+5
 x
 5
 Redis
@@ -151,89 +69,33 @@ x
 5
 Redis
 i
-84
+28
 5
 66
 99
 7
 0
-45
-1
-2
-65
-49
-3
-3
-13
-99
-12
-7
-4
-12
-7
-5
-12
 65
-12
-49
-6
-4
-15
 49
-4
-0
-15
-99
-7
-7
 1
-65
-49
-3
-3
+2
 13
 99
 12
 7
-4
+2
 12
 7
-8
+3
 12
 65
 12
 49
-6
 4
-15
-49
 4
-0
 15
-99
-7
-9
-65
 49
-10
 2
-13
-99
-12
-7
-11
-12
-7
-12
-12
-65
-12
-49
-6
-4
-15
-49
-11
 0
 11
 I
@@ -244,119 +106,147 @@ I
 0
 I
 0
+I
+0
 n
 p
-13
+5
 x
 8
-Response
-x
-5
-Array
-n
+Protocol
 x
-10
-open_class
+11
+open_module
 x
-14
-__class_init__
+15
+__module_init__
 M
 1
 n
 n
 x
 8
-Response
+Protocol
 i
-86
+114
 5
 66
-65
+99
 7
 0
-5
 7
 1
-64
+65
+67
 49
 2
 0
-47
 49
 3
-1
-49
-2
-0
-49
 4
-2
 15
-65
+99
 7
-5
-5
+4
 7
-6
-64
+5
+65
+67
 49
 2
 0
-47
 49
 3
-1
+4
+15
+99
+7
+6
+7
+7
+65
+67
 49
 2
 0
 49
+3
 4
-2
 15
-65
-7
-7
-5
+99
 7
 8
-64
+7
+9
+65
+67
 49
 2
 0
-47
 49
 3
-1
+4
+15
+99
+7
+10
+7
+11
+65
+67
 49
 2
 0
 49
+3
 4
-2
 15
-65
+99
 7
-9
-5
+12
 7
-10
-64
+13
+65
+67
 49
 2
 0
-47
 49
 3
-1
+4
+15
+99
+7
+14
+7
+15
+65
+67
 49
 2
 0
 49
+3
+4
+15
+99
+7
+16
+7
+17
+65
+67
+49
+2
+0
+49
+3
 4
-2
 11
 I
-4
+5
+I
+0
 I
 0
 I
@@ -365,149 +255,189 @@ I
 0
 n
 p
-11
+18
+x
+10
+initialize
+M
+1
+n
+n
 x
+10
+initialize
+i
+43
+45
+0
+1
+13
+71
 2
-OK
-s
+47
+9
+21
+47
+49
+3
+0
+13
+47
+49
+4
+0
+15
+8
+24
+49
+2
+0
+38
 5
-+OK
-
+15
+1
+38
+6
+15
+1
+38
+7
+15
+1
+38
+8
+15
+54
+89
+4
+11
+I
+3
+I
+1
+I
+0
+I
+0
+I
+0
+I
+0
+p
+9
 x
 6
-freeze
+Reader
+n
 x
-2
-[]
+3
+new
 x
-9
-const_set
+8
+allocate
+x
+10
+initialize
 x
-4
-PONG
-s
 7
-+PONG
-
+@reader
 x
 6
-NIL_MB
-s
-5
-*-1
-
+@multi
 x
-6
-QUEUED
-s
 9
-+QUEUED
-
+@deferred
+x
+8
+@watcher
 p
-9
+13
 I
-2
+-1
 I
-d
+4
 I
-17
+0
 I
-e
+5
 I
-2c
+1b
 I
-f
+6
 I
-41
+1f
 I
-10
+7
 I
-56
+23
+I
+8
+I
+27
+I
+9
+I
+2b
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
 p
-0
+1
 x
-13
-attach_method
+4
+args
 x
-7
-Watcher
+17
+method_visibility
+x
+15
+add_defn_method
+x
+6
+unbind
 M
 1
 n
 n
 x
-7
-Watcher
+6
+unbind
 i
-63
-5
-66
-5
-45
+30
+39
+0
+9
+11
+39
 0
-1
-43
-2
-47
 49
-3
 1
-15
-5
-7
-4
-47
-49
-5
+0
+8
+12
 1
 15
-99
-7
-6
-7
-7
-65
-67
-49
-8
-0
-49
+39
+2
 9
-4
-15
-99
-7
-10
-7
-11
-65
-67
+24
+39
+2
 49
-8
+1
 0
-49
-9
-4
-15
-99
-7
-12
-7
-13
-65
-67
-49
 8
-0
-49
-9
-4
+25
+1
+15
+54
+89
+1
 11
 I
-5
+1
+I
+0
 I
 0
 I
@@ -516,2052 +446,502 @@ I
 0
 n
 p
-14
-x
-12
-EventMachine
-n
+3
 x
-10
-Deferrable
+9
+@deferred
 x
-7
-include
-x
-5
-bound
-x
-11
-attr_reader
-x
-10
-initialize
-M
-1
-n
-n
-x
-10
-initialize
-i
-25
-35
-0
-38
-0
-15
-2
-38
-1
-15
-5
-56
-2
-47
-50
-3
-0
-15
-5
-56
-4
-47
-50
-5
-0
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-6
+6
+unbind
 x
 8
-@watched
-x
-6
-@bound
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-10
-initialize
-i
-4
-5
-48
-0
-11
-I
-2
-I
-0
-I
-0
-I
-0
-I
--2
-p
-1
-x
-6
-unbind
-p
-3
-I
-0
-I
-1b
-I
-4
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-0
-x
-7
-errback
-M
-1
+@watcher
 p
-2
-x
-9
-for_block
-t
-n
-x
-10
-initialize
-i
-4
-5
-48
-0
-11
-I
-2
+13
 I
-0
+-1
 I
-0
+c
 I
 0
 I
--2
-p
-1
-x
-6
-unbind
-p
-3
-I
-0
+d
 I
-1c
+c
 I
-4
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
 0
-x
-8
-callback
-p
-11
-I
--1
 I
-18
+d
 I
-0
+e
 I
 19
 I
-5
+0
 I
 1a
 I
-9
-I
-1b
-I
-11
-I
-1c
+f
 I
-19
+1e
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
 p
 0
 x
-17
-method_visibility
-x
-15
-add_defn_method
-x
-4
-bind
+12
+receive_data
 M
 1
 n
 n
 x
-4
-bind
+12
+receive_data
 i
-18
+348
+26
+93
+0
+15
+29
+262
+0
 39
 0
 9
-7
+14
 1
 8
-9
-1
-11
-15
-20
-1
-56
+16
 1
-50
-2
-0
 11
-I
-4
-I
-2
-I
-1
-I
-1
-I
-1
-p
-3
-x
-6
-@bound
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-4
-bind
-i
-74
-57
-19
-0
-15
-21
-1
-0
-20
-0
-35
-2
-19
-1
 15
 39
 0
 20
-1
+0
 49
 1
 1
-9
-27
-1
-11
-8
-28
-1
 15
 39
 0
-20
-1
 49
 2
-1
-15
-21
-1
 0
-49
-3
-0
-20
-0
-14
-2
-49
-4
-1
-13
-10
-65
-15
-35
-0
-13
-18
-3
-49
-5
-2
-15
-8
-69
-18
-2
-16
-2
-5
-49
-6
-1
-11
-I
-7
-I
-2
-I
-1
-I
-1
-n
-p
-7
-x
-8
-@watched
-x
-8
-include?
-x
-2
-<<
-x
-8
-watchers
-x
-2
-[]
-x
-3
-[]=
-x
-4
-push
-p
-13
-I
-0
-I
-21
-I
-4
-I
-22
-I
-e
-I
-23
-I
-1c
-I
-0
-I
-1d
-I
-24
-I
-25
-I
-25
-I
-4a
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-2
-x
-3
-key
-x
-5
-entry
-x
-4
-each
-p
-9
-I
--1
-I
-1f
-I
-0
-I
-20
-I
-9
-I
-0
-I
-a
-I
-21
-I
-12
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-2
-x
-8
-database
-x
-4
-keys
-x
-6
-unbind
-M
-1
-n
-n
-x
-6
-unbind
-i
-22
-39
-0
-9
-7
-1
-8
-9
-1
-11
-15
-39
-1
-56
-2
-50
-3
-0
-15
-3
-38
-0
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-4
-x
-6
-@bound
-x
-8
-@watched
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-6
-unbind
-i
-41
-58
-37
-19
-0
-15
-37
-19
-1
-15
-15
-20
-0
-49
-0
-0
-20
-1
-49
-1
-1
-19
-2
-15
-20
-2
-9
-30
-1
-8
-32
-1
-11
-15
-20
-2
-56
-2
-50
-3
-0
-11
-I
-6
-I
-3
-I
-2
-I
-2
-n
-p
-4
-x
-8
-watchers
-x
-2
-[]
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-6
-unbind
-i
-10
-57
-19
-0
-15
-20
-0
-5
-83
-0
-11
-I
-4
-I
-1
-I
-1
-I
-1
-n
-p
-1
-x
-2
-==
-p
-3
-I
-0
-I
-2e
-I
-a
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-1
-x
-1
-e
-x
-9
-delete_if
-p
-11
-I
-0
-I
-2b
-I
-a
-I
-2c
-I
-17
-I
-2d
-I
-20
-I
-0
-I
-21
-I
-2e
-I
-29
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-3
-x
-8
-database
-x
-3
-key
-x
-11
-key_df_list
-x
-4
-each
-p
-11
-I
--1
-I
-29
-I
-0
-I
-2a
-I
-9
-I
-0
-I
-a
-I
-2b
-I
-12
-I
-30
-I
-16
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-0
-p
-11
-I
-2
-I
-14
-I
-d
-I
-16
-I
-15
-I
-18
-I
-23
-I
-1f
-I
-31
-I
-29
-I
-3f
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-0
-x
-8
-Protocol
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-8
-Protocol
-i
-164
-5
-66
-5
-45
-0
-1
-47
-49
-2
-1
-15
-99
-7
-3
-45
-4
-5
-65
-49
-6
-3
-15
-1
-15
-99
-7
-7
-7
-8
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-11
-7
-12
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-13
-7
-14
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-15
-7
-16
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-17
-7
-18
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-19
-7
-20
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-21
-7
-22
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-23
-7
-24
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-25
-7
-26
-65
-67
-49
-9
-0
-49
-10
-4
-15
-99
-7
-27
-7
-28
-65
-67
-49
-9
-0
-49
-10
-4
-11
-I
-5
-I
-0
-I
-0
-I
-0
-n
-p
-29
-x
-6
-Sender
-n
-x
-7
-include
-x
-15
-CloseConnection
-x
-9
-Exception
-n
-x
-10
-open_class
-x
-10
-initialize
-M
-1
-n
-n
-x
-10
-initialize
-i
-43
-45
-0
-1
-13
-71
-2
-47
-9
-21
-47
-49
-3
-0
-13
-47
-49
-4
-0
-15
-8
-24
-49
-2
-0
-38
-5
-15
-1
-38
-6
-15
-1
-38
-7
-15
-1
-38
-8
-15
-54
-89
-4
-11
-I
-3
-I
-1
-I
-0
-I
-0
-I
-0
-p
-9
-x
-6
-Reader
-n
-x
-3
-new
-x
-8
-allocate
-x
-10
-initialize
-x
-7
-@reader
-x
-6
-@multi
-x
-9
-@deferred
-x
-8
-@watcher
-p
-13
-I
--1
-I
-3d
-I
-0
-I
-3e
-I
-1b
-I
-3f
-I
-1f
-I
-40
-I
-23
-I
-41
-I
-27
-I
-42
-I
-2b
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-1
-x
-4
-args
-x
-17
-method_visibility
-x
-15
-add_defn_method
-x
-6
-unbind
-M
-1
-n
-n
-x
-6
-unbind
-i
-26
-39
-0
-9
-11
-39
-0
-49
-1
-0
-8
-12
-1
-15
-39
-2
-9
-24
-39
-2
-49
-1
-0
-8
-25
-1
-11
-I
-1
-I
-0
-I
-0
-I
-0
-n
-p
-3
-x
-9
-@deferred
-x
-6
-unbind
-x
-8
-@watcher
-p
-11
-I
--1
-I
-45
-I
-0
-I
-46
-I
-c
-I
-0
-I
-d
-I
-47
-I
-19
-I
-0
-I
-1a
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-0
-x
-10
-send_redis
-M
-1
-n
-n
-x
-10
-send_redis
-i
-95
-45
-0
-1
-43
-2
-20
-0
-86
-3
-9
-46
-39
-4
-13
-9
-29
-15
-39
-4
-20
-0
-83
-5
-10
-28
-2
-8
-29
-3
-9
-38
-39
-4
-49
-6
-0
-8
-39
-1
-15
-20
-0
-38
-4
-8
-94
-45
-7
-8
-20
-0
-86
-3
-9
-64
-20
-0
-56
-9
-50
-10
-0
-8
-94
-45
-11
-12
-20
-0
-86
-3
-9
-91
-5
-7
-13
-20
-0
-47
-101
-14
-7
-15
-63
-3
-47
-49
-16
-1
-8
-94
-54
-89
-17
-11
-I
-5
-I
-1
-I
-1
-I
-1
-n
-p
-18
-x
-12
-EventMachine
-n
-x
-10
-Deferrable
-x
-3
-===
-x
-9
-@deferred
-x
-2
-==
-x
-6
-unbind
-x
-8
-Response
-n
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-10
-send_redis
-i
-12
-57
-19
-0
-15
-5
-20
-0
-47
-49
-0
-1
-11
-I
-4
-I
-1
-I
-1
-I
-1
-n
-p
-1
-x
-9
-send_data
-p
-5
-I
-0
-I
-50
-I
-4
-I
-51
-I
-c
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-1
-x
-4
-item
-x
-4
-each
-x
-7
-Integer
-n
-s
-1
-:
-x
-4
-to_s
-s
-2
-
-
-x
-9
-send_data
-x
-10
-send_redis
-p
-23
-I
--1
-I
-4b
-I
-0
-I
-4c
-I
-b
-I
-4d
-I
-27
-I
-0
-I
-28
-I
-4e
-I
-2e
-I
-4f
-I
-37
-I
-50
-I
-40
-I
-53
-I
-49
-I
-54
-I
-5b
-I
-56
-I
-5e
-I
-0
-I
-5f
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-1
-x
-4
-data
-x
-11
-redis_WATCH
-M
-1
-n
-n
-x
-11
-redis_WATCH
-i
-51
-39
-0
-13
-10
-32
-15
-45
-1
-2
-13
-71
-3
-47
-9
-27
-47
-49
-4
-0
-13
-47
-49
-5
-0
-15
-8
-30
-49
-3
-0
-38
-0
-15
-39
-0
-39
-6
-20
-0
-36
-1
-51
-7
-1
-15
-45
-8
-9
-43
-10
-11
-I
-5
-I
+19
 1
-I
-0
-I
-0
-I
-0
-p
-11
-x
-8
-@watcher
-x
-7
-Watcher
-n
-x
 3
-new
-x
-8
-allocate
-x
+83
+3
 10
-initialize
-x
-9
-@database
-x
-4
-bind
-x
-8
-Response
-n
-x
-2
-OK
-p
-9
-I
--1
-I
-5a
-I
-0
-I
-5b
-I
-21
-I
-5c
-I
-2d
-I
-5d
-I
-33
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-1
-x
+258
+39
 4
-keys
-x
-13
-redis_UNWATCH
-M
-1
-n
-n
-x
 13
-redis_UNWATCH
-i
-23
-39
-0
 9
+78
 15
-39
-0
-49
-1
-0
-15
-1
-38
-0
-8
-16
-1
-15
-45
-2
-3
-43
-4
-11
-I
-1
-I
-0
-I
-0
-I
-0
-n
-p
+7
 5
-x
-8
-@watcher
-x
+64
+7
 6
-unbind
-x
+64
+7
+7
+64
+7
 8
-Response
-n
-x
-2
-OK
-p
-15
-I
--1
-I
-60
-I
-0
-I
-61
-I
-4
-I
-62
-I
-a
-I
-63
-I
-f
-I
-61
-I
-10
-I
-0
-I
-11
-I
-65
-I
-17
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-0
-x
-11
-redis_MULTI
-M
-1
-n
-n
-x
-11
-redis_MULTI
-i
-27
-39
-0
+64
+7
 9
-14
+64
+35
 5
-7
+20
 1
-64
-47
+78
 49
-2
-1
-8
-15
+10
 1
-15
-35
-0
-38
-0
-15
-45
-3
-4
-43
-5
-11
-I
-2
-I
-0
-I
-0
-I
-0
-n
-p
-6
-x
-6
-@multi
-s
-25
-MULTI nesting not allowed
-x
-5
-raise
-x
-8
-Response
-n
-x
-2
-OK
-p
+49
 11
-I
--1
-I
-68
-I
-0
-I
-69
-I
-f
-I
 0
-I
+49
+12
+1
 10
-I
-6a
-I
-15
-I
-6b
-I
-1b
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-0
-x
-13
-redis_DISCARD
-M
+77
+2
+8
+78
+3
+9
+97
+39
+4
+20
 1
-n
-n
-x
+49
 13
-redis_DISCARD
-i
+1
+15
+5
+7
 14
+47
+49
+15
+1
+8
+254
 5
-48
+7
+16
+20
+1
+78
+49
+10
+1
+49
+11
 0
-15
+47
+101
+17
+63
+2
+20
 1
-38
+44
+43
+18
+79
+77
+49
+19
+2
+49
+10
+1
+36
+1
+47
+51
+20
 1
+19
+2
 15
 45
+21
+22
+20
 2
+86
+23
+9
+163
+5
+7
+24
+20
+2
+47
+101
+17
+7
+25
+63
 3
-43
-4
-11
-I
+47
+49
+26
 1
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-13
-redis_UNWATCH
-x
-6
-@multi
-x
 8
-Response
-n
-x
+254
+45
+27
+28
+43
+29
+20
 2
-OK
-p
+86
+23
 9
-I
--1
-I
-6e
-I
-0
-I
-6f
-I
-4
-I
-70
-I
-8
-I
-71
-I
-e
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-0
-x
-10
-redis_EXEC
-M
-1
-n
-n
-x
-10
-redis_EXEC
-i
-81
+209
 39
-0
+30
+13
 9
-35
+192
+15
 39
-0
+30
+20
+2
+83
+3
+10
+191
+2
+8
+192
+3
+9
+201
+39
+30
 49
-1
+31
 0
-19
+8
+202
+1
+15
+20
+2
+38
+30
+8
+254
+20
+2
+7
+32
+83
+3
+9
+230
+1
+38
 0
 15
 5
 48
-2
+33
 15
+1
+8
+259
+8
+254
 20
-0
+2
+7
+34
+83
+3
+10
+241
+2
+8
+242
+3
 9
-23
+253
+5
+20
+2
+47
+49
+15
 1
 8
-33
+254
 1
-38
+15
+68
+8
+25
+1
+30
+8
+344
+26
+93
+1
+15
+24
+13
+45
+35
+36
+12
+49
+23
+1
+10
+279
+8
+339
+15
+24
+19
 3
 15
 45
-4
+37
+38
+20
+3
+86
+23
+9
+302
 5
-43
-6
-11
+20
+3
+47
+49
+39
+1
 8
-36
+303
 1
 15
 5
 7
+40
+20
+3
+49
+41
+0
+49
+42
+0
+47
+101
+17
 7
-39
+43
+20
 3
 49
-8
+44
 0
 47
 101
-9
+17
 7
-10
+25
 63
-3
+5
 47
 49
-11
-1
-15
-35
-0
-19
+26
 1
+25
+8
+344
 15
-39
-3
-56
-12
-50
-13
-0
-15
+92
 1
-38
-3
-15
-45
-4
-14
-49
-15
+27
+34
+92
 0
+27
 11
 I
-6
+c
 I
-2
+4
 I
-0
+1
 I
 0
+I
+1
 n
 p
-16
-x
-8
-@watcher
+45
 x
-5
-bound
+7
+@reader
 x
-13
-redis_UNWATCH
+4
+feed
 x
-6
-@multi
+4
+gets
 x
-8
-Response
-n
+2
+==
 x
 6
-NIL_MB
+@multi
+s
+5
+WATCH
+s
+7
+DISCARD
+s
+5
+MULTI
 s
-1
-*
-x
-4
-size
-x
 4
-to_s
+EXEC
 s
+5
+DEBUG
+x
 2
-
-
+[]
+x
+6
+upcase
+x
+8
+include?
 x
-9
-send_data
-M
-1
-p
 2
+<<
 x
-9
-for_block
-t
-n
+7
++QUEUED
 x
 10
-redis_EXEC
-i
-49
-57
-19
-0
-15
-5
-20
-0
-36
-1
-47
-51
-0
-0
-19
-1
-15
-45
-1
-2
-43
-3
-20
-1
-86
+send_redis
+s
+6
+redis_
+x
 4
-9
-41
-20
-1
-49
-5
-0
-15
+to_s
+x
 5
-1
-47
-49
-6
-1
+Range
+x
+3
+new
+x
 8
-48
-5
-20
-1
-47
-49
-6
+__send__
+x
+7
+Integer
+n
+x
+3
+===
+s
 1
-11
-I
-6
-I
+:
+s
 2
-I
-1
-I
-1
-n
-p
-7
+
+
 x
-10
-call_redis
+9
+send_data
 x
 12
 EventMachine
@@ -2570,832 +950,733 @@ x
 10
 Deferrable
 x
-3
-===
+9
+@deferred
 x
 6
 unbind
 x
-10
-send_redis
+4
+quit
+x
+30
+close_connection_after_writing
+x
+4
+exec
+x
+9
+Exception
+n
+x
+9
+Interrupt
+n
+x
+5
+raise
+s
+5
+-ERR 
+x
+5
+class
+x
+4
+name
+s
+2
+: 
+x
+7
+message
 p
+61
+I
+-1
+I
+13
+I
+0
+I
+14
+I
+10
+I
+0
+I
+11
+I
 15
 I
-0
+19
+I
+16
+I
+25
 I
-7f
+17
 I
-4
+50
 I
-80
+18
 I
-10
+58
 I
-81
+19
+I
+61
 I
 1b
 I
-82
+88
 I
-21
+1c
 I
-83
+91
 I
-29
+1d
 I
-85
+a3
 I
-30
+1e
+I
+ae
+I
+1f
+I
+ca
 I
 0
 I
-31
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-2
-x
-7
-strings
-x
-6
-result
-x
-4
-each
-n
-x
-2
-[]
-p
-31
+cb
 I
--1
+20
 I
-74
+d1
 I
-0
+21
 I
-75
+d9
 I
-4
+22
 I
-76
+dd
 I
-c
+23
 I
-77
+e1
 I
-10
+24
 I
-78
+e6
 I
-17
+25
 I
-79
+f4
 I
-1b
+26
 I
-7a
+fd
 I
-21
+25
+I
+fe
 I
 0
 I
-23
+10b
 I
-75
+2a
 I
-24
+118
 I
-0
+30
 I
-25
+119
 I
-7d
+2a
 I
-39
+11c
 I
-7e
+2b
 I
-3e
+12f
 I
-7f
+0
 I
-46
+130
 I
-88
+2f
 I
-4a
+158
 I
-89
+0
 I
-51
+15c
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
 p
-2
+4
 x
-11
-still_bound
+4
+data
 x
-8
-response
+7
+strings
 x
-10
-call_redis
+6
+result
+x
+1
+e
+x
+11
+redis_WATCH
 M
 1
 n
 n
 x
-10
-call_redis
+11
+redis_WATCH
 i
-194
-26
-93
-0
-15
-29
-31
+66
+39
 0
+9
+14
 5
 7
-0
-20
-0
-49
 1
-0
+64
 47
-101
-2
-63
+49
 2
-20
-1
-36
-1
-47
-51
-3
 1
-30
 8
-190
-26
-93
+15
 1
 15
-24
+39
+3
 13
-45
-4
-5
-12
-49
-6
-1
 10
-48
-8
-185
-15
-24
-19
-2
+50
 15
 45
-7
-8
-20
-2
-86
-6
-9
-71
+4
 5
-20
-2
-47
-49
-9
-1
-8
-72
-1
-15
-45
-10
-11
-49
-12
-0
-20
-0
-49
-13
-0
-47
-101
-2
-7
-14
-20
-2
-49
-15
-0
-47
-101
-2
-7
-16
-20
-2
-49
-17
-0
-78
-49
-18
-1
-47
-101
-2
-7
-19
-20
-2
-49
-20
-0
-47
-101
-2
-63
-7
-49
-21
-1
-15
-20
-2
-49
-17
-0
-44
 43
-22
-79
-77
-49
-23
-2
-49
-18
-1
-56
-24
-50
-25
-0
-15
-45
-26
-27
+6
+13
+71
 7
-28
-20
-2
+47
+9
+45
+47
 49
-15
+8
 0
+13
+47
 49
-29
+9
 0
-47
-101
-2
-7
-14
-20
-2
+15
+8
+48
 49
+7
+0
+38
+3
+15
+39
+3
+39
+10
 20
 0
-47
-101
-2
-7
-30
-63
-5
-49
-18
+36
 1
-25
-8
-190
-15
-92
+51
+11
 1
-27
-34
-92
-0
-27
+15
+7
+12
 11
 I
-d
-I
-3
+5
 I
 1
 I
-1
+0
 I
-1
+0
+I
+0
+I
+0
 p
-31
-s
-6
-redis_
+13
 x
 6
-upcase
+@multi
+s
+33
+WATCH inside MULTI is not allowed
 x
-4
-to_s
+5
+raise
 x
-4
-send
+8
+@watcher
 x
-9
-Exception
+8
+Database
 n
 x
+7
+Watcher
+x
 3
-===
+new
 x
-15
-CloseConnection
-n
+8
+allocate
 x
-5
-raise
+10
+initialize
 x
-5
-Redis
-n
+9
+@database
 x
-6
-logger
+4
+bind
+x
+3
++OK
+p
+13
+I
+-1
+I
+32
+I
+0
+I
+33
+I
+f
+I
+0
+I
+10
+I
+34
+I
+33
+I
+35
+I
+3f
+I
+36
+I
+42
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
+p
+1
 x
 4
-dump
-s
-2
-: 
+keys
 x
-5
-class
-s
-2
-:/
+13
+redis_UNWATCH
+M
+1
+n
+n
 x
+13
+redis_UNWATCH
+i
+20
+39
+0
 9
-backtrace
-x
+15
+39
+0
+49
+1
+0
+15
+1
+38
+0
+8
+16
+1
+15
+7
 2
-[]
-s
+11
+I
 1
- 
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
+3
 x
-7
-message
+8
+@watcher
+x
+6
+unbind
 x
+3
++OK
+p
+15
+I
+-1
+I
+39
+I
+0
+I
+3a
+I
 4
-warn
+I
+3b
+I
+a
+I
+3c
+I
+f
+I
+3a
+I
+10
+I
+0
+I
+11
+I
+3e
+I
+14
 x
-5
-Range
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
+p
+0
 x
-3
-new
+11
+redis_MULTI
 M
 1
-p
-2
-x
-9
-for_block
-t
+n
 n
 x
-10
-call_redis
-i
-16
-57
-19
-0
-15
-45
+11
+redis_MULTI
+i
+24
+39
 0
+9
+14
+5
+7
 1
+64
+47
 49
 2
+1
+8
+15
+1
+15
+35
 0
-20
+38
 0
-49
+15
+7
 3
-1
 11
 I
-4
-I
-1
-I
-1
+2
 I
-1
-n
-p
-4
-x
-5
-Redis
-n
-x
-6
-logger
-x
-4
-warn
-p
-3
+0
 I
 0
 I
-91
+0
 I
-10
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
+0
+n
 p
-1
-x
-2
-bt
-x
 4
-each
 x
-8
-Response
-n
+6
+@multi
 s
+25
+MULTI nesting not allowed
+x
 5
--ERR 
+raise
 x
-4
-name
-s
-2
-
-
+3
++OK
 p
-25
+11
 I
 -1
 I
-8c
-I
-0
-I
-8d
-I
-1f
+41
 I
 0
 I
-24
-I
-8e
-I
-31
-I
-93
-I
-32
-I
-8e
-I
-35
-I
-8f
+42
 I
-48
+f
 I
 0
 I
-49
-I
-90
-I
-7f
-I
-91
-I
-95
+10
 I
-92
+43
 I
-be
+15
 I
-0
+44
 I
-c2
+18
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
 p
-3
-x
-7
-command
-x
-9
-arguments
-x
-1
-e
+0
 x
-12
-receive_data
+13
+redis_DISCARD
 M
 1
 n
 n
 x
-12
-receive_data
+13
+redis_DISCARD
 i
-217
-26
-93
+11
+5
+48
 0
 15
-29
-137
-0
-39
-0
-20
-0
-49
 1
+38
 1
 15
-39
-0
-49
+7
 2
-0
-19
+11
+I
 1
+I
+0
+I
+0
+I
+0
+I
+0
+n
+p
 3
-83
+x
+13
+redis_UNWATCH
+x
+6
+@multi
+x
 3
-10
-133
-45
++OK
+p
+9
+I
+-1
+I
+47
+I
+0
+I
+48
+I
 4
-5
+I
 49
-6
-0
-20
-1
-56
-7
-50
+I
 8
+I
+4a
+I
+b
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
+p
 0
-7
-9
-64
-49
+x
 10
+redis_EXEC
+M
 1
-47
-101
-11
-63
-1
-49
-12
-1
-15
+n
+n
+x
+10
+redis_EXEC
+i
+74
 39
-13
-13
-9
-93
-15
-7
-14
-64
-7
-15
-64
-7
-16
-64
-7
-17
-64
-35
-4
-20
-1
-78
-49
-18
-1
-49
-19
 0
-49
-20
-1
-10
-92
-2
-8
-93
-3
 9
-115
+32
 39
-13
-20
-1
+0
 49
-21
 1
+0
+19
+0
 15
 5
-45
-22
-23
-43
-24
-47
-49
-25
-1
-8
-129
-5
-5
+48
+2
+15
 20
-1
-36
-1
-47
-51
-26
 0
-47
-49
-25
+9
+23
 1
-15
-68
 8
-15
-1
 30
-8
-213
-26
-93
 1
+38
+3
 15
-24
-13
-45
-27
-28
-12
-49
-29
-1
-10
-154
+7
+4
+11
 8
-208
-15
-24
-19
-2
+33
+1
 15
-45
-30
-31
-20
-2
-86
-29
-9
-173
-5
-48
-32
-8
-205
 5
 7
-33
-20
-2
-49
-34
-0
+5
+39
+3
 49
-35
+6
 0
 47
 101
-11
 7
-36
-20
-2
-49
-37
-0
-47
-101
-11
 7
-38
+8
 63
-5
+3
 47
 49
-39
+9
 1
-25
-8
-213
 15
-92
+35
+0
+19
 1
-27
-34
-92
+15
+39
+3
+56
+10
+50
+11
 0
-27
+15
+1
+38
+3
+15
+7
+12
 11
 I
-b
+6
 I
-3
+2
 I
-1
+0
 I
-1
+0
+I
+0
 n
 p
-40
+13
 x
-7
-@reader
+8
+@watcher
 x
-4
-feed
+5
+bound
+x
+13
+redis_UNWATCH
+x
+6
+@multi
+x
+3
+*-1
+s
+1
+*
 x
 4
-gets
+size
 x
+4
+to_s
+s
 2
-==
-x
-5
-Redis
-n
+
+
 x
-6
-logger
+9
+send_data
 M
 1
 p
@@ -3406,80 +1687,102 @@ for_block
 t
 n
 x
-12
-receive_data
-i
 10
+redis_EXEC
+i
+76
 57
 19
 0
 15
+5
+7
+0
 20
 0
+78
+49
+1
+1
 49
+2
+0
+47
+101
+3
+63
+2
+20
 0
+44
+43
+4
+79
+77
+49
+5
+2
+49
+1
+1
+36
+1
+47
+51
+6
+1
+19
+1
+15
+45
+7
+8
+43
+9
+20
+1
+86
+10
+9
+68
+20
+1
+49
+11
 0
+15
+5
+1
+47
+49
+12
+1
+8
+75
+5
+20
+1
+47
+49
+12
+1
 11
 I
-3
-I
-1
+9
 I
-1
+2
 I
 1
-n
-p
-1
-x
-4
-dump
-p
-3
 I
 0
 I
-99
-I
-a
-x
-54
-/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
-p
-1
-x
 1
-a
-x
-7
-collect
+n
+p
+13
 s
-1
- 
-x
-4
-join
-x
-4
-to_s
-x
-4
-warn
-x
 6
-@multi
-s
-5
-MULTI
-s
-4
-EXEC
-s
-5
-DEBUG
-s
-7
-DISCARD
+redis_
 x
 2
 []
@@ -3487,215 +1790,209 @@ x
 6
 upcase
 x
-8
-include?
+4
+to_s
 x
-2
-<<
+5
+Range
 x
-8
-Response
-n
+3
+new
 x
-6
-QUEUED
+8
+__send__
 x
-10
-send_redis
+12
+EventMachine
+n
 x
 10
-call_redis
-x
-9
-Exception
-n
+Deferrable
 x
 3
 ===
 x
-15
-CloseConnection
-n
-x
-30
-close_connection_after_writing
-s
-5
--ERR 
-x
-5
-class
+6
+unbind
 x
+10
+send_redis
+p
+15
+I
+0
+I
+58
+I
 4
-name
-s
+I
+59
+I
+2b
+I
+5a
+I
+36
+I
+5b
+I
+3c
+I
+5c
+I
+44
+I
+5e
+I
+4b
+I
+0
+I
+4c
+x
+54
+/Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
+p
 2
-: 
 x
 7
-message
-s
-2
-
-
+strings
 x
-9
-send_data
+6
+result
+x
+4
+each
+x
+4
+exec
 p
-33
+31
 I
 -1
 I
-96
+4d
 I
 0
 I
-97
-I
-f
-I
-98
+4e
 I
-1b
+4
 I
-99
+4f
 I
-37
+c
 I
-9a
+50
 I
-5f
+10
 I
-9b
+51
 I
-67
+17
 I
-9c
+52
 I
-73
+1b
 I
-9e
+53
 I
-81
+1e
 I
 0
 I
-8e
+20
 I
-a1
+4e
 I
-9b
+21
 I
-a7
+0
 I
-9c
+22
 I
-a1
+56
 I
-9f
+36
 I
-a2
+57
 I
-a8
+3b
 I
-a3
+58
 I
-ad
+43
 I
-a5
+61
 I
-cd
+47
 I
-0
+62
 I
-d9
+4a
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
 p
-3
-x
-4
-data
+2
 x
-7
-strings
+11
+still_bound
 x
-1
-e
+8
+response
 p
-25
+17
 I
 2
 I
-37
-I
-b
-I
-3a
-I
-18
-I
-3d
-I
-26
-I
-45
-I
-34
-I
-4b
+4
 I
-42
+10
 I
-5a
+c
 I
-50
+1e
 I
-60
+13
 I
-5e
+2c
 I
-68
+32
 I
-6c
+3a
 I
-6e
+39
 I
-7a
+48
 I
-74
+41
 I
-88
+56
 I
-8c
+47
 I
-96
+64
 I
-96
+4d
 I
-a4
+72
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
 p
 0
+x
+13
+attach_method
 p
-7
+3
 I
 2
 I
-c
-I
-1f
-I
-13
-I
-3a
-I
-35
+2
 I
-54
+1c
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb
@@ -3705,29 +2002,13 @@ x
 13
 attach_method
 p
-11
+3
 I
 0
 I
 1
 I
-19
-I
-2
-I
-22
-I
-3
-I
-2b
-I
-4
-I
-34
-I
-6
-I
-51
+1d
 x
 54
 /Users/dturnbull/ruby/ruby-redis/lib/redis/protocol.rb