hammer_cli_katello 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84928577a648bc814fc24c6342f4d010a7508b3d
-  data.tar.gz: ae2adcd75d521db7666a29beae26eae2ad4be5f0
+  metadata.gz: c986520c7269bb372ae951449583bb5a9ecdc176
+  data.tar.gz: e907badfbd1b54a1d210de801c1c6109a1725e50
 SHA512:
-  metadata.gz: bdc2df3aa42a7ff7d0cb3b6e5d251b352f79e6625c6fc501603e7c71084b8f0abac791733412c71be5c57662c21a0306deb51cc75d0effa36941ee5fd516a9c2
-  data.tar.gz: dc753d50f16b25912466ca7b66b21b51708aacf22ff90d79e31b69dfb9aca5f52a4511cc22a267bb46c5b6f223dc80d9a516ca1f62e1b71391cdc0b918e66379
+  metadata.gz: 7cf1fa2ba30493f3df29ffb603d799ed22707bc4531984a98435dbc032656fe917e28b8aeecd82c45b6f5e76b456620bd20f1e18c425a5a660add29ac18b00cb
+  data.tar.gz: 51e0bb6f6a08bce5b49f03d0101fa605bba935fc7fdae225685bb421c38a83302d12642f3a62aa0a8936f3c0eb61811e46113c5ad481455d9ec29fb23b8739b2

data/lib/hammer_cli_katello/activation_key.rb

@@ -57,6 +57,8 @@ module HammerCLIKatello
         field :description, _("Description")
         field :format_limit, _("Host Limit")
         field :auto_attach, _("Auto Attach")
+        field :service_level, _("Service Level")
+        field :release_version, _("Release Version")
         from :environment do
           field :name, _("Lifecycle Environment")
         end

data/lib/hammer_cli_katello/host_extensions.rb

@@ -5,16 +5,19 @@ require 'hammer_cli_katello/host_package'
 require 'hammer_cli_katello/host_package_group'
 require 'hammer_cli_katello/host_kickstart_repository_options'
 require 'hammer_cli_katello/host_content_source_options'
+require 'hammer_cli_katello/puppet_environment_name_resolvable'
 
 module HammerCLIKatello
   module HostExtensions
     ::HammerCLIForeman::Host::CreateCommand.instance_eval do
+      include HammerCLIKatello::PuppetEnvironmentNameResolvable
       include HammerCLIKatello::ResolverCommons
       include HammerCLIKatello::HostContentSourceOptions
       include ::HammerCLIKatello::HostKickstartRepositoryOptions
     end
 
     ::HammerCLIForeman::Host::UpdateCommand.instance_eval do
+      include HammerCLIKatello::PuppetEnvironmentNameResolvable
       include HammerCLIKatello::ResolverCommons
       include HammerCLIKatello::HostContentSourceOptions
       include ::HammerCLIKatello::HostKickstartRepositoryOptions

data/lib/hammer_cli_katello/hostgroup_extensions.rb

@@ -1,31 +1,9 @@
 require 'hammer_cli_foreman/hostgroup'
+require 'hammer_cli_katello/puppet_environment_name_resolvable'
 require 'hammer_cli_katello/host_kickstart_repository_options'
 require 'hammer_cli_katello/host_content_source_options'
 
 module HammerCLIKatello
-  module PuppetEnvironmentNameResolvable
-    class PuppetEnvParamSource
-      def initialize(command)
-        @command = command
-      end
-
-      def get_options(_defined_options, result)
-        if result['option_environment_id'].nil? && result['option_environment_name']
-          result['option_environment_id'] = @command.resolver.puppet_environment_id(
-            @command.resolver.scoped_options('environment', result, :single))
-        end
-        result
-      end
-    end
-
-    def option_sources
-      sources = super
-      idx = sources.index { |s| s.class == HammerCLIForeman::OptionSources::IdParams }
-      sources.insert(idx, PuppetEnvParamSource.new(self))
-      sources
-    end
-  end
-
   module QueryOrganizationOptions
     def self.included(base)
       base.option '--query-organization-id', 'ORGANIZATION_ID',

data/lib/hammer_cli_katello/puppet_environment_name_resolvable.rb

@@ -0,0 +1,24 @@
+module HammerCLIKatello
+  module PuppetEnvironmentNameResolvable
+    class PuppetEnvParamSource
+      def initialize(command)
+        @command = command
+      end
+
+      def get_options(_defined_options, result)
+        if result['option_environment_id'].nil? && result['option_environment_name']
+          result['option_environment_id'] = @command.resolver.puppet_environment_id(
+            @command.resolver.scoped_options('environment', result, :single))
+        end
+        result
+      end
+    end
+
+    def option_sources
+      sources = super
+      idx = sources.index { |s| s.class == HammerCLIForeman::OptionSources::IdParams }
+      sources.insert(idx, PuppetEnvParamSource.new(self))
+      sources
+    end
+  end
+end

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -20,8 +20,11 @@ module HammerCLIKatello
       product_id = options[HammerCLI.option_accessor_name("product_id")]
 
       search_options = {}
-      search_options['name'] = name if name
-      search_options['names'] = names if names
+      if names
+        search_options['names'] = names
+      elsif name
+        search_options['name'] = name
+      end
       search_options['product_id'] = product_id if product_id
       search_options
     end

data/lib/hammer_cli_katello/version.rb

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