hammer_cli_foreman_remote_execution 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe330b86da113a5a6376d1aabc5acda1187048eba2d40f89b1807977e61b2d1
-  data.tar.gz: 3c4bc1f61da2e243f5826811ae5edd3e555d989d51f28b589921302f09507700
+  metadata.gz: 00e0ed2d507a59921d5e74fea3c867a905275f3cfe08dead49f16ac2c65c270a
+  data.tar.gz: 13b14ae95a38f37186d530c94693cb169ae242302b14fd7cc8a6aa3f78c13863
 SHA512:
-  metadata.gz: 2d8bea4d75e163357cebe8d7843947fe8eb92bdadbc6b576b9159efa4c701f5e1bb7a70b4c0b4dc43bd50b72fd553f99a5e910ddb00257664a9f383b46afaef4
-  data.tar.gz: e021f8c88f05b847d08abfd96020dd557eeba971a3a6b8d2c915015b62fbd7115a8a481a09dccd32a4262bcc97742dfd205b601cc492a9e9eaaa2206d08d9b01
+  metadata.gz: '0779211fbcabdcba9288f5f79ea652f60f6deb8fc0f25d36a16dd7293df196224d2c263e967a2b0cd30c384cea02f2bcb107cee773862befd6563ea0f287641a'
+  data.tar.gz: ac9781413c16f4af51d31896adb1328ed64e112b68dff79159db3409bdf183086a4ec4f50abd8c6d39fed3f6e01fb18a44d3ec9c16e4dadab980905bf9bf7aed

data/.travis.yml

@@ -1,9 +1,9 @@
 ---
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.2.0
-  - 2.3.0
+  - 2.4.0
+  - 2.5.0
+  - 2.6.0
 sudo: false
 before_install:
   - gem update bundler

data/.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[foreman.hammer_cli_foreman_tasks]
+[foreman.hammer-cli-foreman-remote-execution]
 file_filter = locale/<lang>/hammer-cli-foreman-remote-execution.edit.po
 source_file = locale/hammer-cli-foreman-remote-exectution.pot
 source_lang = en

data/hammer_cli_foreman_remote_execution.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.test_files =       `git ls-files test`.split("\n")
   s.extra_rdoc_files = `git ls-files doc`.split("\n") + Dir['README*', 'LICENSE']
 
-  s.add_dependency 'hammer_cli_foreman', '>= 0.1.3', '< 3.0.0'
+  s.add_dependency 'hammer_cli_foreman', '>= 0.1.3', '< 4.0.0'
   s.add_dependency 'hammer_cli_foreman_tasks', '~> 0.0.3'
 end

data/lib/hammer_cli_foreman_remote_execution.rb

@@ -9,6 +9,8 @@ module HammerCLIForemanRemoteExecution
   require 'hammer_cli_foreman_remote_execution/template_input'
   require 'hammer_cli_foreman_remote_execution/foreign_input_set'
   require 'hammer_cli_foreman_remote_execution/remote_execution_feature'
+  require 'hammer_cli_foreman_remote_execution/interface_extensions'
+  require 'hammer_cli_foreman_remote_execution/subnet_extensions'
 
   def self.exception_handler_class
     HammerCLIForeman::ExceptionHandler

data/lib/hammer_cli_foreman_remote_execution/interface_extensions.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'hammer_cli_foreman/interface'
+
+module HammerCLIForemanRemoteExecution
+  class InterfaceExtensionsInfo < ::HammerCLI::CommandExtensions
+    output do |definition|
+      definition.append do
+        field :execution, _('Execution'), Fields::Boolean
+      end
+    end
+  end
+
+  module InterfaceExtensionsList
+    def format_type(nic)
+      type = super(nic)
+      if nic['execution']
+        if nic['primary'] || nic['provision']
+          type[-1] = ', '+_('execution') +')'
+        else
+          type += ' ('+_('execution') +')'
+        end
+      end
+      type
+    end
+  end
+
+  ::HammerCLIForeman::Interface.singleton_class.prepend InterfaceExtensionsList
+  ::HammerCLIForeman::Interface::InfoCommand.extend_with(InterfaceExtensionsInfo.new)
+end

data/lib/hammer_cli_foreman_remote_execution/job_invocation.rb

