hammer_cli_katello 1.17.0 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c92c0dc0ccd350405719c0937686ad4ecbdc36c4c63d22890b93dbced67dae9
-  data.tar.gz: 4009035fd5b20b58c133d53efa6732446aaefc6055b2b134222c494ec4db3fd5
+  metadata.gz: d34c5f35998c691f8932a9cf98aa8aca549580741108f7edb3e35e51c40ec494
+  data.tar.gz: 1e812b2237dd77419855caa60d04b1eb9f578e606337a0981ec41c18e34a2519
 SHA512:
-  metadata.gz: fffa8960428bcd8a2caa609d0eae4e81dd49b05deb848d3e94c0e442066efaef89b0105d23e931e19264d24cd84e42f339ad14d335f02024e81a7e602a00a95e
-  data.tar.gz: a89a857b4727c0232079cad8634a13fe156e5baa204d15bbc2ab85e365245b08dcc900120c4de9709515f717bd506932ea5998fd2eb4e2756f2e4b39d98dbd41
+  metadata.gz: 631c95867137a29663338bf7fc36be6d978d2ebc087dbeea8257f913ab13c1e0dc314fbe4402076c2ee6df58f489e0f09893fa6aa056db97a9c789e78485682a
+  data.tar.gz: 1202367c582d0ffd255896b0f664d54d62800da23d4a47ed8f3dffcb281c050709efe2d8998e3c03d2ac130a1b2f439c20b12a85f690fb428cbeb08e6653f395

data/lib/hammer_cli_katello/content_override.rb

@@ -8,8 +8,25 @@ module HammerCLIKatello
         success_message _("Updated content override.")
         failure_message _("Could not update content override")
 
-        option "--force", "FORCE", _("Force the override. Required for overrides other than 'enabled'"),
-                :attribute_name => :option_force, default: false
+        setup_options
+
+        validate_options do
+          any(:option_remove, :option_value).required
+
+          if option(:option_remove).exist?
+            option(:option_value).rejected
+          elsif option(:option_value).exist?
+            if !@option_values['option_override_name'].casecmp('enabled').zero? &&
+               !option(:option_force).exist?
+              raise ArgumentError, _("You must use --force to set an override other than 'enabled'")
+            end
+            option(:option_remove).rejected
+          end
+        end
+      end
+
+      def self.setup_options
+        option "--force", :flag, _("Force the override. Required for overrides other than 'enabled'")
 
         option "--content-label", "CONTENT_LABEL", _("Label of the content"),
                :attribute_name => :option_content_label, :required => true
@@ -24,20 +41,6 @@ module HammerCLIKatello
                :attribute_name => :option_value, :required => false
 
         option ["--remove"], :flag, _("Remove a content override")
-
-        validate_options do
-          any(:option_remove, :option_value).required
-
-          if option(:option_remove).exist?
-            option(:option_value).rejected
-          elsif option(:option_value).exist?
-            if !@option_values['option_override_name'].casecmp('enabled').zero? &&
-               @option_values['option_force'] == false
-              raise ArgumentError, _("You must use --force to set an override other than 'enabled'")
-            end
-            option(:option_remove).rejected
-          end
-        end
       end
 
       def request_params

data/lib/hammer_cli_katello/host_extensions.rb

@@ -6,6 +6,7 @@ require 'hammer_cli_katello/host_package_group'
 require 'hammer_cli_katello/host_traces'
 require 'hammer_cli_katello/host_bootc'
 
+# rubocop:disable Metrics/ModuleLength
 module HammerCLIKatello
   module HostExtensions
     ::HammerCLIForeman::Host::CreateCommand.instance_eval do
@@ -57,18 +58,34 @@ module HammerCLIKatello
                   _("Content View Environment Labels"), Fields::Field
             collection :content_view_environments, _('Content View Environments') do
               from :content_view do
-                label _("Content view") do
-                  field :id, _("Id")
-                  field :name, _("Name")
-                  field :composite, _("Composite"), Fields::Boolean
-                  field :rolling, _("Rolling"), Fields::Boolean
+                # Deprecated label. To be removed in future versions.
+                label _("Content view"), :sets => ['ALL'] do
+                  field :id, _("Id"), Fields::Field,
+                    :replaced_by => [_('Content Information'), _('Content View Environments'), _('CV Id')].join('/')
+                  field :name, _("Name"), Fields::Field,
+                    :replaced_by => [_('Content Information'), _('Content View Environments'), _('CV Name')].join('/')
+                  field :composite, _("Composite"), Fields::Boolean,
+                    :replaced_by => [_('Content Information'), _('Content View Environments'), _('Composite CV')].join('/')
+                  field :rolling, _("Rolling"), Fields::Boolean,
+                    :replaced_by => [_('Content Information'), _('Content View Environments'), _('Rolling CV')].join('/')
                 end
+
+                field :id, _("CV Id")
+                field :name, _("CV Name")
+                field :composite, _("Composite CV"), Fields::Boolean
+                field :rolling, _("Rolling CV"), Fields::Boolean
               end
               from :lifecycle_environment do
-                label _("Lifecycle environment") do
-                  field :id, _("Id")
-                  field :name, _("Name")
+                # Deprecated label. To be removed in future versions.
+                label _("Lifecycle environment"), :sets => ['ALL'] do
+                  field :id, _("Id"), Fields::Field,
+                    :replaced_by => [_('Content Information'), _('Content View Environments'), _('LE Id')].join('/')
+                  field :name, _("Name"), Fields::Field,
+                    :replaced_by => [_('Content Information'), _('Content View Environments'), _('LE Name')].join('/')
                 end
+
+                field :id, _("LE Id")
+                field :name, _("LE Name")
               end
               field :label, _("Label")
             end
@@ -138,3 +155,4 @@ module HammerCLIKatello
     end
   end
 end
+# rubocop:enable Metrics/ModuleLength

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('1.17.0')
+    @version ||= Gem::Version.new('1.17.2')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.2
 platform: ruby
 authors:
 - Adam Price
@@ -37,7 +37,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-14 00:00:00.000000000 Z
+date: 2025-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -564,7 +564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Katello commands for Hammer