hammer_cli_katello 1.11.0 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb373245d3f5729658982b7aefecc00f6fb1637f708ce9d696473d9d351fef7
-  data.tar.gz: 0c783d65abf303cfde9283a7bc464ae4e238402630b9373e1e44e7bf342924b1
+  metadata.gz: 2a0bb232e9b8a0584ba860f898664e6a36817703793cd4fabe1538c06e899efc
+  data.tar.gz: fbade16a47cee20fa65a9abbcfefb77b8811e0d091547d366bfe8a027531c819
 SHA512:
-  metadata.gz: 8316c8d2380d4cfee7b8dd8a25ea3f4ae56924da1741a179eb43a677af6a81397be3c608abeb6528dda6f81839d3c6749e2500d153518a062e643150d58020a0
-  data.tar.gz: 3497638100e1d86f6ef7a758a7bfef2bf06569c76e804b0736f7eaca1e853c7a0d608082749348f5d91677cfc71b7db0f26e548fd641957c97b4fffc73e5c703
+  metadata.gz: 6b535f374bfecfa675fe4dad827fc395eae0c013c829b1106b92776f71284cf06db6f5160330fe49e29345939670552b54de67c3ee2d481aa063c436a952d373
+  data.tar.gz: 42efbf0e089b7b1dad5b4d48104a0aa081c9afb731f8e34875262d3f6eabb57b90480ffbb106526a39a6d901d41631635b4f15521bfc54262e84edbf287eb364

data/lib/hammer_cli_katello/capsule.rb

@@ -218,7 +218,7 @@ module HammerCLIKatello
           data["lifecycle_environments"].each do |lce|
             lce["content_views"].each do |cv|
               cv["repositories"].each do |repo|
-                if cv["up_to_date"]
+                if cv["up_to_date"] && !data.dig("content_counts").nil?
                   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|

data/lib/hammer_cli_katello/organization.rb

@@ -77,7 +77,9 @@ module HammerCLIKatello
           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."
+            warn(
+              _("Simple Content Access will be required for all organizations in the next release.")
+            )
           end
         end
         params

data/lib/hammer_cli_katello/simple_content_access.rb

@@ -1,5 +1,7 @@
 module HammerCLIKatello
   class SimpleContentAccess < HammerCLIKatello::Command
+    resource :simple_content_access
+
     desc "Toggle simple content access mode across organization"
 
     module EligibleCheck
@@ -47,7 +49,7 @@ module HammerCLIKatello
       build_options
 
       def execute
-        warn "Simple Content Access will be required for all organizations in Katello 4.12."
+        warn _("Simple Content Access will be required for all organizations in the next release.")
         super
       end
     end

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/capsule/content/data/sync_status_no_counts.json

@@ -0,0 +1,6 @@
+{
+    "last_sync_time": "2016-01-10 00:27:51 +0100",
+    "active_sync_tasks": [],
+    "last_failed_sync_tasks": [],
+    "lifecycle_environments": []
+}

data/test/functional/capsule/content/info_test.rb

@@ -53,6 +53,49 @@ describe 'capsule content info' do
     assert_cmd(expected_result, result)
   end
 
+  it "works with no content counts" do
+    @sync_status = load_json('./data/sync_status_no_counts.json', __FILE__)
+    @sync_status['lifecycle_environments'] = [
+      load_json('./data/library_env.json', __FILE__),
+      load_json('./data/unsynced_env.json', __FILE__)
+    ]
+
+    ex = api_expects(:capsule_content, :sync_status, 'Get sync info') do |par|
+      par['id'] == 3
+    end
+    ex.returns(@sync_status)
+
+    output = OutputMatcher.new([
+      "Lifecycle Environments:",
+      " 1) Name:          Library",
+      "    Organization:  Default Organization",
+      "    Content Views:",
+      "     1) Name:           Zoo View",
+      "        Composite:      no",
+      "        Last Published: 2023/10/09 19:18:15",
+      "        Repositories:",
+      "         1) Repository ID:   2",
+      "            Repository Name: Zoo",
+      "            Content Counts:",
+      "                Warning: Content view must be synced to see content counts",
+      " 2) Name:          Test",
+      "    Organization:  Default Organization",
+      "    Content Views:",
+      "     1) Name:           Zoo View",
+      "        Composite:      no",
+      "        Last Published: 2023/10/09 19:18:15",
+      "        Repositories:",
+      "         1) Repository ID:   2",
+      "            Repository Name: Zoo",
+      "            Content Counts:",
+      "                Warning: Content view must be synced to see content counts"
+    ])
+    expected_result = success_result(output)
+
+    result = run_cmd(@cmd + params)
+    assert_cmd(expected_result, result)
+  end
+
   it "resolves id from name" do
     params = ['--name=capsule1']
 

data/test/functional/content_view/version/republish_repositories_test.rb

@@ -1,4 +1,5 @@
 require_relative '../../test_helper'
+require 'hammer_cli_katello/content_view_version'
 
 module HammerCLIKatello
   describe ContentViewVersion::RepublishRepositoriesCommand do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.2
 platform: ruby
 authors:
 - Adam Price
@@ -37,7 +37,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -288,195 +288,101 @@ files:
 - locale/Makefile
 - locale/README.md
 - locale/bn/LC_MESSAGES/hammer-cli-katello.mo
-- locale/bn/hammer-cli-katello.edit.po
 - locale/bn/hammer-cli-katello.po
-- locale/bn/hammer-cli-katello.po.time_stamp
 - locale/bn_IN/LC_MESSAGES/hammer-cli-katello.mo
-- locale/bn_IN/hammer-cli-katello.edit.po
 - locale/bn_IN/hammer-cli-katello.po
-- locale/bn_IN/hammer-cli-katello.po.time_stamp
 - locale/ca/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ca/hammer-cli-katello.edit.po
 - locale/ca/hammer-cli-katello.po
-- locale/ca/hammer-cli-katello.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/hammer-cli-katello.mo
-- locale/cs_CZ/hammer-cli-katello.edit.po
 - locale/cs_CZ/hammer-cli-katello.po
-- locale/cs_CZ/hammer-cli-katello.po.time_stamp
 - locale/de/LC_MESSAGES/hammer-cli-katello.mo
-- locale/de/hammer-cli-katello.edit.po
 - locale/de/hammer-cli-katello.po
-- locale/de/hammer-cli-katello.po.time_stamp
 - locale/de_AT/LC_MESSAGES/hammer-cli-katello.mo
-- locale/de_AT/hammer-cli-katello.edit.po
 - locale/de_AT/hammer-cli-katello.po
-- locale/de_AT/hammer-cli-katello.po.time_stamp
 - locale/de_DE/LC_MESSAGES/hammer-cli-katello.mo
-- locale/de_DE/hammer-cli-katello.edit.po
 - locale/de_DE/hammer-cli-katello.po
-- locale/de_DE/hammer-cli-katello.po.time_stamp
 - locale/el/LC_MESSAGES/hammer-cli-katello.mo
-- locale/el/hammer-cli-katello.edit.po
 - locale/el/hammer-cli-katello.po
-- locale/el/hammer-cli-katello.po.time_stamp
 - locale/en/LC_MESSAGES/hammer-cli-katello.mo
-- locale/en/hammer-cli-katello.edit.po
 - locale/en/hammer-cli-katello.po
-- locale/en/hammer-cli-katello.po.time_stamp
 - locale/en_GB/LC_MESSAGES/hammer-cli-katello.mo
-- locale/en_GB/hammer-cli-katello.edit.po
 - locale/en_GB/hammer-cli-katello.po
-- locale/en_GB/hammer-cli-katello.po.time_stamp
 - locale/en_US/LC_MESSAGES/hammer-cli-katello.mo
-- locale/en_US/hammer-cli-katello.edit.po
 - locale/en_US/hammer-cli-katello.po
-- locale/en_US/hammer-cli-katello.po.time_stamp
 - locale/es/LC_MESSAGES/hammer-cli-katello.mo
-- locale/es/hammer-cli-katello.edit.po
 - locale/es/hammer-cli-katello.po
-- locale/es/hammer-cli-katello.po.time_stamp
 - locale/et_EE/LC_MESSAGES/hammer-cli-katello.mo
-- locale/et_EE/hammer-cli-katello.edit.po
 - locale/et_EE/hammer-cli-katello.po
-- locale/et_EE/hammer-cli-katello.po.time_stamp
 - locale/fr/LC_MESSAGES/hammer-cli-katello.mo
-- locale/fr/hammer-cli-katello.edit.po
 - locale/fr/hammer-cli-katello.po
-- locale/fr/hammer-cli-katello.po.time_stamp
 - locale/gl/LC_MESSAGES/hammer-cli-katello.mo