@@ -8,18 +8,25 @@ module HammerCLIForemanRemoteExecution
       end
     end
 
-    class ListCommand < HammerCLIForeman::ListCommand
-      output do
-        field :id, _('ID')
-        field :description, _('Description')
-        field :status_label, _('Status')
-        field :succeeded, _('Success')
-        field :failed, _('Failed')
-        field :pending, _('Pending')
-        field :total, _('Total')
-        field :start_at, _('Start')
-        field :randomized_ordering, _('Randomized ordering')
+    module BaseOutput
+      def self.included(base)
+        base.output do
+          field :id, _('ID')
+          field :description, _('Description')
+          field :status_label, _('Status')
+          field :succeeded, _('Success')
+          field :failed, _('Failed')
+          field :pending, _('Pending')
+          field :total, _('Total')
+          field :start_at, _('Start')
+          field :randomized_ordering, _('Randomized ordering')
+          field :inputs, _('Inputs'), nil, :hide_blank => true
+        end
       end
+    end
+
+    class ListCommand < HammerCLIForeman::ListCommand
+      include BaseOutput
 
       def extend_data(invocation)
         JobInvocation.extend_data(invocation)
@@ -30,20 +37,56 @@ module HammerCLIForemanRemoteExecution
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       extend WithoutNameOption
-      output ListCommand.output_definition do
-        field :job_category, _('Job Category')
-        field :mode, _('Mode')
-        field :cron_line, _('Cron line')
-        field :recurring_logic_id, _('Recurring logic ID')
-        field :hosts, _('Hosts')
+      include BaseOutput
+      option '--show-inputs', :flag, _('Show the complete input of the job')
+      option '--show-host-status', :flag, _('Show job status for the hosts')
+
+      extend_output_definition do |definition|
+        definition.insert(:before, :total) do
+          field :missing, _('Missing')
+        end
+        definition.append do
+          field :job_category, _('Job Category')
+          field :mode, _('Mode')
+          field :cron_line, _('Cron line')
+          field :recurring_logic_id, _('Recurring logic ID')
+          field :hosts, _('Hosts')
+        end
+      end
+
+      def adapter
+        if option_id
+          :yaml
+        else
+          :base
+        end
       end
 
       def extend_data(invocation)
+        if option_show_inputs?
+          invocation['template_invocations']&.each do |template|
+            input_values = template['template_invocation_input_values']
+            values_for_host = {}
+            input_values&.each do |input_value|
+              values_for_host[input_value['template_input_name']] = input_value['value']
+            end
+            hosts = invocation.dig('targeting', 'hosts')
+            host_index = hosts&.index { |h| h['id'] == template['host_id'] }
+            invocation['targeting']['hosts'][host_index][:inputs] = values_for_host if host_index
+          end
+        end
         JobInvocation.extend_data(invocation)
       end
 
       build_options do |o|
         o.expand(:none)
+        o.without(:host_status)
+      end
+
+      def request_params
+        params = super
+        params[:host_status] = true if option_show_host_status?
+        params
       end
     end
 
@@ -186,10 +229,12 @@ module HammerCLIForemanRemoteExecution
 
     def self.extend_data(invocation)
       if (targeting = invocation['targeting']) && invocation['targeting']['hosts']
-        invocation['randomized_ordering'] = targeting['randomized_ordering']
-        if (hosts = targeting['hosts'])
-          invocation['hosts'] = "\n" + hosts.map { |host| " - #{host['name']}" }.join("\n")
+        invocation['randomized_ordering'] = targeting['randomized_ordering'] || false
+
+        hosts = targeting['hosts'].map do |host|
+          { 'Name' => host['name'], 'Job status' => host['job_status'], 'Inputs' => host[:inputs] }.compact
         end
+        invocation['hosts'] = hosts
       end
 
       if invocation['recurrence']

data/lib/hammer_cli_foreman_remote_execution/subnet_extensions.rb

@@ -0,0 +1,16 @@
+require 'hammer_cli_foreman/subnet'
+
+module HammerCLIForemanRemoteExecution
+  class SubnetExtensions < ::HammerCLI::CommandExtensions
+    output do |definition|
+      definition.insert(:after, _("Smart Proxies"))do
+        collection :remote_execution_proxies, _('Remote execution proxies'), :numbered => false do
+          field :id, _('Id')
+          field :name, _('Name')
+        end
+      end
+    end
+  end
+
+  ::HammerCLIForeman::Subnet::InfoCommand.extend_with(SubnetExtensions.new)
+end

