hammer_cli_foreman_tasks 0.0.24 → 0.1.0

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.
Files changed (36) hide show
  1. checksums.yaml +4 -4
  2. data/lib/hammer_cli_foreman_tasks/command_extensions/recurring_logic.rb +23 -28
  3. data/lib/hammer_cli_foreman_tasks/recurring_logic.rb +16 -9
  4. data/lib/hammer_cli_foreman_tasks/version.rb +1 -1
  5. data/locale/cs_CZ/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  6. data/locale/cs_CZ/hammer_cli_foreman_tasks.po +1 -1
  7. data/locale/de/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  8. data/locale/de/hammer_cli_foreman_tasks.po +1 -1
  9. data/locale/el/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  10. data/locale/el/hammer_cli_foreman_tasks.po +3 -3
  11. data/locale/en/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  12. data/locale/en/hammer_cli_foreman_tasks.po +2 -2
  13. data/locale/en_GB/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  14. data/locale/en_GB/hammer_cli_foreman_tasks.po +1 -1
  15. data/locale/es/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  16. data/locale/es/hammer_cli_foreman_tasks.po +1 -1
  17. data/locale/fr/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  18. data/locale/fr/hammer_cli_foreman_tasks.po +1 -1
  19. data/locale/hammer_cli_foreman_tasks.pot +3 -3
  20. data/locale/it/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  21. data/locale/it/hammer_cli_foreman_tasks.po +1 -1
  22. data/locale/ja/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  23. data/locale/ja/hammer_cli_foreman_tasks.po +1 -1
  24. data/locale/ka/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  25. data/locale/ka/hammer_cli_foreman_tasks.po +1 -1
  26. data/locale/ko/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  27. data/locale/ko/hammer_cli_foreman_tasks.po +1 -1
  28. data/locale/pt_BR/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  29. data/locale/pt_BR/hammer_cli_foreman_tasks.po +1 -1
  30. data/locale/ru/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  31. data/locale/ru/hammer_cli_foreman_tasks.po +1 -1
  32. data/locale/zh_CN/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  33. data/locale/zh_CN/hammer_cli_foreman_tasks.po +1 -1
  34. data/locale/zh_TW/LC_MESSAGES/hammer_cli_foreman_tasks.mo +0 -0
  35. data/locale/zh_TW/hammer_cli_foreman_tasks.po +1 -1
  36. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 19bdcbd34ed87687f91ef550e0e1505b19a044fbba6090e0b5de56567e7c9edb
4
- data.tar.gz: a667a34bac867e8cffdfbe76efd74a5f945652b5e755ae84678e88e397e4648a
3
+ metadata.gz: 1268600e04f2e953de0d5f813e855d9873632c64b300b9725c9576698e243c5d
4
+ data.tar.gz: 2f3a62ca2949ac6e16c9b0fe72e6960da7df6c96c79598e00163c61bf23e3fb0
5
5
  SHA512:
6
- metadata.gz: b847910e4ca343b51c1eacc90a8e2e801da63a74551a2daa9635549fe66689f11d0f527d02b1daf7551aad59ce7f37d28bfc5bb1a5c4773274fd3759fa3b4cc8
7
- data.tar.gz: 5494edff9ea4bfee2a544dc4768cb3b98f2b7aaaf4be543b1f0dc651db7a5c5ea93e0b9042a58be35aafc177d84d8583e419d1c65dc8e0bb29147e8ff4ea60ea
6
+ metadata.gz: a21a6d1e54cc9c1baa931cee2d6aed2d74441081b90b8bf59d9380a38a073fa17bafc02a73e77700efe8efcc8d7722996892dcbe9c0c81dfa5d0589175497bd5
7
+ data.tar.gz: ab7bd9ca157a8246abd49549a0620d5e854fe358a53383ecd43b39884da4eb1da1b66477ddb52e3a1d33bcdece33c4c2874cac0731c9f6712842500d713c5285
data/lib/hammer_cli_foreman_tasks/command_extensions/recurring_logic.rb CHANGED
@@ -1,21 +1,15 @@
1
- require 'date'
2
-
3
1
  module HammerCLIForemanTasks
4
2
  module CommandExtensions
5
3
  class RecurringLogic < HammerCLI::CommandExtensions
6
4
  before_print do |data|
7
- data['action'] = format_task_input(data['tasks'].last)
8
- data['last_occurrence'] = recurring_logic_last_occurrence(data)
9
- data['next_occurrence'] = recurring_logic_next_occurrence(data)
10
- data['iteration_limit'] = format_recurring_logic_limit(data['max_iteration'])
11
- data['repeat_until'] = format_recurring_logic_limit(data['end_time'])
5
+ records(data).each { |record| format_record(record) }
12
6
  end
13
7
 
14
8
  output do |definition|
15
9
  definition.insert(:after, :cron_line) do
16
- field :action, _('Action')
17
- field :last_occurrence, _('Last occurrence')
18
- field :next_occurrence, _('Next occurrence')
10
+ field :action, _('Action'), nil, hide_blank: true
11
+ field :last_occurrence, _('Last occurrence'), Fields::Date, hide_blank: true
12
+ field :next_occurrence, _('Next occurrence'), Fields::Date, hide_blank: true
19
13
  end
20
14
  definition.insert(:after, :iteration) do
21
15
  field :iteration_limit, _('Iteration limit')
@@ -25,26 +19,27 @@ module HammerCLIForemanTasks
25
19
  end
26
20
  end
27
21
 
28
- def self.recurring_logic_last_occurrence(recurring_logic)
29
- last_task = recurring_logic['tasks'].select { |t| t['started_at'] }
30
- .max { |a, b| a['started_at'] <=> b['started_at'] }
31
- return '-' if last_task.nil? || last_task['started_at'].nil?
32
-
33
- last_task['started_at']
34
- end
35
-
36
- def self.recurring_logic_next_occurrence(recurring_logic)
37
- default = '-'
38
- return default if %w[cancelled finished disabled].include?(recurring_logic['state'])
39
-
40
- last_task = recurring_logic['tasks'].max { |a, b| a['start_at'] <=> b['start_at'] }
41
- last_task ? last_task['start_at'] : default
22
+ # The info command hands over a single recurring logic, the list command a
23
+ # whole collection wrapped in `results`. Both are formatted the same way.
24
+ def self.records(data)
25
+ data.is_a?(Hash) && data['results'].is_a?(Array) ? data['results'] : [data]
42
26
  end
43
27
 
44
- def self.format_task_input(task)
45
- return '-' unless task
46
-
47
- task['action']
28
+ # The recurring_logics API already computes the action, the occurrences and
29
+ # the limits (see the `base` rabl view). The extension only normalizes them:
30
+ # the API spells the occurrences with a single "r", so they are copied to
31
+ # the corrected keys and rendered as dates, while blank limits show
32
+ # "Unlimited". The action, occurrences and purpose are nilled when empty so
33
+ # their `hide_blank` fields skip the line entirely in the info output.
34
+ # Working off these fields keeps the list and the info command consistent,
35
+ # as the list output has no `tasks` to recompute them from.
36
+ def self.format_record(data)
37
+ data['action'] = nil if data['action'].to_s.empty?
38
+ data['last_occurrence'] = data['last_occurence']
39
+ data['next_occurrence'] = data['next_occurence']
40
+ data['iteration_limit'] = format_recurring_logic_limit(data['max_iteration'])
41
+ data['repeat_until'] = format_recurring_logic_limit(data['end_time'])
42
+ data['purpose'] = nil if data['purpose'].to_s.empty?
48
43
  end
49
44
 
50
45
  def self.format_recurring_logic_limit(thing)
data/lib/hammer_cli_foreman_tasks/recurring_logic.rb CHANGED
@@ -2,26 +2,33 @@ module HammerCLIForemanTasks
2
2
  class RecurringLogic < HammerCLIForeman::Command
3
3
  resource :recurring_logics
4
4
 
5
- class ListCommand < HammerCLIForeman::ListCommand
6
- output do
5
+ # The list and the info command show the same set of fields. They share this
6
+ # base definition and both let the RecurringLogic extension format it the same
7
+ # way, so their output stays consistent. It is a method rather than a constant
8
+ # on purpose - autoload_subcommands scans the constants of this class.
9
+ def self.output_fields
10
+ proc do
7
11
  field :id, _('ID')
8
12
  field :cron_line, _('Cron line')
9
13
  field :task_count, _('Task count')
10
- field :action, _('Action')
11
- field :last_occurence, _('Last occurrence'), Fields::Date
12
- field :next_occurence, _('Next occurrence'), Fields::Date
13
14
  field :iteration, _('Iteration')
