hammer_cli_katello 1.11.2 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0bb232e9b8a0584ba860f898664e6a36817703793cd4fabe1538c06e899efc
-  data.tar.gz: fbade16a47cee20fa65a9abbcfefb77b8811e0d091547d366bfe8a027531c819
+  metadata.gz: 936408aa397006b59a92dd92461475e03e1ba588790a0a9f50bb136f5f141993
+  data.tar.gz: eb40d197392ffd95dbc19edfaf6b648253c75741c58b223cc65009fbfcc6e3f6
 SHA512:
-  metadata.gz: 6b535f374bfecfa675fe4dad827fc395eae0c013c829b1106b92776f71284cf06db6f5160330fe49e29345939670552b54de67c3ee2d481aa063c436a952d373
-  data.tar.gz: 42efbf0e089b7b1dad5b4d48104a0aa081c9afb731f8e34875262d3f6eabb57b90480ffbb106526a39a6d901d41631635b4f15521bfc54262e84edbf287eb364
+  metadata.gz: 7a2a6f4839415e6e31fe98137e5f0b510a9e8da96dd8c91884818ad141b168d3f3e6b8a87e53dd1eeeda4b265db40f62381709a25298db5985e282513d3de2d1
+  data.tar.gz: 82299345b01f3cd5336d5b74407393aefdf9755c7aefc04cf72581f2bb85b922e71c07e150b896d4f41eca6c83eaec3d3afcfa5c2fb78cba132309d1821c5ea1

data/lib/hammer_cli_katello/capsule.rb

@@ -191,20 +191,34 @@ module HammerCLIKatello
                 field :name, _("Repository Name")
                 label _('Content Counts') do
                   from :_content_counts do
-                    field :warning, _('Warning')
-                    field :rpm, _('Packages')
-                    field :srpm, _('SRPMs')
-                    field :module_stream, _('Module Streams')
-                    field :package_group, _('Package Groups')
-                    field :erratum, _('Errata')
-                    field :deb, _('Debian Packages')
-                    field :docker_tag, _('Container Tags')
-                    field :docker_manifest, _('Container Manifests')
-                    field :docker_manifest_list, _('Container Manifest Lists')
-                    field :file, _('Files')
-                    field :ansible_collection, _('Ansible Collections')
-                    field :ostree_ref, _('OSTree Refs')
-                    field :python_package, _('Python Packages')
+                    field :warning, _('Warning'), Fields::Field,
+                      :hide_blank => true
+                    field :rpm, _('Packages'), Fields::Field,
+                      :hide_blank => true
+                    field :srpm, _('SRPMs'), Fields::Field,
+                      :hide_blank => true
+                    field :module_stream, _('Module Streams'), Fields::Field,
+                      :hide_blank => true
+                    field :package_group, _('Package Groups'), Fields::Field,
+                      :hide_blank => true
+                    field :erratum, _('Errata'), Fields::Field,
+                      :hide_blank => true
+                    field :deb, _('Debian Packages'), Fields::Field,
+                      :hide_blank => true
+                    field :docker_tag, _('Container Tags'), Fields::Field,
+                      :hide_blank => true
+                    field :docker_manifest, _('Container Manifests'), Fields::Field,
+                      :hide_blank => true
+                    field :docker_manifest_list, _('Container Manifest Lists'), Fields::Field,
+                      :hide_blank => true
+                    field :file, _('Files'), Fields::Field,
+                      :hide_blank => true
+                    field :ansible_collection, _('Ansible Collections'), Fields::Field,
+                      :hide_blank => true
+                    field :ostree_ref, _('OSTree Refs'), Fields::Field,
+                      :hide_blank => true
+                    field :python_package, _('Python Packages'), Fields::Field,
+                      :hide_blank => true
                   end
                 end
               end

data/lib/hammer_cli_katello/command_extensions/kickstart_repository.rb

@@ -41,7 +41,7 @@ module HammerCLIKatello
         repos = repo_resource.call(:index, index_options)['results']
         if repos.empty?
           raise _("No such repository with name %{name}, in lifecycle environment"\
-                    " %{environment_id} and content view %{content_view_id}" % index_options)
+                    " %{environment_id} and content view %{content_view_id}") % index_options
         end
         repos.first['id']
       end

data/lib/hammer_cli_katello/content_view.rb

@@ -14,7 +14,7 @@ module HammerCLIKatello
         field :id, _("Content View ID")
         field :name, _("Name")
         field :label, _("Label")
-        field :composite, _("Composite")
+        field :composite, _("Composite"), Fields::Boolean
         field :last_published, _("Last Published"), Fields::Date, :hide_blank => true
         field :repository_ids, _("Repository IDs"), Fields::List, :max_width => 300
       end
@@ -26,33 +26,64 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       include OrganizationOptions
+      # rubocop:disable Layout/LineLength
 
       output do
         field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
-        field :composite, _("Composite")
+        field :composite, _("Composite"), Fields::Boolean
         field :description, _("Description")
         field :content_host_count, _("Content Host Count")
-        field :solve_dependencies, _("Solve Dependencies")
+        field :solve_dependencies, _("Solve Dependencies"), Fields::Boolean
 
         from :organization do
           field :name, _("Organization")
         end
 
