hammer_cli_katello 0.0.26 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e094dd1b1cbbc1c14a8aa39a773badfd770b499
-  data.tar.gz: e9dd8acdc70caf2175484ca6a73dc743290a30f5
+  metadata.gz: fba3fe5b5ff30bffe68b77824669b9d143c2d7ab
+  data.tar.gz: e6a5a233359eba0135cef5f1d7b45ef48839c9d2
 SHA512:
-  metadata.gz: 271de1290be8859f53ad703779871275f9660ce673e969ac1f3b3f4a2ef9b520be07a33e667c94826cf49e1023fe624fca2607dcb2cdb1ad01a0a5812c0e47ac
-  data.tar.gz: 8a767ae4de73c88592816a683a43c26358d3ba99ded850a6c5ef7a26ac5767520514cec1c6f6963cf9e8568fefe2bdda6345760803de14165061b7c5ed2e446c
+  metadata.gz: efe03d7b7ac938789b3449168a83704b23ff2232db7dac164c6404907ea1f20f5506cd1a96b300059558798d50ba1cfaa155546c5259f805c86c2a177de68a06
+  data.tar.gz: ad45ddc94638fce64c602bee4e3c6c0a14c0216d6d98ec639c5f622d3d253372abcd9d211d0288c55e050a005e2e52752577b38a36d106d890b8fb3f7d47b6fe

data/lib/hammer_cli_katello/activation_key.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class ActivationKeyCommand < HammerCLIKatello::Command
     resource :activation_keys
 
@@ -20,11 +19,13 @@ module HammerCLIKatello
       end
 
       def extend_data(data)
+        limit = data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
+
         data["format_consumed"] = _("%{consumed} of %{limit}") %
-          {
-            :consumed => data["usage_count"],
-            :limit => data["unlimited_hosts"] ? _("Unlimited") : data["max_hosts"]
-          }
+                                  {
+                                    :consumed => data["usage_count"],
+                                    :limit => limit
+                                  }
         data
       end
 
@@ -39,7 +40,8 @@ module HammerCLIKatello
         params = super
         if options.keys.any? { |o| o.match(/\Aoption_organization.*/) }
           params['organization_id'] = resolver.organization_id(
-                            resolver.scoped_options('organization', all_options))
+            resolver.scoped_options('organization', all_options)
+          )
         end
         params
       end
@@ -141,37 +143,16 @@ module HammerCLIKatello
         field :account_number, _("Account")
       end
 
-      def extend_data(data)
-        data["format_consumed"] = _("%{consumed} of %{limit}") %
-          {
-            :consumed => data["consumed"],
-            :limit => data["quantity"] == -1 ? _("Unlimited") : data["quantity"]
-          }
-        data
-      end
-
-      option "--id", "ID", _("ID of activation key"),
-             :attribute_name => :option_activation_key_id
-      option "--name", "NAME", _("Name of activation key"),
-             :attribute_name => :option_activation_key_name
+      option '--id', "ACTIVATION_KEY_ID", _("ID of the activation key"),
+        attribute_name: :option_activation_key_id
+      option '--name', "ACTIVATION_KEY_NAME", _("Activation key name to search by"),
+        attribute_name: :option_activation_key_name
 
       validate_options do
         any(:option_activation_key_id, :option_activation_key_name).required
       end
 
-      build_options do |o|
-        o.expand.only(:organizations)
-        o.without(
-                  :system_id,
-                  :activation_key_id,
-                  :full_results,
-                  :search,
-                  :order,
-                  :sort,
-                  :page,
-                  :per_page
-                 )
-      end
+      build_options
     end
 
     class AddSubscriptionsCommand < HammerCLIKatello::SingleResourceCommand
@@ -225,7 +206,8 @@ module HammerCLIKatello
           field :gpgUrl, _("GPG Key")
           field :label, _("Label")
         end
-        field :override, _("Enabled?")
+        field :enabled, _("Enabled?"), Fields::Boolean
+        field :override, _("Override")
       end
 
       build_options
@@ -266,15 +248,14 @@ module HammerCLIKatello
       build_options do |o|
         o.expand.only(:organizations)
         o.without(
-                  :system_id,
-                  :activation_key_id,
-                  :full_results,
-                  :search,
-                  :order,
-                  :sort,
-                  :page,
-                  :per_page
-                 )
+          :activation_key_id,
+          :full_results,
+          :search,
+          :order,
+          :sort,
+          :page,
+          :per_page
+        )
       end
     end
 
@@ -282,5 +263,4 @@ module HammerCLIKatello
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_katello/associating_commands.rb

@@ -1,6 +1,5 @@
 module HammerCLIKatello
   module AssociatingCommands
-
     module Repository
       module AddProductOptions
         def dependencies
@@ -14,7 +13,7 @@ module HammerCLIKatello
             products = dependencies.find { |r| r.name == :products }
             if products
               option_builder.builders << HammerCLIForeman::DependentSearchablesOptionBuilder.new(
-                                        products, searchables)
+                products, searchables)
             end
           end
         end
@@ -25,6 +24,7 @@ module HammerCLIKatello
       class AddRepositoryCommand < HammerCLIKatello::AddAssociatedCommand
         extend AddProductOptions
         include RepositoryScopedToProduct
+        include OrganizationOptions
         command_name 'add-repository'
         associated_resource :repositories
 
@@ -40,6 +40,7 @@ module HammerCLIKatello
       class RemoveRepositoryCommand < HammerCLIKatello::RemoveAssociatedCommand
         extend AddProductOptions
         include RepositoryScopedToProduct
+        include OrganizationOptions
         command_name 'remove-repository'
         associated_resource :repositories
 
@@ -51,7 +52,6 @@ module HammerCLIKatello
         success_message _("The repository has been removed")
         failure_message _("Could not remove repository")
       end
-
     end
 
     module HostCollection
@@ -72,7 +72,6 @@ module HammerCLIKatello
         success_message _("The host collection has been removed")
         failure_message _("Could not remove host collection")
       end
-
     end
 
     module Host
@@ -93,7 +92,6 @@ module HammerCLIKatello
         success_message _("The host has been removed")
         failure_message _("Could not remove host")
       end
-
     end
   end
 end

data/lib/hammer_cli_katello/capsule.rb

@@ -18,7 +18,6 @@ module HammerCLIKatello
           from :organization do
             field :name, _("Organization")
           end
-
         end
 
         build_options
@@ -34,7 +33,6 @@ module HammerCLIKatello
           from :organization do
             field :name, _("Organization")
           end
-
         end
 
         build_options
@@ -114,7 +112,7 @@ module HammerCLIKatello
           data['_last_failure'] = data["last_failed_sync_tasks"][-1]
 
           data["active_sync_tasks"].each do |task|
-            task['_progress'] =  format_progress(task['progress'])
+            task['_progress'] = format_progress(task['progress'])
           end
           data
         end

data/lib/hammer_cli_katello/commands.rb

@@ -1,17 +1,12 @@
 module HammerCLIKatello
-
-  RESOURCE_NAME_MAPPING = {
-    :system => :content_host
-  }.freeze
+  RESOURCE_NAME_MAPPING = {}.freeze
 
   module ResolverCommons
-
     def self.included(base)
       base.extend(ClassMethods)
     end
 
     module ClassMethods
-
       def resolver
         api = HammerCLI::Connection.get("foreman").api
         HammerCLIKatello::IdResolver.new(api, HammerCLIKatello::Searchables.new)
@@ -25,7 +20,6 @@ module HammerCLIKatello
       def resource_name_mapping
         HammerCLIKatello::RESOURCE_NAME_MAPPING.dup
       end
-
     end
   end
 

data/lib/hammer_cli_katello/content_view.rb

