hammer_cli_foreman_remote_execution 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a8e161e362047b1b57912566bba871c744abf23f65b23f5425865138f281a2
-  data.tar.gz: 3a26ec61f5fda760497bbc0bb8d9744ffa1d99bb5717f3d15a82b9750e37d949
+  metadata.gz: a3bdff74fb5bd32d504b13ff551678c6c3ed12aa04d73528ce2cab9f72b46665
+  data.tar.gz: 7ef49c8ed3a5dcaf3d668af3f8f78400eace069dde81cfc04870321ceed58b85
 SHA512:
-  metadata.gz: f3ee7406b730f5036b5b283e35d2353f7341a007b28e10da883f5dc2fe9ab9ad801ac162765e6646b664a8cf61bd7da355eae1d10e76ca940909f9ab87a3c8ac
-  data.tar.gz: 12bad04f757471161f6ac7e4e8cb3b5e25c4971957af6e37e9cc4fa8d7755f9257aa5c3940586696db72afe686c49ff2dcda02af30f9df2f946178ad3f12a61d
+  metadata.gz: fbc9ff36630e21dde97f526c37f9ecd1de65a9d7022fdd507c8fc623c6104e09d8ce6504667e68af9b5d4fff11bafa160b7ffce2506fa6bd36792e55ce76aca5
+  data.tar.gz: f994bee91634dce1295bb824c9fd90197e3bdd9bfa07cca8daa579a0f28110f67fd25c31b3278612a5c1be8bf70b8c1928baef8107f55abd38b270154c8c309d

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,15 +37,43 @@ 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')
+
+      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
 
@@ -187,9 +222,11 @@ 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")
+
+        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.2'
+    @version ||= Gem::Version.new '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -66,10 +66,12 @@ files:
 - lib/hammer_cli_foreman_remote_execution.rb
 - lib/hammer_cli_foreman_remote_execution/foreign_input_set.rb
 - lib/hammer_cli_foreman_remote_execution/i18n.rb
+- lib/hammer_cli_foreman_remote_execution/interface_extensions.rb
 - lib/hammer_cli_foreman_remote_execution/job_invocation.rb
 - lib/hammer_cli_foreman_remote_execution/job_template.rb
 - lib/hammer_cli_foreman_remote_execution/options/normalizers.rb
 - lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb
+- lib/hammer_cli_foreman_remote_execution/subnet_extensions.rb
 - lib/hammer_cli_foreman_remote_execution/template_input.rb
 - lib/hammer_cli_foreman_remote_execution/version.rb
 - locale/Makefile
@@ -100,7 +102,7 @@ homepage: https://github.com/theforeman/hammer_cli_foreman_remote_execution
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: CLI for the Foreman remote execution plugin
 test_files: