hammer_cli_katello 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM5ZDExYmNkY2MxMDAyMTdjMGUwZTMyZWYyMTQwMmZlOTNjMDQyZQ==
+    ZmI2YjgxNzYzMjZkNWU1OWRjNDk5ZTU3NGFmZDM4OTVjYjk0YjY3Yg==
   data.tar.gz: !binary |-
-    ODYxMzRhMzNmMzQxZjYxOWJkOTY4OWNjYTcxMGRlNzY1OTA3ZTk1MQ==
+    Y2E0ZjJjYTc4YmE0OTc4ZmM5MmYxYTY4Y2Q3OGUxOWM1NWZjYzY1Zg==
 SHA512:
   metadata.gz: !binary |-
-    NjA1ODNmMzZmYzllNjMzNzExYmI1MjhlOTkyOGIyYTJlMWY2MGQzNzRlMGU1
-    OTUzN2ZkMjQ5MjQzYzc0NWI3MTIxYjhiZWMxMDFlZmM0M2ViOTljNTRmNDUw
-    OWViNWI0NmQ3YzJlNmQxYzJlOWYzMjU5ZmY3MGY1MjU1YWZjZmE=
+    YTA2MmJjYWEwZjVhYzMyYzRkZjk0NjkxOWI2MmU1NDE3OTFmYjljYWI5MWE4
+    MTcxZWEwOGFjYzk4YTI4OWZlMDFkYTY0YTZmYzZkZWQyMmVlNzYwYzhkYzk0
+    ZmU3YTQyMTNlZjRjMmZmMWNkYjljZDM3MzIwMTI4ZTI5MjgwNzA=
   data.tar.gz: !binary |-
-    YjZmMDRiMGJiMjQ3OTczY2VlMzBmNmM3YzNjYWExMzUzMDM5MDNmMmM3MmZk
-    MTIyNzAxYjE1NmE2YTQ3YTI2ZjA2MDgyYTE0OWUzZGM5ZDkyZGY5ZGE4MjA5
-    NTNhOGZiYzc5ZTA3ZGZmNzViMmIwMTU0OThmODMyNDI0MTMyN2I=
+    ZWVhMmZjMzRlZjJmYjZmYWFiODY3MzEzMjIzMWMxNWRmODhlOTY3ZmI5ZmUx
+    ODkyODg3MDA5ZmNkNDQ0YjYyODAyZTY3NWRkM2I2ZThlODQ0YWRkZWQ0NzBk
+    NzBkNzIxZTJmMGRmYmZmOTA4MDRiMTMzNzkwYTRjMmM0ZDE2ZjE=

data/lib/hammer_cli_katello.rb

@@ -11,6 +11,10 @@ module HammerCLIKatello
     HammerCLIKatello::ExceptionHandler
   end
 
+  require 'hammer_cli_katello/output/fields'
+  require 'hammer_cli_katello/output/formatters'
+  require 'hammer_cli_katello/lifecycle_environment_name_resolvable'
+  require 'hammer_cli_katello/repository_scoped_to_product'
   require "hammer_cli_katello/commands"
   require "hammer_cli_katello/associating_commands"
   require "hammer_cli_katello/version"
@@ -20,20 +24,82 @@ module HammerCLIKatello
   require 'hammer_cli_katello/id_resolver'
 
   # commands
