hammer_cli_foreman_discovery 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437c3b56e34868fe63885b2fa1f88297a3c3beccf89018156236c52c206e5d17
-  data.tar.gz: 704cda11e2d98717abcb0ff3d08764c37a669e051da4f20fac9e7a76edc3271d
+  metadata.gz: 802f7f3eeb1690a136f1fee27ef62216fe8beab061640a9139d3050eb3f1d722
+  data.tar.gz: b26d74acfcdcf2d119b3dfc07cf2c57861b14b37d0766971078edcbf3659b78a
 SHA512:
-  metadata.gz: 32f35416b72207ea81b23bd3e1d7a81ec912b74624d66f588f9b863c81cb5cc7d0570d7f60d6b0fe6ebd9f5d43004cbbce8b2cf5251f10d97f036c416cdcaeea
-  data.tar.gz: e68961ff1a6cd06c7c98039924ca0f924ffc599e664c684572e5991f9459b7b026adfc97f707ad13a3cd73b1756acb17a11ee19c08be0bf35b105a1c28315a8f
+  metadata.gz: 9a345994e82071f26f6eae485267e51504b97e9235053029675aa2d8f5b19211218c9ebce97636649e6bb1e96588e2a54c68a3d989f53aaae3b1e2a74fe770ed
+  data.tar.gz: 491c79e6275f61b06bd712483458b234380ffea78122bc4ebcaf4162a50f196f304dc1db66b15cc79edd59ddbcf4f97fe95bc69a3fc7be15181abc37eb708cc5

data/lib/hammer_cli_foreman_discovery/command_extensions/provision_with_puppet.rb

@@ -18,7 +18,7 @@ module HammerCLIForemanDiscovery
         description: _('Puppet environment. Required if host is managed and value is not inherited from host group'),
         deprecation: _("Use %s instead") % '--puppet-environment[-id]',
         deprecated: { '--environment' => _("Use %s instead") % '--puppet-environment[-id]',
-                      '--environment-id' => _("Use %s instead") % '--puppet-environment[-id]'}
+                      '--environment-id' => _("Use %s instead") % '--puppet-environment[-id]' }
       ) do
         parent '--environment-id', 'ENVIRONMENT_ID', _(''),
                format: HammerCLI::Options::Normalizers::Number.new,
@@ -33,7 +33,6 @@ module HammerCLIForemanDiscovery
         parent '--puppet-proxy-id', 'PUPPET_PROXY_ID', _(''),
                format: HammerCLI::Options::Normalizers::Number.new,
                attribute_name: :option_puppet_proxy_id
