qless 0.9.2 → 0.9.3

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: qless
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
 - Dan Lecocq
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
@@ -24,41 +24,41 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: vegas
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :development
+        version: 0.1.11
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
-  name: vegas
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.11
-  type: :development
+        version: 1.3.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.11
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: sentry-raven
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: ! "\n    `qless` is meant to be a performant alternative to other queueing\n
   \   systems, with statistics collection, a browser interface, and \n    strong guarantees
   about job losses.\n    \n    It's written as a collection of Lua scipts that are
@@ -194,37 +210,45 @@ files:
 - lib/qless/job.rb
 - lib/qless/job_reservers/ordered.rb
 - lib/qless/job_reservers/round_robin.rb
-- lib/qless/lua.rb
+- lib/qless/job_reservers/shuffled_round_robin.rb
+- lib/qless/lua_script.rb
+- lib/qless/middleware/redis_reconnect.rb
+- lib/qless/middleware/retry_exceptions.rb
+- lib/qless/middleware/sentry.rb
 - lib/qless/queue.rb
 - lib/qless/server.rb
+- lib/qless/subscriber.rb
 - lib/qless/tasks.rb
 - lib/qless/version.rb
+- lib/qless/wait_until.rb
 - lib/qless/worker.rb
 - lib/qless.rb
 - lib/qless/qless-core/cancel.lua
 - lib/qless/qless-core/complete.lua
 - lib/qless/qless-core/config.lua
 - lib/qless/qless-core/depends.lua
+- lib/qless/qless-core/deregister_workers.lua
 - lib/qless/qless-core/fail.lua
 - lib/qless/qless-core/failed.lua
 - lib/qless/qless-core/get.lua
 - lib/qless/qless-core/heartbeat.lua
 - lib/qless/qless-core/jobs.lua
+- lib/qless/qless-core/pause.lua
 - lib/qless/qless-core/peek.lua
 - lib/qless/qless-core/pop.lua
 - lib/qless/qless-core/priority.lua
 - lib/qless/qless-core/put.lua
+- lib/qless/qless-core/qless-lib.lua
+- lib/qless/qless-core/qless.lua
 - lib/qless/qless-core/queues.lua
 - lib/qless/qless-core/recur.lua
 - lib/qless/qless-core/retry.lua
 - lib/qless/qless-core/stats.lua
 - lib/qless/qless-core/tag.lua
 - lib/qless/qless-core/track.lua
+- lib/qless/qless-core/unfail.lua
+- lib/qless/qless-core/unpause.lua
 - lib/qless/qless-core/workers.lua
-- bin/install_phantomjs
-- bin/qless-campfire
-- bin/qless-growl
-- bin/qless-web
 - lib/qless/server/static/css/bootstrap-responsive.css
 - lib/qless/server/static/css/bootstrap-responsive.min.css
 - lib/qless/server/static/css/bootstrap.css
@@ -272,6 +296,7 @@ files:
 - lib/qless/server/views/track.erb
 - lib/qless/server/views/worker.erb
 - lib/qless/server/views/workers.erb
+- exe/qless-web
 homepage: http://github.com/seomoz/qless
 licenses: []
 post_install_message: 
@@ -284,18 +309,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4094860363148682256
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4094860363148682256
 requirements: []
 rubyforge_project: qless
 rubygems_version: 1.8.24

data/bin/install_phantomjs

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-version=phantomjs-1.7.0-linux-i686
-wget http://phantomjs.googlecode.com/files/$version.tar.bz2
-tar xjf $version.tar.bz2
-mv $version phantomjs
-

data/bin/qless-campfire

@@ -1,106 +0,0 @@
-#! /usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'qless'
-require 'tinder'
-require 'micro-optparse'
-
-@options = Parser.new do |p|
-  p.banner = 'This agent lets you get campfire notifications for the progress of tracked jobs'
-  p.option :subdomain, 'campfire subdomain'    , :default => '', :value_satisfies => lambda { |subdomain| subdomain.is_a?(String) }
-  p.option :token    , 'campfire token for bot', :default => '', :value_satisfies => lambda { |subdomain| subdomain.is_a?(String) }
-  p.option :room     , 'campfire room to talk in (defaults to first room)', :default => ''
-  p.option :host     , 'host:port for your qless redis instance', :default => 'localhost:6379'
-  p.option :web      , 'host:port for your qless web ui', :default => 'localhost:5678'
-end.process!
-
-# Get a campfire object, and room
-puts 'Connecting to campfire...'
-@campfire = Tinder::Campfire.new @options[:subdomain], :token => @options[:token]
-if not @options[:room]
-  @room   = @campfire.rooms.first
-else
-  @room   = @campfire.find_room_by_name(@options[:room])
-end
-
-# And now qless stuff
-puts 'Connecting to qless...'
-@client   = Qless::Client.new(:host => @options[:host])
-
-def speak(message)
-  @room.speak message
-  puts "Said '#{message}'"
-end
-
-def paste(message)
-  @room.paste message
-  puts "Pasted '#{message}'"
-end
-
-def event(jid, &block)
-  job = @client.jobs[jid]
-  if job.nil?
-    speak("#{jid[0...8]} #{yield job} | http://#{@options[:host]}/jobs/#{jid}]")
-  else
-    speak("#{jid[0...8]} #{yield job} [#{job.tags.join(', ')}] | http://#{@options[:host]}/jobs/#{jid}")
-  end
-end
-
-@client.events.listen do |on|
-  on.canceled  { |jid| event(jid) { |job| 'canceled' } }
-  on.stalled   { |jid| event(jid) { |job| 'stalled'  } }
-  on.track     { |jid| event(jid) { |job| 'is being tracked'   } }
-  on.untrack   { |jid| event(jid) { |job| 'not longer tracked' } }
-  
-  on.completed do |jid|
-    event(jid) do |job|
-      if job
-        if job.queue_name.empty?
-          'completed'
-        else
-          "advanced to #{job.queue_name}"
-        end
-      else
-        'completed'
-      end
-    end
-  end
-  
-  on.popped do |jid|
-    event(jid) do |job|
-      if job
-        "popped by #{job.worker_name}"
-      else
-        'popped'
-      end
-    end
-  end
-  
-  on.put do |jid|
-    event(jid) do |job|
-      if job
-        "moved to #{job.queue_name}"
-      else
-        'moved'
-      end
-    end
-  end
-  
-  on.failed do |jid|
-    job = @client.jobs[jid]
-    if job
-      speak("#{jid} failed by #{job.failure['worker']} | http://#{@options[:web]}/jobs/#{jid}")
-      paste job.failure['message']
-    else
-      speak("#{jid} failed")
-    end
-  end
-  
-  puts 'Listening...'
-  
-  Signal.trap("INT") do
-    puts 'Exiting'
-    Process.exit(0)
-  end
-end

data/bin/qless-growl

@@ -1,99 +0,0 @@
-#! /usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'qless'
-require 'ruby-growl'
-require 'micro-optparse'
-
-@options = Parser.new do |p|
-  p.banner = 'This agent lets you get campfire notifications for the progress of tracked jobs'
-  p.option :growl    , 'host for the growl daemon', :default => 'localhost'
-  p.option :app      , 'application name for notifications', :default => 'qless'
-  p.option :host     , 'host:port for your qless redis instance', :default => 'localhost:6379'
-  p.option :web      , 'host:port for your qless web ui', :default => 'localhost:5678'
-end.process!
-
-# Connect to growl
-puts 'Connecting to growl...'
-@growl  = Growl::GNTP.new @options[:growl], @options[:app]
-
-# Qless client
-puts 'Connecting to qless...'
-@client = Qless::Client.new(:host => @options[:host])
-
-%w{canceled completed failed popped stalled put track untrack}.each do |t|
-  @growl.add_notification(t)
-end
-@growl.register
-
-def notify(jid, event, &block)
-  job = @client.jobs[jid]
-  if job.nil?
-    message = yield job
-    puts "#{jid} -> Notifying #{message}"
-    @growl.notify(event, "#{jid[0...8]}", "#{message}", 0, false, jid, "http://#{@options[:web]}/jobs/#{jid}")
-  else
-    message = yield job
-    puts "#{jid} -> Notifying #{message}"
-    @growl.notify(event, "#{jid[0...8]} [#{job.tags.join(', ')}]", "#{message}", 0, false, jid, "http://#{@options[:web]}/jobs/#{jid}")
-  end
-end
-
-@client.events.listen do |on|
-  on.canceled  { |jid| notify(jid, 'canceled') { |job| 'canceled' } }
-  on.stalled   { |jid| notify(jid, 'canceled') { |job| 'stalled'  } }
-  on.track     { |jid| notify(jid, 'canceled') { |job| 'is being tracked'  } }
-  on.untrack   { |jid| notify(jid, 'canceled') { |job| 'no longer tracked' } }
-  
-  on.completed do |jid|
-    notify(jid, 'completed') do |job|
-      if job
-        if job.queue_name.empty?
-          "completed"
-        else
-          "advanced to #{job.queue_name}"
-        end
-      else
-        "completed"
-      end
-    end
-  end
-  
-  on.failed do |jid|
-    notify(jid, 'failed') do |job|
-      if job
-        "failed by #{job.failure['worker']}"
-      else
-        "failed"
-      end
-    end
-  end
-  
-  on.popped do |jid|
-    notify(jid, 'popped') do |job|
-      if job
-        "popped by #{job.worker_name}"
-      else
-        "popped"
-      end
-    end
-  end
-  
-  on.put do |jid|
-    notify(jid, 'put') do |job|
-      if job
-        "moved to #{job.queue_name}"
-      else
-        "moved"
-      end
-    end
-  end
-  
-  puts 'Listening...'
-  
-  Signal.trap("INT") do
-    puts 'Exiting'
-    Process.exit(0)
-  end
-end

data/lib/qless/lua.rb

@@ -1,25 +0,0 @@
-module Qless
-  class Lua
-    LUA_SCRIPT_DIR = File.expand_path("../qless-core/", __FILE__)
-    
-    def initialize(name, redis)
-      @sha   = nil
-      @name  = name
-      @redis = redis
-      reload()
-    end
-    
-    def reload()
-      @sha = @redis.script(:load, File.read(File.join(LUA_SCRIPT_DIR, "#{@name}.lua")))
-    end
-    
-    def call(keys, args)
-      begin
-        return @redis.evalsha(@sha, keys.length, *(keys + args))
-      rescue
-        reload
-        return @redis.evalsha(@sha, keys.length, *(keys + args))
-      end
-    end
-  end
-end