hiredis 0.4.5 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d434e6b09126833f2a6dcf82385105de08f629dd
+  data.tar.gz: 2d668be20b90a469f8f905f5915868e143cf5ae4
+SHA512:
+  metadata.gz: 637b4bc535ceca4c61aff1f3a1d7456819dc9abdfc934618eac3f8c66b2d791a8106197c552ee6a8635611bcb8588cebb4d183a0de60e21ad4b8b10a29f494eb
+  data.tar.gz: 5170e3ae0d95f728b2ca8566717de256aba4a4e3f804618a968ce81bbe8e3fca5b57942fe3d050441c10fe44aaf3f3c140ed7d8c99bc45e153033cb34884ad99

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler"
 Bundler::GemHelper.install_tasks
 
+require "rbconfig"
 require "rake/testtask"
 require "rake/extensiontask"
 
@@ -18,7 +19,12 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
       if !File.directory?("vendor/hiredis/.git")
         system("git submodule update --init")
       end
-      system("cd vendor/hiredis && make clean")
+      RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
+      make_program = $1 || ENV['make']
+      unless make_program then
+        make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+      end
+      system("cd vendor/hiredis && #{make_program} clean")
     end
   end
 

data/ext/hiredis_ext/connection.c

@@ -72,24 +72,58 @@ static VALUE connection_parent_context_alloc(VALUE klass) {
     return Data_Wrap_Struct(klass, parent_context_mark, parent_context_free, pc);
 }
 