-
       end
       option_family(
         aliased_resource: 'puppet_ca_proxy'
@@ -41,7 +40,6 @@ module HammerCLIForemanDiscovery
         parent '--puppet-ca-proxy-id', 'PUPPET_CA_PROXY_ID', _(''),
                format: HammerCLI::Options::Normalizers::Number.new,
                attribute_name: :option_puppet_ca_proxy_id
-
       end
 
       request_params do |params, command_object|

data/lib/hammer_cli_foreman_discovery/discovery.rb

@@ -4,11 +4,10 @@ require 'hammer_cli_foreman/fact'
 
 module HammerCLIForemanDiscovery
   def self.exception_handler_class
-       HammerCLIForeman::ExceptionHandler
+    HammerCLIForeman::ExceptionHandler
   end
 
   class DiscoveredHost < HammerCLIForeman::Command
-
     resource :discovered_hosts
 
     class ListCommand < HammerCLIForeman::ListCommand
@@ -38,7 +37,6 @@ module HammerCLIForemanDiscovery
       build_options
     end
 
-
     class FactsCommand < HammerCLIForeman::AssociatedResourceListCommand
       command_name "facts"
       resource :fact_values, :index
@@ -77,8 +75,8 @@ module HammerCLIForemanDiscovery
 
       option "--root-password", "ROOT_PW", " "
       option "--ask-root-password", "ASK_ROOT_PW", " ",
-                  :format => HammerCLI::Options::Normalizers::Bool.new
-      bool_format           = {}
+             :format => HammerCLI::Options::Normalizers::Bool.new
+      bool_format = {}
       bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
       option "--managed", "MANAGED", " ", bool_format
       bool_format[:format] = HammerCLI::Options::Normalizers::Bool.new
@@ -89,14 +87,14 @@ module HammerCLIForemanDiscovery
       option "--overwrite", "OVERWRITE", " ", bool_format
 
       option "--parameters", "PARAMS", _("Host parameters"),
-                  :format => HammerCLI::Options::Normalizers::KeyValueList.new
+             :format => HammerCLI::Options::Normalizers::KeyValueList.new
       option "--interface", "INTERFACE", _("Interface parameters"), :multivalued => true,
-                  :format => HammerCLI::Options::Normalizers::KeyValueList.new
+                                                                    :format => HammerCLI::Options::Normalizers::KeyValueList.new
       option "--provision-method", "METHOD", " ",
-                  :format => HammerCLI::Options::Normalizers::Enum.new(['build', 'image'])
+             :format => HammerCLI::Options::Normalizers::Enum.new(%w[build image])
 
       def ask_password
-        prompt = _("Enter the root password for the host:") + '_'
+        prompt = "#{_('Enter the root password for the host:')}_"
         ask(prompt) { |q| q.echo = false }
       end
 
@@ -119,16 +117,15 @@ module HammerCLIForemanDiscovery
         return {} unless option_parameters
         option_parameters.collect do |key, value|
           if value.is_a? String
-            {"name"=>key, "value"=>value}
+            { "name" => key, "value" => value }
           else
-            {"name"=>key, "value"=>value.inspect}
+            { "name" => key, "value" => value.inspect }
           end
         end
       end
 
-      build_options without: %i[
-        root_pass ptable_id host_parameters_attributes
-        puppet_class_ids environment_id puppet_proxy_id puppet_ca_proxy_id
+      build_options without: [
+        :root_pass, :ptable_id, :host_parameters_attributes, :puppet_class_ids, :environment_id, :puppet_proxy_id, :puppet_ca_proxy_id
       ] do |o|
         # TODO: Until the API is cleaned up
         o.expand.except(:environments)
@@ -180,10 +177,10 @@ module HammerCLIForemanDiscovery
             resource.call(:reboot_all, {})
             print_message _("Rebooting hosts")
             HammerCLI::EX_OK
-          rescue RestClient::UnprocessableEntity => error
-            response = JSON.parse(error.response)
-            response = HammerCLIForeman.record_to_common_format(response) unless response.has_key?('message')
-            output.print_error(response['host_details'].map {|i| i['name'] + ": " + i['error'] }.join("\n"))
+          rescue RestClient::UnprocessableEntity => e
+            response = JSON.parse(e.response)
+            response = HammerCLIForeman.record_to_common_format(response) unless response.key?('message')
+            output.print_error(response['host_details'].map { |i| "#{i['name']}: #{i['error']}" }.join("\n"))
             HammerCLI::EX_DATAERR
           end
         else
@@ -208,5 +205,4 @@ module HammerCLIForemanDiscovery
     end
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_foreman_discovery/discovery_references.rb

@@ -1,5 +1,4 @@
 module HammerCLIForemanDiscovery
-
   module DiscoveryReferences
     def self.hosts(dsl)
       dsl.build do
@@ -9,4 +8,4 @@ module HammerCLIForemanDiscovery
       end
     end
   end
-end
+end

data/lib/hammer_cli_foreman_discovery/discovery_rule.rb

@@ -8,21 +8,17 @@ module HammerCLIForemanDiscovery
   end
 
   module CommonDiscoveryRuleUpdateOptions
-
     def self.included(base)
       base.option "--hosts-limit", "HOSTS_LIMIT", _("Enables to limit maximum amount of provisioned hosts per rule"),
                   :attribute_name => :option_max_count
       base.build_options :without => :max_count
     end
-
   end
 
   class DiscoveryRule < HammerCLIForeman::Command
-
     resource :discovery_rules
 
     class ListCommand < HammerCLIForeman::ListCommand
-
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -37,7 +33,6 @@ module HammerCLIForemanDiscovery
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
-
       output ListCommand.output_definition do
         field :hostname, _('Hostname template')
         HammerCLIForemanDiscovery::DiscoveryReferences.hosts(self)
@@ -70,5 +65,4 @@ module HammerCLIForemanDiscovery
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_foreman_discovery/i18n.rb

@@ -2,9 +2,7 @@ require 'hammer_cli/i18n'
 
 module HammerCLIForemanDiscovery
   module I18n
-
     class LocaleDomain < HammerCLI::I18n::LocaleDomain
-
       def translated_files
         Dir.glob(File.join(File.dirname(__FILE__), '../**/*.rb'))
       end
@@ -17,8 +15,7 @@ module HammerCLIForemanDiscovery
         'hammer_cli_foreman_discovery'
       end
     end
-
   end
 end
 
-HammerCLI::I18n.add_domain(HammerCLIForemanDiscovery::I18n::LocaleDomain.new)
+HammerCLI::I18n.add_domain(HammerCLIForemanDiscovery::I18n::LocaleDomain.new)

data/lib/hammer_cli_foreman_discovery/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanDiscovery
   def self.version
-    @version ||= Gem::Version.new('1.2.0')
+    @version ||= Gem::Version.new('1.3.0')
   end
 end

data/lib/hammer_cli_foreman_discovery.rb

@@ -5,16 +5,13 @@ module HammerCLIForemanDiscovery
     require 'hammer_cli_foreman_discovery/discovery_references'
 
     HammerCLI::MainCommand.lazy_subcommand('discovery', _("Manipulate discovered hosts."),
-                                           'HammerCLIForemanDiscovery::DiscoveredHost', 'hammer_cli_foreman_discovery/discovery'
-    )
+                                           'HammerCLIForemanDiscovery::DiscoveredHost', 'hammer_cli_foreman_discovery/discovery')
 
     HammerCLI::MainCommand.lazy_subcommand('discovery-rule', _("Manipulate discovered rules."),
-                                           'HammerCLIForemanDiscovery::DiscoveryRule', 'hammer_cli_foreman_discovery/discovery_rule'
-    )
-
-  rescue => e
+                                           'HammerCLIForemanDiscovery::DiscoveryRule', 'hammer_cli_foreman_discovery/discovery_rule')
+  rescue StandardError => e
     handler = HammerCLIForeman::ExceptionHandler.new(:context => {}, :adapter => :base)
     handler.handle_exception(e)
-    raise HammerCLI::ModuleLoadingError.new(e)
+    raise HammerCLI::ModuleLoadingError, e
   end
 end

metadata

@@ -1,48 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ohad Levy
 - Ori Rabin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-07 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.10'
 description: 'Contains the code for managing host discovery in foreman(results and
   progress) in the Hammer CLI.
 
-'
+  '
 email:
 - ohadlevy@gmail.com
 executables: []
@@ -98,7 +84,7 @@ homepage: https://github.com/theforeman/hammer-cli-foreman-discovery
 licenses:
 - GPL-3.0-or-later
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,15 +92,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Foreman CLI plugin for managing discovery hosts in foreman
 test_files: []