Because you said you were interested

.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 .DS_Store
 *.swp
+vendor

.ruby-version

@@ -0,0 +1 @@
+2.6

.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+- 2.4
+- 2.5
+- 2.6
+services:
+  - redis-server

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 1.0.0 (2015-02-25)
+
+[BUGFIX] Replies becoming out of sync after voluntary reconnect.
+
+[CHANGE] Clients are now configured through the use of URIs only (not individual host, port, db params)
+
+  The previous interface was inconsistently applied, for example clients could be constructed using
+  individual params, but only re-configured using a uri.
+
+[CHANGE] Client's public interface simplified considerably wrt connect / reconnect / reconfigure.
+
+  Use `connect` to connect, `reconnect` to force reconnection and `reconnect(uri)` to force reconnection
+  to a different server.
+
+[CHANGE] Pubsub interface no longer returns deferrables for subscribe methods.
+
+  Rationale: Redis pubsub subscriptions can only ever be provided on a "best effort" basis where
+  reconnection-handling is provided - while reconnection takes place, messages will no be received.
+  If it is important to be aware of these periods, binding to a combination of :disconnected and
+  :subscribe on the pubsub client will allow one to deduce when the subscription is active.
+
+  The deferrable interface was also awkward in terms of issuing subscribe commands for multiple
+  channels at once.
+
+[NEW] Inactivity timeouts:
+
+  Trigger activity on idle connections and force reconnect if no response is found.
+  Particularly beneficial for pubsub connections where there may be no activity from the server for
+  extended periods and this is otherwise indistinguishable from a hung TCP connection.
+
 ## 0.2.1 (2013-04-22)
 
 [NEW] Support for connecting to redis on a unix socket.
@@ -15,7 +45,7 @@
   * Clients now emit the following events: connected, reconnected, disconnected, reconnect_failed (passes the number of consecutive failures)
   * Client is considered failed after 4 consecutive failures
   * Fails all queued commands when client failed
-  * Can now reconfiure and reconnect an exising client
+  * Can now reconfigure and reconnect an exising client
   * Reconnect timeout can be configured (defaults to 0.5s)
 
 [NEW] Added `EM::Hiredis::Lock` and `EM::Hiredis::PersistentLock`

README.md

@@ -79,11 +79,6 @@ This configures a `PING` command to be sent if 5 seconds elapse without receivin
 
 This configuration is per client, you may choose different value for clients with different expected traffic patterns, or activate it on some and not at all on others.
 
-### PING and Pubsub
-
-Because the Redis Pubsub protocol limits the set of valid commands on a connection once it is in "Pubsub" mode, `PING` is not supported in this case (though it may be in future, see https://github.com/antirez/redis/issues/420). In order to create some valid request-response traffic on the connection, a Pubsub connection will issue `SUBSCRIBE "__em-hiredis-ping"`, followed by a corresponding `UNSUBSCRIBE` immediately on success of the subscribe.
-While less than ideal, this is the case where an application layer inactivity check is most valuable, and so the trade off is reasonable until `PING` is supported correctly on Pubsub connections.
-
 ### Close to the metal
 
 Basically just bind to `:message` and `:pmessage` events:
@@ -135,6 +130,25 @@ If you pass a block to `subscribe` or `psubscribe`, the passed block will be cal
 
 It's possible to subscribe to the same channel multiple time and just unsubscribe a single callback using `unsubscribe_proc` or `punsubscribe_proc`.
 
+## Lua scripting
+
+When loading scripts from a directory with `EventMachine::Hiredis::Client.load_scripts_from`, the scripts loaded undergo very simple preprocessing, replacing any occurrence of an "include directive" literally with the contents of the referenced file before sending the script to redis.
+
+```
+-- #include file/name.lua
+```
+
+The filename is expressed relative to the directory of scripts being loaded.
+
+### Recommendations for library code
+
+The implementation is extremely simple, so some sensible recommendations are:
+
+- Put library code in a subdirectory, or using an extension other than `.lua`, to prevent library scripts being loaded as their own commands.
+- Declare only "classes" into the top level scope in library code, and preferably only one per script with the classname matching the script name, to minimise possible naming collisions
+- Attach free function implementations to members of a declared class as a namespace.
+- Remember while developing that line numbers reported back from redis will be offset
+
 ## Developing
 
 Hacking on em-hiredis is pretty simple, make sure you have Bundler installed:

em-hiredis.gemspec

@@ -6,17 +6,17 @@ Gem::Specification.new do |s|
   s.name        = "em-hiredis"
   s.version     = EventMachine::Hiredis::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Martyn Loughran"]
-  s.email       = ["[email protected]"]
+  s.authors     = ["Martyn Loughran", "Mike Pye"]
+  s.email       = ["[email protected]", "[email protected]"]
   s.homepage    = "http://github.com/mloughran/em-hiredis"
   s.summary     = %q{Eventmachine redis client}
   s.description = %q{Eventmachine redis client using hiredis native parser}
 
-  s.add_dependency 'hiredis', '~> 0.4.0'
+  s.add_dependency 'hiredis', '~> 0.6.0'
 
   s.add_development_dependency 'em-spec', '~> 0.2.5'
   s.add_development_dependency 'rspec', '~> 2.6.0'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 10'
 
   s.rubyforge_project = "em-hiredis"
 

lib/em-hiredis.rb

@@ -16,11 +16,9 @@ class << self
     end
     self.reconnect_timeout = 0.5
 
-    def self.setup(uri = nil)
+    def self.setup(uri = nil, activity_timeout = nil, response_timeout = nil)
       uri = uri || ENV["REDIS_URL"] || "redis://127.0.0.1:6379/0"
-      client = Client.new
-      client.configure(uri)
-      client
+      Client.new(uri, activity_timeout, response_timeout)
     end
 
     # Connects to redis and returns a client instance
@@ -34,10 +32,9 @@ def self.setup(uri = nil)
     # Unix socket uris are supported, e.g. unix:///tmp/redis.sock, however
     # it's not possible to set the db or password - use initialize instead in
     # this case
-    def self.connect(uri = nil)
-      client = setup(uri)
+    def self.connect(uri = nil, activity_timeout = nil, response_timeout = nil)
+      client = setup(uri, activity_timeout, response_timeout)
       client.connect
-      client
     end
 
     def self.logger=(logger)
@@ -58,8 +55,14 @@ def self.logger
   end
 end
 
-require 'em-hiredis/event_emitter'
-require 'em-hiredis/connection'
-require 'em-hiredis/base_client'
-require 'em-hiredis/client'
+require 'digest/sha1'
+require 'hiredis/reader'
+require 'em-hiredis/support/event_emitter'
+require 'em-hiredis/support/cancellable_deferrable'
+require 'em-hiredis/support/inactivity_checker'
+require 'em-hiredis/support/state_machine'
+require 'em-hiredis/connection_manager'
+require 'em-hiredis/redis_connection'
+require 'em-hiredis/pubsub_connection'
+require 'em-hiredis/redis_client'
 require 'em-hiredis/pubsub_client'