hammer_cli_katello 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e72239ee798a8de0f21c8590e82f8bec7b7afa6226a7fca79fa86eb98cac93
-  data.tar.gz: 7422feeb5d60c975d7588bbf85b33893f48b05811f11b462c4999fb50fc818d8
+  metadata.gz: 8033d757d1cbf46a42a4db8c40162c286da7014d9fd3daf40b9b77b50ca6af89
+  data.tar.gz: 6df9fec9fffb51a289ed0feda318fca4886c854e81cd4ac73b712dde710cec6c
 SHA512:
-  metadata.gz: 9977229efb0e161dddda02cd32b59a0721b2165b6f63c16438ad722782d9d9b68d733a21a9ac50c9c39f962c2e35dbac866a6bbd812d48ff9eea6324b9da36f5
-  data.tar.gz: 3dc3a3c27f3574dd96a2136d227456717a43b3e2695e55e58b54e7f37ae1c7f3acf7386b632be94be2c3a3e4cf1a1d5cab0f35636f57c071507450d1fa515803
+  metadata.gz: e8fefa39c3064b3b1b8a6f36957a853cb44ec62d052d3582a8c2aebf26ce145c03f71b36795f3f8a2fae6e4bbd602252a470fdcbf53e191d0b3904e44f36528b
+  data.tar.gz: 0f4189c196c37c55a3bb7829e23e9cace800c970a8bc482628001bbe18ce77399f5ecd8085c23fd66dc96290fb34d6af286321a9b7a7357f32f730c36210217b

data/lib/hammer_cli_katello/activation_key.rb

@@ -7,7 +7,7 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
+
       action :index
 
       output do
@@ -34,11 +34,11 @@ module HammerCLIKatello
       end
 
       build_options
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-      include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
       action :show
 
       def request_params
@@ -83,7 +83,7 @@ module HammerCLIKatello
 
     class CreateCommand < HammerCLIKatello::CreateCommand
       include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
+
       action :create
       success_message _("Activation key created.")
       failure_message _("Could not create the activation key")
@@ -95,11 +95,11 @@ module HammerCLIKatello
       end
 
       build_options
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class CopyCommand < HammerCLIKatello::CreateCommand
-      include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
       action :copy
 
       desc _("Copy an activation key")
@@ -113,7 +113,7 @@ module HammerCLIKatello
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
       include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
+
       action :update
       success_message _("Activation key updated.")
       failure_message _("Could not update the activation key")
@@ -125,11 +125,11 @@ module HammerCLIKatello
       end
 
       build_options
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
-      include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
       action :destroy
       success_message _("Activation key deleted.")
       failure_message _("Could not delete the activation key")

data/lib/hammer_cli_katello/capsule.rb

@@ -39,7 +39,8 @@ module HammerCLIKatello
       end
 
       class AddLifecycleEnvironmentCommand < HammerCLIKatello::Command
-        include LifecycleEnvironmentNameResolvable
+        include LifecycleEnvironmentNameMapping
+
         resource :capsule_content, :add_lifecycle_environment
         command_name 'add-lifecycle-environment'
 
@@ -51,10 +52,13 @@ module HammerCLIKatello
         option "--organization", "NAME", _("Organization name"),
                :attribute_name => :option_organization_name
         build_options
+
+        extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       end
 
       class RemoveLifecycleEnvironmentCommand < HammerCLIKatello::Command
-        include LifecycleEnvironmentNameResolvable
+        include LifecycleEnvironmentNameMapping
+
         resource :capsule_content, :remove_lifecycle_environment
         command_name 'remove-lifecycle-environment'
 
@@ -66,11 +70,14 @@ module HammerCLIKatello
         option "--organization", "NAME", _("Organization name"),
                :attribute_name => :option_organization_name
         build_options
+
+        extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       end
 
       class SyncCommand < HammerCLIKatello::SingleResourceCommand
         include HammerCLIForemanTasks::Async
-        include LifecycleEnvironmentNameResolvable
+        include LifecycleEnvironmentNameMapping
+
         resource :capsule_content, :sync
         command_name "synchronize"
 
