qmore 0.6.2 → 0.6.3

data/spec/persistance_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+describe "Qmore::Persistence::Monitor" do
+  before(:each) do
+    Qmore.client.redis.flushall
+  end
+
+  it "updates periodically based on the interval" do
+    persistence = Qmore::Persistence::Redis.new(Qmore.client.redis)
+    persistence.should_receive(:load).at_least(3)
+    monitor = Qmore::Persistence::Monitor.new(persistence, 1)
+    monitor.start
+    sleep 4
+    monitor.stop
+  end
+end
+
+describe "Qmore::Persistence::Redis" do
+  before(:each) do
+    Qmore.client.redis.flushall
+  end
+
+
+  context "dynamic queues" do
+    it "can read/write dynamic queues to redis" do
+      queues = {
+        "key_a" => ["foo"],
+        "key_b" => ["bar"],
+        "key_c" => ["foo", "bar"]
+      }
+
+      configuration = Qmore::Configuration.new
+      configuration.dynamic_queues = queues
+      persistence = Qmore::Persistence::Redis.new(Qmore.client.redis)
+      persistence.write(configuration)
+
+      actual_configuration = persistence.load
+
+      configuration.dynamic_queues.should == actual_configuration.dynamic_queues
+    end
+  end
+
+  context "priorities" do
+    it "can read/write priorities to redis" do
+      priorities = [{'pattern' => 'foo*', 'fairly' => false},{'pattern' => 'default', 'fairly' => false}]
+      configuration = Qmore::Configuration.new
+      configuration.priority_buckets = priorities
+
+      persistence = Qmore::Persistence::Redis.new(Qmore.client.redis)
+      persistence.write(configuration)
+
+      actual_configuration = persistence.load
+      configuration.priority_buckets.should == actual_configuration.priority_buckets
+    end
+  end
+end
+

data/spec/server_spec.rb

@@ -9,7 +9,7 @@ require 'orderedhash'
 Sinatra::Base.set :environment, :test
 
 describe "Qmore Server" do
-  
+
   include Rack::Test::Methods
   include Qmore::Attributes
 
@@ -19,219 +19,230 @@ describe "Qmore Server" do
 
   before(:each) do
     Qmore.client.redis.flushall
+    Qmore.configuration = Qmore::Configuration.new
   end
 
   context "DynamicQueue" do
-    
+
     context "existence in application" do
-  
+
       it "should respond to it's url" do
         get "/dynamicqueues"
         last_response.should be_ok
       end
-  
+
       it "should display its tab" do
         get "/queues"
         last_response.body.should include "<a href='/dynamicqueues'>DynamicQueues</a>"
       end
-  
+
     end
-  
+
     context "show dynamic queues table" do
-  
+
       it "should shows default queue when nothing set" do
         get "/dynamicqueues"
-  
+
         last_response.body.should include 'default'
       end
-  
+
       it "should shows names of queues" do
-        set_dynamic_queue("key_one", ["foo"])
-        set_dynamic_queue("key_two", ["bar"])
-  
+        Qmore.configuration.dynamic_queues["key_one"] = ["foo"]
+        Qmore.configuration.dynamic_queues["key_two"] = ["bar"]
+        Qmore.persistence.write(Qmore.configuration)
+
         get "/dynamicqueues"
-  
+
         last_response.body.should include 'key_one'
         last_response.body.should include 'key_two'
       end
-  
+
       it "should shows values of queues" do
-        set_dynamic_queue("key_one", ["foo"])
-        set_dynamic_queue("key_two", ["bar", "baz"])
-  
+        Qmore.configuration.dynamic_queues["key_one"] = ["foo"]
+        Qmore.configuration.dynamic_queues["key_two"] = ["bar", "baz"]
+        Qmore.persistence.write(Qmore.configuration)
+
         get "/dynamicqueues"
-  
+
         last_response.body.should include 'foo'
         last_response.body.should include 'bar, baz'
       end
-  
+
     end
-  
+
     context "remove queue link" do
-  
+
       it "should show remove link for queue" do
-        set_dynamic_queue("key_one", ["foo"])
-  
+        Qmore.configuration.dynamic_queues["key_one"] = ["foo"]
+        Qmore.persistence.write(Qmore.configuration)
+
         get "/dynamicqueues"
