resque-scheduler 2.5.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62efe393e6b613cf1d08a9d757105c124976010d
-  data.tar.gz: 9e61be4df36fa45b2e46ce09b97d8460481bf814
+  metadata.gz: 315b0ea47908358f5cd357a315f9bcf958402ccb
+  data.tar.gz: 8bcbe775f3fc7f68d47a7d0cf79f75b2f27ac0b3
 SHA512:
-  metadata.gz: 031282aff18c1d4ed4b57b906190adcae00c303cfa50ef66cbe6823761da44180194e64f15d5e81474486092e71a86d24d258294092dc00b2da5f2a27bd26024
-  data.tar.gz: 310937e91fd414c72d95f5394e9dd38090a6e291ba94b78cbab470e5ca9dd92c8365853c0244460e0934cafbac43835fe97adcc0c6de63d4c3eecee5737dac48
+  metadata.gz: 40b428d2bfdbd36eb3ba623812a3d06db24a674531db24069c9dd19e24af478c49eafe615238d333ae9181ecf2ca3e76a0a8f9b20f2181431a4ff147733d80f4
+  data.tar.gz: ce2e9aee9671c7a4ffbf016934d169ee36d575543142fccea9318244c8a84c20108878ed5010ace31d67aa706bc6f4793aabc5952bf521aeecf0f33728ac18f4

data/.gitignore

@@ -1,11 +1,17 @@
-.bundle/
-.idea/
+/.bundle/
+/.idea/
+/.yardoc/
 
-doc/
-pkg
+/doc/
+/pkg/
 nbproject
-Gemfile.lock
-.rvmrc
+/Gemfile.lock
+/.rvmrc
 *.swp
 
 /coverage/
+/.vagrant/
+/dump.rdb
+
+.env
+.env.*

data/.rubocop.yml

@@ -1,129 +1,34 @@
-# This configuration was generated by `rubocop --auto-gen-config`.
-# The point is for the user to remove these configuration records
-# one by one as the offences are removed from the code base.
+inherit_from: .rubocop_todo.yml
 
-AccessorMethodName:
-  Enabled: false
-
-AlignParameters:
-  Enabled: false
-
-AssignmentInCondition:
-  Enabled: false
-
-BracesAroundHashParameters:
-  Enabled: false
+AllCops:
+  Include:
+  - Gemfile
+  - '**/Rakefile'
+  - resque-scheduler.gemspec
+  - bin/resque-scheduler
 
+# Offence count: 1
 CaseEquality:
   Enabled: false
 
+# Offence count: 2
+# Configuration parameters: CountComments.
 ClassLength:
-  Max: 325
-
-ClassVars:
-  Enabled: false
-
-CollectionMethods:
-  Enabled: false
-
-ColonMethodCall:
-  Enabled: false
-
-CommentAnnotation:
-  Enabled: false
+  Max: 130
 
+# Offence count: 3
 CyclomaticComplexity:
-  Max: 28
+  Max: 21
 
+# Offence count: 29
 Documentation:
   Enabled: false
 
-Encoding:
-  Enabled: false
-
-FavorUnlessOverNegatedIf:
-  Enabled: false
-
-FavorUntilOverNegatedWhile:
-  Enabled: false
-
-HandleExceptions:
-  Enabled: false
-
-HashSyntax:
-  Enabled: false
-
-IfUnlessModifier:
-  Enabled: false
-
-IndentationWidth:
-  Enabled: false
-
-LineLength:
-  Max: 152
-
-Loop:
-  Enabled: false
-
-MethodCallParentheses:
-  Enabled: false
-
+# Offence count: 17
+# Configuration parameters: CountComments.
 MethodLength:
-  Max: 180
-
-ModuleFunction:
-  Enabled: false
-
-NumericLiterals:
-  Enabled: false
-
-ParenthesesAroundCondition:
-  Enabled: false
-
-PredicateName:
-  Enabled: false
-
-RedundantBegin:
-  Enabled: false
+  Max: 145
 
+# Offence count: 1
 RescueException:
   Enabled: false
-
-RescueModifier:
-  Enabled: false
-
-SingleLineMethods:
-  Enabled: false
-
-SpaceAfterComma:
-  Enabled: false
-
-SpaceAroundBlockBraces:
-  Enabled: false
-
-SpaceAroundEqualsInParameterDefault:
-  Enabled: false
-
-SpaceAroundOperators:
-  Enabled: false
-
-SpaceInsideHashLiteralBraces:
-  Enabled: false
-
-SpecialGlobalVars:
-  Enabled: false
-
-StringLiterals:
-  Enabled: false
-
-TrailingBlankLines:
-  Enabled: false
-
-TrailingWhitespace:
-  Enabled: false
-
-TrivialAccessors:
-  Enabled: false
-
-UselessAssignment:
-  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,29 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-05-24 08:24:15 -0400 using RuboCop version 0.22.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 12
+DoubleNegation:
+  Enabled: false
+
+# Offense count: 1
+EachWithObject:
+  Enabled: false
+
+# Offense count: 3
+# Configuration parameters: Exclude.
+FileName:
+  Enabled: false
+
+# Offense count: 7
+# Configuration parameters: MinBodyLength.
+GuardClause:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Next:
+  Enabled: false

data/.simplecov

@@ -1 +1,3 @@
-SimpleCov.start { add_filter '/test/' } if ENV['COVERAGE']
+if ENV['COVERAGE'] && RUBY_PLATFORM !~ /java/
+  SimpleCov.start { add_filter '/test/' }
+end

data/.travis.yml

@@ -1,15 +1,23 @@
 language: ruby
 rvm:
-- 1.9.3
-- 2.0.0
+- '1.9.3'
+- '2.1'
+- 'jruby-19mode'
+- 'rbx'
 env:
   global:
   - RESQUE_SCHEDULER_DISABLE_TEST_REDIS_SERVER=1
+  - JRUBY_OPTS='-Xcext.enabled=true'
+matrix:
+  allow_failures:
+  - rvm: 'jruby-19mode'
+  - rvm: 'rbx'
 services:
 - redis-server
 notifications:
   email:
-    recipients: daniel.buch+resque-scheduler@gmail.com
+    recipients:
+    - daniel.buch+resque-scheduler@gmail.com
 deploy:
   provider: rubygems
   api_key:
@@ -18,4 +26,4 @@ deploy:
   on:
     tags: true
     repo: resque/resque-scheduler
-    rvm: 2.0.0
+    rvm: '2.1'

data/.vagrant-provision-as-vagrant.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+set -x
+
+ln -svf /vagrant/.vagrant-skel/bashrc ~/.bashrc
+ln -svf /vagrant/.vagrant-skel/bash_profile ~/.bash_profile
+
+source ~/.bashrc
+
+set +x
+curl -L https://get.rvm.io | bash -s stable --ruby=2.0.0 --auto-dotfiles
+
+source ~/.rvm/scripts/rvm
+gem install --no-ri --no-rdoc bundler foreman

data/.vagrant-provision.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+export DEBIAN_FRONTEND=noninteractive
+
+umask 022
+
+set -e
+set -x
+
+apt-get update -yq
+apt-get install --no-install-suggests -yq python-software-properties
+add-apt-repository -y ppa:chris-lea/redis-server
+apt-get update -yq
+apt-get install --no-install-suggests -yq \
+  build-essential \
+  byobu \
+  curl \
+  git \
+  make \
+  redis-server \
+  screen
+
+su - vagrant -c /vagrant/.vagrant-provision-as-vagrant.sh

data/.vagrant-skel/bash_profile

@@ -0,0 +1,7 @@
+#!bash
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+
+if [[ "$PS1" ]] ; then
+  cd /vagrant
+fi

data/.vagrant-skel/bashrc

@@ -0,0 +1,7 @@
+#!bash
+
+export LANG='en_US.UTF-8'
+export LANGUAGE='en_US.UTF-8'
+export LC_ALL='en_US.UTF-8'
+
+export PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting

data/AUTHORS.md

@@ -3,6 +3,7 @@ Resque Scheduler authors
 
 - Aaron Suggs
 - Alexander Simonov
+- Andrea Campolonghi
 - Ben VandenBos
 - Bernerd Schaefer
 - Bogdan Gusiev
@@ -29,6 +30,7 @@ Resque Scheduler authors
 - John Crepezzi
 - John Griffin
 - Jon Larkowski and Les Hill
+- Jonathan Conley
 - Jonathan Hyman
 - Jonathan Owens
 - Joshua Szmajda
@@ -57,9 +59,12 @@ Resque Scheduler authors
 - Tim Liner
 - Tony Lewis
 - Vincent Zhu
+- Vladislav Shub
 - V Sreekanth
+- Warren Sangster
 - andreas
 - bbauer
+- camol
 - fallwith
 - gravis
 - hpoydar

data/Gemfile

@@ -1,5 +1,4 @@
+# vim:fileencoding=utf-8
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'yajl-ruby', '>= 1.1.0', :platforms => :mri, :group => :test

data/HISTORY.md

@@ -1,5 +1,23 @@
 # Resque Scheduler History / ChangeLog / Release Notes
 
+## 3.0.0 (2014-05-27)
+* The grand re-namespacing of
+`resque_scheduler/(.*)` => `resque/scheduler/\1`
+* Cleanup of a ton of rubocop offenses
+* Vagrant setup
+* Documentation updates
+* "Refactoring"
+* Added support for last execution information through the web
+* Handling signals while "sleeping" by relying on `Thread#wakeup`
+* CodeClimate integration
+* Addition of `Resque.delayed?` and `Resque.next_delayed_schedule`
+* Testing against same rubies as resque (+ 2.1.1)
+* Renamed `Resque.set_last_run` to `Resque.last_enqueued_at`
+* Allow scheduled jobs to be deleted via resque web
+* Fixed duplicated layout for `search_form` partial template.
+* Fix issue where Web UI was ONLY showing jobs that only run in the current
+environment
+
 ## 2.5.5 (2014-02-27)
 * Only showing link to job with args if job is present
 * Only showing scheduled jobs that match current env or omit env

data/README.md

@@ -4,6 +4,7 @@ resque-scheduler
 [![Dependency Status](https://gemnasium.com/resque/resque-scheduler.png)](https://gemnasium.com/resque/resque-scheduler)
 [![Gem Version](https://badge.fury.io/rb/resque-scheduler.png)](http://badge.fury.io/rb/resque-scheduler)
 [![Build Status](https://travis-ci.org/resque/resque-scheduler.png?branch=master)](https://travis-ci.org/resque/resque-scheduler)
+[![Code Climate](https://codeclimate.com/github/resque/resque-scheduler.png)](https://codeclimate.com/github/resque/resque-scheduler)
 
 ### Description
 
@@ -52,7 +53,7 @@ gem 'resque-scheduler'
 Adding the resque:scheduler rake task:
 
 ```ruby
-require 'resque_scheduler/tasks'
+require 'resque/scheduler/tasks'
 ```
 
 ### Rake integration
@@ -65,12 +66,12 @@ everything `resque` needs to know.
 ```ruby
 # Resque tasks
 require 'resque/tasks'
-require 'resque_scheduler/tasks'
+require 'resque/scheduler/tasks'
 
 namespace :resque do
   task :setup do
     require 'resque'
-    require 'resque_scheduler'
+    require 'resque-scheduler'
 
     # you probably already have this somewhere
     Resque.redis = 'localhost:6379'
@@ -144,8 +145,8 @@ scheduled job must run (coerced with `Kernel#Float()`) (default `5`)
 * `LOGFORMAT` - Log output format to use (either `'text'` or `'json'`,
 default `'text'`)
 * `PIDFILE` - If non-empty, write process PID to file (default empty)
-* `QUIET` or `MUTE` - Silence most output if non-empty (equivalent to
-a level of `MonoLogger::FATAL`, default `false`)
+* `QUIET` - Silence most output if non-empty (equivalent to a level of
+`MonoLogger::FATAL`, default `false`)
 * `VERBOSE` - Maximize log verbosity if non-empty (equivalent to a level
 of `MonoLogger::DEBUG`, default `false`)
 
@@ -447,7 +448,7 @@ redis instance and schedule.  The scheduler processes will use redis to
 elect a master process and detect failover when the master dies.  Precautions are
 taken to prevent jobs from potentially being queued twice during failover even
 when the clocks of the scheduler machines are slightly out of sync (or load affects
-scheduled job firing time).  If you want the gory details, look at Resque::SchedulerLocking.
+scheduled job firing time).  If you want the gory details, look at Resque::Scheduler::Locking.
 
 If the scheduler process(es) goes down for whatever reason, the delayed items
 that should have fired during the outage will fire once the scheduler process
@@ -494,8 +495,8 @@ Now, you want to add the following:
 
 ```ruby
 # This will make the tabs show up.
-require 'resque_scheduler'
-require 'resque_scheduler/server'
+require 'resque-scheduler'
+require 'resque/scheduler/server'
 ```
 
 That should make the scheduler tabs show up in `resque-web`.
@@ -533,8 +534,8 @@ worker is started.
 There are several options to toggle the way scheduler logs its actions. They
 are toggled by environment variables:
 
-  - `MUTE` will stop logging anything. Completely silent.
-  - `VERBOSE` opposite of 'mute'; will log even debug information
+  - `QUIET` will stop logging anything. Completely silent.
+  - `VERBOSE` opposite of 'QUIET'; will log even debug information
   - `LOGFILE` specifies the file to write logs to. (default standard output)
   - `LOGFORMAT` specifies either "text" or "json" output format
     (default "text")
@@ -544,7 +545,7 @@ values:
 
 ```ruby
 Resque::Scheduler.configure do |c|
-  c.mute = false
+  c.quiet = false
   c.verbose = false
   c.logfile = nil # meaning all messages go to $stdout
   c.logformat = 'text'
@@ -570,6 +571,33 @@ of the code looking very similar to resque, particularly in resque-web
 and the views. I wanted it to be similar enough that someone familiar
 with resque could easily work on resque-scheduler.
 
+### Development
+
+Working on resque-scheduler requires the following:
+
+* A relatively modern Ruby interpreter (MRI 1.9+ is what's tested)
+* bundler
+
+The development setup looks like this, which is roughly the same thing
+that happens on Travis CI:
+
+``` bash
+# Install everything
+bundle install
+
+# Make sure tests are green before you change stuff
+bundle exec rake
+# Change stuff
+# Repeat
+```
+
+If you have [vagrant](http://www.vagrantup.com) installed, there is a
+development box available that requires no plugins or external
+provisioners:
+
+``` bash
+vagrant up
+```
 
 ### Contributing