resque-dynamic-queues 0.5.1 → 0.6.0

data/.gitignore

@@ -1,8 +1,9 @@
 *.gem
+*.DS_Store
 .bundle
 Gemfile.lock
 pkg/*
 .idea
 spec/dump.rdb
-redis-server.log
-redis.pid
+spec/redis-server.log
+spec/redis.pid

data/CHANGELOG

@@ -0,0 +1,11 @@
+0.6.0
+-----
+
+Stored dynamic keys fall back to a default, or to all the queues.
+Some refactoring and auto loading
+Resque web interface
+
+0.5.1
+-----
+
+Initial version

data/README.md

@@ -44,3 +44,12 @@ QUEUE='@key' rake resque:work
 
   Pulls jobs from queue names stored in redis, with wildcards/negations
 
+
+
+There is also a tab in the resque-web UI that allows you to define the dynamic queues  To activate it, you need to require 'resque-dynamic-queues-server' in whatever initializer you use to bring up resque-web.
+
+
+Contributors:
+
+Matt Conway ( https://github.com/wr0ngway )
+Bert Goethals ( https://github.com/Bertg )

data/Rakefile

@@ -1,2 +1,67 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+task :my_release => ['changelog', 'release'] do
+end
+
+task :changelog do
+
+  helper = Bundler::GemHelper.new(Dir.pwd)
+  version = "v#{helper.gemspec.version}"
+
+  changelog_file = 'CHANGELOG'
+  entries = ""
+
+  # Get a list of current tags
+  tags = `git tag -l`.split
+  tags = tags.sort_by {|t| t[1..-1].split(".").collect {|s| s.to_i } }
+  newest_tag = tags[-1]
+  
+  if version == newest_tag
+    puts "You need to update version, same as most recent tag: #{version}"
+    exit
+  end
+
+  # If we already have a changelog, make the last tag be the
+  # last one in the changelog, and the next one be the one
+  # following that in the tag list
+  newest_changelog_version = nil
+  if File.exist?(changelog_file)
+    entries = File.read(changelog_file)
+    head = entries.split.first
+    if head =~ /\d\.\d\.\d/
+      newest_changelog_version = "v#{head}"
+
+      if version == newest_changelog_version
+        puts "You need to update version, same as most recent changelog: #{version}"
+        exit
+      end
+
+    end
+  end
+
+  # Generate changelog from repo
+  log=`git log --pretty='format:%s <%h> [%cn]' #{newest_tag}..#{HEAD}`
+
+  # Strip out maintenance entries
+  log = log.lines.to_a.delete_if do |l|
+     l =~ /^Regenerated? gemspec/ ||
+         l =~ /^version bump/i ||
+         l =~ /^Updated changelog/ ||
+         l =~ /^Merged? branch/
+  end
+
+  # Write out changelog file
+  File.open(changelog_file, 'w') do |out|
+    out.puts version.gsub(/^v/, '')
+    out.puts "-----"
+    out.puts "\n"
+    out.puts log
+    out.puts "\n"
+    out.puts entries
+  end
+
+  # Commit and push
+  sh "git ci -m'Updated changelog' #{changelog_file}"
+  sh "git push"
+end

data/init.rb

@@ -0,0 +1 @@
+require 'resque-dynamic-queues'

data/lib/resque-dynamic-queues-server.rb

@@ -0,0 +1,2 @@
+require 'resque-dynamic-queues'
+require 'resque/plugins/dynamic_queues/server'

data/lib/resque/plugins/dynamic_queues/attributes.rb

@@ -4,7 +4,17 @@ module Resque
       module Attributes
 
         def get_dynamic_queue(key)
-          redis.lrange("dynamic_queue:#{key}", 0, -1)
+          queue_names = redis.lrange("dynamic_queue:#{key}", 0, -1)
+
+          if queue_names.nil? || queue_names.size == 0
+            queue_names = redis.lrange("dynamic_queue:default", 0, -1)
+          end
+          
+          if queue_names.nil? || queue_names.size == 0
+            queue_names = Resque.queues
+          end
+
+          return queue_names
         end
 
         def set_dynamic_queue(key, values)
@@ -15,6 +25,10 @@ module Resque
           end
         end
 
+        def get_dynamic_queues
+          (redis.keys("dynamic_queue:*") || []).collect{|q| q.gsub('dynamic_queue:', '')}
+        end
+
       end
     end
   end

data/lib/resque/plugins/dynamic_queues/queues.rb

@@ -17,7 +17,7 @@ module Resque
         # list for a key with Resque.set_dynamic_queue(key, ["q1", "q2"]
         #
         def queues_with_dynamic
-          queue_names = @queues
+          queue_names = @queues.dup
 
           return queues_without_dynamic if queue_names.grep(/(^!)|(^@)|(\*)/).size == 0
 

data/lib/resque/plugins/dynamic_queues/server.rb

@@ -0,0 +1,42 @@
+require 'resque-dynamic-queues'
+
+module Resque
+  module Plugins
+    module DynamicQueues
+      module Server
+
+        VIEW_PATH = File.join(File.dirname(__FILE__), 'server', 'views')
+
+        def self.registered(app)
+          app.get "/dynamicqueues" do
+            @queues = Resque.get_dynamic_queues
+            dq_view :queues
+          end
+
+          app.post "/dynamicqueues" do
+            key    = params['name']
+            values = params['queues'].to_s.split.collect{|q| q.gsub(/\s/, '')}
+            Resque.set_dynamic_queue(key, values)
+            redirect url(:dynamicqueues)
+          end
+
+          app.post "/dynamicqueues/:key/remove" do
+            key    = params['key']
+            Resque.set_dynamic_queue(key, [])
+            redirect url(:dynamicqueues)
+          end
+
+          app.helpers do
+            def dq_view(filename, options = {}, locals = {})
+              erb(File.read(File.join(::Resque::Plugins::DynamicQueues::Server::VIEW_PATH, "#{filename}.erb")), options, locals)
+            end
+          end
+
+          app.tabs << "DynamicQueues"
+        end
+      end
+    end
+  end
+end
+
+Resque::Server.register Resque::Plugins::DynamicQueues::Server

data/lib/resque/plugins/dynamic_queues/server/views/queues.erb

@@ -0,0 +1,66 @@
+<h1>Dynamic Queues</h1>
+<table class='workers'>
+  <tr>
+    <th>Name</th>
+    <th>Value</th>
+    <th>Result</th>
+    <th>Workers</th>
+    <th></th>
+  </tr>
+  <% @queues.each do |queue| %>
+    <tr>
+      <td><%= queue %></td>
+      <td><%= Resque.get_dynamic_queue(queue).join(", ") %></td>
+      <td><%= Resque::Worker.new("@#{queue}").queues.join(", ") %></td>
+      <td></td>
+      <td>
+        <a href="<%= url(:dynamicqueues) %>/<%= queue %>/remove" class="remove">Remove</a>
+      </td>
+    </tr>
+  <% end %>
+  <tr>
+    <td>Fallback</td>
+    <td>-</td>
+    <td><%= Resque::Worker.new("@---").queues.join(', ') %></td>
+    <td></td>
+    <td>
+    </td>
+  </tr>
+</table>
+
+
+<h1>Make a new queue</h1>
+<form action="<%= url(:dynamicqueues) %>" method="post" accept-charset="utf-8">
+  <p><input type="text" name="name"></p>
+  <p>
+    <textarea name="queues"></textarea>
+    Separate new queues by lines
+  </p>
+  <p><input type="submit" value="Create or Update"></p>
+</form>
+
+
+<script type="text/javascript" charset="utf-8">
+  jQuery(function($) {
+
+    $('a.remove').click(function(e) {
+      e.preventDefault();
+      var $link = $(this),
+          url = $link.attr('href'),
+          confirmed = confirm("Are you sure you want to kill this job? There is no undo.");
+      if (confirmed) {
+        $link.animate({opacity: 0.5});
+        $.ajax({
+          url: url,
+          type: 'post',
+          success: function() {
+            $link.parents('tr').remove();
+          }
+        });
+      } else {
+        return false
+      }
+    });
+
+  });
+</script>

data/lib/resque/plugins/dynamic_queues/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module DynamicQueues
-      VERSION = "0.5.1"
+      VERSION = "0.6.0"
     end
   end
 end

data/resque-dynamic-queues.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("resque", '~> 1.10')
   s.add_development_dependency('rspec', '~> 2.5')
+  s.add_development_dependency('rack-test', '~> 0.5.4')
 
 end
 

data/spec/queues_spec.rb

@@ -52,7 +52,7 @@ describe "Dynamic Queues" do
     it "should pass lint" do
       Resque::Plugin.lint(Resque::Plugins::DynamicQueues)
     end
-    
+
   end
 
   context "basic queue patterns" do
@@ -80,7 +80,7 @@ describe "Dynamic Queues" do
     it "can include queues with pattern"do
       worker = Resque::Worker.new("high*")
       worker.queues.should == ["high_x", "high_y"]
-      
+
       worker = Resque::Worker.new("*high_z")
       worker.queues.should == ["superhigh_z"]
 
@@ -108,6 +108,16 @@ describe "Dynamic Queues" do
       worker.queues.should == ["bar", "foo"]
     end
 
+    it "will not bloat the workers queue" do
+      Resque.watch_queue("high_x")
+      worker = Resque::Worker.new("@mykey")
+
+      worker.send(:instance_eval, "@queues").should == ['@mykey']
+      worker.queues.should == ["high_x"]
+      worker.send(:instance_eval, "@queues").should == ['@mykey']
+      worker.queues.should == ["high_x"]
+    end
+
     it "uses hostname as default key in dynamic queues" do
       host = `hostname`.chomp
       Resque.set_dynamic_queue(host, ["foo", "bar"])
@@ -120,12 +130,34 @@ describe "Dynamic Queues" do
       Resque.watch_queue("foo")
       Resque.watch_queue("high_y")
       Resque.watch_queue("superhigh_z")
-      
+
       Resque.set_dynamic_queue("mykey", ["*high*", "!high_y"])
       worker = Resque::Worker.new("@mykey")
       worker.queues.should == ["high_x", "superhigh_z"]
     end
-    
+
+    it "falls back to default queues when missing" do
+      Resque.set_dynamic_queue("default", ["foo", "bar"])
+      worker = Resque::Worker.new("@mykey")
+      worker.queues.should == ["bar", "foo"]
+    end
+
+    it "falls back to all queues when missing and no default" do
+      Resque.watch_queue("high_x")
+      Resque.watch_queue("foo")
+      worker = Resque::Worker.new("@mykey")
+      worker.queues.should == ["foo", "high_x"]
+    end
+
+    it "falls back to all queues when missing and no default and keep up to date" do
+      Resque.watch_queue("high_x")
+      Resque.watch_queue("foo")
+      worker = Resque::Worker.new("@mykey")
+      worker.queues.should == ["foo", "high_x"]
+      Resque.watch_queue("bar")
+      worker.queues.should == ["bar", "foo", "high_x"]
+    end
+
   end
 
 end

data/spec/server_spec.rb

@@ -0,0 +1,123 @@
+ENV['RACK_ENV'] = 'test'
+
+require 'spec_helper'
+require 'rack'
+require 'rack/test'
+require 'resque/server'
+require 'resque-dynamic-queues-server'
+
+Sinatra::Base.set :environment, :test
+# ::Test::Unit::TestCase.send :include, Rack::Test::Methods
+
+
+describe "Dynamic Queues pages" do
+  include Rack::Test::Methods
+
+  def app
+    @app ||= Resque::Server.new
+  end
+
+  before(:each) do
+    Resque.redis.flushall
+  end
+
+  context "existnce 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 "/overview"
+      last_response.body.should include "<a href='/dynamicqueues'>DynamicQueues</a>"
+    end
+
+  end
+
+  context "show dynamic queues table" do
+
+    it "should shows names of queues" do
+      Resque.set_dynamic_queue("key_one", ["foo"])
+      Resque.set_dynamic_queue("key_two", ["bar"])
+
+      get "/dynamicqueues"
+
+      last_response.body.should include 'key_one'
+      last_response.body.should include 'key_two'
+    end
+
+    it "should shows values of queues" do
+      Resque.set_dynamic_queue("key_one", ["foo"])
+      Resque.set_dynamic_queue("key_two", ["bar", "baz"])
+
+      get "/dynamicqueues"
+
+      last_response.body.should include 'foo'
+      last_response.body.should include 'bar, baz'
+    end
+
+  end
+
+  context "remove queue link" do
+
+
+    it "should shows remove link for queue" do
+      Resque.set_dynamic_queue("key_one", ["foo"])
+
+      get "/dynamicqueues"
+
+      last_response.body.should match /<a .*href=['"]http:\/\/example.org\/dynamicqueues\/key_one\/remove['"].*>/
+    end
+
+    it "should remove queue when remove link clicked" do # JS will do the post
+      Resque.set_dynamic_queue("key_one", ["foo"])
+
+      post "/dynamicqueues/key_one/remove"
+
+      last_response.should be_redirect
+      last_response['Location'].should match /dynamicqueues/
+      Resque.get_dynamic_queue("key_two").should be_empty
+    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=['"]http:\/\/example.org\/dynamicqueues['"].*>/
+      last_response.body.should match /<input .*name=['"]name['"].*>/
+      last_response.body.should match /<textarea .*name=['"]queues['"].*>/
+    end
+
+    it "should delete queues on empty queue submit" do
+      Resque.set_dynamic_queue("key_two", ["bar", "baz"])
+      post "/dynamicqueues", {'name' => "key_two", "queues" => ""}
+
+      last_response.should be_redirect
+      last_response['Location'].should match /dynamicqueues/
+      Resque.get_dynamic_queue("key_two").should be_empty
+    end
+
+    it "should create queues" do
+      post "/dynamicqueues", {'name' => "key_two", "queues" => "foo\n\rbar\n\rbaz"}
+
+      last_response.should be_redirect
+      last_response['Location'].should match /dynamicqueues/
+      Resque.get_dynamic_queue("key_two").should == %w{foo bar baz}
+    end
+
+    it "should update queues" do
+      Resque.set_dynamic_queue("key_two", ["bar", "baz"])
+      post "/dynamicqueues", {'name' => "key_two", "queues" => "foo\n\rbar\n\rbaz"}
+
+      last_response.should be_redirect
+      last_response['Location'].should match /dynamicqueues/
+      Resque.get_dynamic_queue("key_two").should == %w{foo bar baz}
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rspec'
 require 'resque-dynamic-queues'
 
 spec_dir = File.dirname(File.expand_path(__FILE__))

metadata

@@ -1,91 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque-dynamic-queues
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.1
 platform: ruby
-authors: 
+authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-06-08 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: resque
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156532920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.10"
+      - !ruby/object:Gem::Version
+        version: '1.10'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2156532920
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2156532420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156532420
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2156531960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: 0.5.4
   type: :development
-  version_requirements: *id002
-description: A resque plugin for specifying the queues a worker pulls from with wildcards, negations, or dynamic look up from redis
-email: 
+  prerelease: false
+  version_requirements: *2156531960
+description: A resque plugin for specifying the queues a worker pulls from with wildcards,
+  negations, or dynamic look up from redis
+email:
 - matt@conwaysplace.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- CHANGELOG
 - Gemfile
 - README.md
 - Rakefile
+- init.rb
+- lib/resque-dynamic-queues-server.rb
 - lib/resque-dynamic-queues.rb
 - lib/resque/plugins/dynamic_queues/attributes.rb
 - lib/resque/plugins/dynamic_queues/queues.rb
+- lib/resque/plugins/dynamic_queues/server.rb
+- lib/resque/plugins/dynamic_queues/server/views/queues.erb
 - lib/resque/plugins/dynamic_queues/version.rb
 - resque-dynamic-queues.gemspec
 - spec/queues_spec.rb
 - spec/redis-test.conf
+- spec/server_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: resque-dynamic-queues
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A resque plugin for specifying the queues a worker pulls from with wildcards, negations, or dynamic look up from redis
-test_files: 
+summary: A resque plugin for specifying the queues a worker pulls from with wildcards,
+  negations, or dynamic look up from redis
+test_files:
 - spec/queues_spec.rb
 - spec/redis-test.conf
+- spec/server_spec.rb
 - spec/spec_helper.rb