+
+/*
+ * The rb_fdset_t API was introduced in Ruby 1.9.1. The rb_fd_thread_select
+ * function was introduced in a later version. Therefore, there are one more
+ * versions where we cannot simply test HAVE_RB_FD_INIT and be done, we have to
+ * explicitly test for HAVE_RB_THREAD_FD_SELECT (also see extconf.rb).
+ */
+#ifdef HAVE_RB_THREAD_FD_SELECT
+typedef rb_fdset_t _fdset_t;
+#define _fd_zero(f)                       rb_fd_zero(f)
+#define _fd_set(n, f)                     rb_fd_set(n, f)
+#define _fd_clr(n, f)                     rb_fd_clr(n, f)
+#define _fd_isset(n, f)                   rb_fd_isset(n, f)
+#define _fd_copy(d, s, n)                 rb_fd_copy(d, s, n)
+#define _fd_ptr(f)                        rb_fd_ptr(f)
+#define _fd_init(f)                       rb_fd_init(f)
+#define _fd_term(f)                       rb_fd_term(f)
+#define _fd_max(f)                        rb_fd_max(f)
+#define _thread_fd_select(n, r, w, e, t)  rb_thread_fd_select(n, r, w, e, t)
+#else
+typedef fd_set _fdset_t;
+#define _fd_zero(f)                       FD_ZERO(f)
+#define _fd_set(n, f)                     FD_SET(n, f)
+#define _fd_clr(n, f)                     FD_CLR(n, f)
+#define _fd_isset(n, f)                   FD_ISSET(n, f)
+#define _fd_copy(d, s, n)                 (*(d) = *(s))
+#define _fd_ptr(f)                        (f)
+#define _fd_init(f)                       FD_ZERO(f)
+#define _fd_term(f)                       (void)(f)
+#define _fd_max(f)                        FD_SETSIZE
+#define _thread_fd_select(n, r, w, e, t)  rb_thread_select(n, r, w, e, t)
+#endif
+
 static int __wait_readable(int fd, const struct timeval *timeout, int *isset) {
     struct timeval to;
     struct timeval *toptr = NULL;
-    fd_set fds;
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
 
-    /* rb_thread_select modifies the passed timeval, so we pass a copy */
+    _fdset_t fds;
+    _fd_init(&fds);
+    _fd_set(fd, &fds);
+
+    /* rb_fd_select modifies the passed timeval, so we pass a copy */
     if (timeout != NULL) {
         memcpy(&to, timeout, sizeof(to));
         toptr = &to;
     }
 
-    if (rb_thread_select(fd + 1, &fds, NULL, NULL, toptr) < 0) {
+    if (_thread_fd_select(fd + 1, &fds, NULL, NULL, toptr) < 0) {
         return -1;
     }
 
-    if (FD_ISSET(fd, &fds) && isset) {
+    if (_fd_isset(fd, &fds) && isset) {
         *isset = 1;
     }
 
@@ -99,21 +133,22 @@ static int __wait_readable(int fd, const struct timeval *timeout, int *isset) {
 static int __wait_writable(int fd, const struct timeval *timeout, int *isset) {
     struct timeval to;
     struct timeval *toptr = NULL;
-    fd_set fds;
-    FD_ZERO(&fds);
-    FD_SET(fd, &fds);
 
-    /* rb_thread_select modifies the passed timeval, so we pass a copy */
+    _fdset_t fds;
+    _fd_init(&fds);
+    _fd_set(fd, &fds);
+
+    /* rb_fd_select modifies the passed timeval, so we pass a copy */
     if (timeout != NULL) {
         memcpy(&to, timeout, sizeof(to));
         toptr = &to;
     }
 
-    if (rb_thread_select(fd + 1, NULL, &fds, NULL, toptr) < 0) {
+    if (_thread_fd_select(fd + 1, NULL, &fds, NULL, toptr) < 0) {
         return -1;
     }
 
-    if (FD_ISSET(fd, &fds) && isset) {
+    if (_fd_isset(fd, &fds) && isset) {
         *isset = 1;
     }
 
@@ -124,6 +159,9 @@ static VALUE connection_generic_connect(VALUE self, redisContext *c, VALUE arg_t
     redisParentContext *pc;
     struct timeval tv;
     struct timeval *timeout = NULL;
+    int writable = 0;
+    int optval = 0;
+    socklen_t optlen = sizeof(optval);
 
     Data_Get_Struct(self,redisParentContext,pc);
 
@@ -158,7 +196,6 @@ static VALUE connection_generic_connect(VALUE self, redisContext *c, VALUE arg_t
     }
 
     /* Wait for socket to become writable */
-    int writable = 0;
     if (__wait_writable(c->fd, timeout, &writable) < 0) {
         goto sys_fail;
     }
@@ -169,8 +206,6 @@ static VALUE connection_generic_connect(VALUE self, redisContext *c, VALUE arg_t
     }
 
     /* Check for socket error */
-    int optval = 0;
-    socklen_t optlen = sizeof(optval);
     if (getsockopt(c->fd, SOL_SOCKET, SO_ERROR, &optval, &optlen) < 0) {
         goto sys_fail;
     }
@@ -191,7 +226,6 @@ sys_fail:
 }
 
 static VALUE connection_connect(int argc, VALUE *argv, VALUE self) {
-    redisParentContext *pc;
     redisContext *c;
     VALUE arg_host = Qnil;
     VALUE arg_port = Qnil;
@@ -213,13 +247,11 @@ static VALUE connection_connect(int argc, VALUE *argv, VALUE self) {
         rb_raise(rb_eArgError, "invalid number of arguments");
     }
 
-    Data_Get_Struct(self,redisParentContext,pc);
     c = redisConnectNonBlock(StringValuePtr(arg_host), NUM2INT(arg_port));
     return connection_generic_connect(self,c,arg_timeout);
 }
 
 static VALUE connection_connect_unix(int argc, VALUE *argv, VALUE self) {
-    redisParentContext *pc;
     redisContext *c;
     VALUE arg_path = Qnil;
     VALUE arg_timeout = Qnil;
@@ -239,7 +271,6 @@ static VALUE connection_connect_unix(int argc, VALUE *argv, VALUE self) {
         rb_raise(rb_eArgError, "invalid number of arguments");
     }
 
-    Data_Get_Struct(self,redisParentContext,pc);
     c = redisConnectUnixNonBlock(StringValuePtr(arg_path));
     return connection_generic_connect(self,c,arg_timeout);
 }
@@ -265,7 +296,6 @@ static VALUE connection_disconnect(VALUE self) {
 static VALUE connection_write(VALUE self, VALUE command) {
     redisParentContext *pc;
     int argc;
-    VALUE *args;
     char **argv = NULL;
     size_t *alen = NULL;
     int i;
@@ -280,15 +310,15 @@ static VALUE connection_write(VALUE self, VALUE command) {
         rb_raise(rb_eRuntimeError,"%s","not connected");
 
     argc = (int)RARRAY_LEN(command);
-    args = RARRAY_PTR(command);
     argv = malloc(argc*sizeof(char*));
     alen = malloc(argc*sizeof(size_t));
     for (i = 0; i < argc; i++) {
         /* Replace arguments in the arguments array to prevent their string
          * equivalents to be garbage collected before this loop is done. */
-        args[i] = rb_obj_as_string(args[i]);
-        argv[i] = RSTRING_PTR(args[i]);
-        alen[i] = RSTRING_LEN(args[i]);
+        VALUE entry = rb_obj_as_string(rb_ary_entry(command, i));
+        rb_ary_store(command, i, entry);
+        argv[i] = RSTRING_PTR(entry);
+        alen[i] = RSTRING_LEN(entry);
     }
     redisAppendCommandArgv(pc->context,argc,(const char**)argv,alen);
     free(argv);
@@ -459,6 +489,7 @@ static VALUE connection_fileno(VALUE self) {
 VALUE klass_connection;
 void InitConnection(VALUE mod) {
     klass_connection = rb_define_class_under(mod, "Connection", rb_cObject);
+    rb_global_variable(&klass_connection);
     rb_define_alloc_func(klass_connection, connection_parent_context_alloc);
     rb_define_method(klass_connection, "connect", connection_connect, -1);
     rb_define_method(klass_connection, "connect_unix", connection_connect_unix, -1);

data/ext/hiredis_ext/extconf.rb

@@ -2,16 +2,27 @@ require 'mkmf'
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-hiredis_dir = File.expand_path(File.join(File.dirname(__FILE__), %w{.. .. vendor hiredis}))
+hiredis_dir = File.join(File.dirname(__FILE__), %w{.. .. vendor hiredis})
 unless File.directory?(hiredis_dir)
   STDERR.puts "vendor/hiredis missing, please checkout its submodule..."
   exit 1
 end
 
+RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
+make_program = $1 || ENV['make']
+unless make_program then
+  make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
+end
+
 # Make sure hiredis is built...
-system("cd #{hiredis_dir} && make static")
+Dir.chdir(hiredis_dir) do
+  success = system("#{make_program} static")
+  raise "Building hiredis failed" if !success
+end
 
 # Statically link to hiredis (mkmf can't do this for us)
 $CFLAGS << " -I#{hiredis_dir}"
 $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
+
+have_func("rb_thread_fd_select")
 create_makefile('hiredis/ext/hiredis_ext')

data/ext/hiredis_ext/hiredis_ext.c

@@ -8,6 +8,8 @@ VALUE mod_ext;
 void Init_hiredis_ext() {
     mod_hiredis = rb_define_module("Hiredis");
     mod_ext = rb_define_module_under(mod_hiredis,"Ext");
+    rb_global_variable(&mod_hiredis);
+    rb_global_variable(&mod_ext);
     InitReader(mod_ext);
     InitConnection(mod_ext);
 }

data/ext/hiredis_ext/hiredis_ext.h

@@ -1,6 +1,13 @@
 #ifndef __HIREDIS_EXT_H
 #define __HIREDIS_EXT_H
 
+/* Defined for Rubinius. This indicates a char* obtained
+ * through RSTRING_PTR is never modified in place. With this
+ * define Rubinius can disable the slow copy back mechanisms
+ * to make sure strings are updated at the Ruby side.
+ */
+#define RSTRING_NOT_MODIFIED
+
 #include "hiredis.h"
 #include "ruby.h"
 

data/ext/hiredis_ext/reader.c

@@ -97,6 +97,7 @@ static VALUE reader_gets(VALUE klass) {
 VALUE klass_reader;
 void InitReader(VALUE mod) {
     klass_reader = rb_define_class_under(mod, "Reader", rb_cObject);
+    rb_global_variable(&klass_reader);
     rb_define_alloc_func(klass_reader, reader_allocate);
     rb_define_method(klass_reader, "feed", reader_feed, 1);
     rb_define_method(klass_reader, "gets", reader_gets, 0);
@@ -108,6 +109,7 @@ void InitReader(VALUE mod) {
         enc_klass = rb_const_get(rb_cObject, rb_intern("Encoding"));
         enc_default_external = rb_intern("default_external");
         str_force_encoding = rb_intern("force_encoding");
+        rb_global_variable(&enc_klass);
     } else {
         enc_default_external = 0;
     }

data/lib/hiredis/version.rb

@@ -1,3 +1,3 @@
 module Hiredis
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/vendor/hiredis/Makefile

@@ -15,8 +15,8 @@ CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
 OPTIMIZATION?=-O3
 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
 DEBUG?= -g -ggdb
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG)
-REAL_LDFLAGS=$(LDFLAGS)
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
+REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
 
 DYLIBSUFFIX=so
 STLIBSUFFIX=a

data/vendor/hiredis/async.c

@@ -372,6 +372,11 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
                 __redisAsyncDisconnect(ac);
                 return;
             }
+            
+            /* If monitor mode, repush callback */
+            if(c->flags & REDIS_MONITORING) {
+                __redisPushCallback(&ac->replies,&cb);
+            }
 
             /* When the connection is not being disconnected, simply stop
              * trying to get replies and wait for the next loop tick. */
@@ -381,22 +386,31 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
         /* Even if the context is subscribed, pending regular callbacks will
          * get a reply before pub/sub messages arrive. */
         if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
-            /* A spontaneous reply in a not-subscribed context can only be the
-             * error reply that is sent when a new connection exceeds the
-             * maximum number of allowed connections on the server side. This
-             * is seen as an error instead of a regular reply because the
-             * server closes the connection after sending it. To prevent the
-             * error from being overwritten by an EOF error the connection is
-             * closed here. See issue #43. */
-            if ( !(c->flags & REDIS_SUBSCRIBED) && ((redisReply*)reply)->type == REDIS_REPLY_ERROR ) {
+            /*
+             * A spontaneous reply in a not-subscribed context can be the error
+             * reply that is sent when a new connection exceeds the maximum
+             * number of allowed connections on the server side.
+             *
+             * This is seen as an error instead of a regular reply because the
+             * server closes the connection after sending it.
+             *
+             * To prevent the error from being overwritten by an EOF error the
+             * connection is closed here. See issue #43.
+             *
+             * Another possibility is that the server is loading its dataset.
+             * In this case we also want to close the connection, and have the
+             * user wait until the server is ready to take our request.
+             */
+            if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
                 c->err = REDIS_ERR_OTHER;
                 snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
                 __redisAsyncDisconnect(ac);
                 return;
             }
-            /* No more regular callbacks and no errors, the context *must* be subscribed. */
-            assert(c->flags & REDIS_SUBSCRIBED);
-            __redisGetSubscribeCallback(ac,reply,&cb);
+            /* No more regular callbacks and no errors, the context *must* be subscribed or monitoring. */
+            assert((c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING));
+            if(c->flags & REDIS_SUBSCRIBED)
+                __redisGetSubscribeCallback(ac,reply,&cb);
         }
 
         if (cb.fn != NULL) {
@@ -557,6 +571,10 @@ static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void
         /* (P)UNSUBSCRIBE does not have its own response: every channel or
          * pattern that is unsubscribed will receive a message. This means we
          * should not append a callback function for this command. */
+     } else if(strncasecmp(cstr,"monitor\r\n",9) == 0) {
+         /* Set monitor flag and push callback */
+         c->flags |= REDIS_MONITORING;
+         __redisPushCallback(&ac->replies,&cb);
     } else {
         if (c->flags & REDIS_SUBSCRIBED)
             /* This will likely result in an error reply, but it needs to be

data/vendor/hiredis/hiredis.c

@@ -446,10 +446,10 @@ static int processMultiBulkItem(redisReader *r) {
     long elements;
     int root = 0;
 
-    /* Set error for nested multi bulks with depth > 2 */
-    if (r->ridx == 3) {
+    /* Set error for nested multi bulks with depth > 7 */
+    if (r->ridx == 8) {
         __redisReaderSetError(r,REDIS_ERR_PROTOCOL,
-            "No support for nested multi bulk replies with depth > 2");
+            "No support for nested multi bulk replies with depth > 7");
         return REDIS_ERR;
     }
 
@@ -564,6 +564,7 @@ redisReader *redisReaderCreate(void) {
     r->errstr[0] = '\0';
     r->fn = &defaultFunctions;
     r->buf = sdsempty();
+    r->maxbuf = REDIS_READER_MAX_BUF;
     if (r->buf == NULL) {
         free(r);
         return NULL;
@@ -591,7 +592,7 @@ int redisReaderFeed(redisReader *r, const char *buf, size_t len) {
     /* Copy the provided buffer. */
     if (buf != NULL && len >= 1) {
         /* Destroy internal buffer when it is empty and is quite large. */
-        if (r->len == 0 && sdsavail(r->buf) > 16*1024) {
+        if (r->len == 0 && r->maxbuf != 0 && sdsavail(r->buf) > r->maxbuf) {
             sdsfree(r->buf);
             r->buf = sdsempty();
             r->pos = 0;
@@ -749,6 +750,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
             default:
                 /* Try to detect printf format */
                 {
+                    static const char intfmts[] = "diouxX";
                     char _format[16];
                     const char *_p = c+1;
                     size_t _l = 0;
@@ -774,7 +776,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
                     va_copy(_cpy,ap);
 
                     /* Integer conversion (without modifiers) */
-                    if (strchr("diouxX",*_p) != NULL) {
+                    if (strchr(intfmts,*_p) != NULL) {
                         va_arg(ap,int);
                         goto fmt_valid;
                     }
@@ -788,7 +790,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
                     /* Size: char */
                     if (_p[0] == 'h' && _p[1] == 'h') {
                         _p += 2;
-                        if (*_p != '\0' && strchr("diouxX",*_p) != NULL) {
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
                             va_arg(ap,int); /* char gets promoted to int */
                             goto fmt_valid;
                         }
@@ -798,7 +800,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
                     /* Size: short */
                     if (_p[0] == 'h') {
                         _p += 1;
-                        if (*_p != '\0' && strchr("diouxX",*_p) != NULL) {
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
                             va_arg(ap,int); /* short gets promoted to int */
                             goto fmt_valid;
                         }
@@ -808,7 +810,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
                     /* Size: long long */
                     if (_p[0] == 'l' && _p[1] == 'l') {
                         _p += 2;
-                        if (*_p != '\0' && strchr("diouxX",*_p) != NULL) {
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
                             va_arg(ap,long long);
                             goto fmt_valid;
                         }
@@ -818,7 +820,7 @@ int redisvFormatCommand(char **target, const char *format, va_list ap) {
                     /* Size: long */
                     if (_p[0] == 'l') {
                         _p += 1;
-                        if (*_p != '\0' && strchr("diouxX",*_p) != NULL) {
+                        if (*_p != '\0' && strchr(intfmts,*_p) != NULL) {
                             va_arg(ap,long);
                             goto fmt_valid;
                         }
@@ -1066,7 +1068,7 @@ int redisSetTimeout(redisContext *c, struct timeval tv) {
  * After this function is called, you may use redisContextReadReply to
  * see if there is a reply available. */
 int redisBufferRead(redisContext *c) {
-    char buf[2048];
+    char buf[1024*16];
     int nread;
 
     /* Return early when the context has seen an error. */

data/vendor/hiredis/hiredis.h

@@ -36,8 +36,8 @@
 #include <sys/time.h> /* for struct timeval */
 
 #define HIREDIS_MAJOR 0
-#define HIREDIS_MINOR 10
-#define HIREDIS_PATCH 1
+#define HIREDIS_MINOR 11
+#define HIREDIS_PATCH 0
 
 #define REDIS_ERR -1
 #define REDIS_OK 0
@@ -76,6 +76,9 @@
 /* Flag that is set when the async context has one or more subscriptions. */
 #define REDIS_SUBSCRIBED 0x20
 
+/* Flag that is set when monitor mode is active */
+#define REDIS_MONITORING 0x40
+
 #define REDIS_REPLY_STRING 1
 #define REDIS_REPLY_ARRAY 2
 #define REDIS_REPLY_INTEGER 3
@@ -83,6 +86,8 @@
 #define REDIS_REPLY_STATUS 5
 #define REDIS_REPLY_ERROR 6
 
+#define REDIS_READER_MAX_BUF (1024*16)  /* Default max unused reader buffer. */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -122,8 +127,9 @@ typedef struct redisReader {
     char *buf; /* Read buffer */
     size_t pos; /* Buffer cursor */
     size_t len; /* Buffer length */
+    size_t maxbuf; /* Max length of unused buffer */
 
-    redisReadTask rstack[4];
+    redisReadTask rstack[9];
     int ridx; /* Index of current read task */
     void *reply; /* Temporary reply pointer */
 

data/vendor/hiredis/net.c

@@ -45,6 +45,8 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <poll.h>
+#include <limits.h>
 
 #include "net.h"
 #include "sds.h"
@@ -121,28 +123,38 @@ static int redisSetTcpNoDelay(redisContext *c, int fd) {
     return REDIS_OK;
 }
 
+#define __MAX_MSEC (((LONG_MAX) - 999) / 1000)
+
 static int redisContextWaitReady(redisContext *c, int fd, const struct timeval *timeout) {
-    struct timeval to;
-    struct timeval *toptr = NULL;
-    fd_set wfd;
+    struct pollfd   wfd[1];
+    long msec;
+
+    msec          = -1;
+    wfd[0].fd     = fd;
+    wfd[0].events = POLLOUT;
 
     /* Only use timeout when not NULL. */
     if (timeout != NULL) {
-        to = *timeout;
-        toptr = &to;
+        if (timeout->tv_usec > 1000000 || timeout->tv_sec > __MAX_MSEC) {
+            close(fd);
+            return REDIS_ERR;
+        }
+
+        msec = (timeout->tv_sec * 1000) + ((timeout->tv_usec + 999) / 1000);
+
+        if (msec < 0 || msec > INT_MAX) {
+            msec = INT_MAX;
+        }
     }
 
     if (errno == EINPROGRESS) {
-        FD_ZERO(&wfd);
-        FD_SET(fd, &wfd);
+        int res;
 
-        if (select(FD_SETSIZE, NULL, &wfd, NULL, toptr) == -1) {
-            __redisSetErrorFromErrno(c,REDIS_ERR_IO,"select(2)");
+        if ((res = poll(wfd, 1, msec)) == -1) {
+            __redisSetErrorFromErrno(c, REDIS_ERR_IO, "poll(2)");
             close(fd);
             return REDIS_ERR;
-        }
-
-        if (!FD_ISSET(fd, &wfd)) {
+        } else if (res == 0) {
             errno = ETIMEDOUT;
             __redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
             close(fd);

data/vendor/hiredis/test.c

@@ -177,7 +177,7 @@ static void test_format_commands(void) {
     FLOAT_WIDTH_TEST(double);
 
     test("Format command with invalid printf format: ");
-    len = redisFormatCommand(&cmd,"key:%08p %b",1234,"foo",3);
+    len = redisFormatCommand(&cmd,"key:%08p %b",(void*)1234,"foo",3);
     test_cond(len == -1);
 
     const char *argv[3];
@@ -204,6 +204,7 @@ static void test_reply_reader(void) {
     redisReader *reader;
     void *reply;
     int ret;
+    int i;
 
     test("Error handling in reply parser: ");
     reader = redisReaderCreate();
@@ -225,12 +226,13 @@ static void test_reply_reader(void) {
               strcasecmp(reader->errstr,"Protocol error, got \"@\" as reply type byte") == 0);
     redisReaderFree(reader);
 
-    test("Set error on nested multi bulks with depth > 2: ");
+    test("Set error on nested multi bulks with depth > 7: ");
     reader = redisReaderCreate();
-    redisReaderFeed(reader,(char*)"*1\r\n",4);
-    redisReaderFeed(reader,(char*)"*1\r\n",4);
-    redisReaderFeed(reader,(char*)"*1\r\n",4);
-    redisReaderFeed(reader,(char*)"*1\r\n",4);
+
+    for (i = 0; i < 9; i++) {
+        redisReaderFeed(reader,(char*)"*1\r\n",4);
+    }
+
     ret = redisReaderGetReply(reader,NULL);
     test_cond(ret == REDIS_ERR &&
               strncasecmp(reader->errstr,"No support for",14) == 0);
@@ -283,7 +285,8 @@ static void test_blocking_connection_errors(void) {
     test("Returns error when host cannot be resolved: ");
     c = redisConnect((char*)"idontexist.local", 6379);
     test_cond(c->err == REDIS_ERR_OTHER &&
-        strcmp(c->errstr,"Can't resolve: idontexist.local") == 0);
+        (strcmp(c->errstr,"Name or service not known") == 0 ||
+         strcmp(c->errstr,"Can't resolve: idontexist.local") == 0));
     redisFree(c);
 
     test("Returns error when the port is not open: ");

metadata

@@ -1,28 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: hiredis
 version: !ruby/object:Gem::Version
-  version: 0.4.5
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Pieter Noordhuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70232656303880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70232656303880
-description: Ruby extension that wraps Hiredis (blocking connection and reply parsing)
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+description: Ruby wrapper for hiredis (protocol serialization/deserialization and
+  blocking I/O)
 email:
 - pcnoordhuis@gmail.com
 executables: []
@@ -31,57 +48,56 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/hiredis_ext/extconf.rb
-- ext/hiredis_ext/connection.c
 - ext/hiredis_ext/hiredis_ext.c
 - ext/hiredis_ext/reader.c
+- ext/hiredis_ext/connection.c
 - ext/hiredis_ext/hiredis_ext.h
 - vendor/hiredis/async.c
-- vendor/hiredis/dict.c
 - vendor/hiredis/hiredis.c
+- vendor/hiredis/test.c
+- vendor/hiredis/dict.c
 - vendor/hiredis/net.c
 - vendor/hiredis/sds.c
-- vendor/hiredis/test.c
-- vendor/hiredis/async.h
-- vendor/hiredis/dict.h
 - vendor/hiredis/fmacros.h
-- vendor/hiredis/hiredis.h
-- vendor/hiredis/net.h
 - vendor/hiredis/sds.h
+- vendor/hiredis/dict.h
+- vendor/hiredis/async.h
+- vendor/hiredis/net.h
+- vendor/hiredis/hiredis.h
 - vendor/hiredis/COPYING
 - vendor/hiredis/Makefile
-- lib/hiredis/connection.rb
-- lib/hiredis/errors.rb
-- lib/hiredis/ext/connection.rb
-- lib/hiredis/ext/reader.rb
 - lib/hiredis/reader.rb
-- lib/hiredis/ruby/connection.rb
-- lib/hiredis/ruby/reader.rb
 - lib/hiredis/version.rb
+- lib/hiredis/ruby/reader.rb
+- lib/hiredis/ruby/connection.rb
+- lib/hiredis/ext/reader.rb
+- lib/hiredis/ext/connection.rb
+- lib/hiredis/connection.rb
 - lib/hiredis.rb
 - COPYING
 - Rakefile
-homepage: http://github.com/pietern/hiredis-rb
+homepage: http://github.com/redis/hiredis-rb
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
-summary: Ruby extension that wraps Hiredis (blocking connection and reply parsing)
+specification_version: 4
+summary: Ruby wrapper for hiredis (protocol serialization/deserialization and blocking
+  I/O)
 test_files: []

data/lib/hiredis/errors.rb

@@ -1,5 +0,0 @@
-module Hiredis
-  class Error < StandardError; end
-  class ProtocolError < Error; end
-  class ReplyError < Error; end
-end