sidekiq 3.4.1 → 4.0.0

data/web/locales/{no.yml → nb.yml}

@@ -1,5 +1,5 @@
 # elements like %{queue} are variables and should not be translated
-no:
+nb:
   Dashboard: Oversikt
   Status: Status
   Time: Tid
@@ -33,6 +33,7 @@ no:
   NextRetry: Neste forsøk
   RetryCount: Antall forsøk
   RetryNow: Forsøk igjen nå
+  Kill: Kill
   LastRetry: Forrige forsøk
   OriginallyFailed: Feilet opprinnelig
   AreYouSure: Er du sikker?
@@ -58,7 +59,6 @@ no:
   OneMonth: 1 måned
   ThreeMonths: 3 måneder
   SixMonths: 6 måneder
-  Batches: Samlinger
   Failures: Feil
   DeadJobs: Døde jobber
   NoDeadJobsFound: Ingen døde jobber funnet
@@ -67,3 +67,11 @@ no:
   Thread: Tråd
   Threads: Tråder
   Jobs: Jobber
+  Paused: Pauset
+  Stop: Stopp
+  Quiet: Demp
+  StopAll: Stopp alle
+  QuietAll: Demp alle
+  PollingInterval: Oppdateringsintervall
+  Plugins: Innstikk
+  NotYetEnqueued: Ikke køet enda

data/web/locales/uk.yml

@@ -0,0 +1,76 @@
+uk:
+  Dashboard: Панель керування
+  Status: Статус
+  Time: Час
+  Namespace: Простір імен
+  Realtime: Зараз
+  History: Історія
+  Busy: Зайнятих
+  Processed: Опрацьовано
+  Failed: Невдалих
+  Scheduled: Заплановано
+  Retries: Спроби
+  Enqueued: У черзі
+  Worker: Обробник
+  LivePoll: Постійне опитування
+  StopPolling: Зупинити опитування
+  Queue: Черга
+  Class: Клас
+  Job: Задача
+  Arguments: Аргументи
+  Extras: Додатково
+  Started: Запущено
+  ShowAll: Відобразити усі
+  CurrentMessagesInQueue: Поточні задачі у черзі <span class='title'>%{queue}</span>
+  Delete: Видалити
+  AddToQueue: Додати до черги
+  AreYouSureDeleteJob: Ви впевнені у тому, що хочете видалити задачу?
+  AreYouSureDeleteQueue: Ви впевнені у тому, що хочете видалити чергу %{queue}?
+  Queues: Черги
+  Size: Розмір
+  Actions: Дії
+  NextRetry: Наступна спроба
+  RetryCount: Кількість спроб
+  RetryNow: Повторити зараз
+  Kill: Вбиваємо
+  LastRetry: Остання спроба
+  OriginallyFailed: Перша невдала спроба
+  AreYouSure: Ви впевнені?
+  DeleteAll: Видалити усі
+  RetryAll: Повторити усі
+  NoRetriesFound: Спроб не знайдено
+  Error: Помилка
+  ErrorClass: Клас помилки
+  ErrorMessage: Повідомлення про помилку
+  ErrorBacktrace: Трасування помилки
+  GoBack: ← Назад
+  NoScheduledFound: Запланованих задач не знайдено
+  When: Коли
+  ScheduledJobs: Заплановані задачі
+  idle: незайнятий
+  active: активний
+  Version: Версія
+  Connections: З'єднань
+  MemoryUsage: Використання пам'яті
+  PeakMemoryUsage: Максимальне використання пам'яті
+  Uptime: Днів безперебійної роботи
+  OneWeek: 1 тиждень
+  OneMonth: 1 місяць
+  ThreeMonths: 3 місяці
+  SixMonths: 6 місяців
+  Failures: Невдачі
+  DeadJobs: Вбиті задачі
+  NoDeadJobsFound: Вбитих задач не знайдено
+  Dead: Вбитих
+  Processes: Процеси
+  Thread: Потік
+  Threads: Потоки
+  Jobs: Задачі
+  Paused: Призупинено
+  Stop: Зупинити
+  Quiet: Призупинити
+  StopAll: Зупинити усі
+  QuietAll: Призупинити усі
+  PollingInterval: Інтервал опитування
+  Plugins: Плагіни
+  NotYetEnqueued: Ще не в черзі

data/web/views/_footer.erb

@@ -6,16 +6,11 @@
             <p class="navbar-text" style="color:white;"><%= product_version %></p>
           </li>
           <li>
-            <p class="navbar-text redis-url">Redis: <%= redis_connection %></p>
+            <p class="navbar-text redis-url" title="<%= redis_connection_and_namespace %>"><%= redis_connection_and_namespace %></p>
           </li>
           <li>
-            <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
+            <p class="navbar-text"><%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
           </li>
