hammer_cli_foreman_tasks 0.0.12 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e0692446b3ec745d0ab8636fc100443690a9e562
-  data.tar.gz: fe98659b39aae68eae3cafc0705a9cef3ad95822
+SHA256:
+  metadata.gz: ec71b6d46c5b0bb4e7964c4bd59c75113a34905df7aaecf33a5b15799dfb1475
+  data.tar.gz: 9ebd5f6869ae7ffc42f516ad2af72b6bed78c03fd801b214ebba4728a1f3e320
 SHA512:
-  metadata.gz: 49940870a441e80d680aad0689cb6392ed2abed8b8499e26708d70a5c0834144ac8b57a215f281865604d93fc5b78d841ca317103f9d4970e56969cca5d48d16
-  data.tar.gz: 849d24914d3d05ee8b27e257eda6b34c95d30007de9a989a42015b5c3085a47ced2f821f2f124aaace28fd225ef8b5e80fb23dd90383980e5ea60238f7c119d5
+  metadata.gz: 8a952d7450b20da3f4a4ea2a7c632fe67671af30a606dab2a3139ad6fc1ebaaf0a889780fb37834afc620296a215e4100ee99ee63e114ae270f55d2726a892f7
+  data.tar.gz: af0dcf883b5a7bb7c9660a7ba8e8b7cc362af2b67bf22034766604cd04f21c5abbdca6a9dc97a269a6b91966670ecab5e7fe66dee6f073109c561dae668ea27b

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/helper.rb

@@ -1,17 +1,20 @@
 module HammerCLIForemanTasks
   module Helper
-
     # render the progress of the task using polling to the task API
     def task_progress(task_or_id)
       task_id = task_or_id.is_a?(Hash) ? task_or_id['id'] : task_or_id
-      task_progress = TaskProgress.new(task_id) { |id| load_task(id) }
-      task_progress.render
-      task_progress.success?
+      if !task_id.empty?
+        options = { verbosity: @context[:verbosity] || HammerCLI::V_VERBOSE }
+        task_progress = TaskProgress.new(task_id, options) { |id| load_task(id) }
+        task_progress.render
+        task_progress.success?
+      else
+        signal_usage_error(_('Please mention appropriate attribute value'))
+      end
     end
 
     def load_task(id)
       HammerCLIForeman.foreman_resource!(:foreman_tasks).call(:show, :id => id)
     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,18 +17,52 @@ module HammerCLIForemanTasks
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition
       build_options
+
+      extend_with(HammerCLIForemanTasks::CommandExtensions::RecurringLogic.new)
     end
 
     class CancelCommand < HammerCLIForeman::DeleteCommand
       action :cancel
       command_name 'cancel'
       success_message _('Recurring logic cancelled.')
-      failure_message _('Could not cancel the recurring logic.')
+      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
 
-  HammerCLI::MainCommand.subcommand 'recurring-logic', _('Recurring logic related actions.'), RecurringLogic
+  HammerCLI::MainCommand.subcommand 'recurring-logic', _('Recurring logic related actions'), RecurringLogic
 end

data/lib/hammer_cli_foreman_tasks/task.rb

@@ -3,6 +3,19 @@ module HammerCLIForemanTasks
 
     resource :foreman_tasks
 
+    module WithoutNameOption
+      def create_option_builder
+        HammerCLI::Apipie::OptionBuilder.new(resource, resource.action(action), :require_options => false)
+      end
+    end
+
+    module ActionField
+      def extend_data(task)
+        task["action"] = [task["humanized"]["action"], task["humanized"]["input"]].join(' ')
+        task
+      end
+    end
+
     class ProgressCommand < HammerCLIForeman::Command
 
       include HammerCLIForemanTasks::Helper
@@ -21,26 +34,52 @@ module HammerCLIForemanTasks
     end
 
     class ListCommand < HammerCLIForeman::ListCommand
+      extend WithoutNameOption
+      include ActionField
+
       output do
         field :id, _('ID')
-        field :action, _('Name')
-        field :username, _('Owner')
+        field :action, _('Action')
+        field :state, _('State')
+        field :result, _('Result')
         field :started_at, _('Started at'), Fields::Date
         field :ended_at, _('Ended at'), Fields::Date