@@ -82,6 +89,8 @@ module HammerCLIKatello
         option "--organization", "NAME", _("Organization name"),
                :attribute_name => :option_organization_name
         build_options
+
+        extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       end
 
       class SyncStatusCommand < HammerCLIKatello::InfoCommand

data/lib/hammer_cli_katello/command_extensions/lifecycle_environment.rb

@@ -0,0 +1,23 @@
+module HammerCLIKatello
+  module CommandExtensions
+    class LifecycleEnvironment < HammerCLI::CommandExtensions
+      # Remove when support of --environment options is ended.
+      option '--environment', 'ENVIRONMENT_NAME', _('Lifecycle environment name to search by'),
+             attribute_name: :option_environment_name,
+             deprecated: { '--environment' => _('Use --lifecycle-environment instead') }
+      option '--environment-id', 'ENVIRONMENT_ID', _(''),
+             format: HammerCLI::Options::Normalizers::Number.new,
+             attribute_name: :option_environment_id,
+             deprecated: { '--environment-id' => _('Use --lifecycle-environment-id instead') }
+
+      option_sources do |sources, command|
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdParams',
+          HammerCLIKatello::OptionSources::LifecycleEnvironmentParams.new(command)
+        )
+        sources
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/command_extensions/lifecycle_environments.rb

@@ -0,0 +1,24 @@
+module HammerCLIKatello
+  module CommandExtensions
+    class LifecycleEnvironments < HammerCLI::CommandExtensions
+      # Remove when support of --environments options is ended.
+      option '--environments', 'ENVIRONMENT_NAMES', _(''),
+             format: HammerCLI::Options::Normalizers::List.new,
+             attribute_name: :option_environment_names,
+             deprecated: { '--environments' => _('Use --lifecycle-environments instead') }
+      option '--environment-ids', 'ENVIRONMENT_IDS', _(''),
+             format: HammerCLI::Options::Normalizers::List.new,
+             attribute_name: :option_environment_ids,
+             deprecated: { '--environment-ids' => _('Use --lifecycle-environment-ids instead') }
+
+      option_sources do |sources, command|
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdsParams',
+          HammerCLIKatello::OptionSources::LifecycleEnvironmentParams.new(command)
+        )
+        sources
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/command_extensions.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'hammer_cli_katello/command_extensions/lifecycle_environment'
+require 'hammer_cli_katello/command_extensions/lifecycle_environments'

data/lib/hammer_cli_katello/commands.rb

@@ -1,6 +1,11 @@
 module HammerCLIKatello
   RESOURCE_NAME_MAPPING = {}.freeze
 
+  RESOURCE_ALIAS_NAME_MAPPING = {
+    environment: :lifecycle_environment,
+    environments: :lifecycle_environments
+  }.freeze
+
   def self.api_connection
     if HammerCLI.context[:api_connection]
       HammerCLI.context[:api_connection].get("foreman")

data/lib/hammer_cli_katello/content_view.rb

@@ -10,7 +10,7 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
+
       output do
         field :id, _("Content View ID")
         field :name, _("Name")
@@ -21,6 +21,8 @@ module HammerCLIKatello
       end
 
       build_options
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
@@ -226,7 +228,6 @@ module HammerCLIKatello
 
     class RemoveFromEnvironmentCommand < HammerCLIKatello::SingleResourceCommand
       include LifecycleEnvironmentNameMapping
-      include LifecycleEnvironmentNameResolvable
       include HammerCLIForemanTasks::Async
       include OrganizationOptions
 
@@ -237,6 +238,8 @@ module HammerCLIKatello
       failure_message _("Could not remove the content view from environment")
 
       build_options
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class CVEnvParamsSource < HammerCLI::Options::Sources::Base
@@ -254,6 +257,7 @@ module HammerCLIKatello
     class RemoveCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
       include OrganizationOptions
+      include LifecycleEnvironmentNameMapping
 
       # command to remove content view environments and versions from a content view.
       # corresponds to the UI screen.
@@ -263,7 +267,7 @@ module HammerCLIKatello
       option ["--content-view-version-ids"], "VERSION_IDS",
              _("Version ids to remove"),
             :format => HammerCLI::Options::Normalizers::List.new