-          <% if namespace %>
-              <li>
-                <p class="navbar-text redis-namespace"><%= t('Namespace') %>: <%= namespace %></p>
-              </li>
-          <% end %>
         </ul>
     </div>
   </div>

data/web/views/_job_info.erb

@@ -34,7 +34,7 @@
       </tr>
       <tr>
         <th><%= t('Enqueued') %></th>
-        <td><%= relative_time(job.enqueued_at) %></td>
+        <td><%= (enqueued_at = job.enqueued_at) ? relative_time(enqueued_at) : t('NotYetEnqueued') %></td>
       </tr>
       <% unless retry_extra_items(job).empty? %>
         <tr>

data/web/views/_nav.erb

@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
       </button>
       <div class="navbar-toggle collapsed navbar-livereload">
-        <%= erb :_poll %>
+        <%= erb :_poll_link %>
         <% if Sidekiq::Web.app_url %>
           <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
         <% end %>
@@ -54,7 +54,7 @@
       <ul class="nav navbar-nav navbar-right navbar-livereload" data-navbar="static">
         <li>
           <div class="poll-wrapper pull-right">
-            <%= erb :_poll %>
+            <%= erb :_poll_link %>
             <% if Sidekiq::Web.app_url %>
               <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
             <% end %>

data/web/views/_poll_js.erb

@@ -0,0 +1,5 @@
+<% if current_path != '' && params[:poll] %>
+  <script>
+    updatePage('<%= root_path + current_path %>')
+  </script>
+<% end %>

data/web/views/{_poll.erb → _poll_link.erb}

@@ -1,8 +1,5 @@
 <% if current_path != '' %>
   <% if params[:poll] %>
-    <script>
-      updatePage('<%= root_path + current_path %>')
-    </script>
     <a id="live-poll" class="btn btn-primary active" href="<%= root_path + current_path %>"><%= t('StopPolling') %></a>
   <% else %>
     <a id="live-poll" class="btn btn-primary" href="<%= root_path + current_path %>?<%= qparams(poll: true) %>"><%= t('LivePoll') %></a>

data/web/views/busy.erb

@@ -4,6 +4,7 @@
   </div>
   <div class="col-sm-4 pull-right">
     <form method="POST" style="margin-top: 20px; margin-bottom: 10px;">
+      <%= csrf_tag %>
       <div class="btn-group pull-right">
         <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('QuietAll') %></button>
         <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('StopAll') %></button>
@@ -11,7 +12,6 @@
     </form>
   </div>
 </div>
-</div>
 
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped table-white">
@@ -40,6 +40,7 @@
         <td>
           <div class="btn-group pull-right">
             <form method="POST">
+              <%= csrf_tag %>
               <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
               <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
               <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>

data/web/views/dead.erb

@@ -27,6 +27,7 @@
 </div>
 
 <form class="form-horizontal" action="<%= root_path %>morgue/<%= job_params(@dead, @dead.score) %>" method="post">
+  <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>morgue"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
   <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />

data/web/views/layout.erb

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
     <meta name="google" content="notranslate" />
@@ -26,5 +27,6 @@
       </div>
     </div>
     <%=  erb :_footer %>
+    <%= erb :_poll_js %>
   </body>
 </html>

data/web/views/morgue.erb

@@ -12,6 +12,7 @@
 
 <% if @dead.size > 0 %>
   <form action="<%= root_path %>morgue" method="post">
+    <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-white">
         <thead>
@@ -57,9 +58,11 @@
   </form>
 
   <form action="<%= root_path %>morgue/all/delete" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
   <form action="<%= root_path %>morgue/all/retry" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
 

data/web/views/queue.erb

@@ -33,6 +33,7 @@
         </td>
         <td>
           <form action="<%= root_path %>queues/<%= @name %>/delete" method="post">
+            <%= csrf_tag %>
             <input name="key_val" value="<%= h Sidekiq.dump_json(msg.item) %>" type="hidden" />
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
           </form>

data/web/views/queues.erb

@@ -18,6 +18,7 @@
         <td><%= number_with_delimiter(queue.size) %> </td>
         <td width="20%">
           <form action="<%=root_path %>queues/<%= queue.name %>" method="post">
+            <%= csrf_tag %>
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
           </form>
         </td>

data/web/views/retries.erb

@@ -12,6 +12,7 @@
 
 <% if @retries.size > 0 %>
   <form action="<%= root_path %>retries" method="post">
+    <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-white">
         <thead>
@@ -60,9 +61,11 @@
   </form>
 
   <form action="<%= root_path %>retries/all/delete" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
   <form action="<%= root_path %>retries/all/retry" method="post">
+    <%= csrf_tag %>
     <input class="btn btn-danger btn-xs pull-right" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
   </form>
 

data/web/views/retry.erb

@@ -27,6 +27,7 @@
 </div>
 
 <form class="form-horizontal" action="<%= root_path %>retries/<%= job_params(@retry, @retry.score) %>" method="post">
+  <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>retries"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
   <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />

data/web/views/scheduled.erb

@@ -13,6 +13,7 @@
 <% if @scheduled.size > 0 %>
 
   <form action="<%= root_path %>scheduled" method="post">
+    <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-white">
         <thead>

data/web/views/scheduled_job_info.erb

@@ -1,6 +1,7 @@
 <%= erb :_job_info, :locals => {:job => @job, :type => :scheduled} %>
 
 <form class="form-horizontal" action="<%= root_path %>scheduled/<%= job_params(@job, @job.score) %>" method="post">
+  <%= csrf_tag %>
   <a class="btn btn-default" href="<%= root_path %>scheduled"><%= t('GoBack') %></a>
   <input class="btn btn-primary" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
   <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />

metadata

@@ -1,156 +1,178 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.5.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.3.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '5.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.7.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: Simple, efficient background processing for Ruby
+        version: 3.2.0
+description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com
 executables:
@@ -162,23 +184,26 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - 3.0-Upgrade.md
+- 4.0-Upgrade.md
 - COMM-LICENSE
 - Changes.md
 - Contributing.md
+- Ent-Changes.md
 - Gemfile
 - LICENSE
 - Pro-2.0-Upgrade.md
+- Pro-3.0-Upgrade.md
 - Pro-Changes.md
 - README.md
 - Rakefile
 - bin/sidekiq
 - bin/sidekiqctl
+- bin/sidekiqload
 - lib/generators/sidekiq/templates/worker.rb.erb
 - lib/generators/sidekiq/templates/worker_spec.rb.erb
 - lib/generators/sidekiq/templates/worker_test.rb.erb
 - lib/generators/sidekiq/worker_generator.rb
 - lib/sidekiq.rb
-- lib/sidekiq/actor.rb
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
@@ -215,16 +240,19 @@ files:
 - test/fake_env.rb
 - test/fixtures/en.yml
 - test/helper.rb
+- test/test_actors.rb
 - test/test_api.rb
 - test/test_cli.rb
 - test/test_client.rb
 - test/test_exception_handler.rb
 - test/test_extensions.rb
 - test/test_fetch.rb
+- test/test_launcher.rb
 - test/test_logging.rb
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
+- test/test_rails.rb
 - test/test_redis_connection.rb
 - test/test_retry.rb
 - test/test_scheduled.rb
@@ -233,11 +261,12 @@ files:
 - test/test_testing.rb
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
+- test/test_util.rb
 - test/test_web.rb
 - test/test_web_helpers.rb
-- test/test_worker_generator.rb
 - web/assets/images/bootstrap/glyphicons-halflings-white.png
 - web/assets/images/bootstrap/glyphicons-halflings.png
+- web/assets/images/favicon.ico
 - web/assets/images/logo.png
 - web/assets/images/status-sd8051fd480.png
 - web/assets/images/status/active.png
@@ -302,21 +331,23 @@ files:
 - web/locales/it.yml
 - web/locales/ja.yml
 - web/locales/ko.yml
+- web/locales/nb.yml
 - web/locales/nl.yml
-- web/locales/no.yml
 - web/locales/pl.yml
 - web/locales/pt-br.yml
 - web/locales/pt.yml
 - web/locales/ru.yml
 - web/locales/sv.yml
 - web/locales/ta.yml
+- web/locales/uk.yml
 - web/locales/zh-cn.yml
 - web/locales/zh-tw.yml
 - web/views/_footer.erb
 - web/views/_job_info.erb
 - web/views/_nav.erb
 - web/views/_paging.erb
-- web/views/_poll.erb
+- web/views/_poll_js.erb
+- web/views/_poll_link.erb
 - web/views/_status.erb
 - web/views/_summary.erb
 - web/views/busy.erb
@@ -360,16 +391,19 @@ test_files:
 - test/fake_env.rb
 - test/fixtures/en.yml
 - test/helper.rb
+- test/test_actors.rb
 - test/test_api.rb
 - test/test_cli.rb
 - test/test_client.rb
 - test/test_exception_handler.rb
 - test/test_extensions.rb
 - test/test_fetch.rb
+- test/test_launcher.rb
 - test/test_logging.rb
 - test/test_manager.rb
 - test/test_middleware.rb
 - test/test_processor.rb
+- test/test_rails.rb
 - test/test_redis_connection.rb
 - test/test_retry.rb
 - test/test_scheduled.rb
@@ -378,6 +412,6 @@ test_files:
 - test/test_testing.rb
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
+- test/test_util.rb
 - test/test_web.rb
 - test/test_web_helpers.rb
-- test/test_worker_generator.rb