+        field :username, _('Owner')
+
+        from :humanized do
+          field :errors, _('Task errors'), Fields::List, :hide_blank => true
+        end
+      end
+
+      build_options
+    end
+
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      extend WithoutNameOption
+      include ActionField
+
+      output do
+        field :id, _('ID')
+        field :action, _('Action')
         field :state, _('State')
         field :result, _('Result')
+        field :started_at, _('Started at'), Fields::Date
+        field :ended_at, _('Ended at'), Fields::Date
+        field :username, _('Owner')
+
         from :humanized do
-          field :action, _('Task action')
           field :errors, _('Task errors'), Fields::List, :hide_blank => true
         end
       end
 
       build_options
+
     end
 
     class ResumeCommand < HammerCLIForeman::InfoCommand
       action :bulk_resume
 
+
       command_name "resume"
       desc _("Resume all tasks paused in error state")
 

data/lib/hammer_cli_foreman_tasks/task_progress.rb

@@ -3,10 +3,11 @@ module HammerCLIForemanTasks
   class TaskProgress
     attr_accessor :interval, :task
 
-    def initialize(task_id, &block)
+    def initialize(task_id, options = {}, &block)
       @update_block = block
       @task_id      = task_id
       @interval     = 2
+      @options      = options
     end
 
     def render
@@ -43,8 +44,10 @@ module HammerCLIForemanTasks
     end
 
     def render_result
-      puts @task['humanized']['output'] unless @task['humanized']['output'].to_s.empty?
-      STDERR.puts "Error: #{@task['humanized']['errors'].join("\n")}" unless @task['humanized']['errors'].empty?
+      puts @task['humanized']['output'] if !@task['humanized']['output'].to_s.empty? && appropriate_verbosity?
+      unless @task['humanized']['errors'].nil? || @task['humanized']['errors'].empty?
+        STDERR.puts "Error: #{@task['humanized']['errors'].join("\n")}"
+      end
     end
 
     def update_task
@@ -61,11 +64,15 @@ module HammerCLIForemanTasks
       bar.settings.tty.finite.template.main    = '[${<bar>}] [${<percent>%}]'
       bar.settings.tty.finite.template.padchar = ' '
       bar.settings.tty.finite.template.barchar = '.'
-      bar.settings.tty.finite.output           = Proc.new { |s| $stderr.print s }
+      bar.settings.tty.finite.output           = Proc.new { |s| $stderr.print s if appropriate_verbosity? }
       yield bar
     ensure
       bar.close
       render_result
     end
+
+    def appropriate_verbosity?
+      @options[:verbosity] >= HammerCLI::V_VERBOSE
+    end
   end
 end

data/lib/hammer_cli_foreman_tasks/version.rb

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

data/locale/de/hammer_cli_foreman_tasks.po

@@ -1,131 +1,98 @@
-# bkearney <bkearney@redhat.com>, 2016. #zanata
-# jdimanos <jdimanos@redhat.com>, 2016. #zanata
-# lstemmle <lstemmle@redhat.com>, 2016. #zanata
+# 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.9\n"
+"Project-Id-Version: hammer_cli_foreman_tasks 0.0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-18 10:36-0500\n"
-"PO-Revision-Date: 2016-05-12 11:48+0000\n"
-"Last-Translator: lstemmle <lstemmle@redhat.com>\n"
-"Language-Team: German\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"
-"X-Generator: Zanata 3.8.4\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
-#, fuzzy
 msgid "Recurring logic cancelled."
-msgstr "Wiederkehrende Logik abgebrochen."
+msgstr "Wiederholungslogik abgebrochen."
 
-#: ../lib/hammer_cli_foreman_tasks/recurring_logic.rb:26
 msgid "Could not cancel the recurring logic."
-msgstr "Wiederkehrende Logik konnte nicht abgebrochen werden."
+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 wiederkehrender Logik"
+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"
 
-# translation auto-copied from project Red Hat Satellite Installation Guide,
-# version 6.0, document chap-
-# Uninstalling_Red_Hat_Satellite_Server_and_Capsule_Server
-#: ../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"