-  
+
         last_response.body.should match /<a .*href=['"]#remove['"].*>/
       end
-  
+
       it "should show add link" do
         get "/dynamicqueues"
-  
+
         last_response.body.should match /<a .*href=['"]#add['"].*>/
       end
-  
+
     end
-  
+
     context "form to edit queues" do
-  
+
       it "should have form to edit queues" do
         get "/dynamicqueues"
-  
+
         last_response.body.should match /<form action="\/dynamicqueues"/
       end
-      
+
       it "should show input fields" do
-        set_dynamic_queue("key_one", ["foo"])
-        set_dynamic_queue("key_two", ["bar", "baz"])
+        Qmore.configuration.dynamic_queues["key_one"] = ["foo"]
+        Qmore.configuration.dynamic_queues["key_two"] = ["bar", "baz"]
+        Qmore.persistence.write(Qmore.configuration)
+
         get "/dynamicqueues"
-  
+
         last_response.body.should match /<input type="text" id="input-0-name" name="queues\[\]\[name\]" value="key_one"/
         last_response.body.should match /<input type="text" id="input-0-value" name="queues\[\]\[value\]" value="foo"/
         last_response.body.should match /<input type="text" id="input-1-name" name="queues\[\]\[name\]" value="key_two"/
         last_response.body.should match /<input type="text" id="input-1-value" name="queues\[\]\[value\]" value="bar, baz"/
       end
-  
+
       it "should delete queues on empty queue submit" do
-        set_dynamic_queue("key_two", ["bar", "baz"])
+        Qmore.configuration.dynamic_queues["key_two"] = ["bar", "baz"]
+        Qmore.persistence.write(Qmore.configuration)
+        Qmore.persistence.load.dynamic_queues.has_key?("key_two").should == true
+
         post "/dynamicqueues", {'queues' => [{'name' => "key_two", "value" => ""}]}
-  
+
         last_response.should be_redirect
         last_response['Location'].should match /dynamicqueues/
-        get_dynamic_queue("key_two", []).should be_empty
+        Qmore.configuration.dynamic_queues.has_key?("key_two").should == false
       end
-  
+
       it "should create queues" do
         post "/dynamicqueues", {'queues' => [{'name' => "key_two", "value" => " foo, bar ,baz "}]}
-  
+
         last_response.should be_redirect
         last_response['Location'].should match /dynamicqueues/
-        get_dynamic_queue("key_two").should == %w{foo bar baz}
+        Qmore.configuration.dynamic_queues["key_two"].should == %w{foo bar baz}
       end
-  
+
       it "should update queues" do
-        set_dynamic_queue("key_two", ["bar", "baz"])
+        Qmore.configuration.dynamic_queues["key_two"] = ["bar", "baz"]
+        Qmore.persistence.write(Qmore.configuration)
+
         post "/dynamicqueues", {'queues' => [{'name' => "key_two", "value" => "foo,bar,baz"}]}
-  
+
         last_response.should be_redirect
         last_response['Location'].should match /dynamicqueues/
-        get_dynamic_queue("key_two").should == %w{foo bar baz}
+        Qmore.configuration.dynamic_queues["key_two"].should == %w{foo bar baz}
       end
-  
+
     end
 
   end
-  
+
   context "QueuePriority" do
 
     context "existence in application" do
-  
+
       it "should respond to it's url" do
         get "/queuepriority"
         last_response.should be_ok
       end
-  
+
       it "should display its tab" do
         get "/queues"
         last_response.body.should include "<a href='/queuepriority'>QueuePriority</a>"
       end
-  
+
     end
-  
+
     context "show queue priority table" do
-  
+
       before(:each) do
-        set_priority_buckets [{'pattern' => 'foo', 'fairly' => false},
-                                   {'pattern' => 'default', 'fairly' => false},
-                                   {'pattern' => 'bar', 'fairly' => true}]
-  
+        Qmore.configuration.priority_buckets = [{'pattern' => 'foo', 'fairly' => false},
+                                                {'pattern' => 'default', 'fairly' => false},
+                                                {'pattern' => 'bar', 'fairly' => true}]
+        Qmore.persistence.write(Qmore.configuration)
       end
-  
+
       it "should shows pattern input fields" do
         get "/queuepriority"
-  
+
         last_response.body.should match /<input type="text" id="input-0-pattern" name="priorities\[\]\[pattern\]" value="foo"/
         last_response.body.should match /<input type="text" id="input-1-pattern" name="priorities\[\]\[pattern\]" value="default"/
         last_response.body.should match /<input type="text" id="input-2-pattern" name="priorities\[\]\[pattern\]" value="bar"/
       end
-  
+
       it "should show fairly checkboxes" do
         get "/queuepriority"
-  
+
         last_response.body.should match /<input type="checkbox" id="input-0-fairly" name="priorities\[\]\[fairly\]" value="true" *\/>/
         last_response.body.should match /<input type="checkbox" id="input-1-fairly" name="priorities\[\]\[fairly\]" value="true" *\/>/
         last_response.body.should match /<input type="checkbox" id="input-2-fairly" name="priorities\[\]\[fairly\]" value="true" checked *\/>/
       end
-  
+
     end
-  
+
     context "edit links" do
-  
+
       before(:each) do
-        set_priority_buckets [{'pattern' => 'foo', 'fairly' => false},
-                                   {'pattern' => 'default', 'fairly' => false},
-                                   {'pattern' => 'bar', 'fairly' => true}]
-  
+        Qmore.configuration.priority_buckets = [{'pattern' => 'foo', 'fairly' => false},
+                                                {'pattern' => 'default', 'fairly' => false},
+                                                {'pattern' => 'bar', 'fairly' => true}]
+        Qmore.persistence.write(Qmore.configuration)
       end
-  
+
       it "should show remove link for queue" do
         get "/queuepriority"
-  
+
         last_response.body.should match /<a href="#remove"/
       end
-  
+
       it "should show up link for queue" do
         get "/queuepriority"
-  
+
         last_response.body.should match /<a href="#up"/
       end
-  
+
       it "should show down link for queue" do
         get "/queuepriority"
-  
+
         last_response.body.should match /<a href="#down"/
       end
-  
+
     end
-  
+
     context "form to edit queues" do
-  
+
       it "should have form to edit queues" do
         get "/queuepriority"
-  
+
         last_response.body.should match /<form action="\/queuepriority"/
       end
-  
+
       it "should update queues" do
-        get_priority_buckets.should == [{'pattern' => 'default'}]
-  
+        Qmore.configuration.priority_buckets.should == [{'pattern' => 'default'}]
+
         params = {'priorities' => [
             OrderedHash["pattern", "foo"],
             OrderedHash["pattern", "default"],
             OrderedHash["pattern", "bar", "fairly", "true"]
         ]}
-        post "/queuepriority", params 
-  
+        post "/queuepriority", params
+
         last_response.should be_redirect
         last_response['Location'].should match /queuepriority/
-        get_priority_buckets.should == [{"pattern" => "foo"},
+        Qmore.configuration.priority_buckets.should == [{"pattern" => "foo"},
                                            {"pattern" => "default"},
                                            {"pattern" => "bar", "fairly" => "true"}]
       end
-  
+
     end
-    
+
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ Coveralls.wear!
 require 'qmore'
 
 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 = Dir.entries(redis_configs_directory).select{|f| !File.directory?(f) && f.end_with?(".conf")}
 
 redis_configs.each do |config|
   redis_cmd = "redis-server #{redis_configs_directory}/#{config}"

metadata

@@ -1,113 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: qmore
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
+  prerelease: 
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: qless
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :runtime
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: multi_json
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-  type: :runtime
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
+    none: false
 - !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
+  name: gem_logger
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rake
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rack-test
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: pry
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: orderedhash
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
+    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Qmore allows one to specify the queues a worker processes by the use
   of wildcards, negations, or dynamic look up from redis.  It also allows one to specify
   the relative priority between queues (rather than within a single queue).  It plugs
@@ -118,8 +149,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -129,46 +160,50 @@ files:
 - lib/qmore-server.rb
 - lib/qmore.rb
 - lib/qmore/attributes.rb
+- lib/qmore/configuration.rb
 - lib/qmore/job_reserver.rb
+- lib/qmore/persistence.rb
 - lib/qmore/server.rb
 - lib/qmore/server/views/dynamicqueues.erb
 - lib/qmore/server/views/priorities.erb
 - lib/qmore/version.rb
 - qmore.gemspec
 - spec/attributes_spec.rb
+- spec/configuration_spec.rb
 - spec/job_reserver_spec.rb
+- spec/persistance_spec.rb
 - spec/redis/qless01-test.conf
 - spec/redis/qless02-test.conf
 - spec/server_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -593121205799441535
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -593121205799441535
+  none: false
 requirements: []
 rubyforge_project: qmore
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A qless plugin that gives more control over how queues are processed
-test_files:
-- spec/attributes_spec.rb
-- spec/job_reserver_spec.rb
-- spec/redis/qless01-test.conf
-- spec/redis/qless02-test.conf
-- spec/server_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []