resque-sliders 0.2.0 → 0.2.1

data/README.md

@@ -20,6 +20,7 @@ ResqueSliders comes in two parts:
 * `KEWatcher`: A daemon that runs on any machine that needs to run Resque workers, watches over the workers and controls which ones are running
 * `Resque-Web Plugin`: A bunch of slider bars, with text-input box to specify what queues to run on the workers
 
+
 Installation
 ------------
 
@@ -27,8 +28,8 @@ Install as a gem:
 
     $ gem install resque-sliders
 
-KEWatcher
----------
+### KEWatcher
+
 This is the daemon component that runs on any host that you want to run Resque workers on. The daemon's job is to manage **how many** Resque workers should be running, and **what** they should be running. It also provides an easy way to stop all workers during maintenance or deploys.
 
 When the daemon first runs, it will register itself, by hostname with Redis:
@@ -55,7 +56,7 @@ Options:
     -V, --version                    Prints Version
 ```
 
-### Important Options
+#### Important Options
 
 ```
     -m|--max MAX            (Max Children): Maximum number of workers to run on host (default: 10)
@@ -68,10 +69,20 @@ Options:
                             RAILS_ENV: If you're using rails, you need to set your RAILS_ENV variable
 ```
 
-### Controlling the Daemon
+#### Controlling the Daemon
 
 Once the daemon is running on each host that is going to run Resque workers, you'll need to tell them which queues to run.
 
+#### Signals
+
+KEWatcher supports all the [same signals as Resque](https://github.com/defunkt/resque#signals):
+
+* `TERM` / `INT` / `QUIT` - Shutdown. Gracefully kill all child Resque workers, and wait for them to finish before exiting
+* `HUP`  - Restart all Resque workers by gracefully killing them, and starting new ones in their place
+* `USR1` - Stop all Resque workers, and don't start any more
+* `USR2` - Pause spawning of new queues, but leave current ones running
+* `CONT` - Unpause. Continue spawning/managing child Resque workers
+
 The queue configuration is done via Resque-Web interface
 
 #### Resque-Web
@@ -84,19 +95,9 @@ Buttons:
 * `Stop` - Stop all workers
 * `Reload` - Sends HUP signal to running KEWatcher
 
-#### Signals
-
-KEWatcher supports all the [same signals as Resque](https://github.com/defunkt/resque#signals):
-
-* `TERM` / `INT` / `QUIT` - Shutdown. Gracefully kill all child Resque workers, and wait for them to finish before exiting
-* `HUP`  - Restart all Resque workers by gracefully killing them, and starting new ones in their place
-* `USR1` - Stop all Resque workers, and don't start any more
-* `USR2` - Pause spawning of new queues, but leave current ones running
-* `CONT` - Unpause. Continue spawning/managing child Resque workers
 
+### Resque-Web Integration
 
-Resque-Web Integration
-----------------------
 **Main Screen:** showing 3 hosts, and showing that one of the nodes is not running KEWatcher
 ![Screen 1](https://github.com/kmullin/resque-sliders/raw/master/misc/resque-sliders_main-view.png)
 

data/lib/resque-sliders/commander.rb

@@ -50,8 +50,7 @@ module Resque
         def change(host, queue, quantity)
           # queue is sanitized by:
           # replacing punctuation with spaces, strip end spaces, split on remaining whitespace, and join again on comma.
-          # FIXME
-          queue2 = queue.downcase.gsub(/[^a-z 0-9,_\-\*]/, '').strip.split(/, */).reject {|x| (x.length == 1 and %w(- _).include?(x)) or x.empty? }.join(',')
+          queue2 = queue.gsub(/['":]/, '').strip.gsub(/\s+/, ',').split(/, */).reject { |x| x.nil? or x.empty? }.join(',')
           raise 'Queue Different' unless queue == queue2
           redis_set_hash("#{key_prefix}:#{host}", queue2, quantity) unless queue2.empty?
         end

data/lib/resque-sliders/server/public/js/sliders.js

@@ -7,8 +7,10 @@ $(document).ready(function() {
     $("#total").text(total);
   };
   function sanitize_input(s) {
-    var ary = s.toLowerCase().replace(/[^a-z 0-9,_\-\*]/g, '').replace(/^\s+|\s+$/g, '').split(',');
+    // delete non-friendly chars, replace spaces in words with commas for resque
+    var ary = s.replace(/['":]/g, '').replace(/^\s+|\s+$/g, '').replace(/\s+/g, ',').split(/, */);
     var new_ary = [];
+    // remove empties from array
     $.each(ary, function() {
       if (this != '') {
         new_ary.push($.trim(this));
@@ -57,10 +59,12 @@ $(document).ready(function() {
     e.preventDefault();
     var queue = sanitize_input($("#new_queue").val());
     var host = $(this).attr("id");
-    $.post(host, { quantity: 1, queue: queue }, function(data) {
-      // reload window
-      window.location.reload(true);
-    });
+    if (queue != '') {
+      $.post(host, { quantity: 1, queue: queue }, function(data) {
+        // reload window
+        window.location.reload(true);
+      });
+    }
   });
   $("#plus-one").click(function() {
     $('.new_form').submit();

data/lib/resque-sliders/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module ResqueSliders
-      Version = VERSION = '0.2.0'
+      Version = VERSION = '0.2.1'
     end
   end
 end

data/test/kewatcher_test.rb

@@ -26,12 +26,12 @@ context "kewatcher" do
   end
 
   test "kewatcher runs" do
-    `bundle exec kewatcher --config #{@options[:config]} >/dev/null 2>&1 & sleep 3`
+    `(bundle exec kewatcher --config #{@options[:config]}) >/dev/null 2>&1 & sleep 3`
     assert @kewatcher.running?
   end
 
   test "kewatcher wont run twice" do
-    `bundle exec kewatcher --config #{@options[:config]} >/dev/null 2>&1 &`
+    `(bundle exec kewatcher --config #{@options[:config]}) >/dev/null 2>&1 &`
     sleep 3
     output = `bundle exec kewatcher --config #{@options[:config]}`
     assert_match %r{Already running}, output

data/test/redis-test.conf

@@ -112,4 +112,4 @@ databases 16
 # Glue small output buffers together in order to send small replies in a
 # single TCP packet. Uses a bit more CPU but most of the times it is a win
 # in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
+#glueoutputbuf yes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-sliders
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 430698583574743090
+      hash: 3990848849096963840
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 430698583574743090
+      hash: 3990848849096963840
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24