hammer_cli_foreman_tasks 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62bda14d7478645804917b9bad62f6b5996d25581822d83d6ad96e21ed223848
-  data.tar.gz: cffb80928d8e682430e9c648107f91395a2b66e7565b13e137328885312103e9
+  metadata.gz: d9dc422f50091172a3cb8ae3d9151cdbc57e1c031f456a3d282b04ea7bb1023b
+  data.tar.gz: b2918ea39910b385ba30b68a14e845332804ddb7496e3f58b5943acfa3df3593
 SHA512:
-  metadata.gz: 9882049b59381f43b969a00472f1fc0208a3ded215143df0ad65b17b11389ef980cfb9f82d3db92f86c470c525a5c66d01a14f4b854e4bd4ed742d2869debb7e
-  data.tar.gz: 733aeadb69dba71322221a7f02fabd808ae30269223420902b9e69331c1fbc4612893512b935b12120065dc24466c38831b89a803a4f6f7ee306cd76ae50823c
+  metadata.gz: ec48732c358f190ade7dee1fa2240f92be1369d8e1f37006188af18a2034771e7506d8cbacb6a3e1d1c32f1b564e9d94cdcc2700ac5f56dd16f0635acd1fac79
+  data.tar.gz: 3b4b401ff7fa094ce0da5101c5f8e52685049b9f11760e5132288e8cf3fd5075313e96aa7ff6161f68237ce794cbe5c5aa2e6f83b162c3106539d436be9bfdb3

data/lib/hammer_cli_foreman_tasks.rb

@@ -1,4 +1,5 @@
 module HammerCLIForemanTasks
+  require 'hammer_cli_foreman_tasks/command_extensions'
   require 'hammer_cli_foreman_tasks/helper'
   require 'hammer_cli_foreman_tasks/task_progress'
   require 'hammer_cli_foreman_tasks/async_command'

data/lib/hammer_cli_foreman_tasks/command_extensions.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'hammer_cli_foreman_tasks/command_extensions/recurring_logic'

data/lib/hammer_cli_foreman_tasks/command_extensions/recurring_logic.rb

@@ -0,0 +1,55 @@
+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'])
+      end
+
+      output do |definition|
+        definition.insert(:after, :cron_line) do
+          field :action, _('Action')
+          field :last_occurrence, _('Last occurrence')
+          field :next_occurrence, _('Next occurrence')
+        end
+        definition.insert(:after, :iteration) do
+          field :iteration_limit, _('Iteration limit')
+        end
+        definition.insert(:replace, :end_time) do
+          field :repeat_until, _('Repeat until')
+        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
+      end
+
+      def self.format_task_input(task)
+        return '-' unless task
+
+        task['action']
+      end
+
+      def self.format_recurring_logic_limit(thing)
+        thing || _('Unlimited')
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman_tasks/recurring_logic.rb

@@ -6,8 +6,8 @@ module HammerCLIForemanTasks
       output do
         field :id, _('ID')
         field :cron_line, _('Cron line')
-        field :end_time, _('End time')
         field :iteration, _('Iteration')
+        field :end_time, _('End time')
         field :state, _('State')
       end
 
@@ -17,6 +17,8 @@ module HammerCLIForemanTasks
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition
       build_options
+
+      extend_with(HammerCLIForemanTasks::CommandExtensions::RecurringLogic.new)
     end
 
     class CancelCommand < HammerCLIForeman::DeleteCommand
@@ -26,6 +28,38 @@ module HammerCLIForemanTasks
       failure_message _('Could not cancel the recurring logic')
       build_options
     end
+    
+    class DeleteCommand < HammerCLIForeman::DeleteCommand
+      action :bulk_destroy
+
+      option '--cancelled', :flag, _("Only delete cancelled recurring logics")
+      option '--finished', :flag, _("Only delete finished recurring logics")
+      def request_params
+        params = super
+        raise ArgumentError, "Please specify if you want to remove cancelled or finished recurring logics using --cancelled or --finished." unless (options['option_cancelled'] || options["option_finished"])
+        raise ArgumentError, "Please only use one of the arguments at a time." if (options['option_cancelled'] && options["option_finished"])
+        cancelled = "state=cancelled" if options["option_cancelled"]
+        finished = "state=finished" if options["option_finished"]
+        params["search"] = cancelled || finished
+        params
+      end
+
+      command_name 'delete'
+      desc _("Delete all recuring logics filtered by the arguments")
+      failure_message _('Could not delete recurring logics')
+      output ListCommand.output_definition
+
+      def execute
+        response = send_request
+        if response.length > 0
+          puts _('The following recurring logics deleted:') + "\n"
+          print_data(response)
+        else
+          puts _("No recurring logics deleted.")
+        end
+        HammerCLI::EX_OK
+      end
+    end
 
     autoload_subcommands
   end

