hammer_cli_katello 1.14.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6e319fe25bff57a7bae9c94ba1aa6cc3f2a13674d313ef2ad20116831fa5d50
-  data.tar.gz: 14a3d6086f7fd84a8ee2fa805543bc376effef850413fc690fa7418b244c6878
+  metadata.gz: 8c45f78c5e8f631fe4366e062424c4069c55f4a7966dade28026f4b5548a83fd
+  data.tar.gz: d1b4b4f427de3387d5ed5233e72cbef46f00a0e315b8cd4841883f295429f469
 SHA512:
-  metadata.gz: 5c2f24254cd13da70e70eb61b3b8b71a554d6b4dbf5e1a189f7bb0b33bd8ef701c97dbc904713c82b85bf9a7290670a9698200ce1bcfbc978d1f13919bcfb9a1
-  data.tar.gz: 6df727e51a28c870123c4b7335280d8e2c550e1978c387308a9aa17a0985e376c7e48a6753bbe7a85d27ae5602634b89a2ff2ae260534783af526a0fc0acb6b1
+  metadata.gz: 89d992cc75c1dcb9b69bfde9dbed0f43cf2f61a5825ea9b5edbcc6333bd0fc95cf586da3f22afd489592268eb66f2f516394a1becb4d00c6061829cee3c7b2ad
+  data.tar.gz: 03ac2450254c0848b6d99f75a11c2ccd5d06e86249ac843715df5b29dfa60d1f1a182f71c0abf10ea06f399ada365999d0025a7f7c27114899dd9ae6f29120bc

data/lib/hammer_cli_katello/activation_key.rb

@@ -14,12 +14,9 @@ module HammerCLIKatello
         field :id, _("Id")
         field :name, _("Name")
         field :format_consumed, _("Host Limit")
-        from :environment do
-          field :name, _("Lifecycle Environment")
-        end
-        from :content_view do
-          field :name, _("Content View")
-        end
+        field :content_view_environment_labels, _("Content View Environments"),
+                                              Fields::List, :max_width => 300
+        field :multi_content_view_environment, _("Multi Content View Environment"), Fields::Boolean
       end
 
       def extend_data(data)
@@ -56,41 +53,63 @@ module HammerCLIKatello
         field :id, _("Id")
         field :description, _("Description"), Fields::Field, :hide_blank => true
         field :format_consumed, _("Host Limit")
-        field :auto_attach, _("Auto Attach")
+        field :multi_content_view_environment, _("Multi Content View Environment"), Fields::Boolean
         field :release_version, _("Release Version"), Fields::Field, :hide_blank => true
+        field :content_view_environment_labels, _("Content View Environment Labels"), Fields::Field
 
-        from :environment do
-          field :name, _("Lifecycle Environment")
+        collection :organization, _("Organization") do
+          field :id, _("Id"), Fields::Field, :hide_blank => true
+          field :name, _("Name"), Fields::Field, :hide_blank => true
         end
-        from :content_view do
-          field :name, _("Content View")
+
+        collection :content_view_environments, _('Content View Environments') do
+          from :content_view do
+            label _("Content View") do
+              field :id, _("Id")
+              field :name, _("Name")
+              field :content_view_version, _("Version")
+              field :content_view_version_id, _("Content View version Id")
+              field :composite, _("Composite"), Fields::Boolean
+              field :content_view_environment_id, _("Content View Environment id"), Fields::Field
+            end
+          end
+          from :lifecycle_environment do
+            label _("Lifecycle environment") do
+              field :id, _("Id")
+              field :name, _("Name")
+            end
+          end
+          field :label, _("Label")
         end
 
-        collection :hosts, _("Associated Hosts") do
-          field :id, _('Id')
-          field :name, _("Name")
+        collection :hosts, _("Associated Hosts"), hide_blank: true, hide_empty: true do
+          field :id, _('Id'), Fields::Field, :hide_blank => true
+          field :name, _("Name"), Fields::Field, :hide_blank => true
         end
 
-        collection :host_collections, _("Host Collections") do
-          field :id, _("Id")
-          field :name, _("Name")
+        collection :host_collections, _("Host Collections"), hide_blank: true, hide_empty: true do
+          field :id, _("Id"), Fields::Field, :hide_blank => true
+          field :name, _("Name"), Fields::Field, :hide_blank => true
         end
 
-        collection :content_overrides, _("Content Overrides") do
-          field :content_label, _("Content Label")
-          field :name, _("Name")
-          field :value, _("Value")
+        collection :content_overrides, _("Content Overrides"), hide_blank: true, hide_empty: true do
+          field :content_label, _("Content Label"), Fields::Field, :hide_blank => true
+          field :name, _("Name"), Fields::Field, :hide_blank => true
+          field :value, _("Value"), Fields::Field, :hide_blank => true
         end
 
-        label _("System Purpose") do
-          field :service_level, _('Service Level')
-          field :purpose_usage, _('Purpose Usage')
-          field :purpose_role, _('Purpose Role')
-          field :purpose_addons, _('Purpose Addons'), Fields::List
+        label _("System Purpose"), hide_blank: true, hide_empty: true do
+          field :service_level, _('Service Level'), Fields::Field, :hide_blank => true
+          field :purpose_usage, _('Purpose Usage'), Fields::Field, :hide_blank => true
+          field :purpose_role, _('Purpose Role'), Fields::Field, :hide_blank => true
+          field :purpose_addons, _('Purpose Addons'), Fields::List, :hide_blank => true
         end
       end
 
       def extend_data(data)
+        # rubocop:disable Layout/LineLength
+        # Hack to hide purpose addons if it's not set since it's not possible to hide the Fields::List values
+        data["purpose_addons"].length.positive? ? data["purpose_addons"] = data["purpose_addons"] : data["purpose_addons"] = nil
         limit = data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
 
         data["format_consumed"] = _("%{consumed} of %{limit}") %
@@ -99,6 +118,7 @@ module HammerCLIKatello
                                     :limit => limit
                                   }
         data
+        # rubocop:enable Layout/LineLength
       end
 
       build_options

data/lib/hammer_cli_katello/content_view_environment.rb

@@ -0,0 +1,28 @@
+module HammerCLIKatello
+  class ContentViewEnvironment < HammerCLIKatello::Command
+    resource :content_view_environments
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      output do
+        field :id, _("Id")
+        field :label, _("Label")
+        from :lifecycle_environment do
+          field :name, _("Lifecycle Environment")
+        end
+        from :content_view do
+          field :name, _("Content View")
+        end
+        field :default, _("Default")
+        field :hosts_count, _("Hosts Count")
+        field :activation_keys_count, _("Activation Keys Count")
+        from :organization do
+          field :name, _("Organization")
+        end
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/foreman_search_options_creators.rb

@@ -28,6 +28,10 @@ module HammerCLIKatello
       create_search_options_without_katello_api(options, api.resource(:operatingsystems), mode)
     end
 
+    def create_debs_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:debs), mode)
+    end
+
     def create_domains_search_options(options, mode = nil)
       create_search_options_without_katello_api(options, api.resource(:domains), mode)
     end

data/lib/hammer_cli_katello/host_extensions.rb

@@ -26,12 +26,10 @@ module HammerCLIKatello
     ::HammerCLIForeman::Host::ListCommand.instance_eval do
       output do
         from :content_facet_attributes do
-          from :content_view do
-            field :name, _('Content View'), Fields::List
-          end
-          from :lifecycle_environment do
-            field :name, _('Lifecycle environment'), Fields::List
-          end
+          field :content_view_environment_labels, _("Content View Environments"),
+                                              Fields::List, :max_width => 300
+          field :multi_content_view_environment,
+                _("Multi Content View Environment"), Fields::Boolean
           from :errata_counts do
             field :security, _("Security"), nil, :sets => ['ALL']
             field :bugfix, _("Bugfix"), nil, :sets => ['ALL']
@@ -46,7 +44,9 @@ module HammerCLIKatello
       output do
         label _('Content Information') do
           from :content_facet_attributes do
-            collection :content_view_environments, _('Content view environments') do
+            field :content_view_environment_labels,
+                  _("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")
@@ -60,6 +60,7 @@ module HammerCLIKatello
                   field :name, _("Name")
                 end
               end
+              field :label, _("Label")
             end
 
             label _("Content Source") do

data/lib/hammer_cli_katello/version.rb

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

data/lib/hammer_cli_katello.rb

@@ -60,6 +60,12 @@ module HammerCLIKatello
                                          'hammer_cli_katello/lifecycle_environment'
                                         )
 
+  HammerCLI::MainCommand.lazy_subcommand("content-view-environment",
+                                         _("Manipulate content view environments"),
+                                         'HammerCLIKatello::ContentViewEnvironment',
+                                         'hammer_cli_katello/content_view_environment'
+                                        )
+
   HammerCLI::MainCommand.lazy_subcommand("product", _("Manipulate products"),
                                          'HammerCLIKatello::Product',
                                          'hammer_cli_katello/product'

data/locale/bn/hammer-cli-katello.po

@@ -9,7 +9,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/bn_IN/hammer-cli-katello.po

@@ -9,7 +9,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/bqi/hammer-cli-katello.po

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/ca/hammer-cli-katello.po

@@ -9,7 +9,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/cs_CZ/hammer-cli-katello.po

@@ -10,7 +10,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/de/hammer-cli-katello.po

@@ -23,7 +23,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/de_AT/hammer-cli-katello.po

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/de_DE/hammer-cli-katello.po

@@ -11,7 +11,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/el/hammer-cli-katello.po

@@ -9,7 +9,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/en/hammer-cli-katello.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2023-07-12 17:04+0000\n"

data/locale/en_GB/hammer-cli-katello.po

@@ -5,16 +5,16 @@
 #
 # Translators:
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2022
-# Andi Chandler <andi@gowling.com>, 2023
+# Andi Chandler <andi@gowling.com>, 2024
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>, 2023\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>, 2024\n"
 "Language-Team: English (United Kingdom) (https://app.transifex.com/foreman/"
 "teams/114/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -192,7 +192,7 @@ msgid "Content View"
 msgstr ""
 
 msgid "Unlimited"
-msgstr ""
+msgstr "Unlimited"
 
 msgid "%{consumed} of %{limit}"
 msgstr ""
@@ -390,7 +390,7 @@ msgid "Currently running sync tasks"
 msgstr ""
 
 msgid "Task id"
-msgstr ""
+msgstr "Task id"
 
 msgid "Progress"
 msgstr ""
@@ -1029,7 +1029,7 @@ msgid "Downloaded"
 msgstr ""
 
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 msgid "Manage docker tags"
 msgstr ""
@@ -1050,7 +1050,7 @@ msgid "Errata ID"
 msgstr ""
 
 msgid "Title"
-msgstr ""
+msgstr "Title"
 
 msgid "Issued"
 msgstr ""
@@ -1627,7 +1627,7 @@ msgid "Relative Path"
 msgstr ""
 
 msgid "Summary"
-msgstr ""
+msgstr "Summary"
 
 msgid "Url"
 msgstr ""

data/locale/en_US/hammer-cli-katello.po

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/es/hammer-cli-katello.po

@@ -17,7 +17,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"

data/locale/et_EE/hammer-cli-katello.po

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.13.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.15.0.pre.main\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"