-      option ["--environment-ids"], "ENVIRONMENT_IDS",
+      option ["--lifecycle-environment-ids"], "LIFECYCLE_ENVIRONMENT_IDS",
              _("Environment ids to remove"),
             :format => HammerCLI::Options::Normalizers::List.new
 
@@ -289,6 +293,8 @@ module HammerCLIKatello
       failure_message _("Could not remove objects from content view")
 
       build_options
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironments.new)
     end
 
     class AddContentViewVersionCommand < HammerCLIKatello::AddAssociatedCommand

data/lib/hammer_cli_katello/content_view_version.rb

@@ -7,6 +7,8 @@ module HammerCLIKatello
     desc 'View and manage content view versions'
 
     class ListCommand < HammerCLIKatello::ListCommand
+      include LifecycleEnvironmentNameMapping
+
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -22,9 +24,13 @@ module HammerCLIKatello
       build_options do |o|
         o.expand(:all).including(:organizations)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      include LifecycleEnvironmentNameMapping
+
       resource :content_view_versions, :show
 
       output do
@@ -62,6 +68,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand(:all).including(:environments, :content_views, :organizations)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class RepublishRepositoriesCommand < HammerCLIKatello::SingleResourceCommand
@@ -79,6 +87,7 @@ module HammerCLIKatello
 
     class PromoteCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
+      include LifecycleEnvironmentNameMapping
 
       action :promote
       command_name "promote"
@@ -101,6 +110,10 @@ module HammerCLIKatello
              _(["Id of the environment from where to promote its version ",
                 "from (if version is unknown)"].join),
                :attribute_name => :option_from_environment_id
+      option "--environment-ids", "ENVIRONMENT_IDS", _("Identifiers for Lifecycle Environment"),
+            format: HammerCLI::Options::Normalizers::List.new,
+            attribute_name: :option_environment_ids,
+            deprecated: { '--environment-ids' => _('Use --lifecycle-environment-ids instead') }
 
       def environment_search_options
         {
@@ -123,10 +136,15 @@ module HammerCLIKatello
         o.expand(:all).except(:environments).including(:content_views, :organizations)
         o.without(:environment_id)
       end
+
+      extend_with(
+        HammerCLIKatello::CommandExtensions::LifecycleEnvironments.new(only: :option_sources)
+      )
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
       include HammerCLIForemanTasks::Async
+      include LifecycleEnvironmentNameMapping
 
       action :destroy
       command_name "delete"
@@ -137,6 +155,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand(:all).including(:environments, :content_views, :organizations)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class IncrementalUpdate < HammerCLIKatello::Command
@@ -249,6 +269,7 @@ module HammerCLIKatello
 
     class LegacyExportCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
+      include LifecycleEnvironmentNameMapping
       desc _('Export a content view (deprecated)')
 
       action :export
@@ -260,6 +281,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand(:all).including(:environments, :content_views, :organizations)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class ExportCommand < HammerCLIForeman::Command

data/lib/hammer_cli_katello/cv_import_export_helper.rb

@@ -45,7 +45,9 @@ module HammerCLIKatello
 
     def check_repo_download_policy(repositories)
       non_immediate = repositories.select do |repo|
-        show(:repositories, 'id' => repo['library_instance_id'])['download_policy'] != 'immediate'
+        unless repo['library_instance_id'].nil?
+          show(:repositories, 'id' => repo['library_instance_id'])['download_policy'] != 'immediate'
+        end
       end
       unless non_immediate.empty?
         non_immediate_names = repositories.collect { |repo| repo['name'] }

data/lib/hammer_cli_katello/host_extensions.rb

@@ -5,19 +5,16 @@ 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/host_subscription.rb

@@ -16,7 +16,7 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::SingleResourceCommand
-      include LifecycleEnvironmentNameResolvable
+      include LifecycleEnvironmentNameMapping
       include OrganizationOptions
 
       resource :host_subscriptions, :create
@@ -28,6 +28,8 @@ module HammerCLIKatello
         o.expand(:all).except(:products)
         o.without(:facts, :installed_products)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class AddSubscriptions < HammerCLIKatello::SingleResourceCommand

data/lib/hammer_cli_katello/hostgroup_extensions.rb

@@ -1,5 +1,4 @@
 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'
 
@@ -29,7 +28,6 @@ module HammerCLIKatello
   module HostgroupExtensions
     ::HammerCLIForeman::Hostgroup::CreateCommand.instance_eval do
       include HammerCLIKatello::ResolverCommons
-      include HammerCLIKatello::PuppetEnvironmentNameResolvable
       include HammerCLIKatello::ContentViewNameResolvable
       include HammerCLIKatello::QueryOrganizationOptions
       include HammerCLIKatello::HostContentSourceOptions
@@ -38,7 +36,6 @@ module HammerCLIKatello
 
     ::HammerCLIForeman::Hostgroup::UpdateCommand.instance_eval do
       include HammerCLIKatello::ResolverCommons
-      include HammerCLIKatello::PuppetEnvironmentNameResolvable
       include HammerCLIKatello::ContentViewNameResolvable
       include HammerCLIKatello::QueryOrganizationOptions
       include HammerCLIKatello::HostContentSourceOptions

data/lib/hammer_cli_katello/id_resolver.rb

@@ -14,6 +14,7 @@ module HammerCLIKatello
                                  s("repository_id", _("Repository ID"))],
       :gpg =>                   [s_name(_("Gpg key name to search by"))],
       :host_collection =>       [s_name(_("Host collection name to search by"))],