data/lib/hammer_cli_foreman_tasks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: powerbar
@@ -65,6 +65,8 @@ files:
 - config/foreman_tasks.yml
 - lib/hammer_cli_foreman_tasks.rb
 - lib/hammer_cli_foreman_tasks/async_command.rb
+- lib/hammer_cli_foreman_tasks/command_extensions.rb
+- lib/hammer_cli_foreman_tasks/command_extensions/recurring_logic.rb
 - lib/hammer_cli_foreman_tasks/helper.rb
 - lib/hammer_cli_foreman_tasks/i18n.rb
 - lib/hammer_cli_foreman_tasks/recurring_logic.rb
@@ -73,40 +75,18 @@ files:
 - lib/hammer_cli_foreman_tasks/version.rb
 - locale/Makefile
 - locale/README.md
-- locale/de/hammer_cli_foreman_tasks.edit.po
 - locale/de/hammer_cli_foreman_tasks.po
-- locale/de/hammer_cli_foreman_tasks.po.time_stamp
-- locale/en/hammer_cli_foreman_tasks.edit.po
 - locale/en/hammer_cli_foreman_tasks.po
-- locale/en/hammer_cli_foreman_tasks.po.time_stamp
-- locale/es/hammer_cli_foreman_tasks.edit.po
 - locale/es/hammer_cli_foreman_tasks.po
-- locale/es/hammer_cli_foreman_tasks.po.time_stamp
-- locale/fr/hammer_cli_foreman_tasks.edit.po
 - locale/fr/hammer_cli_foreman_tasks.po
-- locale/fr/hammer_cli_foreman_tasks.po.time_stamp
 - locale/hammer_cli_foreman_tasks.pot
-- locale/it/hammer_cli_foreman_tasks.edit.po
 - locale/it/hammer_cli_foreman_tasks.po
-- locale/it/hammer_cli_foreman_tasks.po.time_stamp
-- locale/ja/hammer_cli_foreman_tasks.edit.po
 - locale/ja/hammer_cli_foreman_tasks.po
-- locale/ja/hammer_cli_foreman_tasks.po.time_stamp
-- locale/ko/hammer_cli_foreman_tasks.edit.po
 - locale/ko/hammer_cli_foreman_tasks.po
-- locale/ko/hammer_cli_foreman_tasks.po.time_stamp
-- locale/pt_BR/hammer_cli_foreman_tasks.edit.po
 - locale/pt_BR/hammer_cli_foreman_tasks.po
-- locale/pt_BR/hammer_cli_foreman_tasks.po.time_stamp
-- locale/ru/hammer_cli_foreman_tasks.edit.po
 - locale/ru/hammer_cli_foreman_tasks.po
-- locale/ru/hammer_cli_foreman_tasks.po.time_stamp
-- locale/zh_CN/hammer_cli_foreman_tasks.edit.po
 - locale/zh_CN/hammer_cli_foreman_tasks.po
-- locale/zh_CN/hammer_cli_foreman_tasks.po.time_stamp
-- locale/zh_TW/hammer_cli_foreman_tasks.edit.po
 - locale/zh_TW/hammer_cli_foreman_tasks.po
-- locale/zh_TW/hammer_cli_foreman_tasks.po.time_stamp
 homepage: https://github.com/theforeman/hammer-cli-foreman-tasks
 licenses:
 - GPL-3.0
@@ -126,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Foreman CLI plugin for showing tasks information for resoruces and users

data/locale/de/hammer_cli_foreman_tasks.edit.po

