sidekiq 2.11.1 → 2.11.2

data/Changes.md

@@ -1,3 +1,11 @@
+2.11.2
+-----------
+
+- Fix Web UI when used without Rails [#886]
+- Add Sidekiq::Stats#reset [#349]
+- Add Norwegian locale.
+- Updates for the JA locale.
+
 2.11.1
 -----------
 

data/lib/sidekiq/api.rb

@@ -16,6 +16,13 @@ module Sidekiq
       count.nil? ? 0 : count.to_i
     end
 
+    def reset
+      Sidekiq.redis do |conn|
+        conn.set("stat:failed", 0)
+        conn.set("stat:processed", 0)
+      end
+    end
+
     def queues
       Sidekiq.redis do |conn|
         queues = conn.smembers('queues')

data/lib/sidekiq/cli.rb

@@ -248,7 +248,7 @@ module Sidekiq
         end
 
         o.on '-i', '--index INT', "unique process index on this machine" do |arg|
-          opts[:index] = Integer(arg)
+          opts[:index] = Integer(arg.match(/\d+/)[0])
         end
 
         o.on '-p', '--profile', "Profile all code run by Sidekiq" do |arg|

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.11.1"
+  VERSION = "2.11.2"
 end

data/lib/sidekiq/web.rb

@@ -1,5 +1,9 @@
+require 'yaml'
 require 'sinatra/base'
 require 'slim'
+
+require 'sidekiq'
+require 'sidekiq/api'
 require 'sidekiq/paginator'
 
 module Sidekiq
@@ -24,11 +28,11 @@ module Sidekiq
       end
 
       def get_locale
-        (request.env["HTTP_ACCEPT_LANGUAGE"] || 'en')[0,2]
+        strings[(request.env["HTTP_ACCEPT_LANGUAGE"] || 'en')[0,2]] || strings['en']
       end
 
       def t(msg, options={})
-        string = strings[get_locale] ? strings[get_locale].fetch(msg) : strings['en'].fetch(msg)
+        string = get_locale[msg] || msg
         string % options
       end
 

data/sidekiq.gemspec

@@ -14,16 +14,16 @@ Gem::Specification.new do |gem|
   gem.name          = "sidekiq"
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::VERSION
-  gem.add_dependency                  'redis', '~> 3'
+  gem.add_dependency                  'redis', '>= 3.0'
   gem.add_dependency                  'redis-namespace'
-  gem.add_dependency                  'connection_pool', '~> 1.0'
-  gem.add_dependency                  'celluloid', '~> 0.13.0'
-  gem.add_dependency                  'multi_json', '~> 1'
+  gem.add_dependency                  'connection_pool', '>= 1.0.0'
+  gem.add_dependency                  'celluloid', '>= 0.13.0'
+  gem.add_dependency                  'multi_json'
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'slim'
-  gem.add_development_dependency      'minitest', '~> 4'
+  gem.add_development_dependency      'minitest'
   gem.add_development_dependency      'rake'
-  gem.add_development_dependency      'actionmailer', '~> 3'
-  gem.add_development_dependency      'activerecord', '~> 3'
+  gem.add_development_dependency      'actionmailer'
+  gem.add_development_dependency      'activerecord'
   gem.add_development_dependency      'coveralls'
 end

data/test/test_api.rb

@@ -32,6 +32,18 @@ class TestApi < MiniTest::Unit::TestCase
       end
     end
 
+    describe "reset" do
+      it 'can reset stats' do
+        Sidekiq.redis do |conn|
+          conn.set('stat:processed', 5)
+          conn.set('stat:failed', 10)
+          Sidekiq::Stats.new.reset
+          assert_equal '0', conn.get('stat:processed')
+          assert_equal '0', conn.get('stat:failed')
+        end
+      end
+    end
+
     describe "queues" do
       it "is initially empty" do
         s = Sidekiq::Stats.new

data/test/test_cli.rb

@@ -45,6 +45,11 @@ class TestCli < MiniTest::Unit::TestCase
       assert_equal 7, Sidekiq.options[:index]
     end
 
+    it 'accepts a stringy process index' do
+      @cli.parse(['sidekiq', '-i', 'worker.7', '-r', './test/fake_env.rb'])
+      assert_equal 7, Sidekiq.options[:index]
+    end
+
     it 'sets strictly ordered queues if weights are not present' do
       @cli.parse(['sidekiq', '-q', 'foo,bar', '-r', './test/fake_env.rb'])
       assert_equal true, !!Sidekiq.options[:strict]

data/web/locales/en.yml

@@ -1,5 +1,5 @@
 # elements like %{queue} are variables and should not be translated
-en:
+en: # <---- change this to your locale code
   Dashboard: Dashboard
   Status: Status
   Time: Time

data/web/locales/ja.yml

@@ -1,7 +1,7 @@
 # elements like %{queue} are variables and should not be translated
 ja:
   Dashboard: ダッシュボード
-  Status: ステータス
+  Status: 状態
   Time: 時間
   Namespace: ネームスペース
   Realtime: リアルタイム
@@ -15,8 +15,8 @@ ja:
   ClearWorkerList: 動作中の作業を停止
   Worker: 動作中の作業
   Workers: 動作中の作業
-  LivePoll: 転送中
-  StopPolling: 転送停止
+  LivePoll: ポーリング開始
+  StopPolling: ポーリング停止
   Queue: キュー
   Class: クラス
   Job: ジョブ
@@ -25,8 +25,8 @@ ja:
   ShowAll: 全て見せる
   CurrentMessagesInQueue: <span class='title'>%{queue}</span>に メッセージがあります
   Delete: 削除
-  AreYouSureDeleteJob: 本当にこの作業を削除しますか？
-  AreYouSureDeleteQueue: 本当に %{queue} キュー 削除しますか?
+  AreYouSureDeleteJob: このジョブを削除しますか？
+  AreYouSureDeleteQueue: この %{queue} キューを削除しますか?
   Queues: キュー
   Size: サイズ
   Actions: アクション
@@ -35,7 +35,7 @@ ja:
   RetryNow: 今すぐ再試行
   LastRetry: 再試行履歴
   OriginallyFailed: 失敗
-  AreYouSure: 本当にいいですか？
+  AreYouSure: いいですか？
   DeleteAll: 全て削除
   RetryAll: 全て再試行
   NoRetriesFound: 再試行できません
@@ -47,16 +47,16 @@ ja:
   NoScheduledFound: 予定された作業はありません
   When: いつ
   ScheduledJobs: 予定された作業
-  idle: アイドル状態
+  idle: アイドル
   active: アクティブ
   Version: バージョン
   Connections: 接続
   MemoryUsage: メモリー容量
   PeakMemoryUsage: 最大メモリー容量
   Uptime: Uptime (days)
-  OneWeek: １週
+  OneWeek: 1 週
   OneMonth: 1 ヶ月
   ThreeMonths: 3 ヶ月
   SixMonths: 6 ヶ月
-  Batches: Batches
+  Batches: バッチ
   Failures: 失敗

data/web/locales/no.yml

@@ -0,0 +1,62 @@
+# elements like %{queue} are variables and should not be translated
+no:
+  Dashboard: Oversikt
+  Status: Status
+  Time: Tid
+  Namespace: Navnerom
+  Realtime: Sanntid
+  History: Historikk
+  Busy: Opptatt
+  Processed: Prosessert
+  Failed: Mislykket
+  Scheduled: Planlagt
+  Retries: Forsøk
+  Enqueued: I kø
+  ClearWorkerList: Nullstill jobbliste
+  Worker: Arbeider
+  Workers: Arbeidere
+  LivePoll: Automatisk oppdatering
+  StopPolling: Stopp automatisk oppdatering
+  Queue: Kø
+  Class: Klasse
+  Job: Jobb
+  Arguments: Argumenter
+  Started: Startet
+  ShowAll: Vis alle
+  CurrentMessagesInQueue: Nåværende melding i <span class='title'>%{queue}</span>
+  Delete: Slett
+  AreYouSureDeleteJob: Er du sikker på at du vil slette denne jobben?
+  AreYouSureDeleteQueue: Er du sikker på at du vil slette køen %{queue}?
+  Queues: Køer
+  Size: Størrelse
+  Actions: Handlinger
+  NextRetry: Neste forsøk
+  RetryCount: Antall forsøk
+  RetryNow: Forsøk igjen nå
+  LastRetry: Forrige forsøk
+  OriginallyFailed: Feilet opprinnelig
+  AreYouSure: Er du sikker?
+  DeleteAll: Slett alle
+  RetryAll: Forsøk alle på nytt
+  NoRetriesFound: Ingen forsøk funnet
+  Error: Feil
+  ErrorClass: Feilklasse
+  ErrorMessage: Feilmelding
+  ErrorBacktrace: Feilbakgrunn
+  GoBack: ← Tilbake
+  NoScheduledFound: Ingen planlagte jobber funnet
+  When: Når
+  ScheduledJobs: Planlagte jobber
+  idle: uvirksom
+  active: aktiv
+  Version: Versjon
+  Connections: Tilkoblinger
+  MemoryUsage: Minneforbruk
+  PeakMemoryUsage: Høyeste minneforbruk
+  Uptime: Oppetid (dager)
+  OneWeek: 1 uke
+  OneMonth: 1 måned
+  ThreeMonths: 3 måneder
+  SixMonths: 6 måneder
+  Batches: Samlinger
+  Failures: Mislykkeser

data/web/views/_nav.slim

@@ -13,4 +13,5 @@
 
       - custom_tabs.each do |title, url|
           li class="#{(current_path =~ Regexp.new(url)) ? 'active':''}"
-            a href='#{{root_path}}#{{url}}' = title
+            a href='#{{root_path}}#{{url}}' = t(title)
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-05-01 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: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -48,23 +48,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,33 +160,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ files:
 - web/locales/it.yml
 - web/locales/ja.yml
 - web/locales/nl.yml
+- web/locales/no.yml
 - web/locales/pl.yml
 - web/locales/pt-br.yml
 - web/locales/pt.yml