hammer_cli_katello 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dcf91d9100831001701d8a61e531d765ac488c4
-  data.tar.gz: 37a5a7be16c2289cc9b6a97aaff6248e80610b8f
+  metadata.gz: 8197e2982960b69052e68e379aba43aad78c6819
+  data.tar.gz: b9d0f0364f933ff8a71a8e8aafee5775610d2982
 SHA512:
-  metadata.gz: c7c554fda4cc6b31e6e845a81eb38b4aaf68a7272e1abfdecb1de9360f20afc50f5b6d0cb137967be58859337029a757ca1b7dde2ec4f27ee931710307c0501f
-  data.tar.gz: 647ad55f48a038b4c4f9c76539aa9a60c4a824e93525c40757c4af2921e126bb88a87946a3b8db15c12875fb694f8821088de9786c8fb0838bf33fc856813810
+  metadata.gz: 780d8434cd5a4968f09058345c61afffd1d3d3d94af048651c0076eeaa96e2732d1c0f944b68c71b8dce3fd14c454fc43a17b8c7bafd4d982dd6aa5236501322
+  data.tar.gz: 7b77ee2069bbb31901a6f96d271b9a85df834e28435fed5cfc2f031cd670ff804eb72b8e42aaa1b2d20d3a4db5e539a3abf2652aef409b9e5cdd8e7892c96977

data/lib/hammer_cli_katello/filter.rb

@@ -67,13 +67,20 @@ module HammerCLIKatello
       validate_options do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
+        product_options = [:option_product_id, :option_product_name]
 
-        if option(:option_repository_names).exist? || option(:option_content_view_name).exist?
+        if option(:option_product_name).exist? || option(:option_content_view_name).exist?
           any(*organization_options).required
         end
+
+        if option(:option_repository_names).exist?
+          any(*product_options).required
+        end
       end
 
-      build_options
+      build_options do |o|
+        o.expand.including(:products)
+      end
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand

data/lib/hammer_cli_katello/id_resolver.rb

@@ -33,7 +33,9 @@ module HammerCLIKatello
     DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))].freeze
 
     def for(resource)
-      SEARCHABLES[resource.singular_name.to_sym] || DEFAULT_SEARCHABLES
+      SEARCHABLES[resource.singular_name.to_sym] ||
+        HammerCLIForeman::Searchables::SEARCHABLES[resource.singular_name.to_sym] ||
+        DEFAULT_SEARCHABLES
     end
   end
 

data/lib/hammer_cli_katello/package.rb

@@ -13,18 +13,30 @@ module HammerCLIKatello
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
         product_options = [:option_product_id, :option_product_name]
+        content_view_options = [:option_content_view_id, :option_content_view_name]
 
-        if option(:option_product_name).exist?
+        if option(:option_product_name).exist? || option(:option_content_view_name).exist?
           any(*organization_options).required
         end
 
         if option(:option_repository_name).exist?
           any(*product_options).required
         end
+
+        if option(:option_content_view_version_version).exist?
+          any(*content_view_options).required
+        end
+
+        if any(*content_view_options).exist?
+          any(:option_content_view_version_id,
+              :option_content_view_version_version,
+              :option_environment_id,
+              :option_environment_name).required
+        end
       end
 
       build_options do |o|
-        o.expand.including(:products)
+        o.expand.including(:products, :content_views)
       end
     end
 

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -4,27 +4,15 @@ module HammerCLIKatello
   module SearchOptionsCreators
     include HammerCLIKatello::ForemanSearchOptionsCreators
 
-    def create_repository_search_options(options)
-      name = options[HammerCLI.option_accessor_name("name")]
-      organization_id = options[HammerCLI.option_accessor_name("organization_id")]
-
-      search_options = {}
-      search_options['name'] = name if name
-      search_options['organization_id'] = organization_id if organization_id
-      search_options
-    end
-
     def create_repositories_search_options(options)
       name = options[HammerCLI.option_accessor_name("name")]
       names = options[HammerCLI.option_accessor_name("names")]
       product_id = options[HammerCLI.option_accessor_name("product_id")]
-      organization_id = options[HammerCLI.option_accessor_name("organization_id")]
 
       search_options = {}
       search_options['name'] = name if name
       search_options['names'] = names if names
       search_options['product_id'] = product_id if product_id
-      search_options['organization_id'] = organization_id if organization_id
       search_options
     end
 

data/lib/hammer_cli_katello/sync_plan.rb

@@ -31,7 +31,8 @@ module HammerCLIKatello
              )
 
       option "--sync-date", "SYNC_DATE",
-             _("start date and time of the synchronization defaults to now"),
+             _("Start date and time for the sync plan." \
+               "Time is optional, if kept blank current system time will be considered"),
              :format => HammerCLI::Options::Normalizers::DateTime.new
 
       success_message _("Sync plan created")

data/lib/hammer_cli_katello/version.rb

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

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

@@ -5,8 +5,7 @@ describe 'content-view filter create' do
   include RepositoryHelpers
   before do
     @cmd = %w(content-view filter create)
-    @base_params = ["--organization-id=#{org_id}", "--name=#{filter_name}", \
-                    "--content-view-id=#{content_view_id}", "--type=rpm"]
+    @base_params = ["--name=#{filter_name}", "--content-view-id=#{content_view_id}", "--type=rpm"]
   end
 
   let(:org_id) { 1 }
