hammer_cli_katello 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 259eec49a3c0e1fb35c8ac5333ef563235d500363c6502c3b1cba8b93a011a95
-  data.tar.gz: 982937c903bed8199e89f4e4375c0411dfbd67d36d677104737fab8b44cc2621
+  metadata.gz: a7536aa9077d22fd3ed9c677b0d8c15509ee0076d7aba70dbbc6422be6434a7f
+  data.tar.gz: a0cfb58ff5e1b4fa732e4d57bfb5393a5f145e9a173044597e2f337c6fe545da
 SHA512:
-  metadata.gz: 2e6c290259d07d4b6cf983023d26f2588225b9f3d0e814dde9c64b5cbdae93d76269aa76410014ef2ddcb67d3ac6995918be63be17a68f9251bb94a49a137a29
-  data.tar.gz: bcc0aa004a258b7d3dca182d1a6428cbd09e591fff3c2dea65cd5363f900dbc58b11dd8323197c52543145b39937ecf0bfb69671549fa57eaddc856dc1b50af1
+  metadata.gz: 6a0bd15aa2bc96d97ab6ec79686b38449566a9d7c85dc15a3b3751c873e2a336f05b79e3c3cd147fbf54ffcb54ffec5c187eb087aae3725fd9f89be797a3b432
+  data.tar.gz: bdfa75b6d35e99f0590a7df20e8024b02756b86ec7701455ff8030671a0cd07ca698af12740be55cead555eda6163a32910eae5c1725c91c8175501d37095444

data/lib/hammer_cli_katello/erratum.rb

@@ -22,16 +22,27 @@ module HammerCLIKatello
       validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
+        content_view_options = [:option_content_view_id, :option_content_view_name]
 
-        if option(:option_product_name).exist?
+        if option(:option_product_name).exist? || option(:option_content_view_name).exist?
           any(*organization_options).required
         end
+
+        if option(:option_content_view_version_version).exist?
+          any(*content_view_options).required
+        end
+
+        if any(*content_view_options).exist?
+          any(:option_content_view_version_id,
+              :option_content_view_version_version,
+              :option_environment_id,
+              :option_environment_name).required
+        end
       end
 
       build_options do |o|
         o.expand.including(:products, :organizations, :content_views)
       end
-
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 

data/lib/hammer_cli_katello/id_resolver.rb

@@ -119,6 +119,9 @@ module HammerCLIKatello
     end
 
     # rubocop:disable Style/EmptyElse
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def content_view_version_id(options)
       key_id = HammerCLI.option_accessor_name("id")
       key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
@@ -128,7 +131,16 @@ module HammerCLIKatello
 
       options[key_content_view_id] ||= search_and_rescue(:content_view_id, "content_view", options)
 
+      if options[key_content_view_id] && options['option_environment_name'] &&
+         options['option_environment_id'].nil?
+        lifecycle_environment_resource_name = (HammerCLIForeman.param_to_resource('environment') ||
+         HammerCLIForeman.param_to_resource('lifecycle_environment')).singular_name
+        options['option_environment_id'] = lifecycle_environment_id(
+          scoped_options(lifecycle_environment_resource_name, options, :single))
+      end
+
       results = find_resources(:content_view_versions, options)
+
       options[from_environment_id] ||= from_lifecycle_environment_id(options)
 
       return pick_result(results, @api.resource(:content_view_versions))['id'] if results.size == 1
@@ -145,6 +157,9 @@ module HammerCLIKatello
       end
     end
     # rubocop:enable Style/EmptyElse
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     private
 

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/content_view/component/add_test.rb

@@ -8,7 +8,7 @@ module HammerCLIKatello
       @composite = ::OpenStruct.new(:id => 2, :name => "composite")
       @component_version = ::OpenStruct.new(:id => 666, :version => "1.0")
       @component = ::OpenStruct.new(:id => 6, :name => "component",
-                                  :content_view_version => @component_version)
+                                    :content_view_version => @component_version)
       @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
     end
 

data/test/functional/content_view/component/remove_test.rb

@@ -9,13 +9,13 @@ module HammerCLIKatello
       @component2 = ::OpenStruct.new(:id => 7, :name => "component2")
 
       @content_view_component = ::OpenStruct.new(:id => 1444,
-                                               :content_view => @component)
+                                                 :content_view => @component)
 
       @content_view_component2 = ::OpenStruct.new(:id => 1445,
-                                                :content_view => @component2)
+                                                  :content_view => @component2)
 
       @composite = ::OpenStruct.new(:id => 2, :name => "composite",
-                                  :content_view_components => [@content_view_component])
+                                    :content_view_components => [@content_view_component])
       @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
       @content_view_components = [@content_view_component, @content_view_component2]
     end

data/test/functional/content_view/component/update_test.rb

@@ -7,13 +7,13 @@ module HammerCLIKatello
       @cmd = %w(content-view component update)
       @component_version = ::OpenStruct.new(:id => 666, :version => "1.0")
       @component = ::OpenStruct.new(:id => 6, :name => "component",
-                                  :content_view_version => @component_version)
+                                    :content_view_version => @component_version)
       @content_view_component = ::OpenStruct.new(:id => 1444,
-                                               :content_view => @component,
-                                               :content_view_version => @component_version)
+                                                 :content_view => @component,
+                                                 :content_view_version => @component_version)
 
       @composite = ::OpenStruct.new(:id => 2, :name => "composite",
-                                  :content_view_components => [@content_view_component])
+                                    :content_view_components => [@content_view_component])
       @organization = ::OpenStruct.new(:id => 1, :name => "great", :label => "label")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Adam Price
@@ -34,11 +34,25 @@ authors:
 - Tom McKay
 - Walden Raines
 - Zach Huntington-Meath
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: theforeman-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
   requirement: !ruby/object:Gem::Requirement
@@ -161,199 +175,103 @@ 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/bqi/LC_MESSAGES/hammer-cli-katello.mo
-- locale/bqi/hammer-cli-katello.edit.po
 - locale/bqi/hammer-cli-katello.po
-- locale/bqi/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
@@ -574,7 +492,7 @@ homepage: https://github.com/Katello/hammer-cli-katello
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -592,8 +510,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Katello commands for Hammer
 test_files: