sidekiq 4.1.4 → 4.2.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of sidekiq might be problematic. Click here for more details.

Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +0 -6
  3. data/Changes.md +24 -0
  4. data/Ent-Changes.md +24 -1
  5. data/Gemfile +5 -5
  6. data/Pro-Changes.md +11 -0
  7. data/lib/sidekiq.rb +4 -1
  8. data/lib/sidekiq/cli.rb +11 -2
  9. data/lib/sidekiq/launcher.rb +5 -1
  10. data/lib/sidekiq/manager.rb +1 -0
  11. data/lib/sidekiq/processor.rb +28 -25
  12. data/lib/sidekiq/rails.rb +17 -0
  13. data/lib/sidekiq/scheduled.rb +1 -0
  14. data/lib/sidekiq/version.rb +1 -1
  15. data/lib/sidekiq/web.rb +79 -202
  16. data/lib/sidekiq/web/action.rb +99 -0
  17. data/lib/sidekiq/web/application.rb +335 -0
  18. data/lib/sidekiq/{web_helpers.rb → web/helpers.rb} +29 -10
  19. data/lib/sidekiq/web/router.rb +96 -0
  20. data/sidekiq.gemspec +2 -2
  21. data/test/test_cli.rb +14 -2
  22. data/test/test_launcher.rb +12 -2
  23. data/test/test_web.rb +52 -5
  24. data/web/assets/images/{status-sd8051fd480.png → status.png} +0 -0
  25. data/web/assets/javascripts/application.js +5 -0
  26. data/web/assets/stylesheets/application.css +26 -1
  27. data/web/assets/stylesheets/bootstrap.css +4 -8
  28. data/web/locales/de.yml +1 -1
  29. data/web/views/_footer.erb +1 -1
  30. data/web/views/busy.erb +2 -2
  31. data/web/views/dashboard.erb +2 -2
  32. data/web/views/dead.erb +1 -1
  33. data/web/views/layout.erb +3 -3
  34. data/web/views/morgue.erb +2 -2
  35. data/web/views/queue.erb +3 -3
  36. data/web/views/queues.erb +1 -1
  37. data/web/views/retries.erb +2 -2
  38. data/web/views/retry.erb +1 -1
  39. data/web/views/scheduled.erb +2 -2
  40. data/web/views/scheduled_job_info.erb +1 -1
  41. metadata +12 -20
  42. data/web/assets/images/bootstrap/glyphicons-halflings-white.png +0 -0
  43. data/web/assets/images/bootstrap/glyphicons-halflings.png +0 -0
  44. data/web/assets/images/status/active.png +0 -0
  45. data/web/assets/images/status/idle.png +0 -0
  46. data/web/views/_poll_js.erb +0 -5
@@ -8,7 +8,7 @@
8
8
  </h3>
9
9
  </div>
10
10
  <div class="col-sm-4 pull-right">
11
- <%= erb :_paging, :locals => { :url => "#{root_path}queues/#{@name}" } %>
11
+ <%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
12
12
  </div>
13
13
  </header>
14
14
  <div class="table_container">
@@ -26,7 +26,7 @@
26
26
  <% if a.size > 100 %>
27
27
  <%= h(msg.display_args.inspect[0..100]) + "... " %>
28
28
  <button data-toggle="collapse" data-target="#worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
29
- <div class="toggle" id="worker_<%= index %>" style="display: none;"><%= h(msg.display_args) %></div>
29
+ <div class="toggle" id="worker_<%= index %>"><%= h(msg.display_args) %></div>
30
30
  <% else %>
31
31
  <%= h(msg.display_args) %>
32
32
  <% end %>
@@ -42,4 +42,4 @@
42
42
  <% end %>
43
43
  </table>
44
44
  </div>
45
- <%= erb :_paging, :locals => { :url => "#{root_path}queues/#{@name}" } %>
45
+ <%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
@@ -16,7 +16,7 @@
16
16
  <% end %>
17
17
  </td>
18
18
  <td><%= number_with_delimiter(queue.size) %> </td>
19
- <td width="20%">
19
+ <td class="delete-confirm">
20
20
  <form action="<%=root_path %>queues/<%= queue.name %>" method="post">
21
21
  <%= csrf_tag %>
22
22
  <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
@@ -4,7 +4,7 @@
4
4
  </div>
5
5
  <% if @retries.size > 0 && @total_size > @count %>
6
6
  <div class="col-sm-4">
7
- <%= erb :_paging, :locals => { :url => "#{root_path}retries" } %>
7
+ <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
8
8
  </div>
9
9
  <% end %>
10
10
  <%= filtering('retries') %>
@@ -17,7 +17,7 @@
17
17
  <table class="table table-striped table-bordered table-white">
18
18
  <thead>
19
19
  <tr>
20
- <th width="20px" class="table-checkbox">
20
+ <th class="table-checkbox checkbox-column">
21
21
  <label>
22
22
  <input type="checkbox" class="check_all" />
23
23
  </label>