14
- field :max_iteration, _('Iteration limit')
15
15
  field :end_time, _('End time')
16
16
  field :state, _('State')
17
- field :purpose, _('Purpose')
17
+ field :purpose, _('Purpose'), nil, hide_blank: true
18
18
  end
19
+ end
20
+
21
+ class ListCommand < HammerCLIForeman::ListCommand
22
+ output(&RecurringLogic.output_fields)
19
23
 
20
24
  build_options
25
+
26
+ extend_with(HammerCLIForemanTasks::CommandExtensions::RecurringLogic.new)
21
27
  end
22
28
 
23
29
  class InfoCommand < HammerCLIForeman::InfoCommand
24
- output ListCommand.output_definition
30
+ output(&RecurringLogic.output_fields)
31
+
25
32
  build_options
26
33
 
27
34
  extend_with(HammerCLIForemanTasks::CommandExtensions::RecurringLogic.new)
@@ -53,7 +60,7 @@ module HammerCLIForemanTasks
53
60
  command_name 'delete'
54
61
  desc _("Delete all recuring logics filtered by the arguments")
55
62
  failure_message _('Could not delete recurring logics')
56
- output ListCommand.output_definition
63
+ output(&RecurringLogic.output_fields)
57
64
 
58
65
  def execute
59
66
  response = send_request
data/lib/hammer_cli_foreman_tasks/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module HammerCLIForemanTasks
2
2
  def self.version
3
- @version ||= Gem::Version.new('0.0.24')
3
+ @version ||= Gem::Version.new('0.1.0')
4
4
  end
5
5
  end
data/locale/cs_CZ/hammer_cli_foreman_tasks.po CHANGED
@@ -9,7 +9,7 @@
9
9
  #, fuzzy
10
10
  msgid ""
11
11
  msgstr ""
12
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
12
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
13
13
  "Report-Msgid-Bugs-To: \n"
14
14
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
15
15
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/de/hammer_cli_foreman_tasks.po CHANGED
@@ -11,7 +11,7 @@
11
11
  #, fuzzy
12
12
  msgid ""
13
13
  msgstr ""
14
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
14
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
15
15
  "Report-Msgid-Bugs-To: \n"
16
16
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
17
17
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/el/hammer_cli_foreman_tasks.po CHANGED
@@ -4,16 +4,16 @@
4
4
  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5
5
  #
6
6
  # Translators:
7
- # Efstathios Iosifidis <iefstathios@gmail.com>, 2023
7
+ # Efstathios Iosifidis <eiosifidis@gmail.com>, 2023
8
8
  #
9
9
  #, fuzzy
10
10
  msgid ""
11
11
  msgstr ""
12
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
12
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
13
13
  "Report-Msgid-Bugs-To: \n"
14
14
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
15
15
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
16
- "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2023\n"
16
+ "Last-Translator: Efstathios Iosifidis <eiosifidis@gmail.com>, 2023\n"
17
17
  "Language-Team: Greek (https://app.transifex.com/foreman/teams/114/el/)\n"
18
18
  "MIME-Version: 1.0\n"
19
19
  "Content-Type: text/plain; charset=UTF-8\n"
data/locale/en/hammer_cli_foreman_tasks.po CHANGED
@@ -5,9 +5,9 @@
5
5
  #
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
8
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
- "POT-Creation-Date: 2025-07-28 14:41+0000\n"
10
+ "POT-Creation-Date: 2026-02-10 10:50+0000\n"
11
11
  "PO-Revision-Date: 2025-07-28 14:41+0000\n"
12
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
data/locale/en_GB/hammer_cli_foreman_tasks.po CHANGED
@@ -9,7 +9,7 @@
9
9
  #, fuzzy
10
10
  msgid ""
11
11
  msgstr ""
12
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
12
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
13
13
  "Report-Msgid-Bugs-To: \n"
14
14
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
15
15
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/es/hammer_cli_foreman_tasks.po CHANGED
@@ -12,7 +12,7 @@
12
12
  #, fuzzy
13
13
  msgid ""
14
14
  msgstr ""
15
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
15
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
16
16
  "Report-Msgid-Bugs-To: \n"
17
17
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
18
18
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/fr/hammer_cli_foreman_tasks.po CHANGED
@@ -13,7 +13,7 @@
13
13
  #, fuzzy
14
14
  msgid ""
15
15
  msgstr ""
16
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
16
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
17
17
  "Report-Msgid-Bugs-To: \n"
18
18
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
19
19
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/hammer_cli_foreman_tasks.pot CHANGED
@@ -6,10 +6,10 @@
6
6
  #, fuzzy
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
9
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2025-07-28 14:41+0000\n"
12
- "PO-Revision-Date: 2025-07-28 14:41+0000\n"
11
+ "POT-Creation-Date: 2026-02-10 10:50+0000\n"
12
+ "PO-Revision-Date: 2026-02-10 10:50+0000\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
data/locale/it/hammer_cli_foreman_tasks.po CHANGED
@@ -11,7 +11,7 @@
11
11
  #, fuzzy
12
12
  msgid ""
13
13
  msgstr ""
14
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
14
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
15
15
  "Report-Msgid-Bugs-To: \n"
16
16
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
17
17
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/ja/hammer_cli_foreman_tasks.po CHANGED
@@ -13,7 +13,7 @@
13
13
  #, fuzzy
14
14
  msgid ""
15
15
  msgstr ""
16
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
16
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
17
17
  "Report-Msgid-Bugs-To: \n"
18
18
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
19
19
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/ka/hammer_cli_foreman_tasks.po CHANGED
@@ -9,7 +9,7 @@
9
9
  #, fuzzy
10
10
  msgid ""
11
11
  msgstr ""
12
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
12
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
13
13
  "Report-Msgid-Bugs-To: \n"
14
14
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
15
15
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/ko/hammer_cli_foreman_tasks.po CHANGED
@@ -12,7 +12,7 @@
12
12
  #, fuzzy
13
13
  msgid ""
14
14
  msgstr ""
15
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
15
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
16
16
  "Report-Msgid-Bugs-To: \n"
17
17
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
18
18
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/pt_BR/hammer_cli_foreman_tasks.po CHANGED
@@ -11,7 +11,7 @@
11
11
  #, fuzzy
12
12
  msgid ""
13
13
  msgstr ""
14
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
14
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
15
15
  "Report-Msgid-Bugs-To: \n"
16
16
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
17
17
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/ru/hammer_cli_foreman_tasks.po CHANGED
@@ -11,7 +11,7 @@
11
11
  #, fuzzy
12
12
  msgid ""
13
13
  msgstr ""
14
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
14
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
15
15
  "Report-Msgid-Bugs-To: \n"
16
16
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
17
17
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/zh_CN/hammer_cli_foreman_tasks.po CHANGED
@@ -12,7 +12,7 @@
12
12
  #, fuzzy
13
13
  msgid ""
14
14
  msgstr ""
15
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
15
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
16
16
  "Report-Msgid-Bugs-To: \n"
17
17
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
18
18
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
data/locale/zh_TW/hammer_cli_foreman_tasks.po CHANGED
@@ -12,7 +12,7 @@
12
12
  #, fuzzy
13
13
  msgid ""
14
14
  msgstr ""
15
- "Project-Id-Version: hammer_cli_foreman_tasks 0.0.23\n"
15
+ "Project-Id-Version: hammer_cli_foreman_tasks 0.0.24\n"
16
16
  "Report-Msgid-Bugs-To: \n"
17
17
  "POT-Creation-Date: 2025-07-28 14:41+0000\n"
18
18
  "PO-Revision-Date: 2017-09-11 13:45+0000\n"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hammer_cli_foreman_tasks
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.24
4
+ version: 0.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
@@ -18,7 +18,7 @@ dependencies:
18
18
  version: 0.1.1
19
19
  - - "<"
20
20
  - !ruby/object:Gem::Version
21
- version: 4.0.0
21
+ version: 6.0.0
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
28
28
  version: 0.1.1
29
29
  - - "<"
30
30
  - !ruby/object:Gem::Version
31
- version: 4.0.0
31
+ version: 6.0.0
32
32
  - !ruby/object:Gem::Dependency
33
33
  name: powerbar
34
34
  requirement: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0'
125
125
  requirements: []
126
- rubygems_version: 3.6.9
126
+ rubygems_version: 4.0.20
127
127
  specification_version: 4
128
128
  summary: Foreman CLI plugin for showing tasks information for resoruces and users
129
129
  test_files: []