hammer_cli_foreman_remote_execution 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b139880b77689e075db7ec8c87bad033251dd69cd5449c3551727cd1530d3b
-  data.tar.gz: aab12510bea01268618f5540d1401149e09c03490e6ca3ce74d19a1337d43267
+  metadata.gz: bfe330b86da113a5a6376d1aabc5acda1187048eba2d40f89b1807977e61b2d1
+  data.tar.gz: 3c4bc1f61da2e243f5826811ae5edd3e555d989d51f28b589921302f09507700
 SHA512:
-  metadata.gz: c8e4c4a787ee43ff7792e3d3bc74b5be6a4c05adb3c27eb28854a9d8002ec4792f207ecc7c70e0a4a1e4897df5d2a284964a8672705582d7a7f26158ed82f554
-  data.tar.gz: 14ef2c8226dcc2ea55aa560b0861bc292a8760fd570defaaca6ac0a144f3b82ead27f3d8420e7e4a4cf66dd515812e161297fcb9726765398372de36b99c0eab
+  metadata.gz: 2d8bea4d75e163357cebe8d7843947fe8eb92bdadbc6b576b9159efa4c701f5e1bb7a70b4c0b4dc43bd50b72fd553f99a5e910ddb00257664a9f383b46afaef4
+  data.tar.gz: e021f8c88f05b847d08abfd96020dd557eeba971a3a6b8d2c915015b62fbd7115a8a481a09dccd32a4262bcc97742dfd205b601cc492a9e9eaaa2206d08d9b01

data/.travis.yml

@@ -1,7 +1,6 @@
 ---
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.0
   - 2.2.0
   - 2.3.0

data/hammer_cli_foreman_remote_execution.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.authors       = ['Foreman Remote Execution team']
   s.email         = ['foreman-dev@googlegroups.com']
-  s.homepage      = 'http://github.com/theforeman/hammer_cli_foreman_remote_execution'
-  s.license       = 'GPL v3+'
+  s.homepage      = 'https://github.com/theforeman/hammer_cli_foreman_remote_execution'
+  s.license       = 'GPL-3.0-or-later'
 
   s.summary       = 'CLI for the Foreman remote execution plugin'
   s.description   = 'CLI for the Foreman remote execution plugin'
@@ -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', '< 1.0.0'
+  s.add_dependency 'hammer_cli_foreman', '>= 0.1.3', '< 3.0.0'
   s.add_dependency 'hammer_cli_foreman_tasks', '~> 0.0.3'
 end

data/lib/hammer_cli_foreman_remote_execution/job_invocation.rb

@@ -18,6 +18,7 @@ module HammerCLIForemanRemoteExecution
         field :pending, _('Pending')
         field :total, _('Total')
         field :start_at, _('Start')
+        field :randomized_ordering, _('Randomized ordering')
       end
 
       def extend_data(invocation)
@@ -184,8 +185,11 @@ module HammerCLIForemanRemoteExecution
     end
 
     def self.extend_data(invocation)
-      if invocation['targeting'] && invocation['targeting']['hosts']
-        invocation['hosts'] = "\n" + invocation['targeting']['hosts'].map { |host| " - #{host['name']}" }.join("\n")
+      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")
+        end
       end
 
       if invocation['recurrence']

data/lib/hammer_cli_foreman_remote_execution/job_template.rb

@@ -20,6 +20,7 @@ module HammerCLIForemanRemoteExecution
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition do
+        field :description, _('Description'), Fields::Text
         field :template_inputs, _('Inputs')
         HammerCLIForeman::References.taxonomies(self)
       end

data/lib/hammer_cli_foreman_remote_execution/template_input.rb

@@ -23,20 +23,28 @@ module HammerCLIForemanRemoteExecution
         field :variable_name, _('Variable name')
         field :puppet_parameter_name, _('Puppet parameter name')
         field :options, _('Options'), Fields::List, :width => 25, :hide_blank => true
