hammer_cli_katello 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7777a95f65993c11aafcdf3e93bd4e62e05a71c
-  data.tar.gz: 10751c77ff38e730bd28edf8a393387ae5ac4551
+  metadata.gz: 8ee67377eb8631f27bc3ac6fb8893aa4f3e19cd6
+  data.tar.gz: 3aa751e158e61a5e65854d7423c280ff9be55493
 SHA512:
-  metadata.gz: 483606e3bfe638f29d98185eb2dc38f2a0704f3e16de14cc4e89aff942f1ad8ea7f5fd60a7939ea17a91a57b56449e3dd3618c9e2e009b92d048dc8774872342
-  data.tar.gz: b043a18647859bba0dadfa79103085f23a3de85a2fb332cff57b082ed20efd3b1b86a69b705148110f0028d7b682dade57ef6fce691b27c681b147831b15be18
+  metadata.gz: 8af86a66650da765757af0c2ea262f08bbdeadfd27f88e5bb8dcac35f9318f7badfd7885bb0d844010d860bf636de433ffd032402de81e3774d635e4b6f86d76
+  data.tar.gz: b7db6c9f52337875421b12022cb1a2ea4dddfce2e88707c5035636395cfa8cfbe70ad1ef71430d2bf0dc6446e0cd22cfaf5eacfba16e6d58ec903125a80d78c5

data/lib/hammer_cli_katello.rb

@@ -25,6 +25,7 @@ module HammerCLIKatello
   require "hammer_cli_katello/version"
   require 'hammer_cli_katello/id_resolver'
   require 'hammer_cli_katello/capsule'