@@ -1,134 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the hammer_cli_foreman_tasks package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-# Translators:
-# Wiederoder <stefanwiederoder@googlemail.com>, 2017
-# Ettore Atalan <atalanttore@googlemail.com>, 2017
-# Bryan Kearney <bryan.kearney@gmail.com>, 2017
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: hammer_cli_foreman_tasks 0.0.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-01 15:19-0500\n"
-"PO-Revision-Date: 2017-09-11 13:45+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2017\n"
-"Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:7
-#: ../lib/hammer_cli_foreman_tasks/task.rb:25
-msgid "ID"
-msgstr "ID"
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:8
-msgid "Cron line"
-msgstr "Cron-Zeile"
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:9
-msgid "End time"
-msgstr "Endzeit"
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:10
-msgid "Iteration"
-msgstr "Wiederholung"
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:11
-#: ../lib/hammer_cli_foreman_tasks/task.rb:30
-msgid "State"
-msgstr "Status"
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:25
-msgid "Recurring logic cancelled."
-msgstr "Wiederholungslogik abgebrochen."
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:26
-msgid "Could not cancel the recurring logic."
-msgstr "Wiederholungslogik konnte nicht abgebrochen werden."
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:33
-msgid "Recurring logic related actions."
-msgstr "Aktionen im Zusammenhang mit Wiederholungslogik"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:14
-msgid "Show the progress of the task"
-msgstr "Fortschritt der Aufgabe anzeigen"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:26
-msgid "Name"
-msgstr "Name"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:27
-msgid "Owner"
-msgstr "Besitzer"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:28
-msgid "Started at"
-msgstr "Gestartet um"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:29
-msgid "Ended at"
-msgstr "Beendet um"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:31
-msgid "Result"
-msgstr "Ergebnis"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:33
-#: ../lib/hammer_cli_foreman_tasks/task.rb:54
-#: ../lib/hammer_cli_foreman_tasks/task.rb:63
-#: ../lib/hammer_cli_foreman_tasks/task.rb:72
-msgid "Task action"
-msgstr "Aufgabenaktion"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:34
-#: ../lib/hammer_cli_foreman_tasks/task.rb:55
-#: ../lib/hammer_cli_foreman_tasks/task.rb:64
-#: ../lib/hammer_cli_foreman_tasks/task.rb:73
-msgid "Task errors"
-msgstr "Aufgabenfehler"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:45
-msgid "Resume all tasks paused in error state"
-msgstr "Alle in Fehler-Status angehaltenen Aufgaben fortsetzen"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:48
-msgid "Total tasks found paused in error state"
-msgstr "Alle in Fehler-Status gefundenen Aufgaben "
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:50
-msgid "Total tasks resumed"
-msgstr "Insgesamt fortgesetzte Aufgaben"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:51
-msgid "Resumed tasks"
-msgstr "Fortgesetzte Aufgaben"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:52
-#: ../lib/hammer_cli_foreman_tasks/task.rb:61
-#: ../lib/hammer_cli_foreman_tasks/task.rb:70
-msgid "Task identifier"
-msgstr "Aufgabenbezeichner"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:59
-msgid "Total tasks failed to resume"
-msgstr "Gesamtzahl der Aufgaben, die nicht fortgesetzt werden konnten"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:60
-msgid "Failed tasks"
-msgstr "Fehlgeschlagene Aufgaben"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:68
-msgid "Total tasks skipped"
-msgstr "Insgesamt übersprungene Aufgaben"
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:69
-msgid "Skipped tasks"
-msgstr "Übersprungene Aufgaben"

data/locale/en/hammer_cli_foreman_tasks.edit.po

@@ -1,118 +0,0 @@
-# English translations for hammer_cli_foreman_tasks package.
-# Copyright (C) 2016 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the hammer_cli_foreman_tasks package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: hammer_cli_foreman_tasks 0.0.9\n"
-"Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-02-10 13:03-0500\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"\n"
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:7 ../lib/hammer_cli_foreman_tasks/task.rb:25
-msgid "ID"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:8
-msgid "Cron line"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:9
-msgid "End time"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:10
-msgid "Iteration"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:11 ../lib/hammer_cli_foreman_tasks/task.rb:30
-msgid "State"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:25
-msgid "Recurring logic cancelled."
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:26
-msgid "Could not cancel the recurring logic."
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:33
-msgid "Recurring logic related actions."
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:14
-msgid "Show the progress of the task"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:26
-msgid "Name"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:27
-msgid "Owner"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:28
-msgid "Started at"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:29
-msgid "Ended at"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:31
-msgid "Result"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:33 ../lib/hammer_cli_foreman_tasks/task.rb:54 ../lib/hammer_cli_foreman_tasks/task.rb:63 ../lib/hammer_cli_foreman_tasks/task.rb:72
-msgid "Task action"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:34 ../lib/hammer_cli_foreman_tasks/task.rb:55 ../lib/hammer_cli_foreman_tasks/task.rb:64 ../lib/hammer_cli_foreman_tasks/task.rb:73
-msgid "Task errors"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:45
-msgid "Resume all tasks paused in error state"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:48
-msgid "Total tasks found paused in error state"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:50
-msgid "Total tasks resumed"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:51
-msgid "Resumed tasks"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:52 ../lib/hammer_cli_foreman_tasks/task.rb:61 ../lib/hammer_cli_foreman_tasks/task.rb:70
-msgid "Task identifier"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:59
-msgid "Total tasks failed to resume"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:60
-msgid "Failed tasks"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:68
-msgid "Total tasks skipped"
-msgstr ""
-
-#: ../lib/hammer_cli_foreman_tasks/task.rb:69
-msgid "Skipped tasks"
-msgstr ""