+        field :default, _('Default value')
       end
 
       build_options
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _('Template input created')
+      success_message _('Template input created.')
       failure_message _('Could not create the template input')
 
       build_options
     end
 
+    class UpdateCommand < HammerCLIForeman::UpdateCommand
+      success_message _('Template input updated.')
+      failure_message _('Could not update the template input')
+
+      build_options
+    end
+
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _('Template input deleted')
+      success_message _('Template input deleted.')
       failure_message _('Could not delete the template input')
 
       build_options

data/lib/hammer_cli_foreman_remote_execution/version.rb

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

data/locale/hammer-cli-foreman-remote-execution.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-foreman-remote-execution 0.0.4\n"
+"Project-Id-Version: hammer-cli-foreman-remote-execution 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-11 13:44-0500\n"
-"PO-Revision-Date: 2016-02-11 13:44-0500\n"
+"POT-Creation-Date: 2019-02-26 10:44-0500\n"
+"PO-Revision-Date: 2019-02-26 10:44-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -25,8 +25,10 @@ msgstr ""
 
 #: ../lib/hammer_cli_foreman_remote_execution/foreign_input_set.rb:8
 #: ../lib/hammer_cli_foreman_remote_execution/foreign_input_set.rb:18
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:7
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:13
 #: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:7
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:8
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:19
 #: ../lib/hammer_cli_foreman_remote_execution/template_input.rb:8
 #: ../lib/hammer_cli_foreman_remote_execution/template_input.rb:18
 msgid "ID"
@@ -44,6 +46,8 @@ msgstr ""
 
 #: ../lib/hammer_cli_foreman_remote_execution/foreign_input_set.rb:19
 #: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:8
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:9
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:21
 #: ../lib/hammer_cli_foreman_remote_execution/template_input.rb:9
 #: ../lib/hammer_cli_foreman_remote_execution/template_input.rb:19
 msgid "Name"
@@ -85,96 +89,122 @@ msgstr ""
 msgid "Could not delete the input set"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:8
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:14
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:10
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:22
 msgid "Description"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:9
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:15
 msgid "Status"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:10
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:16
 msgid "Success"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:11
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:17
 msgid "Failed"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:12
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:18
 msgid "Pending"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:13
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:19
 msgid "Total"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:14
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:20
 msgid "Start"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:26
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:33
 #: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:9
 msgid "Job Category"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:27
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:34
 msgid "Mode"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:28
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:35
 msgid "Cron line"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:29
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:36
 msgid "Recurring logic ID"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:30
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:37
 msgid "Hosts"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:45
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:52
 msgid "View the output for a host"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:47
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:54
 msgid "Do not wait for job to complete, shows current output only"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:73
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:70
+msgid "The job is scheduled to start at %{timestamp}"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:102
 msgid "Job invocation %{id} created"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:76
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:105
 msgid "Schedule the execution for a later time"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:79
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:108
 msgid "Execution should be cancelled if it cannot be started before --start-at"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:83
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:112
 msgid "Create a recurring execution"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:85
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:114
 msgid "Perform no more executions after this time, used with --cron-line"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:89
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:118
 msgid "Specify inputs from command line"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:93
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:122
 msgid "Read input values from files"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:96
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:125
 msgid "Dynamic search queries are evaluated at run time"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:148
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:168
+msgid "Cancel the job"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:169
+msgid "Job invocation %{id} cancelled"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:170
+msgid "Could not cancel the job invocation"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:180
+msgid "Rerun the job"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:181
+msgid "Job invocation was rerun as %{id}"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_invocation.rb:202
 msgid "Manage job invocations"
 msgstr ""
 
@@ -195,7 +225,7 @@ msgid "View job template content"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:46
-#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:59
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:88
 msgid "Path to a file that contains the template"
 msgstr ""
 
@@ -207,23 +237,39 @@ msgstr ""
 msgid "Could not create the job template"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:63
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:62
+msgid "Path to a file that contains the template - must include ERB metadata"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:66
+msgid "Job template imported"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:67
+msgid "Could not import the job template"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:78
+msgid "Export a template including all metadata"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:92
 msgid "Job template updated"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:64
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:93
 msgid "Could not update the job template"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:72
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:101
 msgid "Job template deleted"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:73
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:102
 msgid "Could not delete the job template"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:92
+#: ../lib/hammer_cli_foreman_remote_execution/job_template.rb:121
 msgid "Manage job templates"
 msgstr ""
 
@@ -243,6 +289,32 @@ msgid ""
 "  e. is day of week (range: 0-6)"
 msgstr ""
 
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:4
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:40
+msgid "Manage remote execution features"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:11
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:23
+msgid "Job template name"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:20
+msgid "Label"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:24
+msgid "Job template ID"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:31
+msgid "Remote execution feature updated"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_remote_execution/remote_execution_feature.rb:32
+msgid "Could not update the remote execution feature"
+msgstr ""
+
 #: ../lib/hammer_cli_foreman_remote_execution/template_input.rb:4
 #: ../lib/hammer_cli_foreman_remote_execution/template_input.rb:48
 msgid "Manage template inputs"

data/test/unit/job_invocation_test.rb

@@ -41,7 +41,7 @@ describe HammerCLIForemanRemoteExecution::JobInvocation do
 
     context 'output' do
       with_params ['--id=1'] do
-        it_should_print_columns ['ID','Description','Status','Success','Failed','Pending','Total','Start','Job Category','Mode','Cron line','Recurring logic ID','Hosts']
+        it_should_print_columns ['ID','Description','Status','Success','Failed','Pending','Total','Start','Job Category','Mode','Cron line','Recurring logic ID','Hosts', 'Randomized ordering']
       end
     end
   end
@@ -50,12 +50,10 @@ describe HammerCLIForemanRemoteExecution::JobInvocation do
     let(:cmd) { HammerCLIForemanRemoteExecution::JobInvocation::CreateCommand.new('', ctx) }
 
     context 'parameters' do
-      it_should_accept 'create options', ['--job-template="Run Command - SSH Default', '--inputs=command="hostname"', '--search-query="name ~ foreman"', '--start-at="2099-01-01 12:00"', '--async']
-
       it 'detects async flag correctly' do
         refute cmd.option_async?
         _out, err = capture_io do
-          cmd.run(%w(--async)).must_equal HammerCLI::EX_OK
+          cmd.run(['--job-template="Run Command - SSH Default', '--inputs=command="hostname"', '--search-query="name ~ foreman"', '--start-at="2099-01-01 12:00"', '--async']).must_equal HammerCLI::EX_OK
         end
         err.must_be :empty?
         assert cmd.option_async?

data/test/unit/template_input_test.rb

@@ -48,4 +48,12 @@ describe HammerCLIForemanRemoteExecution::TemplateInput do
       it_should_accept 'create options', ['--template-id=1', "--name=asdf", '--input-type=user']
     end
   end
+
+  context 'UpdateCommand' do
+    let(:cmd) { HammerCLIForemanRemoteExecution::TemplateInput::UpdateCommand.new('', ctx) }
+
+    context 'parameters' do
+      it_should_accept 'update options', ['--template-id=1', '--name=asdf', '--input-type=user', '--new-name=fdsa']
+    end
+  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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -19,7 +19,7 @@ dependencies:
         version: 0.1.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.1.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman_tasks
   requirement: !ruby/object:Gem::Requirement
@@ -96,9 +96,9 @@ files:
 - test/unit/job_template_test.rb
 - test/unit/remote_execution_feature_test.rb
 - test/unit/template_input_test.rb
-homepage: http://github.com/theforeman/hammer_cli_foreman_remote_execution
+homepage: https://github.com/theforeman/hammer_cli_foreman_remote_execution
 licenses:
-- GPL v3+
+- GPL-3.0-or-later
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -115,8 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: CLI for the Foreman remote execution plugin