-        collection :_yum_repositories, _("Yum Repositories") do
+        collection :_yum_repositories, _("Yum Repositories"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
-        collection :_docker_repositories, _("Container Image Repositories") do
+        collection :_file_repositories, _("File Repositories"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
-        collection :_ostree_repositories, _("OSTree Repositories") do
+        collection :_docker_repositories, _("Container Image Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_ostree_repositories, _("OSTree Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_ansible_collection_repositories, _("Ansible Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_file_repositories, _("File Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_deb_repositories, _("Debian Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_python_repositories, _("Python Repositories"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
@@ -69,18 +100,18 @@ module HammerCLIKatello
           field :published, _("Published"), Fields::Date
         end
 
-        collection :components, _("Components") do
+        collection :components, _("Components"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
         end
 
-        collection :activation_keys, _("Activation Keys") do
+        collection :activation_keys, _("Activation Keys"), hide_blank: true, hide_empty: true do
           custom_field Fields::Reference
         end
       end
 
       def extend_data(data)
-        %w(yum docker ostree).each do |content_type|
+        %w(yum docker ostree file deb ansible_collection python).each do |content_type|
           data["_#{content_type}_repositories"] = data["repositories"].select do |repo|
             repo["content_type"] == content_type
           end
@@ -91,6 +122,7 @@ module HammerCLIKatello
 
       build_options
     end
+    # rubocop:enable Layout/LineLength
 
     class CreateCommand < HammerCLIKatello::CreateCommand
       success_message _("Content view created.")

data/lib/hammer_cli_katello/host_extensions.rb

@@ -26,8 +26,12 @@ module HammerCLIKatello
     ::HammerCLIForeman::Host::ListCommand.instance_eval do
       output do
         from :content_facet_attributes do
-          field :content_view_name, _('Content View')
-          field :lifecycle_environment_name, _('Lifecycle Environment')
+          from :content_view do
+            field :name, _('Content View'), Fields::List
+          end
+          from :lifecycle_environment do
+            field :name, _('Lifecycle environment'), Fields::List
+          end
           from :errata_counts do
             field :security, _("Security"), nil, :sets => ['ALL']
             field :bugfix, _("Bugfix"), nil, :sets => ['ALL']

data/lib/hammer_cli_katello/repository.rb

@@ -116,17 +116,34 @@ module HammerCLIKatello
         field :updated_at, _("Updated"), Fields::Date
 
         label _("Content Counts") do
-          field :package_total, _("Packages"), Fields::Field, :hide_blank => true
-          field :srpm_total, _("Source RPMS"), Fields::Field, :hide_blank => true
-          field :package_group_total, _("Package Groups"), Fields::Field, :hide_blank => true
-          field :errata_total, _("Errata"), Fields::Field, :hide_blank => true
-          field :docker_manifest_list_total, _("Container Image Manifest Lists"),
-                                           Fields::Field, :hide_blank => true
-          field :docker_manifest_total, _("Container Image Manifests"), Fields::Field,
-                                           :hide_blank => true
-          field :docker_tag_total, _("Container Image Tags"), Fields::Field, :hide_blank => true
-          field :file_total, _("Files"), Fields::Field, :hide_blank => true
-          field :module_stream_total, _("Module Streams"), Fields::Field, :hide_blank => true
+          from :content_counts do
+            field :rpm, _('Packages'), Fields::Field,
+              :hide_blank => true
+            field :srpm, _('SRPMs'), Fields::Field,
+              :hide_blank => true
+            field :module_stream, _('Module Streams'), Fields::Field,
+              :hide_blank => true
+            field :package_group, _('Package Groups'), Fields::Field,
+              :hide_blank => true
+            field :erratum, _('Errata'), Fields::Field,
+              :hide_blank => true
+            field :deb, _('Debian Packages'), Fields::Field,
+              :hide_blank => true
+            field :docker_tag, _('Container Tags'), Fields::Field,
+              :hide_blank => true
+            field :docker_manifest, _('Container Manifests'), Fields::Field,
+              :hide_blank => true
+            field :docker_manifest_list, _('Container Manifest Lists'), Fields::Field,
+              :hide_blank => true
+            field :file, _('Files'), Fields::Field,
+              :hide_blank => true
+            field :ansible_collection, _('Ansible Collections'), Fields::Field,
+              :hide_blank => true
+            field :ostree_ref, _('OSTree Refs'), Fields::Field,
+              :hide_blank => true
+            field :python_package, _('Python Packages'), Fields::Field,
+              :hide_blank => true
+          end
         end
       end
 
@@ -554,7 +571,7 @@ module HammerCLIKatello
           upload_results = results.dig('output', 'upload_results') || []
 
           if upload_results.empty?
-            print_message _("Successfully uploaded file %s" % name)
+            print_message _("Successfully uploaded file %s") % name
           else
             upload_results.each do |result|
               if result['type'] == 'docker_manifest'
@@ -562,7 +579,7 @@ module HammerCLIKatello
                   _("Successfully uploaded manifest file '%{name}' with digest '%{digest}'") % {
                     :name => name, :digest => result['digest'] })
               else
-                print_message _("Successfully uploaded file %s" % name)
+                print_message _("Successfully uploaded file %s") % name
               end
             end
           end

data/lib/hammer_cli_katello/subscription.rb

@@ -32,9 +32,9 @@ module HammerCLIKatello
         if !data["virt_only"]
           _("Physical")
         elsif data["host"]
-          _("Guests of %s" % data['host']['name'])
+          _("Guests of %s") % data['host']['name']
         elsif data["hypervisor"]
-          _("Guests of %s" % data['hypervisor']['name'])
+          _("Guests of %s") % data['hypervisor']['name']
         elsif data["unmapper_guest"]
           _("Temporary")
         else

data/lib/hammer_cli_katello/version.rb

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