data/lib/hammer_cli_foreman_remote_execution/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanRemoteExecution
   def self.version
-    @version ||= Gem::Version.new '0.1.1'
+    @version ||= Gem::Version.new '0.2.2'
   end
 end

data/locale/README.md

@@ -1,11 +1,11 @@
 Updating the translations
 -------------------------
 
-  1. Check if there are any new languages with progress more than 50% on [transifex](https://www.transifex.com/projects/p/foreman/resource/hammer-cli-foreman/). If so, do the following for each of the new languages:
+  1. Check if there are any new languages with progress more than 50% on [transifex](https://www.transifex.com/projects/p/foreman/resource/hammer-cli-foreman-remote-execution/). If so, do the following for each of the new languages:
 
   ```
     mkdir locale/<lang>
-    cp locale/hammer-cli-foreman.pot locale/<lang>/hammer-cli-foreman.po
+    cp locale/hammer-cli-foreman-remote-execution.pot locale/<lang>/hammer-cli-foreman-remote-execution.po
   ```
   2. Make sure you have `transifex-client` installed
 

data/locale/de/hammer-cli-foreman-remote-execution.po

@@ -3,10 +3,9 @@
 # This file is distributed under the same license as the hammer_cli_foreman_tasks package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_tasks 0.0.9\n"
+"Project-Id-Version: hammer-cli-foreman-remote-execution 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-18 10:36-0500\n"
 "Last-Translator: Wiederoder <stefanwiederoder@googlemail.com>, 2017\n"
@@ -17,77 +16,247 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Manage foreign input sets"
+msgstr ""
+
 msgid "ID"
 msgstr "ID"
 
+#, fuzzy
+msgid "Target template ID"
+msgstr "ID"
+
+msgid "Target template name"
+msgstr ""
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Include all"
+msgstr ""
+
+msgid "Include"
+msgstr ""
+
+msgid "Exclude"
+msgstr ""
+
+msgid "Foreign input set updated"
+msgstr ""
+
+msgid "Could not update the input set"
+msgstr ""
+
+msgid "Foreign input set created"
+msgstr ""
+
+msgid "Could not create the input set"
+msgstr ""
+
+msgid "Foreign input set deleted"
+msgstr ""
+
+msgid "Could not delete the input set"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+#, fuzzy
+msgid "Status"
+msgstr "Status"
+
+msgid "Success"
+msgstr ""
+
+msgid "Failed"
+msgstr ""
+
+msgid "Pending"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+#, fuzzy
+msgid "Start"
+msgstr "Status"
+
+msgid "Job Category"
+msgstr ""
+
+msgid "Mode"
+msgstr ""
+
 msgid "Cron line"
 msgstr "Cron-Zeile"
 
-msgid "End time"
-msgstr "Endzeit"
+#, fuzzy
+msgid "Recurring logic ID"
+msgstr "ID"
 
-msgid "Iteration"
-msgstr "Wiederholung"
+msgid "Hosts"
+msgstr ""
 
-msgid "State"
-msgstr "Status"
+msgid "View the output for a host"
+msgstr ""
 
-msgid "Recurring logic cancelled."
-msgstr "Wiederholungslogik abgebrochen."
+msgid "Do not wait for job to complete, shows current output only"
+msgstr ""
 
-msgid "Could not cancel the recurring logic."
-msgstr "Wiederholungslogik konnte nicht abgebrochen werden."
+msgid "The job is scheduled to start at %{timestamp}"
+msgstr ""
 
-msgid "Recurring logic related actions."
-msgstr "Aktionen im Zusammenhang mit Wiederholungslogik"
+msgid "Job invocation %{id} created"
+msgstr ""
 
-msgid "Show the progress of the task"
-msgstr "Fortschritt der Aufgabe anzeigen"
+msgid "Schedule the execution for a later time"
+msgstr ""
 
-msgid "Name"
-msgstr "Name"
+msgid "Execution should be cancelled if it cannot be started before --start-at"
+msgstr ""
+
+msgid "Create a recurring execution"
+msgstr ""
+
+msgid "Perform no more executions after this time, used with --cron-line"
+msgstr ""
+
+msgid "Specify inputs from command line"
+msgstr ""
+
+msgid "Read input values from files"
+msgstr ""
+
+msgid "Dynamic search queries are evaluated at run time"
+msgstr ""
+
+msgid "Cancel the job"
+msgstr ""
+
+msgid "Job invocation %{id} cancelled"
+msgstr ""
+
+msgid "Could not cancel the job invocation"
+msgstr ""
+
+msgid "Rerun the job"
+msgstr ""
+
+msgid "Job invocation was rerun as %{id}"
+msgstr ""
+
+msgid "Manage job invocations"
+msgstr ""
+
+msgid "Provider"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Inputs"
+msgstr ""
+
+msgid "View job template content"
+msgstr ""
+
+msgid "Path to a file that contains the template"
+msgstr ""
+
+msgid "Job template created"
+msgstr ""
+
+msgid "Could not create the job template"
+msgstr ""
+
+msgid "Path to a file that contains the template - must include ERB metadata"
+msgstr ""
+
+msgid "Job template imported"
+msgstr ""
+
+msgid "Could not import the job template"
+msgstr ""
+
+msgid "Export a template including all metadata"
+msgstr ""
 
-msgid "Owner"
-msgstr "Besitzer"
+msgid "Job template updated"
+msgstr ""
 
-msgid "Started at"
-msgstr "Gestartet um"
+msgid "Could not update the job template"
+msgstr ""
 
-msgid "Ended at"
-msgstr "Beendet um"
+msgid "Job template deleted"
+msgstr ""
 
-msgid "Result"
-msgstr "Ergebnis"
+msgid "Could not delete the job template"
+msgstr ""
 
-msgid "Task action"
-msgstr "Aufgabenaktion"
+msgid "Manage job templates"
+msgstr ""
 
-msgid "Task errors"
-msgstr "Aufgabenfehler"
+msgid ""
+"Comma-separated list of key=file, where file is a path to a text file to be re"
+"ad"
+msgstr ""
 
-msgid "Resume all tasks paused in error state"
-msgstr "Alle in Fehler-Status angehaltenen Aufgaben fortsetzen"
+#, fuzzy
+msgid ""
+"Cron line format 'a b c d e', where:\n"
+"  a. is minute (range: 0-59)\n"
+"  b. is hour (range: 0-23)\n"
+"  c. is day of month (range: 1-31)\n"
+"  d. is month (range: 1-12)\n"
+"  e. is day of week (range: 0-6)"
+msgstr "Cron-Zeile"
 
-msgid "Total tasks found paused in error state"
-msgstr "Alle in Fehler-Status gefundenen Aufgaben "
+msgid "Manage remote execution features"
+msgstr ""
 
-msgid "Total tasks resumed"
-msgstr "Insgesamt fortgesetzte Aufgaben"
+msgid "Job template name"
+msgstr ""
 
-msgid "Resumed tasks"
-msgstr "Fortgesetzte Aufgaben"
+msgid "Label"
+msgstr ""
 
-msgid "Task identifier"
-msgstr "Aufgabenbezeichner"
+#, fuzzy
+msgid "Job template ID"
+msgstr "ID"
 
-msgid "Total tasks failed to resume"
-msgstr "Gesamtzahl der Aufgaben, die nicht fortgesetzt werden konnten"
+msgid "Remote execution feature updated"
+msgstr ""
 
-msgid "Failed tasks"
-msgstr "Fehlgeschlagene Aufgaben"
+msgid "Could not update the remote execution feature"
+msgstr ""
 
-msgid "Total tasks skipped"
-msgstr "Insgesamt übersprungene Aufgaben"
+msgid "Manage template inputs"
+msgstr ""
 
-msgid "Skipped tasks"
-msgstr "Übersprungene Aufgaben"
+msgid "Input type"
+msgstr ""
+
+msgid "Fact name"
+msgstr ""
+
+msgid "Variable name"
+msgstr ""
+
+msgid "Puppet parameter name"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Template input created"
+msgstr ""
+
+msgid "Could not create the template input"
+msgstr ""
+
+msgid "Template input deleted"
+msgstr ""
+
+msgid "Could not delete the template input"
+msgstr ""