-- locale/gl/hammer-cli-katello.edit.po
 - locale/gl/hammer-cli-katello.po
-- locale/gl/hammer-cli-katello.po.time_stamp
 - locale/gu/LC_MESSAGES/hammer-cli-katello.mo
-- locale/gu/hammer-cli-katello.edit.po
 - locale/gu/hammer-cli-katello.po
-- locale/gu/hammer-cli-katello.po.time_stamp
 - locale/hammer-cli-katello.pot
 - locale/he_IL/LC_MESSAGES/hammer-cli-katello.mo
-- locale/he_IL/hammer-cli-katello.edit.po
 - locale/he_IL/hammer-cli-katello.po
-- locale/he_IL/hammer-cli-katello.po.time_stamp
 - locale/hi/LC_MESSAGES/hammer-cli-katello.mo
-- locale/hi/hammer-cli-katello.edit.po
 - locale/hi/hammer-cli-katello.po
-- locale/hi/hammer-cli-katello.po.time_stamp
 - locale/id/LC_MESSAGES/hammer-cli-katello.mo
-- locale/id/hammer-cli-katello.edit.po
 - locale/id/hammer-cli-katello.po
-- locale/id/hammer-cli-katello.po.time_stamp
 - locale/it/LC_MESSAGES/hammer-cli-katello.mo
-- locale/it/hammer-cli-katello.edit.po
 - locale/it/hammer-cli-katello.po
-- locale/it/hammer-cli-katello.po.time_stamp
 - locale/ja/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ja/hammer-cli-katello.edit.po
 - locale/ja/hammer-cli-katello.po
-- locale/ja/hammer-cli-katello.po.time_stamp
 - locale/ka/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ka/hammer-cli-katello.edit.po
 - locale/ka/hammer-cli-katello.po
-- locale/ka/hammer-cli-katello.po.time_stamp
 - locale/kn/LC_MESSAGES/hammer-cli-katello.mo
-- locale/kn/hammer-cli-katello.edit.po
 - locale/kn/hammer-cli-katello.po
-- locale/kn/hammer-cli-katello.po.time_stamp
 - locale/ko/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ko/hammer-cli-katello.edit.po
 - locale/ko/hammer-cli-katello.po
-- locale/ko/hammer-cli-katello.po.time_stamp
 - locale/ml_IN/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ml_IN/hammer-cli-katello.edit.po
 - locale/ml_IN/hammer-cli-katello.po
-- locale/ml_IN/hammer-cli-katello.po.time_stamp
 - locale/mr/LC_MESSAGES/hammer-cli-katello.mo
-- locale/mr/hammer-cli-katello.edit.po
 - locale/mr/hammer-cli-katello.po
-- locale/mr/hammer-cli-katello.po.time_stamp
 - locale/nl_NL/LC_MESSAGES/hammer-cli-katello.mo
-- locale/nl_NL/hammer-cli-katello.edit.po
 - locale/nl_NL/hammer-cli-katello.po
-- locale/nl_NL/hammer-cli-katello.po.time_stamp
 - locale/or/LC_MESSAGES/hammer-cli-katello.mo
-- locale/or/hammer-cli-katello.edit.po
 - locale/or/hammer-cli-katello.po
-- locale/or/hammer-cli-katello.po.time_stamp
 - locale/pa/LC_MESSAGES/hammer-cli-katello.mo
-- locale/pa/hammer-cli-katello.edit.po
 - locale/pa/hammer-cli-katello.po
-- locale/pa/hammer-cli-katello.po.time_stamp
 - locale/pl/LC_MESSAGES/hammer-cli-katello.mo
-- locale/pl/hammer-cli-katello.edit.po
 - locale/pl/hammer-cli-katello.po
-- locale/pl/hammer-cli-katello.po.time_stamp
 - locale/pl_PL/LC_MESSAGES/hammer-cli-katello.mo
-- locale/pl_PL/hammer-cli-katello.edit.po
 - locale/pl_PL/hammer-cli-katello.po
-- locale/pl_PL/hammer-cli-katello.po.time_stamp
 - locale/pt/LC_MESSAGES/hammer-cli-katello.mo
-- locale/pt/hammer-cli-katello.edit.po
 - locale/pt/hammer-cli-katello.po
-- locale/pt/hammer-cli-katello.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/hammer-cli-katello.mo
-- locale/pt_BR/hammer-cli-katello.edit.po
 - locale/pt_BR/hammer-cli-katello.po
-- locale/pt_BR/hammer-cli-katello.po.time_stamp
 - locale/ro/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ro/hammer-cli-katello.edit.po
 - locale/ro/hammer-cli-katello.po
-- locale/ro/hammer-cli-katello.po.time_stamp
 - locale/ro_RO/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ro_RO/hammer-cli-katello.edit.po
 - locale/ro_RO/hammer-cli-katello.po
-- locale/ro_RO/hammer-cli-katello.po.time_stamp
 - locale/ru/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ru/hammer-cli-katello.edit.po
 - locale/ru/hammer-cli-katello.po
-- locale/ru/hammer-cli-katello.po.time_stamp
 - locale/sl/LC_MESSAGES/hammer-cli-katello.mo
-- locale/sl/hammer-cli-katello.edit.po
 - locale/sl/hammer-cli-katello.po
-- locale/sl/hammer-cli-katello.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/hammer-cli-katello.mo
-- locale/sv_SE/hammer-cli-katello.edit.po
 - locale/sv_SE/hammer-cli-katello.po
-- locale/sv_SE/hammer-cli-katello.po.time_stamp
 - locale/ta/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ta/hammer-cli-katello.edit.po
 - locale/ta/hammer-cli-katello.po
-- locale/ta/hammer-cli-katello.po.time_stamp
 - locale/ta_IN/LC_MESSAGES/hammer-cli-katello.mo
-- locale/ta_IN/hammer-cli-katello.edit.po
 - locale/ta_IN/hammer-cli-katello.po
-- locale/ta_IN/hammer-cli-katello.po.time_stamp
 - locale/te/LC_MESSAGES/hammer-cli-katello.mo
-- locale/te/hammer-cli-katello.edit.po
 - locale/te/hammer-cli-katello.po
-- locale/te/hammer-cli-katello.po.time_stamp
 - locale/tr/LC_MESSAGES/hammer-cli-katello.mo
-- locale/tr/hammer-cli-katello.edit.po
 - locale/tr/hammer-cli-katello.po
-- locale/tr/hammer-cli-katello.po.time_stamp
 - locale/vi/LC_MESSAGES/hammer-cli-katello.mo
-- locale/vi/hammer-cli-katello.edit.po
 - locale/vi/hammer-cli-katello.po
-- locale/vi/hammer-cli-katello.po.time_stamp
 - locale/vi_VN/LC_MESSAGES/hammer-cli-katello.mo
-- locale/vi_VN/hammer-cli-katello.edit.po
 - locale/vi_VN/hammer-cli-katello.po
-- locale/vi_VN/hammer-cli-katello.po.time_stamp
 - locale/zanata.xml
 - locale/zh/LC_MESSAGES/hammer-cli-katello.mo
-- locale/zh/hammer-cli-katello.edit.po
 - locale/zh/hammer-cli-katello.po
-- locale/zh/hammer-cli-katello.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/hammer-cli-katello.mo
-- locale/zh_CN/hammer-cli-katello.edit.po
 - locale/zh_CN/hammer-cli-katello.po
-- locale/zh_CN/hammer-cli-katello.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/hammer-cli-katello.mo
-- locale/zh_TW/hammer-cli-katello.edit.po
 - locale/zh_TW/hammer-cli-katello.po
-- locale/zh_TW/hammer-cli-katello.po.time_stamp
 - test/data/2.5/foreman_api.json
 - test/data/3.0/foreman_api.json
 - test/data/3.10/foreman_api.json
@@ -529,6 +435,7 @@ files:
 - test/functional/capsule/content/capsule_content_helpers.rb
 - test/functional/capsule/content/data/library_env.json
 - test/functional/capsule/content/data/sync_status.json
+- test/functional/capsule/content/data/sync_status_no_counts.json
 - test/functional/capsule/content/data/sync_tasks.json
 - test/functional/capsule/content/data/unsynced_env.json
 - test/functional/capsule/content/info_test.rb
@@ -769,6 +676,7 @@ test_files:
 - test/functional/capsule/content/capsule_content_helpers.rb
 - test/functional/capsule/content/data/library_env.json
 - test/functional/capsule/content/data/sync_status.json
+- test/functional/capsule/content/data/sync_status_no_counts.json
 - test/functional/capsule/content/data/sync_tasks.json
 - test/functional/capsule/content/data/unsynced_env.json
 - test/functional/capsule/content/info_test.rb