+  require 'hammer_cli_katello/id_name_options_validator'
 
   # commands
   HammerCLI::MainCommand.lazy_subcommand("activation-key", _("Manipulate activation keys."),

data/lib/hammer_cli_katello/content_view.rb

@@ -207,7 +207,7 @@ module HammerCLIKatello
       success_message _("Content view objects are being removed task %{id}")
       failure_message _("Could not remove objects from content view")
 
-      build_options :without => %w(content_view_version_ids  environment_ids)
+      build_options :without => %w(content_view_version_ids environment_ids)
     end
 
     class AddContentViewVersionCommand < HammerCLIKatello::AddAssociatedCommand

data/lib/hammer_cli_katello/filter.rb

@@ -7,6 +7,9 @@ module HammerCLIKatello
     desc 'View and manage filters'
 
     class ListCommand < HammerCLIKatello::ListCommand
+      include OrganizationOptions
+      extend IdNameOptionsValidator
+
       output do
         field :id, _("Filter ID")
         field :name, _("Name")
@@ -15,9 +18,13 @@ module HammerCLIKatello
       end
 
       build_options
+      validate_id_or_name_with_parent :content_view
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
+      include OrganizationOptions
+      extend IdNameOptionsValidator
+
       output do
         field :id, _("Filter ID")
         field :name, _("Name")
@@ -47,6 +54,8 @@ module HammerCLIKatello
       end
 
       build_options :without => [:content_view_id]
+      validate_id_or_name_with_parent parent: :content_view
+      validate_id_or_name_with_parent :content_view, required: false
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
@@ -68,17 +77,27 @@ module HammerCLIKatello
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
+      include OrganizationOptions
+      extend IdNameOptionsValidator
+
       success_message _("Filter updated")
       failure_message _("Could not update the filter")
 
       build_options :without => [:content_view_id]
+      validate_id_or_name_with_parent parent: :content_view
+      validate_id_or_name_with_parent :content_view, required: false
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
+      include OrganizationOptions
+      extend IdNameOptionsValidator
+
       success_message _("Filter deleted")
       failure_message _("Could not delete the filter")
 
       build_options :without => [:content_view_id]
+      validate_id_or_name_with_parent parent: :content_view
+      validate_id_or_name_with_parent :content_view, required: false
     end
 
     HammerCLIKatello::AssociatingCommands::Repository.extend_command(self)

data/lib/hammer_cli_katello/filter_rule.rb

@@ -5,8 +5,6 @@ module HammerCLIKatello
     desc 'View and manage filter rules'
 
     class ListCommand < HammerCLIKatello::ListCommand
-      include OrganizationOptions
-
       output do
         field :id, _("Rule ID")
         field :content_view_filter_id, _("Filter ID")
@@ -24,8 +22,6 @@ module HammerCLIKatello
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand
-      include OrganizationOptions
-
       output do
         field :id, _("Rule ID")
         field :content_view_filter_id, _("Filter ID")
@@ -47,8 +43,6 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
-      include OrganizationOptions
-
       success_message _("Filter rule created")
       failure_message _("Could not create the filter rule")
 
@@ -64,8 +58,6 @@ module HammerCLIKatello
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
-      include OrganizationOptions
-
       success_message _("Filter rule updated")
       failure_message _("Could not update the filter rule")
 
@@ -73,8 +65,6 @@ module HammerCLIKatello
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
-      include OrganizationOptions
-
       success_message _("Filter rule deleted")
       failure_message _("Could not delete the filter rule")
 

data/lib/hammer_cli_katello/host_extensions.rb

@@ -21,6 +21,8 @@ module HammerCLIKatello
           from :content_facet_attributes do
             field :content_view_name, _('Content View')
             field :lifecycle_environment_name, _('Lifecycle Environment')
+            field :applicable_package_count, _('Applicable Packages')
+            field :upgradable_package_count, _('Upgradable Packages')
 
             label _('Applicable Errata') do
               from :errata_counts do

data/lib/hammer_cli_katello/id_name_options_validator.rb

@@ -0,0 +1,73 @@
+module HammerCLIKatello
+  module IdNameOptionsValidator
+    # This is a method that requires:
+    # 1. either name or id has been supplied
+    # 2. if name is supplied, parent id/name/etc is also required
+    #
+    # Normally the parent will be organization as with products, content views,
+    # etc but this could also apply to repos for example whose names are unique
+    # per product
+    #
+    # Some examples:
+    #
+    # validate_id_or_name_with_parent
+    # validate_id_or_name_with_parent :content_view
+    # validate_id_or_name_with_parent :repository, parent: 'product', required: false
+    # validate_id_or_name_with_parent :content_view, parent: {organization: ['id', 'name']}
+    def validate_id_or_name_with_parent(record_name = nil, parent: 'organization', required: true)
+      child_options = IdNameOptionsValidator.build_child_options(record_name)
+      parent_options = IdNameOptionsValidator.build_parent_options(parent)
+
+      validate_options do
+        any(*child_options).required if required
+
+        if (name_option = child_options.detect { |opt| opt.end_with?('_name') }) &&
+           option(name_option).exist?
+          any(*parent_options).required
+        end
+      end
+    end
+
+    # This method simply checks that either id or name is supplied
+    #
+    # Some examples:
+    #
+    # # checks for a --id or --name option
+    # validate_id_or_name
+    # # checks for --content-view-id or --content-view-name
+    # validate_id_or_name :content_view
+    def validate_id_or_name(record_name = nil)
+      child_options = IdNameOptionsValidator.build_child_options(record_name)
+
+      validate_options do
+        any(*child_options).required
+      end
+    end
+
+    def self.build_child_options(record_name)
+      if record_name.nil?
+        %w(option_id option_name)
+      else
+        IdNameOptionsValidator.build_options(record_name, %w(id name))
+      end
+    end
+
+    def self.build_parent_options(parent)
+      if parent.is_a?(String) || parent.is_a?(Symbol)
+        opts = parent.to_s == 'organization' ? %w(id name label) : %w(id name)
+      elsif parent.is_a?(Hash)
+        parent, opts = parent.first.to_a
+      else
+        raise "Unkown parent class: #{parent.class} for #{parent}"
+      end
+
+      IdNameOptionsValidator.build_options(parent, opts)
+    end
+
+    def self.build_options(record_name, options)
+      options.map do |opt|
+        "option_#{record_name}_#{opt}"
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/package.rb

@@ -9,6 +9,8 @@ module HammerCLIKatello
       end
 
       build_options do |o|
+        o.without(:repository_id)
+        o.expand.except(:repositories)
         o.expand.including(:products, :organizations, :content_views)
       end
     end

data/lib/hammer_cli_katello/repository.rb

@@ -172,6 +172,7 @@ module HammerCLIKatello
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
       include RepositoryScopedToProduct
+      include OrganizationOptions
 
       success_message _("Repository deleted")
       failure_message _("Could not delete the Repository")
@@ -194,8 +195,10 @@ module HammerCLIKatello
 
           if File.directory?(fullpath)
             Dir["#{fullpath}/*"]
-          else
+          elsif File.exist?(fullpath)
             [fullpath]
+          else
+            Dir[fullpath]
           end
         end
       end
@@ -206,7 +209,14 @@ module HammerCLIKatello
 
       def execute
         @failure = false
-        option_content.each do |file_path|
+        files = option_content
+
+        if files.length.zero?
+          output.print_error _("Could not find any files matching PATH")
+          return HammerCLI::EX_NOINPUT
+        end
+
+        files.each do |file_path|
           File.open(file_path, 'rb') { |file| upload_file file }
         end
 
@@ -223,7 +233,9 @@ module HammerCLIKatello
       build_options(:without => [:content]) do |o|
         o.expand.including(:products, :organizations)
       end
-      option "--path", "PATH", _("Upload file or directory of files as content for a repository"),
+      option "--path", "PATH", _("Upload file, directory of files, or glob of files " \
+                                 "as content for a repository.\n" \
+                                 "Globs must be escaped by single or double quotes."),
              :attribute_name => :option_content,
              :required => true, :format => BinaryPath.new
 
@@ -251,8 +263,8 @@ module HammerCLIKatello
         print_message _("Successfully uploaded file '%s'.") % filename
       rescue
         @failure = true
-        print_message _("Failed to upload file '%s' to repository. Please check "\
-                        "the file and try again.") % filename
+        output.print_error _("Failed to upload file '%s' to repository. Please check "\
+                             "the file and try again.") % filename
       ensure
         content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
       end

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/content_view/create_test.rb

@@ -1,8 +1,5 @@
 require_relative '../test_helper'
 
-# Workaround for issue #14289
-require 'hammer_cli_katello/content_view_puppet_module'
-
 describe 'content-view create' do
   before do
     @cmd = %w(content-view create)

data/test/functional/content_view/filter/delete_test.rb

@@ -0,0 +1,93 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require File.join(File.dirname(__FILE__), '../content_view_helpers')
+require File.join(File.dirname(__FILE__), '../../organization/organization_helpers')
+
+module HammerCLIForeman
+  describe DeleteCommand do
+    include ContentViewHelpers
+    include OrganizationHelpers
+
+    before do
+      @cmd = %w(content-view filter delete)
+    end
+
+    it 'accepts filter id' do
+      params = ['--id=1']
+
+      api_expects(:content_view_filters, :destroy) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'accepts filter name, content view name, and org name' do
+      params = ['--name=scanner', '--content-view=darkly', '--organization=pkd']
+
+      expect_organization_search('pkd', 1)
+      expect_content_view_search(1, 'darkly', 1)
+      expect_content_view_search(1, 'darkly', 1) # redmine #15930
+
+      ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
+        par['content_view_id'] == 1 && par['name'] == 'scanner'
+      end
+      ex.returns(index_response([{'id' => '1'}]))
+
+      api_expects(:content_view_filters, :destroy) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'accepts filter name, content view name, and org label' do
+      params = ['--name=scanner', '--content-view=darkly', '--organization-label=pkd']
+
+      expect_organization_search('pkd', 1, field: 'label')
+      expect_content_view_search(1, 'darkly', 1)
+      expect_content_view_search(1, 'darkly', 1) # redmine #15930
+
+      ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
+        par['content_view_id'] == 1 && par['name'] == 'scanner'
+      end
+      ex.returns(index_response([{'id' => '1'}]))
+
+      api_expects(:content_view_filters, :destroy) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'accepts filter name, content view name, and org id' do
+      params = ['--name=scanner', '--content-view=darkly', '--organization-id=1']
+
+      expect_content_view_search('1', 'darkly', 1)
+      expect_content_view_search('1', 'darkly', 1) # redmine #15930
+
+      ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
+        par['content_view_id'] == 1 && par['name'] == 'scanner'
+      end
+      ex.returns(index_response([{'id' => '1'}]))
+
+      api_expects(:content_view_filters, :destroy) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'requires organization name or id if content view name is supplied' do
+      params = ["--name=high-castle", "--content-view=grasshopper"]
+      expected_result = usage_error_result(
+        @cmd,
+        'At least one of options --organization-id, --organization, --organization-label ' \
+          'is required',
+        'Could not delete the filter'
+      )
+      api_expects_no_call
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+end

data/test/functional/content_view/filter/info_test.rb

@@ -0,0 +1,92 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require File.join(File.dirname(__FILE__), '../content_view_helpers')
+require File.join(File.dirname(__FILE__), '../../organization/organization_helpers')
+
+module HammerCLIForeman
+  describe InfoCommand do
+    include ContentViewHelpers
+    include OrganizationHelpers
+
+    before do
+      @cmd = %w(content-view filter info)
+    end
+
+    it 'accepts filter id' do
+      params = ['--id=1']
+
+      api_expects(:content_view_filters, :show) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'accepts filter name, content view name, and org name' do
+      params = ['--name=scanner', '--content-view=darkly', '--organization=pkd']
+
+      expect_organization_search('pkd', 1)
+      expect_content_view_search(1, 'darkly', 1)
+      expect_content_view_search(1, 'darkly', 1) # redmine #15930
+
+      ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
+        par['content_view_id'] == 1 && par['name'] == 'scanner'
+      end
+      ex.returns(index_response([{'id' => '1'}]))
+
+      api_expects(:content_view_filters, :show) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'accepts filter name, content view name, and org label' do
+      params = ['--name=scanner', '--content-view=darkly', '--organization-label=pkd']
+
+      expect_organization_search('pkd', 1, field: 'label')
+      expect_content_view_search(1, 'darkly', 1)
+      expect_content_view_search(1, 'darkly', 1) # redmine #15930
+
+      ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
+        par['content_view_id'] == 1 && par['name'] == 'scanner'
+      end
+      ex.returns(index_response([{'id' => '1'}]))
+
+      api_expects(:content_view_filters, :show) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'accepts filter name, content view name, and org id' do
+      params = ['--name=scanner', '--content-view=darkly', '--organization-id=1']
+
+      expect_content_view_search('1', 'darkly', 1)
+      expect_content_view_search('1', 'darkly', 1) # redmine #15930
+
+      ex = api_expects(:content_view_filters, :index, 'Content view filters list') do |par|
+        par['content_view_id'] == 1 && par['name'] == 'scanner'
+      end
+      ex.returns(index_response([{'id' => '1'}]))
+
+      api_expects(:content_view_filters, :show) do |par|
+        par['id'] == '1'
+      end
+
+      run_cmd(@cmd + params)
+    end
+
+    it 'requires organization name or id if content view name is supplied' do
+      params = ["--name=high-castle", "--content-view=grasshopper"]
+      expected_result = usage_error_result(
+        @cmd,
+        'At least one of options --organization-id, --organization, --organization-label ' \
+        'is required'
+      )
+      api_expects_no_call
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+end