@@ -3,7 +3,6 @@ require 'hammer_cli_katello/filter'
 require 'hammer_cli_katello/content_view_version'
 
 module HammerCLIKatello
-
   class ContentView < HammerCLIKatello::Command
     resource :content_views
 
@@ -14,6 +13,7 @@ module HammerCLIKatello
         field :name, _("Name")
         field :label, _("Label")
         field :composite, _("Composite")
+        field :last_published, _("Last Published"), Fields::Date, :hide_blank => true
         field :repository_ids, _("Repository IDs"), Fields::List
       end
 
@@ -21,6 +21,8 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      include OrganizationOptions
+
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -56,8 +58,6 @@ module HammerCLIKatello
           field :uuid, _("UUID"), Fields::Field, :hide_blank => true
           field :name, _("Name")
           field :author, _("Author")
-          field :created_at, _("Created"), Fields::Date
-          field :updated_at, _("Updated"), Fields::Date
         end
 
         collection :environments, _("Lifecycle Environments") do
@@ -157,6 +157,7 @@ module HammerCLIKatello
 
     class PublishCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
+      include OrganizationOptions
 
       action :publish
       command_name "publish"
@@ -170,6 +171,7 @@ module HammerCLIKatello
     class RemoveFromEnvironmentCommand < HammerCLIKatello::SingleResourceCommand
       include KatelloEnvironmentNameResolvable
       include HammerCLIForemanTasks::Async
+      include OrganizationOptions
 
       action :remove_from_environment
       command_name "remove-from-environment"
@@ -182,6 +184,7 @@ module HammerCLIKatello
 
     class RemoveCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
+      include OrganizationOptions
 
       # command to remove content view environments and versions from a content view.
       # corresponds to the UI screen.

data/lib/hammer_cli_katello/content_view_name_resolvable.rb

@@ -0,0 +1,21 @@
+module HammerCLIKatello
+  module ContentViewNameResolvable
+    def content_view_resolve_options(options)
+      {
+        HammerCLI.option_accessor_name("name") => options['option_content_view_name'],
+        HammerCLI.option_accessor_name("organization_id") => options["option_organization_id"],
+        HammerCLI.option_accessor_name("organization_name") => options["option_organization_name"]
+      }
+    end
+
+    def all_options
+      result = super.clone
+      if result['option_content_view_name'] && result['option_content_view_id'].nil?
+        result['option_content_view_id'] = resolver.content_view_id(
+          content_view_resolve_options(result))
+        @all_options = result
+      end
+      result
+    end
+  end
+end

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -1,12 +1,12 @@
 module HammerCLIKatello
-
   class ContentViewPuppetModule < HammerCLIKatello::Command
-
     resource :content_view_puppet_modules
     command_name 'puppet-module'
     desc 'View and manage puppet modules'
 
     class ListCommand < HammerCLIKatello::ListCommand
+      include OrganizationOptions
+
       output do
         field :uuid, _("UUID")
         field :name, _("Name")
@@ -15,11 +15,11 @@ module HammerCLIKatello
       end
 
       def extend_data(mod)
-        if mod['uuid']
-          mod['version'] = mod['computed_version']
-        else
-          mod['version'] = _("Latest(Currently %s)") % mod['computed_version']
-        end
+        mod['version'] = if mod['uuid']
+                           mod['computed_version']
+                         else
+                           _("Latest(Currently %s)") % mod['computed_version']
+                         end
         mod
       end
 
@@ -27,6 +27,8 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include OrganizationOptions
+
       command_name "add"
 
       success_message _("Puppet module added to content view")
@@ -44,6 +46,8 @@ module HammerCLIKatello
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
+      include OrganizationOptions
+
       command_name "remove"
 
       success_message _("Puppet module removed from content view")

data/lib/hammer_cli_katello/content_view_version.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class ContentViewVersion < HammerCLIKatello::Command
     resource :content_view_versions
     command_name 'version'
@@ -24,6 +23,8 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      resource :content_view_versions, :show
+
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -133,41 +134,41 @@ module HammerCLIKatello
       failure_message _("An error occurred incrementally updating the content view")
 
       option('--lifecycle-environment-ids',
-        'ENVIRONMENT_IDS',
-        _("list of lifecycle environment IDs to update the content view version in"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      )
+             'ENVIRONMENT_IDS',
+             _("list of lifecycle environment IDs to update the content view version in"),
+             :format => HammerCLI::Options::Normalizers::List.new
+            )
 
       option('--lifecycle-environments',
-        'ENVIRONMENTS',
-        _("list of lifecycle environment names to update the content view version in"),
-        :format => HammerCLI::Options::Normalizers::List.new,
-        :attribute_name => :option_lifecycle_environment_names
-      )
+             'ENVIRONMENTS',
+             _("list of lifecycle environment names to update the content view version in"),
+             :format => HammerCLI::Options::Normalizers::List.new,
+             :attribute_name => :option_lifecycle_environment_names
+            )
 
       option('--organization',
-        'ORGANIZATION_NAME',
-        _("Organization name for resolving lifecycle environment names"),
-        :attribute_name => :option_organization_name
-      )
+             'ORGANIZATION_NAME',
+             _("Organization name for resolving lifecycle environment names"),
+             :attribute_name => :option_organization_name
+            )
 
       option('--organization-id',
-        'ORGANIZATION_ID',
-        _("Organization id for resolving lifecycle environment names")
-      )
+             'ORGANIZATION_ID',
+             _("Organization id for resolving lifecycle environment names")
+            )
 
       option('--update-all-hosts',
-        'UPDATE',
-        _('Update all editable and applicable hosts within the specified Content View and \
-          Lifecycle Environments'),
-        :format => HammerCLI::Options::Normalizers::Bool.new
-      )
+             'UPDATE',
+             _('Update all editable and applicable hosts within the specified Content View and \
+               Lifecycle Environments'),
+             :format => HammerCLI::Options::Normalizers::Bool.new
+            )
 
       option('--host-ids',
-        'HOST_IDS',
-        _("IDs of hosts to update"),
-        :format => HammerCLI::Options::Normalizers::List.new
-      )
+             'HOST_IDS',
+             _("IDs of hosts to update"),
+             :format => HammerCLI::Options::Normalizers::List.new
+            )
 
       validate_options do
         organization_options = [:option_organization_id, :option_organization_name]
@@ -191,9 +192,9 @@ module HammerCLIKatello
         ]
 
         if options.key?(HammerCLI.option_accessor_name(:lifecycle_environment_names)) ||
-            options.key?(HammerCLI.option_accessor_name(:lifecycle_environment_ids))
+           options.key?(HammerCLI.option_accessor_name(:lifecycle_environment_ids))
           params[:content_view_version_environments][0][:environment_ids] =
-              resolver.environment_ids(options)
+            resolver.environment_ids(options)
         end
 
         add_content = {}
@@ -210,7 +211,7 @@ module HammerCLIKatello
 
       def request_params_hosts(params)
         if params['update_hosts'] && params['update_hosts']['included'] &&
-             params['update_hosts']['included'].key?('ids')
+           params['update_hosts']['included'].key?('ids')
           params['update_hosts'].delete('excluded')
         else
           params.delete('update_hosts')

data/lib/hammer_cli_katello/erratum.rb

@@ -1,5 +1,4 @@
 module HammerCLIKatello
-
   class ErratumCommand < HammerCLIKatello::Command
     resource :errata
 

data/lib/hammer_cli_katello/exception_handler.rb

@@ -1,7 +1,6 @@
 
 module HammerCLIKatello
   class ExceptionHandler < HammerCLIForeman::ExceptionHandler
-
     def mappings
       super + [
         [RestClient::InternalServerError, :handle_internal_error],
@@ -41,6 +40,5 @@ module HammerCLIKatello
       print_error response["displayMessage"] || response["full_messages"] || response["message"]
       log_full_error e
     end
-
   end
 end

data/lib/hammer_cli_katello/filter.rb

@@ -1,9 +1,7 @@
 require 'hammer_cli_katello/filter_rule'
 
 module HammerCLIKatello
-
   class Filter < HammerCLIKatello::Command
-
     resource :content_view_filters
     command_name 'filter'
     desc 'View and manage filters'
@@ -52,9 +50,20 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include OrganizationOptions
+
       success_message _("Filter created")
       failure_message _("Could not create the filter")
 
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_repository_names).exist? || option(:option_content_view_name).exist?
+          any(*organization_options).required
+        end
+      end
+
       build_options
     end
 
@@ -79,6 +88,5 @@ module HammerCLIKatello
     subcommand HammerCLIKatello::FilterRule.command_name,
                HammerCLIKatello::FilterRule.desc,
                HammerCLIKatello::FilterRule
-
   end
 end

data/lib/hammer_cli_katello/filter_rule.rb

@@ -1,7 +1,5 @@
 module HammerCLIKatello
-
   class FilterRule < HammerCLIKatello::Command
-
     resource :content_view_filter_rules
     command_name 'rule'
     desc 'View and manage filter rules'
@@ -48,6 +46,14 @@ module HammerCLIKatello
       success_message _("Filter rule created")
       failure_message _("Could not create the filter rule")
 
+      option '--names', 'NAMES', _('Package and package group names')
+
+      def all_options
+        options = super
+        options['option_name'] ||= options['option_names'].split(',') if options['option_names']
+        options
+      end
+
       build_options
     end
 

data/lib/hammer_cli_katello/foreman_search_options_creators.rb

@@ -0,0 +1,71 @@
+module HammerCLIKatello
+  module ForemanSearchOptionsCreators
+    def create_environments_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:environments))
+    end
+
+    def create_organizations_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:organizations))
+    end
+
+    def create_smart_proxies_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
+    end
+
+    def create_capsules_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:smart_proxies))
+    end
+
+    def create_hosts_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:hosts))
+    end
+
+    def create_architectures_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:architectures))
+    end
+
+    def create_operatingsystems_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:operatingsystems))
+    end
+
+    def create_domains_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:domains))
+    end
+
+    def create_locations_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:locations))
+    end
+
+    def create_media_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:media))
+    end
+
+    def create_hostgroups_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:hostgroups))
+    end
+
+    def create_ptables_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:ptables))
+    end
+
+    def create_puppet_ca_proxies_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:puppet_ca_proxies))
+    end
+
+    def create_puppet_proxies_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:puppet_proxies))
+    end
+
+    def create_puppetclasses_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:puppetclasses))
+    end
+
+    def create_subnets_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:subnets))
+    end
+
+    def create_realms_search_options(options)
+      create_search_options_without_katello_api(options, api.resource(:realms))
+    end
+  end
+end

data/lib/hammer_cli_katello/gpg_key.rb

@@ -1,11 +1,8 @@
 module HammerCLIKatello
-
   class GpgKeyCommand < HammerCLIForeman::Command
-
     resource :gpg_keys
 
     class ListCommand < HammerCLIKatello::ListCommand
-
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -15,7 +12,6 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-
       output do
         field :id, _("ID")
         field :name, _("Name")
@@ -68,5 +64,4 @@ module HammerCLIKatello
 
     autoload_subcommands
   end
-
 end

data/lib/hammer_cli_katello/host.rb

@@ -1,4 +1,5 @@
 require 'hammer_cli_foreman/host'
+require 'hammer_cli_katello/host_extensions'
 require 'hammer_cli_katello/host_errata'
 require 'hammer_cli_katello/host_subscription'
 require 'hammer_cli_katello/host_package'