hammer_cli_katello 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f66bd7ae12181e8cd2afcacc8f4075041ce8c3e1eb54143c2aa101ab05c1d382
-  data.tar.gz: ff5f5beec4477a942ae4f9c6e57fd9093af0521796b1c01263cfbb88b320a192
+  metadata.gz: 7eb373245d3f5729658982b7aefecc00f6fb1637f708ce9d696473d9d351fef7
+  data.tar.gz: 0c783d65abf303cfde9283a7bc464ae4e238402630b9373e1e44e7bf342924b1
 SHA512:
-  metadata.gz: 4ec444e6f8e7673f60223a2c1c65296d7d3b66fa55df4a5eab8718e52be1989db8645e180a4bd95b61780c0850027f027acfdc5d15d7f7afb659dfc2611c040b
-  data.tar.gz: 68caae7795b8cc7d23aff003847ad0e62f0b798d35b819bd3bc5cde27a2963143515771755c92758d5fea9184ada8ca5bbe127e2764b92c89254ed32fb24a8d6
+  metadata.gz: 8316c8d2380d4cfee7b8dd8a25ea3f4ae56924da1741a179eb43a677af6a81397be3c608abeb6528dda6f81839d3c6749e2500d153518a062e643150d58020a0
+  data.tar.gz: 3497638100e1d86f6ef7a758a7bfef2bf06569c76e804b0736f7eaca1e853c7a0d608082749348f5d91677cfc71b7db0f26e548fd641957c97b4fffc73e5c703

data/lib/hammer_cli_katello/capsule.rb

@@ -74,6 +74,18 @@ module HammerCLIKatello
         extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       end
 
+      class ReclaimSpaceCommand < HammerCLIKatello::SingleResourceCommand
+        include HammerCLIForemanTasks::Async
+
+        resource :capsule_content, :reclaim_space
+        command_name "reclaim-space"
+
+        success_message _("Capsule reclaim space has been started in task %{id}.")
+        failure_message _("Capsule reclaim space was unsuccessful.")
+
+        build_options
+      end
+
       class SyncCommand < HammerCLIKatello::SingleResourceCommand
         include HammerCLIForemanTasks::Async
         include LifecycleEnvironmentNameMapping
@@ -93,6 +105,22 @@ module HammerCLIKatello
         extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       end
 
+      class UpdateCountsCommand < HammerCLIKatello::SingleResourceCommand
+        include HammerCLIForemanTasks::Async
+
+        resource :capsule_content, :update_counts
+        command_name "update-counts"
+
+        success_message _("Capsule content counts are being updated in task %{id}.")
+        failure_message _("Could not update capsule content counts")
+
+        option "--organization-id", "ID", _("Organization ID"),
+               :attribute_name => :option_organization_id
+        option "--organization", "NAME", _("Organization name"),
+               :attribute_name => :option_organization_name
+        build_options
+      end
+
       class SyncStatusCommand < HammerCLIKatello::InfoCommand
         resource :capsule_content, :sync_status
         command_name "synchronization-status"
@@ -158,19 +186,57 @@ module HammerCLIKatello
               field nil, _("Name"), Fields::Reference
               field :composite, _('Composite'), Fields::Boolean
               field :last_published, _('Last Published'), Fields::Date
-              label _('Content') do
-                from :counts do
-                  field :content_hosts, _('Hosts')
-                  field :products, _('Products')
-                  field :yum_repositories, _('Yum repos')
-                  field :docker_repositories, _('Container Image repos')
-                  field :packages, _('Packages')
-                  field :package_groups, _('Package groups')
-                  field :errata, _('Errata')
+              collection :repositories, _('Repositories') do
+                field :id, _("Repository ID")
+                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')
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        private
+
+        def extend_data(data)
+          data["lifecycle_environments"].each do |lce|
+            lce["content_views"].each do |cv|
+              cv["repositories"].each do |repo|
+                if cv["up_to_date"]
+                  cvv_count_repos = data.dig("content_counts", "content_view_versions",
+                    cv["cvv_id"].to_s, "repositories")
+                  cvv_count_repos.each do |_repo_id, counts_and_metadata|
+                    if counts_and_metadata.
+                       dig("metadata", "library_instance_id") == repo["library_id"] &&
+                       counts_and_metadata.dig("metadata", "env_id") == lce["id"]
+                      repo["_content_counts"] = counts_and_metadata["counts"]
+                    end
+                  end
+                else
+                  repo["_content_counts"] = {}
+                  repo["_content_counts"]["warning"] =
+                    _("Content view must be synced to see content counts")
                 end
               end
             end
           end
+          data
         end
 
         build_options

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -100,6 +100,7 @@ module HammerCLIKatello
         paths.each do |dir|
           directories = Dir.chdir(dir) { Dir['*'] }
           File.write("#{dir}/listing", directories.join("\n"))
+          File.chmod(0o644, "#{dir}/listing")
         end
       rescue SystemCallError
         output.print_message _("Unable to access/write listing files"\

data/lib/hammer_cli_katello/content_view.rb

@@ -16,7 +16,7 @@ module HammerCLIKatello
         field :label, _("Label")
         field :composite, _("Composite")
         field :last_published, _("Last Published"), Fields::Date, :hide_blank => true
-        field :repository_ids, _("Repository IDs"), Fields::List
+        field :repository_ids, _("Repository IDs"), Fields::List, :max_width => 300
       end
 
       build_options

data/lib/hammer_cli_katello/erratum.rb

@@ -6,6 +6,7 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       extend RepositoryScopedToProduct
+      include LifecycleEnvironmentNameMapping
 
       validate_repo_name_requires_product_options(:option_repository_name)
 
@@ -30,6 +31,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand.including(:products, :organizations, :content_views)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::ErratumInfoCommand

data/lib/hammer_cli_katello/option_sources/lifecycle_environment_params.rb

@@ -25,6 +25,9 @@ module HammerCLIKatello
           result['option_environment_id'] = @command.resolver.lifecycle_environment_id(
             @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :single))
         end
+        if result['option_lifecycle_environment_id'] && result['option_environment_id'].nil?
+          result['option_environment_id'] = result['option_lifecycle_environment_id']
+        end
       end
 
       def legacy_option_ids(result)
@@ -32,6 +35,9 @@ module HammerCLIKatello
           result['option_environment_ids'] = @command.resolver.lifecycle_environment_ids(
             @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :multi))
         end
+        if result['option_lifecycle_environment_ids'] && result['option_environment_ids'].nil?
+          result['option_environment_ids'] = result['option_lifecycle_environment_ids']
+        end
       end
 
       def ensure_option_id(result)

data/lib/hammer_cli_katello/organization.rb

@@ -76,6 +76,9 @@ module HammerCLIKatello
         if params.key?('simple_content_access')
           params["organization"] = params.fetch('organization', {}).merge(
             "_simple_content_access" => params['simple_content_access'])
+          unless params['simple_content_access']
+            warn "Simple Content Access will be required for all organizations in Katello 4.12."
+          end
         end
         params
       end

data/lib/hammer_cli_katello/simple_content_access.rb

@@ -45,6 +45,11 @@ module HammerCLIKatello
       failure_message _("Could not disable Simple Content Access for this organization")
 
       build_options
+
+      def execute
+        warn "Simple Content Access will be required for all organizations in Katello 4.12."
+        super
+      end
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/version.rb

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

data/locale/Makefile

@@ -1,65 +1,6 @@
 #
 # Makefile for PO merging and MO generation. More info in the README.
 #
-# make all-mo (default) - generate MO files
-# make check - check translations using translate-tool
-# make tx-update - download and merge translations from Transifex
-# make clean - clean everything
+# Run make help to list available targets
 #
-DOMAIN = hammer-cli-katello
-VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load("../hammer_cli_katello.gemspec");puts spec.version')
-POTFILE = $(DOMAIN).pot
-MOFILE = $(DOMAIN).mo
-POFILES = $(shell find . -name '*.po')
-MOFILES = $(patsubst %.po,%.mo,$(POFILES))
-POXFILES = $(patsubst %.po,%.pox,$(POFILES))
-
-%.mo: %.po
-	mkdir -p $(shell dirname $@)/LC_MESSAGES
-	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
-
-# Generate MO files from PO files
-all-mo: $(MOFILES)
-
-# Check for malformed strings
-%.pox: %.po
-	msgfmt -c $<
-	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
-		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
-	cat $@
-	! grep -q msgid $@
-
-check: $(POXFILES)
-	msgfmt -c ${POTFILE}
-
-# Merge PO files
-update-po:
-	for f in $(shell find ./ -name "*.po") ; do \
-		msgmerge -N --backup=none -U $$f ${POTFILE} ; \
-	done
-
-# Unify duplicate translations
-uniq-po:
-	for f in $(shell find ./ -name "*.po") ; do \
-		msguniq $$f -o $$f ; \
-	done
-
-tx-pull:
-	tx pull -f
-	for f in $(POFILES) ; do \
-		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
-	done
-	-git commit -a -m "i18n - extracting new, pulling from tx"
-
-extract-strings:
-	bundle exec rake gettext:find
-
-reset-po:
-	# merging po files is unnecessary when using transifex.com
-	git checkout -- ../locale/*/*po
-
-tx-update: tx-pull extract-strings reset-po $(MOFILES)
-	# amend mo files
-	git add ../locale/*/LC_MESSAGES
-	git commit -a --amend -m "i18n - extracting new, pulling from tx"
-	-echo Changes commited!
+include $(shell bundle exec ruby -e 'require "hammer_cli"; puts HammerCLI::I18n.main_makefile')

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

@@ -9,7 +9,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.10.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.11.0.pre.master\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"