resque-history 1.9.5 → 1.10.0
Sign up to get free protection for your applications and to get access to all the features.
- data/.travis.yml +3 -1
- data/Gemfile +6 -4
- data/Gemfile.lock +56 -75
- data/VERSION +1 -1
- data/lib/resque-history/helpers/helper.rb +5 -1
- data/lib/resque-history/server/views/history.erb +8 -2
- data/resque-history.gemspec +6 -18
- data/spec/redis-test.conf +0 -4
- data/spec/resque-web_spec.rb +6 -1
- metadata +6 -70
data/.travis.yml
CHANGED
data/Gemfile
CHANGED
@@ -1,12 +1,14 @@
|
|
1
1
|
source "http://rubygems.org"
|
2
2
|
|
3
3
|
# Specify your gem's dependencies in resque-history.gemspec
|
4
|
-
gemspec
|
4
|
+
# gemspec
|
5
5
|
|
6
|
-
gem "rake"
|
7
6
|
gem "resque"
|
8
7
|
|
9
|
-
group :
|
8
|
+
group :development, :test do
|
9
|
+
gem "rake"
|
10
|
+
gem "bundler"
|
11
|
+
gem "jeweler"
|
12
|
+
gem "rspec-rails"
|
10
13
|
gem "timecop"
|
11
14
|
end
|
12
|
-
|
data/Gemfile.lock
CHANGED
@@ -1,94 +1,76 @@
|
|
1
|
-
PATH
|
2
|
-
remote: .
|
3
|
-
specs:
|
4
|
-
resque-history (1.9.5)
|
5
|
-
rake
|
6
|
-
resque
|
7
|
-
resque-history
|
8
|
-
|
9
1
|
GEM
|
10
2
|
remote: http://rubygems.org/
|
11
3
|
specs:
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
rack
|
20
|
-
rack-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
i18n (~> 0.
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
4
|
+
abstract (1.0.0)
|
5
|
+
actionpack (3.0.8)
|
6
|
+
activemodel (= 3.0.8)
|
7
|
+
activesupport (= 3.0.8)
|
8
|
+
builder (~> 2.1.2)
|
9
|
+
erubis (~> 2.6.6)
|
10
|
+
i18n (~> 0.5.0)
|
11
|
+
rack (~> 1.2.1)
|
12
|
+
rack-mount (~> 0.6.14)
|
13
|
+
rack-test (~> 0.5.7)
|
14
|
+
tzinfo (~> 0.3.23)
|
15
|
+
activemodel (3.0.8)
|
16
|
+
activesupport (= 3.0.8)
|
17
|
+
builder (~> 2.1.2)
|
18
|
+
i18n (~> 0.5.0)
|
19
|
+
activesupport (3.0.8)
|
20
|
+
backports (3.1.1)
|
21
|
+
builder (2.1.2)
|
22
|
+
diff-lcs (1.2.1)
|
23
|
+
erubis (2.6.6)
|
24
|
+
abstract (>= 1.0.0)
|
31
25
|
git (1.2.5)
|
32
|
-
|
33
|
-
|
34
|
-
jeweler (1.6.4)
|
26
|
+
i18n (0.5.0)
|
27
|
+
jeweler (1.8.4)
|
35
28
|
bundler (~> 1.0)
|
36
29
|
git (>= 1.2.5)
|
37
30
|
rake
|
38
|
-
|
39
|
-
json (1.
|
40
|
-
multi_json (1.
|
41
|
-
rack (1.
|
42
|
-
rack-
|
43
|
-
rack (>= 0.
|
44
|
-
rack-
|
45
|
-
rack
|
46
|
-
rack-ssl (1.3.2)
|
47
|
-
rack
|
48
|
-
rack-test (0.6.1)
|
31
|
+
rdoc
|
32
|
+
json (1.7.7)
|
33
|
+
multi_json (1.7.1)
|
34
|
+
rack (1.2.8)
|
35
|
+
rack-mount (0.6.14)
|
36
|
+
rack (>= 1.0.0)
|
37
|
+
rack-test (0.5.7)
|
49
38
|
rack (>= 1.0)
|
50
|
-
railties (3.
|
51
|
-
actionpack (= 3.
|
52
|
-
activesupport (= 3.
|
53
|
-
rack-ssl (~> 1.3.2)
|
39
|
+
railties (3.0.8)
|
40
|
+
actionpack (= 3.0.8)
|
41
|
+
activesupport (= 3.0.8)
|
54
42
|
rake (>= 0.8.7)
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
rdoc (3.12)
|
43
|
+
thor (~> 0.14.4)
|
44
|
+
rake (10.0.3)
|
45
|
+
rdoc (4.0.0)
|
59
46
|
json (~> 1.4)
|
60
|
-
redis (
|
61
|
-
redis-namespace (1.
|
62
|
-
redis (
|
63
|
-
resque (1.
|
47
|
+
redis (3.0.3)
|
48
|
+
redis-namespace (1.2.1)
|
49
|
+
redis (~> 3.0.0)
|
50
|
+
resque (1.23.1)
|
64
51
|
multi_json (~> 1.0)
|
65
|
-
redis-namespace (~> 1.0
|
52
|
+
redis-namespace (~> 1.0)
|
66
53
|
sinatra (>= 0.9.2)
|
67
54
|
vegas (~> 0.1.2)
|
68
|
-
rspec (2.
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
rspec-
|
73
|
-
rspec-expectations (2.9.0)
|
74
|
-
diff-lcs (~> 1.1.3)
|
75
|
-
rspec-mocks (2.9.0)
|
76
|
-
rspec-rails (2.9.0)
|
55
|
+
rspec-core (2.13.1)
|
56
|
+
rspec-expectations (2.13.0)
|
57
|
+
diff-lcs (>= 1.1.3, < 2.0)
|
58
|
+
rspec-mocks (2.13.0)
|
59
|
+
rspec-rails (2.13.0)
|
77
60
|
actionpack (>= 3.0)
|
78
61
|
activesupport (>= 3.0)
|
79
62
|
railties (>= 3.0)
|
80
|
-
rspec (~> 2.
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
rack (~> 1.0)
|
88
|
-
tilt (~> 1.1, != 1.3.0)
|
63
|
+
rspec-core (~> 2.13.0)
|
64
|
+
rspec-expectations (~> 2.13.0)
|
65
|
+
rspec-mocks (~> 2.13.0)
|
66
|
+
sinatra (1.2.9)
|
67
|
+
backports
|
68
|
+
rack (~> 1.1, < 1.5)
|
69
|
+
tilt (>= 1.2.2, < 2.0)
|
89
70
|
thor (0.14.6)
|
90
|
-
tilt (1.3.
|
91
|
-
timecop (0.
|
71
|
+
tilt (1.3.6)
|
72
|
+
timecop (0.6.1)
|
73
|
+
tzinfo (0.3.37)
|
92
74
|
vegas (0.1.11)
|
93
75
|
rack (>= 1.0.0)
|
94
76
|
|
@@ -100,6 +82,5 @@ DEPENDENCIES
|
|
100
82
|
jeweler
|
101
83
|
rake
|
102
84
|
resque
|
103
|
-
resque-history!
|
104
85
|
rspec-rails
|
105
86
|
timecop
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.
|
1
|
+
1.10.0
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<% size =
|
1
|
+
<% size = resque_history_total_jobs %>
|
2
2
|
<% start = params[:start].to_i %>
|
3
3
|
<% history = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, start, start + 20)%>
|
4
4
|
|
@@ -10,7 +10,13 @@
|
|
10
10
|
</form>
|
11
11
|
<% end %>
|
12
12
|
|
13
|
-
<p class='intro'>Showing <%=
|
13
|
+
<p class='intro'>Showing <%= start %> to
|
14
|
+
<% if size > 20 %>
|
15
|
+
<%= start + 20 %> of <b><%= size %></b>
|
16
|
+
<% else %>
|
17
|
+
<%= size %>
|
18
|
+
<% end %>jobs</p>
|
19
|
+
|
14
20
|
<div id="main">
|
15
21
|
<%= partial :next_more, :start => params[:start].to_i, :size => size %>
|
16
22
|
|
data/resque-history.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "resque-history"
|
8
|
-
s.version = "1.
|
8
|
+
s.version = "1.10.0"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Katzmopolitan"]
|
12
|
-
s.date = "
|
12
|
+
s.date = "2013-03-24"
|
13
13
|
s.description = "Show history of recently executed jobs"
|
14
14
|
s.email = "ilyakatz@gmail.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -49,46 +49,34 @@ Gem::Specification.new do |s|
|
|
49
49
|
]
|
50
50
|
s.homepage = "https://github.com/ilyakatz/resque-history"
|
51
51
|
s.require_paths = ["lib"]
|
52
|
-
s.rubygems_version = "1.8.
|
52
|
+
s.rubygems_version = "1.8.25"
|
53
53
|
s.summary = "Show history of recently executed jobs"
|
54
54
|
|
55
55
|
if s.respond_to? :specification_version then
|
56
56
|
s.specification_version = 3
|
57
57
|
|
58
58
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
59
|
-
s.add_runtime_dependency(%q<resque-history>, [">= 0"])
|
60
|
-
s.add_runtime_dependency(%q<rake>, [">= 0"])
|
61
59
|
s.add_runtime_dependency(%q<resque>, [">= 0"])
|
60
|
+
s.add_development_dependency(%q<rake>, [">= 0"])
|
62
61
|
s.add_development_dependency(%q<bundler>, [">= 0"])
|
63
62
|
s.add_development_dependency(%q<jeweler>, [">= 0"])
|
64
63
|
s.add_development_dependency(%q<rspec-rails>, [">= 0"])
|
65
64
|
s.add_development_dependency(%q<timecop>, [">= 0"])
|
66
|
-
s.add_development_dependency(%q<timecop>, [">= 0"])
|
67
|
-
s.add_development_dependency(%q<timecop>, [">= 0"])
|
68
|
-
s.add_development_dependency(%q<timecop>, [">= 0"])
|
69
65
|
else
|
70
|
-
s.add_dependency(%q<resque-history>, [">= 0"])
|
71
|
-
s.add_dependency(%q<rake>, [">= 0"])
|
72
66
|
s.add_dependency(%q<resque>, [">= 0"])
|
67
|
+
s.add_dependency(%q<rake>, [">= 0"])
|
73
68
|
s.add_dependency(%q<bundler>, [">= 0"])
|
74
69
|
s.add_dependency(%q<jeweler>, [">= 0"])
|
75
70
|
s.add_dependency(%q<rspec-rails>, [">= 0"])
|
76
71
|
s.add_dependency(%q<timecop>, [">= 0"])
|
77
|
-
s.add_dependency(%q<timecop>, [">= 0"])
|
78
|
-
s.add_dependency(%q<timecop>, [">= 0"])
|
79
|
-
s.add_dependency(%q<timecop>, [">= 0"])
|
80
72
|
end
|
81
73
|
else
|
82
|
-
s.add_dependency(%q<resque-history>, [">= 0"])
|
83
|
-
s.add_dependency(%q<rake>, [">= 0"])
|
84
74
|
s.add_dependency(%q<resque>, [">= 0"])
|
75
|
+
s.add_dependency(%q<rake>, [">= 0"])
|
85
76
|
s.add_dependency(%q<bundler>, [">= 0"])
|
86
77
|
s.add_dependency(%q<jeweler>, [">= 0"])
|
87
78
|
s.add_dependency(%q<rspec-rails>, [">= 0"])
|
88
79
|
s.add_dependency(%q<timecop>, [">= 0"])
|
89
|
-
s.add_dependency(%q<timecop>, [">= 0"])
|
90
|
-
s.add_dependency(%q<timecop>, [">= 0"])
|
91
|
-
s.add_dependency(%q<timecop>, [">= 0"])
|
92
80
|
end
|
93
81
|
end
|
94
82
|
|
data/spec/redis-test.conf
CHANGED
@@ -109,7 +109,3 @@ databases 16
|
|
109
109
|
|
110
110
|
############################### ADVANCED CONFIG ###############################
|
111
111
|
|
112
|
-
# Glue small output buffers together in order to send small replies in a
|
113
|
-
# single TCP packet. Uses a bit more CPU but most of the times it is a win
|
114
|
-
# in terms of number of queries per second. Use 'yes' if unsure.
|
115
|
-
glueoutputbuf yes
|
data/spec/resque-web_spec.rb
CHANGED
@@ -41,6 +41,11 @@ describe ResqueHistory::Server do
|
|
41
41
|
last_response.body.should_not include("HistoryJob")
|
42
42
|
end
|
43
43
|
|
44
|
+
it "should not show full message if there is small number of jobs in the history" do
|
45
|
+
get '/history'
|
46
|
+
last_response.body.should =~ /Showing 0 to.*jobs/m
|
47
|
+
end
|
48
|
+
|
44
49
|
end
|
45
50
|
|
46
51
|
class HistoryJob
|
@@ -49,4 +54,4 @@ class HistoryJob
|
|
49
54
|
|
50
55
|
def self.perform(*args)
|
51
56
|
end
|
52
|
-
end
|
57
|
+
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: resque-history
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.10.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,10 +9,10 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2013-03-24 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
|
-
name: resque
|
15
|
+
name: resque
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
@@ -35,23 +35,7 @@ dependencies:
|
|
35
35
|
- - ! '>='
|
36
36
|
- !ruby/object:Gem::Version
|
37
37
|
version: '0'
|
38
|
-
type: :
|
39
|
-
prerelease: false
|
40
|
-
version_requirements: !ruby/object:Gem::Requirement
|
41
|
-
none: false
|
42
|
-
requirements:
|
43
|
-
- - ! '>='
|
44
|
-
- !ruby/object:Gem::Version
|
45
|
-
version: '0'
|
46
|
-
- !ruby/object:Gem::Dependency
|
47
|
-
name: resque
|
48
|
-
requirement: !ruby/object:Gem::Requirement
|
49
|
-
none: false
|
50
|
-
requirements:
|
51
|
-
- - ! '>='
|
52
|
-
- !ruby/object:Gem::Version
|
53
|
-
version: '0'
|
54
|
-
type: :runtime
|
38
|
+
type: :development
|
55
39
|
prerelease: false
|
56
40
|
version_requirements: !ruby/object:Gem::Requirement
|
57
41
|
none: false
|
@@ -123,54 +107,6 @@ dependencies:
|
|
123
107
|
- - ! '>='
|
124
108
|
- !ruby/object:Gem::Version
|
125
109
|
version: '0'
|
126
|
-
- !ruby/object:Gem::Dependency
|
127
|
-
name: timecop
|
128
|
-
requirement: !ruby/object:Gem::Requirement
|
129
|
-
none: false
|
130
|
-
requirements:
|
131
|
-
- - ! '>='
|
132
|
-
- !ruby/object:Gem::Version
|
133
|
-
version: '0'
|
134
|
-
type: :development
|
135
|
-
prerelease: false
|
136
|
-
version_requirements: !ruby/object:Gem::Requirement
|
137
|
-
none: false
|
138
|
-
requirements:
|
139
|
-
- - ! '>='
|
140
|
-
- !ruby/object:Gem::Version
|
141
|
-
version: '0'
|
142
|
-
- !ruby/object:Gem::Dependency
|
143
|
-
name: timecop
|
144
|
-
requirement: !ruby/object:Gem::Requirement
|
145
|
-
none: false
|
146
|
-
requirements:
|
147
|
-
- - ! '>='
|
148
|
-
- !ruby/object:Gem::Version
|
149
|
-
version: '0'
|
150
|
-
type: :development
|
151
|
-
prerelease: false
|
152
|
-
version_requirements: !ruby/object:Gem::Requirement
|
153
|
-
none: false
|
154
|
-
requirements:
|
155
|
-
- - ! '>='
|
156
|
-
- !ruby/object:Gem::Version
|
157
|
-
version: '0'
|
158
|
-
- !ruby/object:Gem::Dependency
|
159
|
-
name: timecop
|
160
|
-
requirement: !ruby/object:Gem::Requirement
|
161
|
-
none: false
|
162
|
-
requirements:
|
163
|
-
- - ! '>='
|
164
|
-
- !ruby/object:Gem::Version
|
165
|
-
version: '0'
|
166
|
-
type: :development
|
167
|
-
prerelease: false
|
168
|
-
version_requirements: !ruby/object:Gem::Requirement
|
169
|
-
none: false
|
170
|
-
requirements:
|
171
|
-
- - ! '>='
|
172
|
-
- !ruby/object:Gem::Version
|
173
|
-
version: '0'
|
174
110
|
description: Show history of recently executed jobs
|
175
111
|
email: ilyakatz@gmail.com
|
176
112
|
executables: []
|
@@ -222,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
222
158
|
version: '0'
|
223
159
|
segments:
|
224
160
|
- 0
|
225
|
-
hash:
|
161
|
+
hash: 3341239409612412022
|
226
162
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
227
163
|
none: false
|
228
164
|
requirements:
|
@@ -231,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
231
167
|
version: '0'
|
232
168
|
requirements: []
|
233
169
|
rubyforge_project:
|
234
|
-
rubygems_version: 1.8.
|
170
|
+
rubygems_version: 1.8.25
|
235
171
|
signing_key:
|
236
172
|
specification_version: 3
|
237
173
|
summary: Show history of recently executed jobs
|