@@ -26,12 +25,9 @@ describe 'content-view filter create' do
     ids = repo_ids.join(',')
     params = %W(--repository-ids=#{ids})
 
-    ex = api_expects(:content_view_filters, :create, 'Create content-view filter') do |par|
-      par['name'] == filter_name && par['repository_ids'] == repo_ids
-      true
-    end
-
-    ex.returns({})
+    api_expects(:content_view_filters, :create, 'Create content-view filter')
+      .with_params('name' => filter_name, 'repository_ids' => repo_ids.map(&:to_s))
+      .returns({})
 
     expected_result = success_result("Filter created\n")
     result = run_cmd(@cmd + @base_params + params)
@@ -39,25 +35,23 @@ describe 'content-view filter create' do
   end
 
   it 'creates a content-view filter with repository names' do
-    params = %W(--repositories=#{repo_names.join(',')})
+    params = %W(--repositories=#{repo_names.join(',')} --product-id 3)
 
-    expect_repositories_search(org_id.to_s, repo_names, repo_ids)
+    expect_generic_repositories_search({'names' => repo_names, 'product_id' => 3}, repositories)
 
-    api_expects(:content_view_filters, :create, "Create content-view filter") do |par|
-      par['name'] == filter_name && par['repository_ids'] == repo_ids &&
-        par['type'] == 'rpm'
-    end
+    api_expects(:content_view_filters, :create, "Create content-view filter")
+      .with_params('name' => filter_name, 'repository_ids' => repo_ids, 'type' => 'rpm')
 
     expected_result = success_result("Filter created\n")
     result = run_cmd(@cmd + @base_params + params)
     assert_cmd(expected_result, result)
   end
 
-  it 'should fail with no organization specified' do
+  it 'should fail with no product specified' do
     ids = repo_ids.join(',')
     params = ["--repositories=#{ids}", "--name=#{filter_name}", \
               "--content-view-id=#{content_view_id}", "--type=rpm"]
     result = run_cmd(@cmd + params)
-    assert(result.err[/--organization-id, --organization, --organization-label is required/])
+    assert(result.err[/--product-id, --product is required/])
   end
 end

data/test/functional/package/list_test.rb

@@ -16,11 +16,36 @@ module HammerCLIKatello
       run_cmd(%w(package list))
     end
 
+    describe 'content view options' do
+      it 'may be specified by ID' do
+        api_expects(:content_view_versions, :index)
+          .with_params('content_view_id' => 1, 'version' => '2.1')
+          .returns(index_response([{'id' => 5}]))
+        api_expects(:packages, :index).with_params('content_view_version_id' => 5)
+
+        run_cmd(%w(package list --content-view-id 1 --content-view-version 2.1))
+      end
+
+      it 'requires organization ID when given content view name' do
+        api_expects_no_call
+
+        r = run_cmd(%w(package list --content-view cv1 --content-view-version 2.1))
+        expected_error = "--organization-id, --organization, --organization-label is required"
+        assert(r.err.include?(expected_error), "Invalid error message")
+      end
+
+      it 'requires content view ID when given content view version name' do
+        api_expects_no_call
+
+        r = run_cmd(%w(package list --content-view-version cvv1))
+        assert(r.err.include?("--content-view-id, --content-view is required"),
+               "Invalid error message")
+      end
+    end
+
     describe 'repository options' do
       it 'may be specified by ID' do
-        api_expects(:packages, :index) do |params|
-          params['repository_id'] == 1
-        end
+        api_expects(:packages, :index).with_params('repository_id' => 1)
 
         run_cmd(%w(package list --repository-id 1))
       end
@@ -35,9 +60,7 @@ module HammerCLIKatello
       it 'may be specified by name and product ID' do
         expect_repository_search(2, 'repo1', 1)
 
-        api_expects(:packages, :index) do |params|
-          params['repository_id'] == 1
-        end
+        api_expects(:packages, :index).with_params('repository_id' => 1)
 
         run_cmd(%w(package list --repository repo1 --product-id 2))
       end
@@ -45,23 +68,19 @@ module HammerCLIKatello
 
     describe 'product options' do
       it 'may be specified by ID' do
-        ex = api_expects(:repositories, :index) do |p|
-          p['product_id'] == 1
-        end
-        ex.returns(index_response([{'id' => 2}]))
+        api_expects(:repositories, :index)
+          .with_params('product_id' => 1)
+          .returns(index_response([{'id' => 2}]))
 
-        api_expects(:packages, :index) do |p|
-          p['repository_id'] = 2
-        end
+        api_expects(:packages, :index).with_params('repository_id' => 2)
 
         run_cmd(%w(package list --product-id 1))
       end
 
       it 'fail if more than one repository is found' do
-        ex = api_expects(:repositories, :index) do |p|
-          p['product_id'] == 1
-        end
-        ex.returns(index_response([{'id' => 2}, {'id' => 3}]))
+        api_expects(:repositories, :index)
+          .with_params('product_id' => 1)
+          .returns(index_response([{'id' => 2}, {'id' => 3}]))
 
         r = run_cmd(%w(package list --product-id 1))
         assert(r.err.include?("found more than one repository"), "Invalid error message")
@@ -78,11 +97,9 @@ module HammerCLIKatello
       it 'allows organization ID when resolving ID by name' do
         expect_product_search(3, 'product1', 1)
 
-        expect_repository_search(1, nil, 2)
+        expect_generic_repositories_search({'product_id' => 1}, [{'id' => 2}])
 
-        api_expects(:packages, :index) do |p|
-          p['repository_id'] = 2
-        end
+        api_expects(:packages, :index).with_params('repository_id' => 2)
 
         run_cmd(%w(package list --product product1 --organization-id 3))
       end
@@ -92,11 +109,9 @@ module HammerCLIKatello
 
         expect_product_search(3, 'product1', 1)
 
-        expect_repository_search(1, nil, 2)
+        expect_generic_repositories_search({'product_id' => 1}, [{'id' => 2}])
 
-        api_expects(:packages, :index) do |p|
-          p['repository_id'] = 2
-        end
+        api_expects(:packages, :index).with_params('repository_id' => 2)
 
         run_cmd(%w(package list --product product1 --organization org3))
       end
@@ -106,11 +121,9 @@ module HammerCLIKatello
 
         expect_product_search(3, 'product1', 1)
 
-        expect_repository_search(1, nil, 2)
+        expect_generic_repositories_search({'product_id' => 1}, [{'id' => 2}])
 
-        api_expects(:packages, :index) do |p|
-          p['repository_id'] = 2
-        end
+        api_expects(:packages, :index).with_params('repository_id' => 2)
 
         run_cmd(%w(package list --product product1 --organization-label org3))
       end

data/test/functional/repository/delete_test.rb

@@ -16,10 +16,9 @@ module HammerCLIKatello
       end
 
       it 'can be specified via product id' do
-        ex = api_expects(:repositories, :index) do |p|
-          p['product_id'] == 3 && p['name'] == 'repo1'
-        end
-        ex.returns(index_response([{'id' => 1}]))
+        api_expects(:repositories, :index)
+          .with_params('product_id' => 3, 'name' => 'repo1')
+          .returns(index_response([{'id' => 1}]))
 
         api_expects(:repositories, :destroy) { |p| p['id'] == 1 }
 
@@ -27,15 +26,13 @@ module HammerCLIKatello
       end
 
       it 'can be specified via product name' do
-        ex = api_expects(:products, :index) do |p|
-          p['organization_id'] == '6' && p['name'] == 'product3'
-        end
-        ex.returns(index_response([{'id' => 3}]))
+        api_expects(:products, :index)
+          .with_params('organization_id' => '6', 'name' => 'product3')
+          .returns(index_response([{'id' => 3}]))
 
-        ex = api_expects(:repositories, :index) do |p|
-          p['product_id'] == 3 && p['name'] == 'repo1' && p['organization_id'] == '6'
-        end
-        ex.returns(index_response([{'id' => 1}]))
+        api_expects(:repositories, :index)
+          .with_params('product_id' => 3, 'name' => 'repo1')
+          .returns(index_response([{'id' => 1}]))
 
         api_expects(:repositories, :destroy) { |p| p['id'] == 1 }
 
@@ -44,31 +41,31 @@ module HammerCLIKatello
 
       describe 'organization options' do
         it 'can be specified by organization id' do
-          ex = api_expects(:repositories, :index) do |p|
-            p['product_id'] == 3 && p['name'] == 'repo1' && p['organization_id'] == '6'
-          end
-          ex.returns(index_response([{'id' => 1}]))
+          api_expects(:products, :index)
+            .with_params('organization_id' => '6', 'name' => 'product3')
+            .returns(index_response([{'id' => 3}]))
+
+          api_expects(:repositories, :index)
+            .with_params('product_id' => 3, 'name' => 'repo1')
+            .returns(index_response([{'id' => 1}]))
 
           api_expects(:repositories, :destroy) { |p| p['id'] == 1 }
 
-          run_cmd(%w(repository delete --name repo1 --product-id 3 --organization-id 6))
+          run_cmd(%w(repository delete --name repo1 --product product3 --organization-id 6))
         end
 
         it 'can be specified by organization name' do
-          ex = api_expects(:organizations, :index) do |p|
-            p[:search] == "name = \"org6\""
-          end
-          ex.returns(index_response([{'id' => 6}]))
+          api_expects(:organizations, :index)
+            .with_params(:search => "name = \"org6\"")
+            .returns(index_response([{'id' => 6}]))
 
-          ex = api_expects(:products, :index) do |p|
-            p['organization_id'] == 6 && p['name'] == 'product3'
-          end
-          ex.returns(index_response([{'id' => 3}]))
+          api_expects(:products, :index)
+            .with_params('organization_id' => 6, 'name' => 'product3')
+            .returns(index_response([{'id' => 3}]))
 
-          ex = api_expects(:repositories, :index) do |p|
-            p['product_id'] == 3 && p['name'] == 'repo1'
-          end
-          ex.returns(index_response([{'id' => 1}]))
+          api_expects(:repositories, :index)
+            .with_params('product_id' => 3, 'name' => 'repo1')
+            .returns(index_response([{'id' => 1}]))
 
           api_expects(:repositories, :destroy) { |p| p['id'] == 1 }
 
@@ -76,20 +73,17 @@ module HammerCLIKatello
         end
 
         it 'can be specified by organization label' do
-          ex = api_expects(:organizations, :index) do |p|
-            p[:search] == "label = \"org6\""
-          end
-          ex.returns(index_response([{'id' => 6}]))
-
-          ex = api_expects(:products, :index) do |p|
-            p['organization_id'] == 6 && p['name'] == 'product3'
-          end
-          ex.returns(index_response([{'id' => 3}]))
-
-          ex = api_expects(:repositories, :index) do |p|
-            p['product_id'] == 3 && p['name'] == 'repo1'
-          end
-          ex.returns(index_response([{'id' => 1}]))
+          api_expects(:organizations, :index)
+            .with_params(:search => "label = \"org6\"")
+            .returns(index_response([{'id' => 6}]))
+
+          api_expects(:products, :index)
+            .with_params('organization_id' => 6, 'name' => 'product3')
+            .returns(index_response([{'id' => 3}]))
+
+          api_expects(:repositories, :index)
+            .with_params('product_id' => 3, 'name' => 'repo1')
+            .returns(index_response([{'id' => 1}]))
 
           api_expects(:repositories, :destroy) { |p| p['id'] == 1 }
 

data/test/functional/repository/repository_helpers.rb

@@ -1,15 +1,18 @@
 module RepositoryHelpers
   def expect_repository_search(product_id, name, id)
-    ex = api_expects(:repositories, :index, 'Find a repository') do |par|
-      par['name'] == name && par['product_id'] == product_id
-    end
-    ex.returns(index_response([{'id' => id}]))
+    api_expects(:repositories, :index, 'Find a repository')
+      .with_params('name' => name, 'product_id' => product_id)
+      .returns(index_response([{'id' => id}]))
   end
 
   def expect_repositories_search(org_id, names, ids)
-    ex = api_expects(:repositories, :index, 'Find repositories') do |par|
-      par['names'] == names && par['organization_id'] == org_id
-    end
-    ex.returns(index_response(ids.zip(names).map { |id, name| { 'id' => id, 'name' => name } }))
+    expect_generic_repositories_search({'names' => names, 'organization_id' => org_id},
+      ids.zip(names).map { |id, name| { 'id' => id, 'name' => name } })
+  end
+
+  def expect_generic_repositories_search(params = {}, returns = [])
+    api_expects(:repositories, :index, 'Find repositories')
+      .with_params(params)
+      .returns(index_response(returns))
   end
 end

data/test/unit/search_options_creators_test.rb

@@ -20,20 +20,6 @@ describe HammerCLIKatello::SearchOptionsCreators do
     resource.stubs(:singular_name).returns('')
   end
 
-  describe '#create_repository_search_options' do
-    it 'handles a repository' do
-      search_options_creators.create_repository_search_options(
-        'option_name' => 'repo1'
-      )['name'].must_equal 'repo1'
-    end
-
-    it 'handles an organization_id' do
-      search_options_creators.create_repository_search_options(
-        'option_organization_id' => 2
-      )['organization_id'].must_equal 2
-    end
-  end
-
   describe '#create_repositories_search_options' do
     it 'handles an array of names' do
       search_options_creators.create_repositories_search_options(
@@ -52,12 +38,6 @@ describe HammerCLIKatello::SearchOptionsCreators do
         'option_product_id' => 3
       )['product_id'].must_equal 3
     end
-
-    it 'handles an organization_id' do
-      search_options_creators.create_repositories_search_options(
-        'option_organization_id' => 4
-      )['organization_id'].must_equal 4
-    end
   end
 
   describe '#create_content_view_versions_search_options(options)' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Adam Price
@@ -34,7 +34,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman