sidekiq 2.2.1 → 2.3.0

data/web/views/_summary.slim

@@ -1,8 +1,8 @@
 .hero-unit
   h1 Sidekiq is #{current_status}
-  p Processed: #{processed}
-  p Failed: #{failed}
-  p Busy Workers: #{workers.size}
-  p Scheduled: #{zcard('schedule')}
-  p Retries Pending: #{zcard('retry')}
-  p Queue Backlog: #{backlog}
+  p Processed: #{number_with_delimiter(processed)}
+  p Failed: #{number_with_delimiter(failed)}
+  p Busy Workers: #{number_with_delimiter(workers.size)}
+  p Scheduled: #{number_with_delimiter(zcard('schedule'))}
+  p Retries Pending: #{number_with_delimiter(zcard('retry'))}
+  p Queue Backlog: #{number_with_delimiter(backlog)}

data/web/views/index.slim

@@ -1,10 +1,11 @@
 == slim :_summary
 
-.poll
-  a*{name: 'poll'} href='#{{root_path}}poll' Live Poll
-  span class="poll-status"
+.actions
+  form.pull-left action="#{root_path}reset" method="post"
+    button.btn.btn-small type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list
+  .pull-right
+    span.poll-status
+    a.btn.btn-small name='poll' href='#{{root_path}}poll' Live Poll
 
 == slim :_workers
 
-form action="#{root_path}reset" method="post"
-  button.btn type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list

data/web/views/layout.slim

@@ -4,7 +4,7 @@ html
     link href='#{{root_path}}assets/application.css' media='screen' rel='stylesheet' type='text/css'
     title Sidekiq
   body
-    .navbar.navbar-fixed-top
+    .navbar.navbar-fixed-top.navbar-inverse
       .navbar-inner
         .container
           a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse"

data/web/views/queues.slim

@@ -10,10 +10,10 @@ h1 Queues
       tr
         td
           a href="#{root_path}queues/#{queue}" #{queue}
-        td= size
+        td= number_with_delimiter(size)
         td
           form action="#{root_path}queues/#{queue}" method="post"
-            input.btn.btn-danger type="submit" name="delete" value="Delete"
+            input.btn.btn-danger type="submit" name="delete" value="Delete" data-confirm="Are you sure you want to delete the #{queue} queue?"
 - else
   p No queues found.
   a href="#{root_path}" Back

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -244,6 +260,7 @@ files:
 - lib/sidekiq/rails.rb
 - lib/sidekiq/redis_connection.rb
 - lib/sidekiq/scheduled.rb
+- lib/sidekiq/stats.rb
 - lib/sidekiq/testing.rb
 - lib/sidekiq/testing/inline.rb
 - lib/sidekiq/util.rb
@@ -251,45 +268,6 @@ files:
 - lib/sidekiq/web.rb
 - lib/sidekiq/worker.rb
 - lib/sidekiq/yaml_patch.rb
-- myapp/.gitignore
-- myapp/Capfile
-- myapp/Gemfile
-- myapp/Rakefile
-- myapp/app/controllers/application_controller.rb
-- myapp/app/controllers/work_controller.rb
-- myapp/app/helpers/application_helper.rb
-- myapp/app/mailers/.gitkeep
-- myapp/app/mailers/user_mailer.rb
-- myapp/app/models/.gitkeep
-- myapp/app/models/post.rb
-- myapp/app/views/layouts/application.html.erb
-- myapp/app/views/user_mailer/greetings.html.erb
-- myapp/app/views/work/index.html.erb
-- myapp/app/workers/hard_worker.rb
-- myapp/config.ru
-- myapp/config/application.rb
-- myapp/config/boot.rb
-- myapp/config/database.yml
-- myapp/config/deploy.rb
-- myapp/config/environment.rb
-- myapp/config/environments/development.rb
-- myapp/config/environments/production.rb
-- myapp/config/environments/test.rb
-- myapp/config/initializers/backtrace_silencers.rb
-- myapp/config/initializers/inflections.rb
-- myapp/config/initializers/mime_types.rb
-- myapp/config/initializers/secret_token.rb
-- myapp/config/initializers/session_store.rb
-- myapp/config/initializers/sidekiq.rb
-- myapp/config/initializers/wrap_parameters.rb
-- myapp/config/locales/en.yml
-- myapp/config/routes.rb
-- myapp/db/migrate/20120123214055_create_posts.rb
-- myapp/db/seeds.rb
-- myapp/lib/assets/.gitkeep
-- myapp/lib/tasks/.gitkeep
-- myapp/log/.gitkeep
-- myapp/script/rails
 - sidekiq.gemspec
 - test/config.yml
 - test/fake_env.rb
@@ -311,18 +289,6 @@ files:
 - web/assets/images/bootstrap/glyphicons-halflings.png
 - web/assets/javascripts/application.js
 - web/assets/javascripts/vendor/bootstrap.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-alert.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-button.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-carousel.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-collapse.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-dropdown.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-modal.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-popover.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-scrollspy.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-tab.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-tooltip.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-transition.js
-- web/assets/javascripts/vendor/bootstrap/bootstrap-typeahead.js
 - web/assets/javascripts/vendor/jquery.js
 - web/assets/javascripts/vendor/jquery.timeago.js
 - web/assets/stylesheets/application.css

data/myapp/.gitignore

@@ -1,15 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp

data/myapp/Capfile

@@ -1,5 +0,0 @@
-load 'deploy'
-# Uncomment if you are using Rails' asset pipeline
-    # load 'deploy/assets'
-Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-load 'config/deploy' # remove this line to skip loading any of the default tasks

data/myapp/Gemfile

@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :ruby do
-  gem 'sqlite3'
-end
-
-platforms :jruby do
-  gem 'jruby-openssl'
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-gem 'rails', '3.2.6'
-gem 'sidekiq', :path => '..'
-gem 'capistrano'
-
-# sidekiq-web dependencies
-gem 'slim'
-gem 'sinatra'
-gem 'sprockets'

data/myapp/Rakefile

@@ -1,7 +0,0 @@
-#!/usr/bin/env rake
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Myapp::Application.load_tasks

data/myapp/app/controllers/application_controller.rb

@@ -1,3 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-end

data/myapp/app/controllers/work_controller.rb

@@ -1,38 +0,0 @@
-class WorkController < ApplicationController
-  def index
-    @count = rand(100)
-    puts "Adding #{@count} jobs"
-    @count.times do |x|
-      HardWorker.perform_async('bubba', 0.01, x)
-    end
-  end
-
-  def email
-    UserMailer.delay_for(30.seconds).greetings(Time.now)
-    render :nothing => true
-  end
-
-  def long
-    50.times do |x|
-      HardWorker.perform_async('bob', 10, x)
-    end
-    render :text => 'enqueued'
-  end
-
-  def crash
-    HardWorker.perform_async('crash', 1, Time.now.to_f)
-    render :text => 'enqueued'
-  end
-
-  def delayed_post
-    p = Post.first
-    unless p
-      p = Post.create!(:title => "Title!", :body => 'Body!')
-      p2 = Post.create!(:title => "Other!", :body => 'Second Body!')
-    else
-      p2 = Post.second
-    end
-    p.delay.long_method(p2)
-    render :nothing => true
-  end
-end

data/myapp/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/myapp/app/mailers/user_mailer.rb

@@ -1,9 +0,0 @@
-class UserMailer < ActionMailer::Base
-  default from: "sidekiq@example.com"
-
-  def greetings(now)
-    @now = now
-    @hostname = `hostname`.strip
-    mail(:to => 'mperham@gmail.com', :subject => 'Ahoy Matey!')
-  end
-end

data/myapp/app/models/post.rb

@@ -1,5 +0,0 @@
-class Post < ActiveRecord::Base
-  def long_method(other_post)
-    puts "Running long method with #{self.id} and #{other_post.id}"
-  end
-end

data/myapp/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Myapp</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/myapp/app/views/user_mailer/greetings.html.erb

@@ -1,3 +0,0 @@
-<p>
-  Hi Mike, it's <%= @now %> and I'm at <%= @hostname %>.
-</p>

data/myapp/app/views/work/index.html.erb

@@ -1 +0,0 @@
-Added <%= @count %> jobs!

data/myapp/app/workers/hard_worker.rb

@@ -1,10 +0,0 @@
-class HardWorker
-  include Sidekiq::Worker
-  sidekiq_options :timeout => 20, :backtrace => 5
-
-  def perform(name, count, salt)
-    raise name if name == 'crash'
-    logger.info Time.now
-    sleep count
-  end
-end

data/myapp/config.ru

@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run Myapp::Application

data/myapp/config/application.rb

@@ -1,59 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
-
-module Myapp
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-  end
-end

data/myapp/config/boot.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/myapp/config/database.yml

@@ -1,25 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

data/myapp/config/deploy.rb

@@ -1,15 +0,0 @@
-require 'bundler/capistrano'
-require 'sidekiq/capistrano'
-
-set :scm, :git
-set :repository, 'git@github.com:mperham/sidekiq'
-ssh_options[:forward_agent] = true
-
-default_run_options[:pty] = true # needed to run sudo
-set :user, 'mperham'
-set :application, "myapp"
-set :deploy_via, :remote_cache
-
-role :web, "localhost"
-role :app, "localhost"
-role :db,  "localhost", :primary => true