naf 2.1.12 → 2.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile +4 -3
- data/RELEASE_NOTES.rdoc +17 -4
- data/app/assets/images/download.png +0 -0
- data/app/assets/javascripts/dataTablesTemplates/jobs.js +37 -0
- data/app/controllers/naf/historical_jobs_controller.rb +30 -0
- data/app/controllers/naf/log_parsers_controller.rb +9 -0
- data/app/helpers/naf/application_helper.rb +1 -1
- data/app/models/logical/naf/application_schedule.rb +7 -3
- data/app/models/logical/naf/log_parser/base.rb +1 -0
- data/app/models/logical/naf/log_parser/job.rb +4 -3
- data/app/models/logical/naf/log_parser/job_downloader.rb +156 -0
- data/app/models/logical/naf/log_parser/runner.rb +4 -3
- data/app/models/logical/naf/metric_sender.rb +62 -0
- data/app/models/process/naf/database_models_cleanup.rb +91 -0
- data/app/models/process/naf/runner.rb +52 -35
- data/app/views/naf/historical_jobs/_button_control.html.erb +64 -0
- data/app/views/naf/historical_jobs/index.json.erb +26 -5
- data/app/views/naf/historical_jobs/show.html.erb +20 -29
- data/app/views/naf/log_viewer/_job_log_download_button.html.erb +11 -0
- data/app/views/naf/log_viewer/_job_logs.html.erb +3 -0
- data/app/views/naf/log_viewer/_log_display.html.erb +4 -4
- data/app/views/naf/log_viewer/_log_layout.html.erb +5 -0
- data/config/routes.rb +4 -0
- data/lib/naf.rb +8 -0
- data/lib/naf/configuration.rb +5 -1
- data/lib/naf/version.rb +1 -1
- data/naf.gemspec +5 -2
- data/spec/controllers/naf/log_parsers_controller_spec.rb +35 -0
- data/spec/models/logical/naf/application_schedule_spec.rb +41 -0
- data/spec/models/logical/naf/construction_zone/boss_spec.rb +5 -0
- data/spec/models/logical/naf/construction_zone/foreman_spec.rb +6 -3
- data/spec/models/logical/naf/job_downloader_spec.rb +72 -0
- data/spec/models/logical/naf/job_statuses/errored_spec.rb +33 -0
- data/spec/models/logical/naf/job_statuses/finished_less_minute_spec.rb +33 -0
- data/spec/models/logical/naf/job_statuses/finished_spec.rb +33 -0
- data/spec/models/logical/naf/job_statuses/queued_spec.rb +34 -0
- data/spec/models/logical/naf/job_statuses/running_spec.rb +37 -0
- data/spec/models/logical/naf/job_statuses/terminated_spec.rb +33 -0
- data/spec/models/logical/naf/job_statuses/waiting_spec.rb +33 -0
- metadata +80 -6
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
require 'spec_helper'
|
|
2
|
+
|
|
3
|
+
module Logical
|
|
4
|
+
module Naf
|
|
5
|
+
module JobStatuses
|
|
6
|
+
|
|
7
|
+
describe Finished do
|
|
8
|
+
|
|
9
|
+
context "no conditions" do
|
|
10
|
+
|
|
11
|
+
let!(:conditions) { "" }
|
|
12
|
+
|
|
13
|
+
it "returns executable query" do
|
|
14
|
+
expect { ActiveRecord::Base.connection.execute(Finished.all(conditions)) }.to_not raise_error
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
context "with conditions" do
|
|
20
|
+
|
|
21
|
+
let!(:conditions) { "TEST STRING" }
|
|
22
|
+
|
|
23
|
+
it "adds conditions to returned sql string" do
|
|
24
|
+
expect(Finished.all(conditions).include?(conditions)).to be_true
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
end
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
require 'spec_helper'
|
|
2
|
+
|
|
3
|
+
module Logical
|
|
4
|
+
module Naf
|
|
5
|
+
module JobStatuses
|
|
6
|
+
|
|
7
|
+
describe Queued do
|
|
8
|
+
|
|
9
|
+
context "no conditions" do
|
|
10
|
+
|
|
11
|
+
let!(:conditions) { "" }
|
|
12
|
+
|
|
13
|
+
it "returns executable query" do
|
|
14
|
+
expect { ActiveRecord::Base.connection.execute(Queued.all(conditions)) }.to_not raise_error
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
context "custom conditions" do
|
|
20
|
+
|
|
21
|
+
let!(:conditions) { "TEST STRING" }
|
|
22
|
+
|
|
23
|
+
it "adds conditions to returned query" do
|
|
24
|
+
sql = Queued.all(conditions)
|
|
25
|
+
expect(sql.include?(conditions)).to be_true
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
end
|
|
33
|
+
end
|
|
34
|
+
end
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
require 'spec_helper'
|
|
2
|
+
|
|
3
|
+
module Logical
|
|
4
|
+
module Naf
|
|
5
|
+
module JobStatuses
|
|
6
|
+
|
|
7
|
+
describe Running do
|
|
8
|
+
|
|
9
|
+
context "no conditions" do
|
|
10
|
+
|
|
11
|
+
let!(:conditions) { "" }
|
|
12
|
+
|
|
13
|
+
it "returns executable query" do
|
|
14
|
+
expect { ActiveRecord::Base.connection.execute(Running.all(conditions)) }.to_not raise_error
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
context "with conditions" do
|
|
20
|
+
|
|
21
|
+
let!(:conditions) { "TEST STRING" }
|
|
22
|
+
|
|
23
|
+
it "adds conditions to returned sql string" do
|
|
24
|
+
expect(Running.all(conditions).include?(conditions)).to be_true
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
it "accepts a status argument as well" do
|
|
28
|
+
expect { Running.all(:queued, conditions) }.to_not raise_error
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
end
|
|
36
|
+
end
|
|
37
|
+
end
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
require 'spec_helper'
|
|
2
|
+
|
|
3
|
+
module Logical
|
|
4
|
+
module Naf
|
|
5
|
+
module JobStatuses
|
|
6
|
+
|
|
7
|
+
describe Terminated do
|
|
8
|
+
|
|
9
|
+
context "no conditions" do
|
|
10
|
+
|
|
11
|
+
let!(:conditions) { "" }
|
|
12
|
+
|
|
13
|
+
it "returns executable query" do
|
|
14
|
+
expect { ActiveRecord::Base.connection.execute(Terminated.all(conditions)) }.to_not raise_error
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
context "with conditions" do
|
|
20
|
+
|
|
21
|
+
let!(:conditions) { "TEST STRING" }
|
|
22
|
+
|
|
23
|
+
it "adds conditions to returned sql string" do
|
|
24
|
+
expect(Terminated.all(conditions).include?(conditions)).to be_true
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
end
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
require 'spec_helper'
|
|
2
|
+
|
|
3
|
+
module Logical
|
|
4
|
+
module Naf
|
|
5
|
+
module JobStatuses
|
|
6
|
+
|
|
7
|
+
describe Waiting do
|
|
8
|
+
|
|
9
|
+
context "no conditions" do
|
|
10
|
+
|
|
11
|
+
let!(:conditions) { "" }
|
|
12
|
+
|
|
13
|
+
it "returns executable query" do
|
|
14
|
+
expect { ActiveRecord::Base.connection.execute(Waiting.all(conditions)) }.to_not raise_error
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
context "with conditions" do
|
|
20
|
+
|
|
21
|
+
let!(:conditions) { "TEST STRING" }
|
|
22
|
+
|
|
23
|
+
it "adds conditions to returned sql string" do
|
|
24
|
+
expect(Waiting.all(conditions).include?(conditions)).to be_true
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
end
|
|
28
|
+
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
end
|
|
32
|
+
end
|
|
33
|
+
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: naf
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.13
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2014-
|
|
13
|
+
date: 2014-07-08 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|
|
@@ -108,6 +108,54 @@ dependencies:
|
|
|
108
108
|
- - ~>
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
110
|
version: 1.7.5
|
|
111
|
+
- !ruby/object:Gem::Dependency
|
|
112
|
+
name: aws-sdk
|
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
|
114
|
+
none: false
|
|
115
|
+
requirements:
|
|
116
|
+
- - ! '>='
|
|
117
|
+
- !ruby/object:Gem::Version
|
|
118
|
+
version: 1.1.0
|
|
119
|
+
type: :runtime
|
|
120
|
+
prerelease: false
|
|
121
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
122
|
+
none: false
|
|
123
|
+
requirements:
|
|
124
|
+
- - ! '>='
|
|
125
|
+
- !ruby/object:Gem::Version
|
|
126
|
+
version: 1.1.0
|
|
127
|
+
- !ruby/object:Gem::Dependency
|
|
128
|
+
name: yajl-ruby
|
|
129
|
+
requirement: !ruby/object:Gem::Requirement
|
|
130
|
+
none: false
|
|
131
|
+
requirements:
|
|
132
|
+
- - ! '>='
|
|
133
|
+
- !ruby/object:Gem::Version
|
|
134
|
+
version: 1.1.0
|
|
135
|
+
type: :runtime
|
|
136
|
+
prerelease: false
|
|
137
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
138
|
+
none: false
|
|
139
|
+
requirements:
|
|
140
|
+
- - ! '>='
|
|
141
|
+
- !ruby/object:Gem::Version
|
|
142
|
+
version: 1.1.0
|
|
143
|
+
- !ruby/object:Gem::Dependency
|
|
144
|
+
name: dogstatsd-ruby
|
|
145
|
+
requirement: !ruby/object:Gem::Requirement
|
|
146
|
+
none: false
|
|
147
|
+
requirements:
|
|
148
|
+
- - ! '>='
|
|
149
|
+
- !ruby/object:Gem::Version
|
|
150
|
+
version: 1.2.0
|
|
151
|
+
type: :runtime
|
|
152
|
+
prerelease: false
|
|
153
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
154
|
+
none: false
|
|
155
|
+
requirements:
|
|
156
|
+
- - ! '>='
|
|
157
|
+
- !ruby/object:Gem::Version
|
|
158
|
+
version: 1.2.0
|
|
111
159
|
- !ruby/object:Gem::Dependency
|
|
112
160
|
name: pg
|
|
113
161
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -129,17 +177,17 @@ dependencies:
|
|
|
129
177
|
requirement: !ruby/object:Gem::Requirement
|
|
130
178
|
none: false
|
|
131
179
|
requirements:
|
|
132
|
-
- -
|
|
180
|
+
- - ~>
|
|
133
181
|
- !ruby/object:Gem::Version
|
|
134
|
-
version:
|
|
182
|
+
version: 2.14.0
|
|
135
183
|
type: :development
|
|
136
184
|
prerelease: false
|
|
137
185
|
version_requirements: !ruby/object:Gem::Requirement
|
|
138
186
|
none: false
|
|
139
187
|
requirements:
|
|
140
|
-
- -
|
|
188
|
+
- - ~>
|
|
141
189
|
- !ruby/object:Gem::Version
|
|
142
|
-
version:
|
|
190
|
+
version: 2.14.0
|
|
143
191
|
- !ruby/object:Gem::Dependency
|
|
144
192
|
name: factory_girl_rails
|
|
145
193
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -198,6 +246,7 @@ files:
|
|
|
198
246
|
- app/assets/images/diagram_runners.png
|
|
199
247
|
- app/assets/images/diagram_running_system.png
|
|
200
248
|
- app/assets/images/down_arrow.gif
|
|
249
|
+
- app/assets/images/download.png
|
|
201
250
|
- app/assets/images/job.png
|
|
202
251
|
- app/assets/images/machine.png
|
|
203
252
|
- app/assets/images/machine_runner.png
|
|
@@ -281,11 +330,13 @@ files:
|
|
|
281
330
|
- app/models/logical/naf/log_file.rb
|
|
282
331
|
- app/models/logical/naf/log_parser/base.rb
|
|
283
332
|
- app/models/logical/naf/log_parser/job.rb
|
|
333
|
+
- app/models/logical/naf/log_parser/job_downloader.rb
|
|
284
334
|
- app/models/logical/naf/log_parser/runner.rb
|
|
285
335
|
- app/models/logical/naf/log_reader.rb
|
|
286
336
|
- app/models/logical/naf/machine.rb
|
|
287
337
|
- app/models/logical/naf/machine_runner.rb
|
|
288
338
|
- app/models/logical/naf/machine_runner_invocation.rb
|
|
339
|
+
- app/models/logical/naf/metric_sender.rb
|
|
289
340
|
- app/models/logical/naf/pickler.rb
|
|
290
341
|
- app/models/logical/naf/unpickler.rb
|
|
291
342
|
- app/models/logical/naf/user_session.rb
|
|
@@ -319,6 +370,7 @@ files:
|
|
|
319
370
|
- app/models/naf/running_job.rb
|
|
320
371
|
- app/models/process/naf/application.rb
|
|
321
372
|
- app/models/process/naf/data_migration/backfill_application_schedule_run_interval.rb
|
|
373
|
+
- app/models/process/naf/database_models_cleanup.rb
|
|
322
374
|
- app/models/process/naf/janitor.rb
|
|
323
375
|
- app/models/process/naf/log_archiver.rb
|
|
324
376
|
- app/models/process/naf/log_archiver_queuer.rb
|
|
@@ -356,6 +408,7 @@ files:
|
|
|
356
408
|
- app/views/naf/historical_job_affinity_tabs/_form.html.erb
|
|
357
409
|
- app/views/naf/historical_job_affinity_tabs/edit.html.erb
|
|
358
410
|
- app/views/naf/historical_job_affinity_tabs/new.html.erb
|
|
411
|
+
- app/views/naf/historical_jobs/_button_control.html.erb
|
|
359
412
|
- app/views/naf/historical_jobs/_form.html.erb
|
|
360
413
|
- app/views/naf/historical_jobs/_runners.html.erb
|
|
361
414
|
- app/views/naf/historical_jobs/_search_container.html.erb
|
|
@@ -370,6 +423,7 @@ files:
|
|
|
370
423
|
- app/views/naf/janitorial_assignments/index.js.erb
|
|
371
424
|
- app/views/naf/janitorial_assignments/new.html.erb
|
|
372
425
|
- app/views/naf/layouts/jquery_datatables.json.erb
|
|
426
|
+
- app/views/naf/log_viewer/_job_log_download_button.html.erb
|
|
373
427
|
- app/views/naf/log_viewer/_job_logs.html.erb
|
|
374
428
|
- app/views/naf/log_viewer/_log_display.html.erb
|
|
375
429
|
- app/views/naf/log_viewer/_log_layout.html.erb
|
|
@@ -441,6 +495,7 @@ files:
|
|
|
441
495
|
- spec/controllers/naf/applications_controller_spec.rb
|
|
442
496
|
- spec/controllers/naf/historical_job_affinity_tabs_controller_spec.rb
|
|
443
497
|
- spec/controllers/naf/historical_jobs_controller_spec.rb
|
|
498
|
+
- spec/controllers/naf/log_parsers_controller_spec.rb
|
|
444
499
|
- spec/controllers/naf/machine_affinity_slots_controller_spec.rb
|
|
445
500
|
- spec/controllers/naf/machines_controller_spec.rb
|
|
446
501
|
- spec/dummy/.gitignore
|
|
@@ -486,13 +541,22 @@ files:
|
|
|
486
541
|
- spec/dummy/script/rails
|
|
487
542
|
- spec/factories/naf.rb
|
|
488
543
|
- spec/helpers/naf/application_helper_spec.rb
|
|
544
|
+
- spec/models/logical/naf/application_schedule_spec.rb
|
|
489
545
|
- spec/models/logical/naf/application_spec.rb
|
|
490
546
|
- spec/models/logical/naf/construction_zone/boss_spec.rb
|
|
491
547
|
- spec/models/logical/naf/construction_zone/foreman_spec.rb
|
|
492
548
|
- spec/models/logical/naf/construction_zone/proletariat_spec.rb
|
|
493
549
|
- spec/models/logical/naf/construction_zone/work_order_spec.rb
|
|
550
|
+
- spec/models/logical/naf/job_downloader_spec.rb
|
|
494
551
|
- spec/models/logical/naf/job_fetcher_spec.rb
|
|
495
552
|
- spec/models/logical/naf/job_spec.rb
|
|
553
|
+
- spec/models/logical/naf/job_statuses/errored_spec.rb
|
|
554
|
+
- spec/models/logical/naf/job_statuses/finished_less_minute_spec.rb
|
|
555
|
+
- spec/models/logical/naf/job_statuses/finished_spec.rb
|
|
556
|
+
- spec/models/logical/naf/job_statuses/queued_spec.rb
|
|
557
|
+
- spec/models/logical/naf/job_statuses/running_spec.rb
|
|
558
|
+
- spec/models/logical/naf/job_statuses/terminated_spec.rb
|
|
559
|
+
- spec/models/logical/naf/job_statuses/waiting_spec.rb
|
|
496
560
|
- spec/models/logical/naf/log_file_spec.rb
|
|
497
561
|
- spec/models/logical/naf/machine_runner_invocation_spec.rb
|
|
498
562
|
- spec/models/logical/naf/machine_runner_spec.rb
|
|
@@ -560,6 +624,7 @@ test_files:
|
|
|
560
624
|
- spec/controllers/naf/applications_controller_spec.rb
|
|
561
625
|
- spec/controllers/naf/historical_job_affinity_tabs_controller_spec.rb
|
|
562
626
|
- spec/controllers/naf/historical_jobs_controller_spec.rb
|
|
627
|
+
- spec/controllers/naf/log_parsers_controller_spec.rb
|
|
563
628
|
- spec/controllers/naf/machine_affinity_slots_controller_spec.rb
|
|
564
629
|
- spec/controllers/naf/machines_controller_spec.rb
|
|
565
630
|
- spec/dummy/.gitignore
|
|
@@ -605,13 +670,22 @@ test_files:
|
|
|
605
670
|
- spec/dummy/script/rails
|
|
606
671
|
- spec/factories/naf.rb
|
|
607
672
|
- spec/helpers/naf/application_helper_spec.rb
|
|
673
|
+
- spec/models/logical/naf/application_schedule_spec.rb
|
|
608
674
|
- spec/models/logical/naf/application_spec.rb
|
|
609
675
|
- spec/models/logical/naf/construction_zone/boss_spec.rb
|
|
610
676
|
- spec/models/logical/naf/construction_zone/foreman_spec.rb
|
|
611
677
|
- spec/models/logical/naf/construction_zone/proletariat_spec.rb
|
|
612
678
|
- spec/models/logical/naf/construction_zone/work_order_spec.rb
|
|
679
|
+
- spec/models/logical/naf/job_downloader_spec.rb
|
|
613
680
|
- spec/models/logical/naf/job_fetcher_spec.rb
|
|
614
681
|
- spec/models/logical/naf/job_spec.rb
|
|
682
|
+
- spec/models/logical/naf/job_statuses/errored_spec.rb
|
|
683
|
+
- spec/models/logical/naf/job_statuses/finished_less_minute_spec.rb
|
|
684
|
+
- spec/models/logical/naf/job_statuses/finished_spec.rb
|
|
685
|
+
- spec/models/logical/naf/job_statuses/queued_spec.rb
|
|
686
|
+
- spec/models/logical/naf/job_statuses/running_spec.rb
|
|
687
|
+
- spec/models/logical/naf/job_statuses/terminated_spec.rb
|
|
688
|
+
- spec/models/logical/naf/job_statuses/waiting_spec.rb
|
|
615
689
|
- spec/models/logical/naf/log_file_spec.rb
|
|
616
690
|
- spec/models/logical/naf/machine_runner_invocation_spec.rb
|
|
617
691
|
- spec/models/logical/naf/machine_runner_spec.rb
|