tasks_scheduler 0.6.11 → 0.6.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/tasks_scheduler/alert.js +13 -12
  3. data/app/assets/javascripts/tasks_scheduler/status.js +9 -10
  4. data/app/assets/javascripts/tasks_scheduler.js +0 -1
  5. data/app/helpers/tasks_scheduler_helper.rb +1 -1
  6. data/app/models/scheduled_task.rb +3 -3
  7. data/lib/tasks_scheduler/cron_scheduling_validator.rb +1 -1
  8. data/lib/tasks_scheduler/daemon.rb +1 -1
  9. data/lib/tasks_scheduler/engine.rb +0 -1
  10. data/lib/tasks_scheduler/info.rb +1 -1
  11. data/lib/tasks_scheduler/version.rb +1 -1
  12. metadata +39 -27
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b3760f5ae476c10c5166722f3b1b5c81e5bcde2299fe48ec4ef42e7e4fd0c8db
4
- data.tar.gz: 1c9440df190d263e5b608af45bc89c4be1296c98754ff754d0c462e7c209e73e
3
+ metadata.gz: 8c54c9a9dba7d2601023944efb038902f7bd7d9f30a2eb922f10fa6575eb8e18
4
+ data.tar.gz: 90b2bf8cf961dc20a175fcc064c04583a4eb5288af5779d7246c5c26d94ef986
5
5
  SHA512:
6
- metadata.gz: a32fc19de0d39afbe0518dceaa2c447552bc23cbeb723b7e9c214a57ceb31098f9ba71a9a888d4537eee81237cc5be51e22cd076752b5191158d53deb9bfa684
7
- data.tar.gz: 6aa25c2872092f048b7f1e80e576ef3c138dab8a821849f54c1953cbf0f6747963af01086efe21a1080cce823ad58cc491a8d3227a86bc6e533a91ba39eed24e
6
+ metadata.gz: 8c6019296c5122948ae4f3f315e09fbb1da0527f76efc4fe05ffee4b89d1b60343b40c07795dda781ec30b61472215d3617e9f025f89c0a84707f73b547caf76
7
+ data.tar.gz: 1c81e0019f50de3946129f858b6a146d0eed057bac8f00d67f8aa7835119442e202f79bdb5a7593fbec82797904ca44bc1a1d6b1bd6f119498ca0e483720c492
data/app/assets/javascripts/tasks_scheduler/alert.js CHANGED
@@ -1,20 +1,21 @@
1
+ //= require eac_rails_utils/url_helper
2
+
1
3
  if (typeof TasksScheduler == "undefined") {
2
4
  TasksScheduler = function() {};
3
5
  }
4
6
 
5
- TasksScheduler.Alert = function () {
6
- };
7
+ TasksScheduler.Alert = function() {};
7
8
 
8
9
  _A = TasksScheduler.Alert;
9
10
 
10
11
  _A.DEFAULT_REFRESH_INTERVAL = 5000;
11
12
  _A.DEFAULT_ELEMENT_SELECTOR = '#tasks_scheduler_alert';
12
13
  _A.CSS_CLASSES_PREFIX = 'alert_';
13
- _A.url = Routes.status_tasks_scheduler_daemon_path();
14
+ _A.url = EacRailsUtils.UrlHelper.path_for('/tasks_scheduler_daemon/status');
14
15
 
15
- _A.init = function (options) {
16
+ _A.init = function(options) {
16
17
  options = typeof options !== 'undefined' ? options : {};
17
- $(document).ready(function () {
18
+ $(document).ready(function() {
18
19
  _A.options = options;
19
20
  if (!_A.options.refresh_interval) {
20
21
  _A.options.refresh_interval = _A.DEFAULT_REFRESH_INTERVAL;
@@ -26,26 +27,26 @@ _A.init = function (options) {
26
27
  });
27
28
  };
28
29
 
29
- _A.setNextRefresh = function () {
30
+ _A.setNextRefresh = function() {
30
31
  setTimeout(_A.refresh, _A.options.refresh_interval);
31
32
  };
32
33
 
33
- _A.refresh = function () {
34
+ _A.refresh = function() {
34
35
  $.ajax(_A.refreshAjaxData());
35
36
  };
36
37
 
37
- _A.refreshAjaxData = function () {
38
+ _A.refreshAjaxData = function() {
38
39
  return {
39
40
  url: _A.url,
40
- success: function (result) {
41
+ success: function(result) {
41
42
  var alert = $(_A.options.element_selector);
42
43
  var pattern = new RegExp('(^|\\s)' + _A.CSS_CLASSES_PREFIX + "\\S+", 'g');
43
- alert.removeClass (function (index, className) {
44
- return (className.match (pattern) || []).join(' ');
44
+ alert.removeClass(function(index, className) {
45
+ return (className.match(pattern) || []).join(' ');
45
46
  });
46
47
  alert.addClass(_A.resultToCssClass(result));
47
48
  },
48
- complete: function (result) {
49
+ complete: function(result) {
49
50
  _A.setNextRefresh();
50
51
  }
51
52
  };
data/app/assets/javascripts/tasks_scheduler/status.js CHANGED
@@ -2,15 +2,14 @@ if (typeof TasksScheduler == "undefined") {
2
2
  TasksScheduler = function() {};
3
3
  }
4
4
 
5
- TasksScheduler.Status = function () {
6
- };
5
+ TasksScheduler.Status = function() {};
7
6
 
8
7
  // Shortcut
9
8
  var _S = TasksScheduler.Status;
10
9
 
11
10
  _S.initialized = false;
12
11
 
13
- _S.init = function (url, interval_max) {
12
+ _S.init = function(url, interval_max) {
14
13
  if (!_S.initialized) {
15
14
  _S.initialized = true;
16
15
  _S.url = url;
@@ -19,21 +18,21 @@ _S.init = function (url, interval_max) {
19
18
  }
20
19
  };
21
20
 
22
- _S.content = function () {
21
+ _S.content = function() {
23
22
  return $('#TaskScheduler_Status_Content');
24
23
  };
25
24
 
26
- _S.status = function () {
25
+ _S.status = function() {
27
26
  return $('#TaskScheduler_Status_Status');
28
27
  };
29
28
 
30
- _S.update_status = function () {
29
+ _S.update_status = function() {
31
30
  _S.status().html(
32
31
  "Updating in " + _S.interval + " seconds..."
33
32
  );
34
33
  };
35
34
 
36
- _S.check = function () {
35
+ _S.check = function() {
37
36
  if (_S.interval <= 0) {
38
37
  _S.update();
39
38
  } else {
@@ -43,17 +42,17 @@ _S.check = function () {
43
42
  }
44
43
  };
45
44
 
46
- _S.update = function () {
45
+ _S.update = function() {
47
46
  $.ajax(_S.updateAjaxData());
48
47
  };
49
48
 
50
49
  _S.updateAjaxData = function() {
51
50
  return {
52
51
  url: _S.url,
53
- success: function (result) {
52
+ success: function(result) {
54
53
  _S.content().html(result);
55
54
  },
56
- complete: function (result) {
55
+ complete: function(result) {
57
56
  _S.interval = _S.interval_max + 1;
58
57
  _S.last_update = new Date();
59
58
  _S.check();
data/app/assets/javascripts/tasks_scheduler.js CHANGED
@@ -1,4 +1,3 @@
1
1
  //= require eac_active_scaffold
2
- //= require js-routes
3
2
  //= require tasks_scheduler/alert
4
3
  //= require tasks_scheduler/status
data/app/helpers/tasks_scheduler_helper.rb CHANGED
@@ -8,7 +8,7 @@ module TasksSchedulerHelper
8
8
  }.freeze
9
9
 
10
10
  def tasks_scheduler_navbar
11
- content_tag(:navbar) do
11
+ tag.navbar do
12
12
  safe_join(tasks_scheduler_navbar_entries.map { |label, path| link_to label, path }, ' | ')
13
13
  end
14
14
  end
data/app/models/scheduled_task.rb CHANGED
@@ -15,7 +15,7 @@ class ScheduledTask < ActiveRecord::Base
15
15
  class << self
16
16
  def rake_tasks
17
17
  @rake_tasks ||= begin
18
- Rails.application.load_tasks
18
+ Rails.application.load_tasks if Rake.application.tasks.empty?
19
19
  Rake.application.tasks.map(&:name)
20
20
  end
21
21
  end
@@ -24,8 +24,8 @@ class ScheduledTask < ActiveRecord::Base
24
24
  @timeout ||= begin
25
25
  r = Integer(ENV[DEFAULT_TIMEOUT_ENVVAR_NAME])
26
26
  r.positive? ? r.seconds : DEFAULT_TIMEOUT
27
- rescue ArgumentError, TypeError
28
- DEFAULT_TIMEOUT
27
+ rescue ArgumentError, TypeError
28
+ DEFAULT_TIMEOUT
29
29
  end
30
30
  end
31
31
  end
data/lib/tasks_scheduler/cron_scheduling_validator.rb CHANGED
@@ -6,7 +6,7 @@ module TasksScheduler
6
6
  return if value_valid?(value)
7
7
 
8
8
  record.errors[attribute] << (options[:message] ||
9
- I18n.translate(:cron_scheduling_validator_error_message))
9
+ I18n.t(:cron_scheduling_validator_error_message))
10
10
  end
11
11
 
12
12
  private
data/lib/tasks_scheduler/daemon.rb CHANGED
@@ -11,7 +11,7 @@ module TasksScheduler
11
11
  raise "Action not allowed: #{action} (Allowed: #{ACTIONS})" unless ACTIONS.include?(action)
12
12
 
13
13
  ::TasksScheduler::AppGem.instance.bundle('exec', 'tasks_scheduler', action)
14
- .envvar(::TasksScheduler::Checker::LOG_ON_FILE_ENV_KEY, '1')
14
+ .envvar(::TasksScheduler::Checker::LOG_ON_FILE_ENV_KEY, '1')
15
15
  end
16
16
 
17
17
  def execute(action)
data/lib/tasks_scheduler/engine.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_active_scaffold'
4
- require 'js-routes'
5
4
 
6
5
  module TasksScheduler
7
6
  class Engine < ::Rails::Engine
data/lib/tasks_scheduler/info.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  module TasksScheduler
4
4
  class Info
5
5
  TASKS_LIMIT_KEY = 'TASKS_SCHEDULER_TASKS_LIMIT'
6
- TASKS_LIMIT_DEFAULT_VALUE = '-1'
6
+ TASKS_LIMIT_DEFAULT_VALUE = -1
7
7
 
8
8
  class << self
9
9
  def can_run_new_task?
data/lib/tasks_scheduler/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module TasksScheduler
4
- VERSION = '0.6.11'
4
+ VERSION = '0.6.13'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tasks_scheduler
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.11
4
+ version: 0.6.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eduardo H. Bogoni
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-07-05 00:00:00.000000000 Z
11
+ date: 2023-09-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm-eac_ruby_base1
@@ -16,102 +16,114 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.8'
19
+ version: '0.31'
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 0.31.2
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
27
  - - "~>"
25
28
  - !ruby/object:Gem::Version
26
- version: '0.8'
29
+ version: '0.31'
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: 0.31.2
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: daemons
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
37
+ - - "~>"
38
+ - !ruby/object:Gem::Version
39
+ version: '1.4'
31
40
  - - ">="
32
41
  - !ruby/object:Gem::Version
33
- version: '0'
42
+ version: 1.4.1
34
43
  type: :runtime
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
37
46
  requirements:
47
+ - - "~>"
48
+ - !ruby/object:Gem::Version
49
+ version: '1.4'
38
50
  - - ">="
39
51
  - !ruby/object:Gem::Version
40
- version: '0'
52
+ version: 1.4.1
41
53
  - !ruby/object:Gem::Dependency
42
54
  name: eac_active_scaffold
43
55
  requirement: !ruby/object:Gem::Requirement
44
56
  requirements:
45
57
  - - "~>"
46
58
  - !ruby/object:Gem::Version
47
- version: '0.2'
59
+ version: '0.5'
48
60
  - - ">="
49
61
  - !ruby/object:Gem::Version
50
- version: 0.2.2
62
+ version: 0.5.1
51
63
  type: :runtime
52
64
  prerelease: false
53
65
  version_requirements: !ruby/object:Gem::Requirement
54
66
  requirements:
55
67
  - - "~>"
56
68
  - !ruby/object:Gem::Version
57
- version: '0.2'
69
+ version: '0.5'
58
70
  - - ">="
59
71
  - !ruby/object:Gem::Version
60
- version: 0.2.2
72
+ version: 0.5.1
61
73
  - !ruby/object:Gem::Dependency
62
- name: eac_ruby_utils
74
+ name: eac_rails_utils
63
75
  requirement: !ruby/object:Gem::Requirement
64
76
  requirements:
65
77
  - - "~>"
66
78
  - !ruby/object:Gem::Version
67
- version: '0.95'
68
- - - ">="
69
- - !ruby/object:Gem::Version
70
- version: 0.95.1
79
+ version: '0.21'
71
80
  type: :runtime
72
81
  prerelease: false
73
82
  version_requirements: !ruby/object:Gem::Requirement
74
83
  requirements:
75
84
  - - "~>"
76
85
  - !ruby/object:Gem::Version
77
- version: '0.95'
78
- - - ">="
79
- - !ruby/object:Gem::Version
80
- version: 0.95.1
86
+ version: '0.21'
81
87
  - !ruby/object:Gem::Dependency
82
- name: js-routes
88
+ name: eac_ruby_utils
83
89
  requirement: !ruby/object:Gem::Requirement
84
90
  requirements:
85
91
  - - "~>"
86
92
  - !ruby/object:Gem::Version
87
- version: '1.4'
93
+ version: '0.119'
88
94
  - - ">="
89
95
  - !ruby/object:Gem::Version
90
- version: 1.4.14
96
+ version: 0.119.2
91
97
  type: :runtime
92
98
  prerelease: false
93
99
  version_requirements: !ruby/object:Gem::Requirement
94
100
  requirements:
95
101
  - - "~>"
96
102
  - !ruby/object:Gem::Version
97
- version: '1.4'
103
+ version: '0.119'
98
104
  - - ">="
99
105
  - !ruby/object:Gem::Version
100
- version: 1.4.14
106
+ version: 0.119.2
101
107
  - !ruby/object:Gem::Dependency
102
108
  name: parse-cron
103
109
  requirement: !ruby/object:Gem::Requirement
104
110
  requirements:
111
+ - - "~>"
112
+ - !ruby/object:Gem::Version
113
+ version: '0.1'
105
114
  - - ">="
106
115
  - !ruby/object:Gem::Version
107
- version: '0'
116
+ version: 0.1.4
108
117
  type: :runtime
109
118
  prerelease: false
110
119
  version_requirements: !ruby/object:Gem::Requirement
111
120
  requirements:
121
+ - - "~>"
122
+ - !ruby/object:Gem::Version
123
+ version: '0.1'
112
124
  - - ">="
113
125
  - !ruby/object:Gem::Version
114
- version: '0'
126
+ version: 0.1.4
115
127
  - !ruby/object:Gem::Dependency
116
128
  name: rails
117
129
  requirement: !ruby/object:Gem::Requirement
@@ -217,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
217
229
  requirements:
218
230
  - - ">="
219
231
  - !ruby/object:Gem::Version
220
- version: '0'
232
+ version: 2.7.0
221
233
  required_rubygems_version: !ruby/object:Gem::Requirement
222
234
  requirements:
223
235
  - - ">="