+      :environment =>           [s_name(_("Lifecycle environment name to search by"))],
       :lifecycle_environment => [s_name(_("Lifecycle environment name to search by"))],
       :organization =>          [s_name(_("Organization name to search by")),
                                  s("label", _("Organization label to search by"),
@@ -62,14 +63,14 @@ module HammerCLIKatello
       smart_proxy_id(options)
     end
 
-    def puppet_environment_id(options)
-      get_id(:environments, options)
-    end
-
     def environment_id(options)
       lifecycle_environment_id(options)
     end
 
+    def lifecycle_environment_ids(options)
+      environment_ids(options)
+    end
+
     def environment_ids(options)
       unless options['option_lifecycle_environment_ids'].nil?
         return options['option_lifecycle_environment_ids']

data/lib/hammer_cli_katello/lifecycle_environment_name_mapping.rb

@@ -8,8 +8,13 @@ module HammerCLIKatello
       def resource_name_mapping
         mapping = Command.resource_name_mapping
         mapping[:environment] = :lifecycle_environment
+        mapping[:environments] = :lifecycle_environments
         mapping
       end
+
+      def resource_alias_name_mapping
+        HammerCLIKatello::RESOURCE_ALIAS_NAME_MAPPING
+      end
     end
   end
 end

data/lib/hammer_cli_katello/{lifecycle_environment_name_resolvable.rb → option_sources/lifecycle_environment_params.rb}

@@ -1,6 +1,6 @@
 module HammerCLIKatello
-  module LifecycleEnvironmentNameResolvable
-    class LifecycleEnvironmentParamSource < HammerCLI::Options::Sources::Base
+  module OptionSources
+    class LifecycleEnvironmentParams < HammerCLI::Options::Sources::Base
       def initialize(command)
         @command = command
       end
@@ -10,18 +10,12 @@ module HammerCLIKatello
           result['option_environment_id'] = @command.resolver.lifecycle_environment_id(
             @command.resolver.scoped_options('environment', result, :single))
         end
+        if result['option_environment_names'] && result['option_environment_ids'].nil?
+          result['option_environment_ids'] = @command.resolver.lifecycle_environment_ids(
+            @command.resolver.scoped_options('environment', result, :multi))
+        end
         result
       end
     end
-
-    def option_sources
-      sources = super
-      sources.find_by_name('IdResolution').insert_relative(
-        :after,
-        'IdParams',
-        LifecycleEnvironmentParamSource.new(self)
-      )
-      sources
-    end
   end
 end

data/lib/hammer_cli_katello/option_sources.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require 'hammer_cli_katello/option_sources/lifecycle_environment_params'

data/lib/hammer_cli_katello/repository.rb

@@ -3,6 +3,8 @@ module HammerCLIKatello
     resource :repositories
 
     class ListCommand < HammerCLIKatello::ListCommand
+      include LifecycleEnvironmentNameMapping
+
       output do
         field :id, _("Id")
         field :name, _("Name")
@@ -14,6 +16,8 @@ module HammerCLIKatello
       end
 
       build_options
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     # rubocop:disable ClassLength

data/lib/hammer_cli_katello/version.rb

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

data/lib/hammer_cli_katello.rb

@@ -14,7 +14,8 @@ module HammerCLIKatello
   require 'hammer_cli_katello/output/fields'
   require 'hammer_cli_katello/output/formatters'
   require 'hammer_cli_katello/lifecycle_environment_name_mapping'
-  require 'hammer_cli_katello/lifecycle_environment_name_resolvable'
+  require 'hammer_cli_katello/option_sources'
+  require 'hammer_cli_katello/command_extensions'
   require 'hammer_cli_katello/content_view_name_resolvable'
   require 'hammer_cli_katello/composite_content_view_name_resolvable'
   require 'hammer_cli_katello/organization_options'

data/test/functional/repository/list_test.rb

@@ -59,10 +59,10 @@ ID | NAME | PRODUCT | CONTENT TYPE | URL
 
     ex.returns(empty_response)
 
-    expected_result = success_result("---|------|---------|--------------|----
+    expected_result = CommandExpectation.new("---|------|---------|--------------|----
 ID | NAME | PRODUCT | CONTENT TYPE | URL
 ---|------|---------|--------------|----
-")
+", "Warning: Option --environment is deprecated. Use --lifecycle-environment instead\n")
 
     result = run_cmd(@cmd + params)
     assert_cmd(expected_result, result)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Adam Price
@@ -34,7 +34,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -232,6 +232,9 @@ files:
 - lib/hammer_cli_katello/apipie_helper.rb
 - lib/hammer_cli_katello/associating_commands.rb
 - lib/hammer_cli_katello/capsule.rb
+- lib/hammer_cli_katello/command_extensions.rb
+- lib/hammer_cli_katello/command_extensions/lifecycle_environment.rb
+- lib/hammer_cli_katello/command_extensions/lifecycle_environments.rb
 - lib/hammer_cli_katello/commands.rb
 - lib/hammer_cli_katello/composite_content_view_name_resolvable.rb
 - lib/hammer_cli_katello/content_override.rb
@@ -269,10 +272,11 @@ files:
 - lib/hammer_cli_katello/id_resolver.rb
 - lib/hammer_cli_katello/lifecycle_environment.rb
 - lib/hammer_cli_katello/lifecycle_environment_name_mapping.rb
-- lib/hammer_cli_katello/lifecycle_environment_name_resolvable.rb
 - lib/hammer_cli_katello/local_helper.rb
 - lib/hammer_cli_katello/module_stream.rb
 - lib/hammer_cli_katello/module_stream_profile.rb
+- lib/hammer_cli_katello/option_sources.rb
+- lib/hammer_cli_katello/option_sources/lifecycle_environment_params.rb
 - lib/hammer_cli_katello/organization.rb
 - lib/hammer_cli_katello/organization_options.rb
 - lib/hammer_cli_katello/ostree_branch.rb
@@ -283,7 +287,6 @@ files:
 - lib/hammer_cli_katello/ping.rb
 - lib/hammer_cli_katello/product.rb
 - lib/hammer_cli_katello/product_content.rb
-- lib/hammer_cli_katello/puppet_environment_name_resolvable.rb
 - lib/hammer_cli_katello/puppet_module.rb
 - lib/hammer_cli_katello/repository.rb
 - lib/hammer_cli_katello/repository_scoped_to_product.rb
@@ -486,7 +489,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer

data/lib/hammer_cli_katello/puppet_environment_name_resolvable.rb

@@ -1,27 +0,0 @@
-module HammerCLIKatello
-  module PuppetEnvironmentNameResolvable
-    class PuppetEnvParamSource < HammerCLI::Options::Sources::Base
-      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
-      sources.find_by_name('IdResolution').insert_relative(
-        :after,
-        'IdParams',
-        PuppetEnvParamSource.new(self)
-      )
-      sources
-    end
-  end
-end