hammer_cli_foreman_tasks 0.0.25 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d28037aaaca062b487102f190490a7238916f4439d37d8f99d689f1c19acfdd
-  data.tar.gz: c62de4cb043b1ffd46fad42acfc08fb6ad6fb38aae5476768d1718f615fbf101
+  metadata.gz: 1268600e04f2e953de0d5f813e855d9873632c64b300b9725c9576698e243c5d
+  data.tar.gz: 2f3a62ca2949ac6e16c9b0fe72e6960da7df6c96c79598e00163c61bf23e3fb0
 SHA512:
-  metadata.gz: 4bf35322200ad65b8dfe6f22f3dfccb701a6d968a6271925cdb2c716914a3206fcdbaffa78346624a8c825983a53164e3f944f6d6f8b2a9d96dc953e6672ebd3
-  data.tar.gz: e2b56f6d61c37191904cd0302286479cd007949f7ef67f72d411f7a01c8ced3e1fceb8ff102578bcf3d795d0cbfe5f597c1b43cd8ab1f0f7cecf0ba2fc85ca56
+  metadata.gz: a21a6d1e54cc9c1baa931cee2d6aed2d74441081b90b8bf59d9380a38a073fa17bafc02a73e77700efe8efcc8d7722996892dcbe9c0c81dfa5d0589175497bd5
+  data.tar.gz: ab7bd9ca157a8246abd49549a0620d5e854fe358a53383ecd43b39884da4eb1da1b66477ddb52e3a1d33bcdece33c4c2874cac0731c9f6712842500d713c5285

data/lib/hammer_cli_foreman_tasks/command_extensions/recurring_logic.rb

@@ -1,21 +1,15 @@
-require 'date'
-
 module HammerCLIForemanTasks
   module CommandExtensions
     class RecurringLogic < HammerCLI::CommandExtensions
       before_print do |data|
-        data['action'] = format_task_input(data['tasks'].last)
-        data['last_occurrence'] = recurring_logic_last_occurrence(data)
-        data['next_occurrence'] = recurring_logic_next_occurrence(data)
-        data['iteration_limit'] = format_recurring_logic_limit(data['max_iteration'])
-        data['repeat_until'] = format_recurring_logic_limit(data['end_time'])
+        records(data).each { |record| format_record(record) }
       end
 
       output do |definition|
         definition.insert(:after, :cron_line) do
-          field :action, _('Action')
-          field :last_occurrence, _('Last occurrence')
-          field :next_occurrence, _('Next occurrence')
+          field :action, _('Action'), nil, hide_blank: true
+          field :last_occurrence, _('Last occurrence'), Fields::Date, hide_blank: true
+          field :next_occurrence, _('Next occurrence'), Fields::Date, hide_blank: true
         end
         definition.insert(:after, :iteration) do
           field :iteration_limit, _('Iteration limit')
@@ -25,26 +19,27 @@ module HammerCLIForemanTasks
         end
       end
 
-      def self.recurring_logic_last_occurrence(recurring_logic)
-        last_task = recurring_logic['tasks'].select { |t| t['started_at'] }
-                                            .max { |a, b| a['started_at'] <=> b['started_at'] }
-        return '-' if last_task.nil? || last_task['started_at'].nil?
-
-        last_task['started_at']
-      end
-
-      def self.recurring_logic_next_occurrence(recurring_logic)
-        default = '-'
-        return default if %w[cancelled finished disabled].include?(recurring_logic['state'])
-
-        last_task = recurring_logic['tasks'].max { |a, b| a['start_at'] <=> b['start_at'] }
-        last_task ? last_task['start_at'] : default
+      # The info command hands over a single recurring logic, the list command a
+      # whole collection wrapped in `results`. Both are formatted the same way.
+      def self.records(data)
+        data.is_a?(Hash) && data['results'].is_a?(Array) ? data['results'] : [data]
       end
 
-      def self.format_task_input(task)
-        return '-' unless task
-
-        task['action']
+      # The recurring_logics API already computes the action, the occurrences and
+      # the limits (see the `base` rabl view). The extension only normalizes them:
+      # the API spells the occurrences with a single "r", so they are copied to
+      # the corrected keys and rendered as dates, while blank limits show
+      # "Unlimited". The action, occurrences and purpose are nilled when empty so
+      # their `hide_blank` fields skip the line entirely in the info output.
+      # Working off these fields keeps the list and the info command consistent,
+      # as the list output has no `tasks` to recompute them from.
+      def self.format_record(data)
+        data['action'] = nil if data['action'].to_s.empty?
+        data['last_occurrence'] = data['last_occurence']
+        data['next_occurrence'] = data['next_occurence']
+        data['iteration_limit'] = format_recurring_logic_limit(data['max_iteration'])
+        data['repeat_until'] = format_recurring_logic_limit(data['end_time'])
+        data['purpose'] = nil if data['purpose'].to_s.empty?
       end
 
       def self.format_recurring_logic_limit(thing)

data/lib/hammer_cli_foreman_tasks/recurring_logic.rb

@@ -2,26 +2,33 @@ module HammerCLIForemanTasks
   class RecurringLogic < HammerCLIForeman::Command
     resource :recurring_logics
 
-    class ListCommand < HammerCLIForeman::ListCommand
-      output do
+    # The list and the info command show the same set of fields. They share this
+    # base definition and both let the RecurringLogic extension format it the same
+    # way, so their output stays consistent. It is a method rather than a constant
+    # on purpose - autoload_subcommands scans the constants of this class.
+    def self.output_fields
+      proc do
         field :id, _('ID')
         field :cron_line, _('Cron line')
         field :task_count, _('Task count')
-        field :action, _('Action')
-        field :last_occurence, _('Last occurrence'), Fields::Date
-        field :next_occurence, _('Next occurrence'), Fields::Date
         field :iteration, _('Iteration')
-        field :max_iteration, _('Iteration limit')
         field :end_time, _('End time')
         field :state, _('State')
-        field :purpose, _('Purpose')
+        field :purpose, _('Purpose'), nil, hide_blank: true
       end
+    end
+
+    class ListCommand < HammerCLIForeman::ListCommand
+      output(&RecurringLogic.output_fields)
 
       build_options
+
+      extend_with(HammerCLIForemanTasks::CommandExtensions::RecurringLogic.new)
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
-      output ListCommand.output_definition
+      output(&RecurringLogic.output_fields)
+
       build_options
 
       extend_with(HammerCLIForemanTasks::CommandExtensions::RecurringLogic.new)
@@ -53,7 +60,7 @@ module HammerCLIForemanTasks
       command_name 'delete'
       desc _("Delete all recuring logics filtered by the arguments")
       failure_message _('Could not delete recurring logics')
-      output ListCommand.output_definition
+      output(&RecurringLogic.output_fields)
 
       def execute
         response = send_request

data/lib/hammer_cli_foreman_tasks/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanTasks
   def self.version
-    @version ||= Gem::Version.new('0.0.25')
+    @version ||= Gem::Version.new('0.1.0')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.1.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Foreman CLI plugin for showing tasks information for resoruces and users
 test_files: []