hammer_cli_katello 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70bd64a3e1a162fa1c50c097a5f6c60cff91f6764a91aa715f575387bc02406c
-  data.tar.gz: 9b75290d2868faa302f15f23022bf310ca7f091ec819da5eba988abb17adda4d
+  metadata.gz: 9299bc667628d32e5cdabeb70fff4b381bd71664bb999abede682076e8b1b82a
+  data.tar.gz: 0b6db8c43b4a4994dd78063760bf57801c14cc1cc88fb727d6fffeb36085ed47
 SHA512:
-  metadata.gz: 0b5ab6e3272b3336bb11ca0b0e200fab63654f90bdafc5c213807fb9928da84e377132a408f826a58b8b58d2d55d9fa5f8b142284ff8f0f310b74b72cfd18ec7
-  data.tar.gz: a114e7f127f3418cadf0a7f9e06a728a6837013eac2245fe4ca49836441486cb7599146a027f22559376fa0ecaf3f44ecd1a5a587f97a9bc0e19b44e62bc8465
+  metadata.gz: 54ebe7f1d033e4d15a965d731947684e13fc52e74aa9838e5e4ed821ea76f724d02a0b8cf67b16198e563b2732b53ef2a75de0c20e4e69809de52b16994475d0
+  data.tar.gz: f53d1b937657cbcc786a868127d29a549a56bab4e76e484d141abd2aac0864b65dc76ca3b4cefb3ccd67ddca12e9f87f4318d537f6cd9f0ca3e0c9d879cea309

data/lib/hammer_cli_katello/content_units.rb

@@ -0,0 +1,66 @@
+module HammerCLIKatello
+  class ContentUnitsCommand < HammerCLIKatello::Command
+    resource :generic_content_units
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      extend RepositoryScopedToProduct
+
+      validate_repo_name_requires_product_options(:option_repository_name)
+
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+        field :version, _("Version")
+        field :filename, _("Filename"), Fields::Field, hide_blank: true
+      end
+
+      validate_options :before, 'IdResolution' do
+        organization_options = [:option_organization_id, :option_organization_name,
+                                :option_organization_label]
+        if any(:option_product_name, :option_content_view_name).exist?
+          any(*organization_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views)
+      end
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+        field :version, _("Version")
+        field :filename, _("Filename"), Fields::Field, hide_blank: true
+      end
+
+      validate_options :before, 'IdResolution' do
+        organization_options = [:option_organization_id, :option_organization_name,
+                                :option_organization_label]
+        product_options = [:option_product_id, :option_product_name]
+        repository_options = [:option_repository_id, :option_repository_name]
+        content_view_version_options = [:option_content_view_version_id,
+                                        :option_content_view_version_version]
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+
+        if option(:option_repository_name).exist?
+          any(*product_options).required
+        end
+
+        if option(:option_name).exist?
+          any(*(repository_options + content_view_version_options)).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views, :content_view_versions)
+      end
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/repository.rb

@@ -110,7 +110,6 @@ module HammerCLIKatello
           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 :ostree_branch_total, _("OSTree Branches"), 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
         end
@@ -159,21 +158,11 @@ module HammerCLIKatello
           data["docker_manifest_list_total"] = content_counts["docker_manifest_list"]
           data["docker_manifest_total"] = content_counts["docker_manifest"]
           data["docker_tag_total"] = content_counts["docker_tag"]
-        when "ostree"
-          setup_ostree(data)
         when "file"
           data["file_total"] = content_counts["file"]
         end
       end
 
-      def setup_ostree(data)
-        content_counts = data["content_counts"]
-        data["ostree_branch_total"] = content_counts["ostree_branch"]
-        if data["ostree_upstream_sync_policy"] == "custom"
-          data["_ostree_upstream_sync_depth"] = data["ostree_upstream_sync_depth"]
-        end
-      end
-
       def get_sync_status(state)
         sync_states = {
           "failed" => _("Failed"), "success" => _("Success"), "finished" => _("Finished"),

data/lib/hammer_cli_katello/version.rb

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

data/lib/hammer_cli_katello.rb

@@ -117,16 +117,16 @@ module HammerCLIKatello
                                          'hammer_cli_katello/erratum'
                                         )
 
-  HammerCLI::MainCommand.lazy_subcommand("ostree-branch", _("Manipulate ostree branches"),
-                                         'HammerCLIKatello::OstreeBranchCommand',
-                                         'hammer_cli_katello/ostree_branch'
-                                        )
-
   HammerCLI::MainCommand.lazy_subcommand("file", _("Manipulate files"),
                                          'HammerCLIKatello::FileCommand',
                                          'hammer_cli_katello/file'
                                         )
 
+  HammerCLI::MainCommand.lazy_subcommand("content-units", _("Manipulate content units"),
+                                         'HammerCLIKatello::ContentUnitsCommand',
+                                         'hammer_cli_katello/content_units'
+                                        )
+
   HammerCLI::MainCommand.lazy_subcommand("content-export",
                                           _("Prepare content for export to a disconnected Katello"),
                                          'HammerCLIKatello::ContentExport',