@@ -1,4 +1,4 @@
1
- <%= erb :_job_info, :locals => {:job => @retry, :type => :retry} %>
1
+ <%= erb :_job_info, locals: { job: @retry, type: :retry } %>
2
2
 
3
3
  <h3><%= t('Error') %></h3>
4
4
  <div class="table_container">
@@ -4,7 +4,7 @@
4
4
  </div>
5
5
  <% if @scheduled.size > 0 && @total_size > @count %>
6
6
  <div class="col-sm-4">
7
- <%= erb :_paging, :locals => { :url => "#{root_path}scheduled" } %>
7
+ <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
8
8
  </div>
9
9
  <% end %>
10
10
  <%= filtering('scheduled') %>
@@ -18,7 +18,7 @@
18
18
  <table class="table table-striped table-bordered table-white">
19
19
  <thead>
20
20
  <tr>
21
- <th width="20px">
21
+ <th class="checkbox-column">
22
22
  <input type="checkbox" class="check_all" />
23
23
  </th>
24
24
  <th><%= t('When') %></th>
@@ -1,4 +1,4 @@
1
- <%= erb :_job_info, :locals => {:job => @job, :type => :scheduled} %>
1
+ <%= erb :_job_info, locals: { job: @job, type: :scheduled } %>
2
2
 
3
3
  <form class="form-horizontal" action="<%= root_path %>scheduled/<%= job_params(@job, @job.score) %>" method="post">
4
4
  <%= csrf_tag %>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sidekiq
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.4
4
+ version: 4.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Perham
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-01 00:00:00.000000000 Z
11
+ date: 2016-09-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: redis
@@ -65,19 +65,19 @@ dependencies:
65
65
  - !ruby/object:Gem::Version
66
66
  version: '1.0'
67
67
  - !ruby/object:Gem::Dependency
68
- name: sinatra
68
+ name: rack-protection
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
- - - ">="
71
+ - - "~>"
72
72
  - !ruby/object:Gem::Version
73
- version: 1.4.7
73
+ version: '1.5'
74
74
  type: :runtime
75
75
  prerelease: false
76
76
  version_requirements: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - ">="
78
+ - - "~>"
79
79
  - !ruby/object:Gem::Version
80
- version: 1.4.7
80
+ version: '1.5'
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: redis-namespace
83
83
  requirement: !ruby/object:Gem::Requirement
@@ -136,9 +136,6 @@ dependencies:
136
136
  name: rails
137
137
  requirement: !ruby/object:Gem::Requirement
138
138
  requirements:
139
- - - "~>"
140
- - !ruby/object:Gem::Version
141
- version: '4'
142
139
  - - ">="
143
140
  - !ruby/object:Gem::Version
144
141
  version: 3.2.0
@@ -146,9 +143,6 @@ dependencies:
146
143
  prerelease: false
147
144
  version_requirements: !ruby/object:Gem::Requirement
148
145
  requirements:
149
- - - "~>"
150
- - !ruby/object:Gem::Version
151
- version: '4'
152
146
  - - ">="
153
147
  - !ruby/object:Gem::Version
154
148
  version: 3.2.0
@@ -214,7 +208,10 @@ files:
214
208
  - lib/sidekiq/util.rb
215
209
  - lib/sidekiq/version.rb
216
210
  - lib/sidekiq/web.rb
217
- - lib/sidekiq/web_helpers.rb
211
+ - lib/sidekiq/web/action.rb
212
+ - lib/sidekiq/web/application.rb
213
+ - lib/sidekiq/web/helpers.rb
214
+ - lib/sidekiq/web/router.rb
218
215
  - lib/sidekiq/worker.rb
219
216
  - sidekiq.gemspec
220
217
  - test/config.yml
@@ -247,13 +244,9 @@ files:
247
244
  - test/test_util.rb
248
245
  - test/test_web.rb
249
246
  - test/test_web_helpers.rb
250
- - web/assets/images/bootstrap/glyphicons-halflings-white.png
251
- - web/assets/images/bootstrap/glyphicons-halflings.png
252
247
  - web/assets/images/favicon.ico
253
248
  - web/assets/images/logo.png
254
- - web/assets/images/status-sd8051fd480.png
255
- - web/assets/images/status/active.png
256
- - web/assets/images/status/idle.png
249
+ - web/assets/images/status.png
257
250
  - web/assets/javascripts/application.js
258
251
  - web/assets/javascripts/dashboard.js
259
252
  - web/assets/javascripts/locales/README.md
@@ -329,7 +322,6 @@ files:
329
322
  - web/views/_job_info.erb
330
323
  - web/views/_nav.erb
331
324
  - web/views/_paging.erb
332
- - web/views/_poll_js.erb
333
325
  - web/views/_poll_link.erb
334
326
  - web/views/_status.erb
335
327
  - web/views/_summary.erb
@@ -1,5 +0,0 @@
1
- <% if current_path != '' && params[:poll] %>
2
- <script>
3
- updatePage('<%= root_path + current_path %>')
4
- </script>
5
- <% end %>