-  require "hammer_cli_katello/activation_key"
-  require "hammer_cli_katello/gpg_key"
-  require "hammer_cli_katello/lifecycle_environment"
-  require "hammer_cli_katello/organization"
-  require "hammer_cli_katello/ping"
-  require "hammer_cli_katello/product"
-  require "hammer_cli_katello/puppet_module"
-  require "hammer_cli_katello/repository"
-  require "hammer_cli_katello/repository_set"
-  require "hammer_cli_katello/subscription"
-  require "hammer_cli_katello/sync_plan"
-  require "hammer_cli_katello/host_collection"
-  require "hammer_cli_katello/content_host"
-  require "hammer_cli_katello/content_view"
-  require "hammer_cli_katello/capsule"
+  HammerCLI::MainCommand.lazy_subcommand("activation-key", _("Manipulate activation keys."),
+                                         'HammerCLIKatello::ActivationKeyCommand',
+                                         'hammer_cli_katello/activation_key'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand!("organization", _("Manipulate organizations"),
+                                          'HammerCLIKatello::Organization',
+                                          'hammer_cli_katello/organization'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("gpg", _("manipulate GPG Key actions on the server"),
+                                         'HammerCLIKatello::GpgKeyCommand',
+                                         'hammer_cli_katello/gpg_key'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("lifecycle-environment",
+                                         _("manipulate lifecycle_environments on the server"),
+                                         'HammerCLIKatello::LifecycleEnvironmentCommand',
+                                         'hammer_cli_katello/lifecycle_environment'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("ping", _("get the status of the server"),
+                                         'HammerCLIKatello::PingCommand',
+                                         'hammer_cli_katello/ping'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("product", _("Manipulate products."),
+                                         'HammerCLIKatello::Product',
+                                         'hammer_cli_katello/product'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("puppet-module", _("View Puppet Module details."),
+                                         'HammerCLIKatello::PuppetModule',
+                                         'hammer_cli_katello/puppet_module'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("repository", _("Manipulate repositories"),
+                                         'HammerCLIKatello::Repository',
+                                         'hammer_cli_katello/repository'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("repository-set",
+                                         _("manipulate repository sets on the server"),
+                                         'HammerCLIKatello::RepositorySetCommand',
+                                         'hammer_cli_katello/repository_set'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("subscription", _("Manipulate subscriptions."),
+                                         'HammerCLIKatello::SubscriptionCommand',
+                                         'hammer_cli_katello/subscription'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand('sync-plan', _("Manipulate sync plans"),
+                                         'HammerCLIKatello::SyncPlan',
+                                         'hammer_cli_katello/sync_plan'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand('host-collection', _("Manipulate host collections"),
+                                         'HammerCLIKatello::HostCollection',
+                                         'hammer_cli_katello/host_collection'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("content-host",
+                                         _("manipulate content hosts on the server"),
+                                         'HammerCLIKatello::ContentHostCommand',
+                                         'hammer_cli_katello/content_host'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("content-view", _("Manipulate content views."),
+                                         'HammerCLIKatello::ContentView',
+                                         'hammer_cli_katello/content_view'
+  )
+
+  HammerCLI::MainCommand.lazy_subcommand("capsule", _("Manipulate capsule"),
+                                         'HammerCLIKatello::Capsule',
+                                         'hammer_cli_katello/capsule'
+  )
 
 end

data/lib/hammer_cli_katello/activation_key.rb

@@ -2,8 +2,12 @@ module HammerCLIKatello
 
   class ActivationKeyCommand < HammerCLIKatello::Command
     resource :activation_keys
+    class Common
+      INTEGER_FORMAT = /^-?\d+/
+    end
 
     class ListCommand < HammerCLIKatello::ListCommand
+      include LifecycleEnvironmentNameResolvable
       action :index
 
       output do
@@ -22,7 +26,7 @@ module HammerCLIKatello
         data["format_consumed"] = _("%{consumed} of %{limit}") %
           {
             :consumed => data["usage_count"],
-            :limit => data["usage_limit"] == -1 ? _("Unlimited") : data["usage_limit"]
+            :limit => data["unlimited"] ? _("Unlimited") : data["usage_limit"]
           }
         data
       end
@@ -31,8 +35,18 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      include LifecycleEnvironmentNameResolvable
       action :show
 
+      def request_params
+        params = super
+        if options.keys.any? { |o| o.match(/\Aoption_organization.*/) }
+          params['organization_id'] = resolver.organization_id(
+                            resolver.scoped_options('organization', all_options))
+        end
+        params
+      end
+
       output do
         field :name, _("Name")
         field :id, _("ID")
@@ -54,14 +68,24 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include LifecycleEnvironmentNameResolvable
       action :create
       success_message _("Activation key created")
       failure_message _("Could not create the activation key")
 
+      def request_params
+        params = super
+        if params.key?('max_content_hosts') && !params['max_content_hosts'].match(Common::INTEGER_FORMAT)
+          fail ::HammerCLI::Validator::ValidationError, 'Content host limit must be an integer'
+        end
+        params
+      end
+
       build_options
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
+      include LifecycleEnvironmentNameResolvable
       action :update
       success_message _("Activation key updated")
       failure_message _("Could not update the activation key")
@@ -69,6 +93,15 @@ module HammerCLIKatello
       build_options
     end
 
+    class DeleteCommand < HammerCLIKatello::DeleteCommand
+      include LifecycleEnvironmentNameResolvable
+      action :destroy
+      success_message _("Activation key deleted")
+      failure_message _("Could not delete the activation key")
+
+      build_options
+    end
+
     class SubscriptionsCommand < HammerCLIKatello::ListCommand
       resource :subscriptions, :index
       desc _("List associated subscriptions")
@@ -171,6 +204,3 @@ module HammerCLIKatello
   end
 
 end
-
-HammerCLI::MainCommand.subcommand("activation-key", _("Manipulate activation keys."),
-                                  HammerCLIKatello::ActivationKeyCommand)

data/lib/hammer_cli_katello/associating_commands.rb

@@ -5,6 +5,7 @@ module HammerCLIKatello
       extend HammerCLIForeman::AssociatingCommands::CommandExtension
 
       class AddRepositoryCommand < HammerCLIKatello::AddAssociatedCommand
+        include RepositoryScopedToProduct
         command_name 'add-repository'
         associated_resource :repositories
 
@@ -13,6 +14,7 @@ module HammerCLIKatello
       end
 
       class RemoveRepositoryCommand < HammerCLIKatello::RemoveAssociatedCommand
+        include RepositoryScopedToProduct
         command_name 'remove-repository'
         associated_resource :repositories
 
@@ -34,7 +36,7 @@ module HammerCLIKatello
       end
 
       class RemoveHostCollectionCommand < HammerCLIKatello::RemoveAssociatedCommand
-        command_name 'remove-repository'
+        command_name 'remove-host-collection'
         associated_resource :host_collections
 
         success_message _("The host collection has been removed")

data/lib/hammer_cli_katello/capsule.rb

@@ -43,6 +43,10 @@ module HammerCLIKatello
         output do
           field :id, _("ID")
           field :name, _("Name")
+          from :organization do
+            field :name, _("Organization")
+          end
+
         end
 
         build_options
@@ -55,6 +59,10 @@ module HammerCLIKatello
         output do
           field :id, _("ID")
           field :name, _("Name")
+          from :organization do
+            field :name, _("Organization")
+          end
+
         end
 
         build_options
@@ -96,5 +104,4 @@ module HammerCLIKatello
     autoload_subcommands
   end
 
-  HammerCLI::MainCommand.subcommand "capsule", _("Manipulate capsule"), Capsule
 end

data/lib/hammer_cli_katello/commands.rb

@@ -1,5 +1,9 @@
 module HammerCLIKatello
 
+  RESOURCE_NAME_MAPPING = {
+    :system => :content_host
+  }
+
   module ResolverCommons
 
     def self.included(base)
@@ -18,6 +22,10 @@ module HammerCLIKatello
         @searchables
       end
 
+      def resource_name_mapping
+        HammerCLIKatello::RESOURCE_NAME_MAPPING
+      end
+
     end
   end
 
@@ -25,6 +33,10 @@ module HammerCLIKatello
     include HammerCLIKatello::ResolverCommons
   end
 
+  class SingleResourceCommand < HammerCLIForeman::SingleResourceCommand
+    include HammerCLIKatello::ResolverCommons
+  end
+
   class ListCommand < HammerCLIForeman::ListCommand
     include HammerCLIKatello::ResolverCommons
   end

data/lib/hammer_cli_katello/content_host.rb

@@ -1,8 +1,19 @@
+require 'hammer_cli_katello/content_host_package'
+require 'hammer_cli_katello/content_host_package_group'
+require 'hammer_cli_katello/content_host_errata'
+
 module HammerCLIKatello
 
   class ContentHostCommand < HammerCLI::AbstractCommand
+    module IdDescriptionOverridable
+      def self.included(base)
+        base.option "--id", "ID",
+                    _("ID of the content host")
+      end
+    end
 
     class ListCommand < HammerCLIKatello::ListCommand
+      include LifecycleEnvironmentNameResolvable
       resource :systems, :index
 
       output do
@@ -14,11 +25,14 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      include LifecycleEnvironmentNameResolvable
+      include IdDescriptionOverridable
       resource :systems, :show
 
       output do
         field :name, _("Name")
         field :uuid, _("ID")
+        field :katello_agent_installed, _("Katello Agent Installed"), Fields::Boolean
         field :description, _("Description")
         field :location, _("Location")
         from :environment do
@@ -36,6 +50,7 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include LifecycleEnvironmentNameResolvable
       resource :systems, :create
 
       output InfoCommand.output_definition
@@ -50,10 +65,18 @@ module HammerCLIKatello
         end
       end
 
+      validate_options do
+        if any(:option_environment_id, :option_environment_name).exist?
+          any(:option_content_view_name, :option_content_view_id).required
+        end
+      end
+
       build_options :without => [:facts, :type, :installed_products]
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
+      include IdDescriptionOverridable
+      include LifecycleEnvironmentNameResolvable
       resource :systems, :update
 
       success_message _("Content host updated")
@@ -63,6 +86,8 @@ module HammerCLIKatello
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
+      include IdDescriptionOverridable
+      include LifecycleEnvironmentNameResolvable
       resource :systems, :destroy
 
       success_message _("Content host deleted")
@@ -72,6 +97,7 @@ module HammerCLIKatello
     end
 
     class TasksCommand < HammerCLIKatello::ListCommand
+      include IdDescriptionOverridable
       resource :systems, :tasks
 
       command_name "tasks"
@@ -80,11 +106,18 @@ module HammerCLIKatello
     end
 
     autoload_subcommands
-  end
 
-  cmd_name = "content-host"
-  cmd_desc = _("manipulate content hosts on the server")
-  cmd_cls  = HammerCLIKatello::ContentHostCommand
-  HammerCLI::MainCommand.subcommand(cmd_name, cmd_desc, cmd_cls)
+    subcommand "package",
+               HammerCLIKatello::ContentHostPackage.desc,
+               HammerCLIKatello::ContentHostPackage
+
+    subcommand "package-group",
+               HammerCLIKatello::ContentHostPackageGroup.desc,
+               HammerCLIKatello::ContentHostPackageGroup
+
+    subcommand "errata",
+               HammerCLIKatello::ContentHostErrata.desc,
+               HammerCLIKatello::ContentHostErrata
+  end
 
 end

data/lib/hammer_cli_katello/content_host_errata.rb

@@ -0,0 +1,39 @@
+module HammerCLIKatello
+  class ContentHostErrata < HammerCLIKatello::Command
+
+    desc "Manage errata on your content hosts"
+
+    class ApplyCommand < HammerCLIKatello::SingleResourceCommand
+      resource :system_errata, :apply
+      command_name "apply"
+      success_message _("Errata applied successfully")
+      failure_message _("Could not apply errata")
+
+      build_options
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      resource :system_errata, :show
+      command_name "info"
+
+      output do
+        field :title, _("Title")
+        field :version, _("Version")
+        field :description, _("Description")
+        field :status, _("Status")
+        field :id, _("ID")
+        field :errata_id, _("Errata ID")
+        field :reboot_suggested, _("Reboot Suggested")
+        field :updated, _("Updated")
+        field :issued, _("Issued")
+        field :release, _("Release")
+        field :solution, _("Solution")
+        field :packages, _("Packages"), Fields::List
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/content_host_package.rb

@@ -0,0 +1,58 @@
+module HammerCLIKatello
+
+  class ContentHostPackage < HammerCLIKatello::Command
+
+    desc "Manage packages on your content hosts"
+
+    class InstallCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      resource :system_packages, :install
+      command_name "install"
+      success_message "Packages install successfully"
+      failure_message "Could not install packages"
+
+      validate_options do
+        option(:option_packages).required
+      end
+
+      build_options :without => [:groups]
+    end
+
+    class UpgradeCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      resource :system_packages, :upgrade
+      command_name "upgrade"
+      success_message "Packages upgraded successfully"
+      failure_message "Could not upgrade packages"
+
+      build_options
+    end
+
+    class UpgradeAllCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      resource :system_packages, :upgrade_all
+      command_name "upgrade-all"
+      success_message "All packages upgraded successfully"
+      failure_message "Could not upgrade all packages"
+
+      build_options
+    end
+
+    class RemoveCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      resource :system_packages, :remove
+      command_name "remove"
+      success_message "Packages removed successfully"
+      failure_message "Could not remove packages"
+
+      validate_options do
+        option(:option_packages).required
+      end
+
+      build_options :without => [:groups]
+    end
+
+    autoload_subcommands
+  end
+
+end