disque 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9796d605e959e6f35a0496c2f9d809919d08121
-  data.tar.gz: ac9b84f30b28dc50f030c9bb643fc192d9e3bcea
+  metadata.gz: 4ab3407c0c795f337c046fa94c96e67f9f2be51b
+  data.tar.gz: 8c0c0aedf7f7a97edf30512bc8558b8bca019bbe
 SHA512:
-  metadata.gz: 52e663f3f5eb7bade1c2e28cb61d0e55a2b8974bdcb053c3ee991f2b57028e3b19436ff43e25093663e835d6a90946c16c78db266e7b19842ab5bb9ff62f3305
-  data.tar.gz: ce21a8e38a1e953adc053eda602d9085dcdce54744fc9c4b74dd9b47e7eac2d189658fcb9ed6ee04954e59aef27c0fb2225fa2461095a3c54c798f30423e44a5
+  metadata.gz: bb908195fd598056f7af0f0e45834996b4ae57f479afada1b1b4e21177cc49e4083cfd2bf708736c451102656c33069ebaad29c8af3879d6b79f8b50d597338e
+  data.tar.gz: 63945a37c822eef761d2fa7f8dd5c75de68f91c54d319572a38d066481b2421feed6a4eb0de55553ba35b45e8e9e838a980ef2602a1699315f203fa89e6f3955

data/.gems

@@ -1,2 +1,2 @@
 cutest -v 1.2.0
-redic -v 1.4.1
+redic -v 1.5.0

data/CHANGELOG

@@ -0,0 +1,3 @@
+0.0.4
+
+- Add AUTH option.

data/disque.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "disque"
-  s.version           = "0.0.3"
+  s.version           = "0.0.4"
   s.summary           = "Client for Disque"
   s.description       = "Disque client for Ruby"
   s.authors           = ["Michel Martens", "Damian Janowski"]
@@ -11,5 +11,5 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.license           = "MIT"
 
-  s.add_dependency "redic"
+  s.add_dependency "redic", "~> 1.5.0"
 end

data/lib/disque.rb

@@ -22,7 +22,10 @@ class Disque
   #
   # TODO Account for authentication
   # TODO Account for timeout
-  def initialize(hosts, cycle: 1000)
+  def initialize(hosts, auth: nil, cycle: 1000)
+
+    # Cluster password
+    @auth = auth
 
     # Cycle length
     @cycle = cycle
@@ -49,11 +52,15 @@ class Disque
   end
 
   def url(host)
-    sprintf("disque://%s", host)
+    if @auth
+      sprintf("disque://:%s@%s", @auth, host)
+    else
+      sprintf("disque://%s", host)
+    end
   end
 
-  # Collect the list of nodes by means of `CLUSTER NODES` and
-  # keep a connection to the node that provided that information.
+  # Collect the list of nodes and keep a connection to the
+  # node that provided that information.
   def explore!(hosts)
 
     # Reset nodes
@@ -63,21 +70,20 @@ class Disque
       begin
         @scout.configure(url(host))
 
-        @scout.call("CLUSTER", "NODES").lines do |line|
-          id, host, flag = line.split
-
-          prefix = id[0,8]
+        result = @scout.call!("HELLO")
 
-          if flag == "myself"
+        # For keeping track of nodes and stats, we use only the
+        # first eight characters of the node_id. That's because
+        # those eight characters are part of the job_ids, and
+        # our stats are based on that.
+        @prefix = result[1][0,8]
 
-            # Configure main client
-            @client.configure(@scout.url)
+        # Connect the main client to the first node that replied
+        @client.configure(@scout.url)
 
-            # Keep track of selected node
-            @prefix = prefix
-          end
-
-          @nodes[prefix] = host
+        # Populate cache with the list of node and their hosts
+        result[2..-1].each do |node_id, hostname, port, priority|
+          @nodes[node_id[0,8]] = sprintf("%s:%s", hostname, port)
         end
 
         @scout.quit
@@ -106,6 +112,8 @@ class Disque
 
           # Reconfigure main client
           @client.configure(url(host))
+
+          # Save current node prefix
           @prefix = prefix
 
           # Reset stats for this new connection
@@ -119,7 +127,7 @@ class Disque
   # connection is lost, new connections are tried
   # until all nodes become unavailable.
   def call(*args)
-    @client.call(*args)
+    @client.call!(*args)
   rescue *ECONN
     explore!(@nodes.values)
     retry

data/makefile

@@ -23,6 +23,7 @@ stop:
 		--daemonize yes \
 		--bind 127.0.0.1 \
 		--loglevel notice \
+		--requirepass test \
 		--pidfile disque.$@.pid \
 		--appendfilename disque.$@.aof \
 		--cluster-config-file disque.$@.nodes \

data/tests/disque_test.rb

@@ -33,24 +33,24 @@ DISQUE_GOOD_NODES = DISQUE_NODES[1,3]
 test "raise if connection is not possible" do
   Silencer.start
   assert_raise(ArgumentError) do
