qmore 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81dfd049f15b6991030f758016c3b47f4590a591
-  data.tar.gz: e940b3230a609ae3d40c732d91ca017ca23d7dac
+  metadata.gz: 6f079f1d98ba4c005750de9469e2606766e18ea3
+  data.tar.gz: c736db45bb274e617bca058222298eea4fa55b8e
 SHA512:
-  metadata.gz: 4a34b907609e0c0aad6502255b847cadd2e1ac1576a77db9bb8dee1c2fc2a04015c9b0d9fee7a887b12274aa258fe396b6d9109799f0439b1603507b08dcf4ca
-  data.tar.gz: e897e91ffa701441f469f509a67006506cb968e3728d18974c89397e46a7987fe0aa9a0c08bc672e88e1514706e75103e2d7fa260a69f087ec4752b545d0ba55
+  metadata.gz: f847b813fd9f3d01073060a3efad7373e7e50cd8c37def71be557f05b0e2ef9e078fb54dc3239cac8d68831991ef5c58ac5d377ed1044b41ece77490aa0bfa74
+  data.tar.gz: 8e7f39e5973a0dddb8d8e4cac20ffe4e1e1862b075b2962f2121f90332b4dcfb6fae180317411374715a0a61330d3a6bee4392eb9b6b78846479001b97248b1a

data/.travis.yml

@@ -2,7 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-services:
-  - redis-server
+  - 2.1.1
 script: bundle exec rspec spec

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.6.1 (03/05/2014)
+------------------
+
+shuffle clients so we do not select from the same order of clients every time <58edfde> [james-lawrence]
+
 0.6.0 (02/25/2014)
 ------------------
 

data/lib/qmore/job_reserver.rb

@@ -39,7 +39,8 @@ module Qmore
     def realize_queues
       realized_queues = []
 
-      self.clients.each do |client, regexes|
+      self.clients.keys.shuffle.each do |client|
+        regexes = self.clients[client]
         # Cache the queues so we don't make multiple calls.
         actual_queues = client.queues
 

data/lib/qmore/version.rb

@@ -1,3 +1,3 @@
 module Qmore
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/job_reserver_spec.rb

@@ -26,10 +26,19 @@ describe "JobReserver" do
       queue_a.length.should == 0
       queue_b.length.should == 0
     end
+
+    it "shuffles the order of the clients" do
+      queue = Qmore.client.queues['queue']
+
+      reserver = Qmore::JobReserver.new([queue])
+      k = reserver.clients.keys
+      k.should_receive(:shuffle).once.and_return(reserver.clients.keys)
+      reserver.clients.should_receive(:keys).and_return(k)
+      reserver.reserve
+    end
   end
 
   context "basic qless behavior still works" do
-
     it "can reserve from multiple queues" do
       high_queue = Qmore.client.queues['high']
       critical_queue = Qmore.client.queues['critical']
@@ -38,6 +47,7 @@ describe "JobReserver" do
       critical_queue.put(SomeJob, [])
 
       reserver = Qmore::JobReserver.new([critical_queue, high_queue])
+
       reserver.reserve.queue.name.should == 'critical'
       reserver.reserve.queue.name.should == 'high'
     end

data/spec/redis/qless01-test.conf

@@ -76,7 +76,7 @@ save 60 10000
 rdbcompression yes
 
 # The filename where to dump the DB
-dbfilename ./qless01-test-dump.rdb
+dbfilename qless01-test-dump.rdb
 
 # The working directory.
 #

data/spec/redis/qless02-test.conf

@@ -76,7 +76,7 @@ save 60 10000
 rdbcompression yes
 
 # The filename where to dump the DB
-dbfilename ./qless02-test-dump.rdb
+dbfilename qless02-test-dump.rdb
 
 # The working directory.
 #

data/spec/spec_helper.rb

@@ -5,26 +5,23 @@ Coveralls.wear!
 
 require 'qmore'
 
-# No need to start redis when running in Travis
-unless ENV['CI']
-  redis_configs_directory = File.join(File.dirname(File.expand_path(__FILE__)), "redis")
-  redis_configs = Dir.entries(redis_configs_directory).select{|f| !File.directory? f}
+redis_configs_directory = File.join(File.dirname(File.expand_path(__FILE__)), "redis")
+redis_configs = Dir.entries(redis_configs_directory).select{|f| !File.directory? f}
 
-  redis_configs.each do |config|
-    redis_cmd = "redis-server #{redis_configs_directory}/#{config}"
-    puts "Starting redis for testing at localhost..."
-    puts `cd #{redis_configs_directory}; #{redis_cmd}`
+redis_configs.each do |config|
+  redis_cmd = "redis-server #{redis_configs_directory}/#{config}"
+  puts "Starting redis for testing at localhost..."
+  puts `cd #{redis_configs_directory}; #{redis_cmd}`
 
-    # Schedule the redis server for shutdown when tests are all finished.
-    at_exit do
-      redis_instance_name = config.chomp(".conf")
-      puts 'Stopping redis'
-      pid = File.read("#{redis_configs_directory}/#{redis_instance_name}.pid").to_i rescue nil
-      system ("kill -9 #{pid}") if pid.to_i != 0
-      File.delete("#{redis_configs_directory}/#{redis_instance_name}.pid") rescue nil
-      File.delete("#{redis_configs_directory}/#{redis_instance_name}-server.log") rescue nil
-      File.delete("#{redis_configs_directory}/#{redis_instance_name}-dump.rdb") rescue nil
-    end
+  # Schedule the redis server for shutdown when tests are all finished.
+  at_exit do
+    redis_instance_name = config.chomp(".conf")
+    puts 'Stopping redis'
+    pid = File.read("#{redis_configs_directory}/#{redis_instance_name}.pid").to_i rescue nil
+    system ("kill -9 #{pid}") if pid.to_i != 0
+    File.delete("#{redis_configs_directory}/#{redis_instance_name}.pid") rescue nil
+    File.delete("#{redis_configs_directory}/#{redis_instance_name}-server.log") rescue nil
+    File.delete("#{redis_configs_directory}/#{redis_instance_name}-dump.rdb") rescue nil
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qmore
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qless