-    c = Disque.new(DISQUE_BAD_NODES)
+    c = Disque.new(DISQUE_BAD_NODES, auth: "test")
   end
   Silencer.stop
 
-  assert_equal "#<Errno::ECONNREFUSED: Can't connect to: disque://127.0.0.1:7710>\n", Silencer.output
+  assert_equal "#<Errno::ECONNREFUSED: Can't connect to: disque://:test@127.0.0.1:7710>\n", Silencer.output
 end
 
 test "retry until a connection is reached" do
   Silencer.start
-  c = Disque.new(DISQUE_NODES)
+  c = Disque.new(DISQUE_NODES, auth: "test")
   Silencer.stop
 
-  assert_equal "#<Errno::ECONNREFUSED: Can't connect to: disque://127.0.0.1:7710>\n", Silencer.output
+  assert_equal "#<Errno::ECONNREFUSED: Can't connect to: disque://:test@127.0.0.1:7710>\n", Silencer.output
   assert_equal "PONG", c.call("PING")
 end
 
 test "lack of jobs" do
-  c = Disque.new(DISQUE_GOOD_NODES)
+  c = Disque.new(DISQUE_GOOD_NODES, auth: "test")
   reached = false
 
   c.fetch(from: ["foo"], timeout: 1) do |job|
@@ -61,7 +61,7 @@ test "lack of jobs" do
 end
 
 test "one job" do
-  c = Disque.new(DISQUE_GOOD_NODES)
+  c = Disque.new(DISQUE_GOOD_NODES, auth: "test")
 
   c.push("foo", "bar", 1000)
 
@@ -71,7 +71,7 @@ test "one job" do
 end
 
 test "multiple jobs" do
-  c = Disque.new(DISQUE_GOOD_NODES)
+  c = Disque.new(DISQUE_GOOD_NODES, auth: "test")
 
   c.push("foo", "bar", 1000)
   c.push("foo", "baz", 1000)
@@ -87,7 +87,7 @@ test "multiple jobs" do
 end
 
 test "multiple queues" do
-  c = Disque.new(DISQUE_GOOD_NODES)
+  c = Disque.new(DISQUE_GOOD_NODES, auth: "test")
 
   c.push("foo", "bar", 1000)
   c.push("qux", "baz", 1000)
@@ -105,11 +105,11 @@ test "multiple queues" do
 end
 
 test "add jobs with other parameters" do
-  c = Disque.new(DISQUE_GOOD_NODES)
+  c = Disque.new(DISQUE_GOOD_NODES, auth: "test")
 
-  c.push("foo", "bar", 1000, async: true, ttl: 0)
+  c.push("foo", "bar", 1000, async: true, ttl: 1)
 
-  sleep 0.1
+  sleep 2
 
   queues = ["foo"]
   jobs = ["bar"]
@@ -124,8 +124,8 @@ test "add jobs with other parameters" do
 end
 
 test "connect to the best node" do
-  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2)
-  c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2)
+  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
+  c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2, auth: "test")
 
   assert c1.prefix != c2.prefix
 
@@ -146,8 +146,8 @@ test "connect to the best node" do
 end
 
 test "connect to the best node, part 2" do
-  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2)
-  c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2)
+  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
+  c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2, auth: "test")
 
   assert c1.prefix != c2.prefix
 
@@ -164,7 +164,7 @@ test "connect to the best node, part 2" do
 end
 
 test "recover after node disconnection" do
-  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2)
+  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
 
   prefix = c1.prefix
 
@@ -187,12 +187,12 @@ test "recover after node disconnection" do
   c1.fetch(from: ["q1"])
 
   # Prefix should stay the same
-  assert prefix == c1.prefix
+  assert_equal prefix, c1.prefix
 end
 
 test "federation" do
-  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2)
-  c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2)
+  c1 = Disque.new([DISQUE_GOOD_NODES[0]], cycle: 2, auth: "test")
+  c2 = Disque.new([DISQUE_GOOD_NODES[1]], cycle: 2, auth: "test")
 
   c1.push("q1", "j1", 0)
 
@@ -202,7 +202,7 @@ test "federation" do
 end
 
 test "ack jobs when block is given" do
-  c = Disque.new(DISQUE_GOOD_NODES)
+  c = Disque.new(DISQUE_GOOD_NODES, auth: "test")
 
   c.push("q1", "j1", 1000)
 
@@ -223,7 +223,7 @@ test "ack jobs when block is given" do
 end
 
 test "don't ack jobs when no block is given" do
-  c = Disque.new(DISQUE_GOOD_NODES)
+  c = Disque.new(DISQUE_GOOD_NODES, auth: "test")
 
   c.push("q1", "j1", 1000)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disque
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michel Martens
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 description: Disque client for Ruby
 email:
 - michel@soveran.com
@@ -36,6 +36,7 @@ files:
 - .gems
 - .gitignore
 - AUTHORS
+- CHANGELOG
 - LICENSE
 - README.md
 - disque.gemspec
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Client for Disque