hammer_cli_katello 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cba613b687a09867f991db7067887e8b4081c21bf2f4ef91dec62a526232052
-  data.tar.gz: 1314bb33f0f3f715a3b629b54b7d8c4f3a625eb63b020f9e715182b5076d5ec1
+  metadata.gz: fba6e1084b82989bca341b0de60b13f08ecdf223fa2a7c44be4df296ae9d88e3
+  data.tar.gz: ff4554e7abe415a95ef8a69e8d6a141045d80a7f9eb93bab68ca33594f87416f
 SHA512:
-  metadata.gz: ab9572e1855282d5a7a7b7321ed5b059c98ead6f147adc7be663bb6b0f26ca8af7c0ef03287854ea0b947f66dc04b4a20a45b855736cdc1e1055b49f3929c8bd
-  data.tar.gz: 93226ed6593f9c493ed1e83d46207c58eefe8423421ea61f455a661be3347e01e5e9f5f86bca3627f493404f0647e53a57ece0f159c805bdb066b9e2d71ca63b
+  metadata.gz: 4467809af59038ebd1749c8e0a0ea09051e2ac05c5ae4675b42928031bc20f8c9c33d4f55b696c2f6e0cbd665c2cb916455f37b844ad4367e4a45688b7be4624
+  data.tar.gz: 65f5924fdf39fa51ee0142721ef0d23fb32134684e478d43f55418a64e31c541ae25ce4b4c3856832a5ae2e682b4ac1a0a4f2c0b72ecb6d0c906df3c373a3a5b

data/lib/hammer_cli_katello/content_view.rb

@@ -111,20 +111,8 @@ module HammerCLIKatello
         end
       end
 
-      validate_options :before, 'IdResolution' do
-        product_options = [:option_product_id, :option_product_name]
-        if option(:option_repository_ids).exist?
-          any(*product_options).rejected
-          option(:option_repository_names).rejected
-        end
-
-        if option(:option_repository_names).exist?
-          any(*product_options).required
-        end
-      end
-
       build_options do |o|
-        o.expand.including(:products)
+        o.expand.except(:repositories)
       end
     end
 
@@ -174,20 +162,10 @@ module HammerCLIKatello
         if option(:option_name).exist? || option(:option_product_name).exist?
           any(*organization_options).required
         end
-
-        product_options = [:option_product_id, :option_product_name]
-        if option(:option_repository_ids).exist?
-          any(*product_options).rejected
-          option(:option_repository_names).rejected
-        end
-
-        if option(:option_repository_names).exist?
-          any(*product_options).required
-        end
       end
 
       build_options do |o|
-        o.expand.including(:products)
+        o.expand.except(:repositories)
       end
     end
 

data/lib/hammer_cli_katello/content_view_version.rb

@@ -13,6 +13,7 @@ module HammerCLIKatello
         field :id, _("ID")
         field :name, _("Name")
         field :version, _("Version")
+        field :description, _("Description")
         field :environments, _("Lifecycle Environments"), Fields::List
       end
 
@@ -159,6 +160,20 @@ module HammerCLIKatello
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
+    class UpdateCommand < HammerCLIKatello::UpdateCommand
+      action :update
+      command_name "update"
+
+      success_message _("Content view version updated.")
+      failure_message _("Could not update the content view version")
+
+      build_options do |o|
+        o.expand(:all).including(:environments, :content_views, :organizations)
+      end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
+    end
+
     class IncrementalUpdate < HammerCLIKatello::Command
       include HammerCLIForemanTasks::Async
 

data/lib/hammer_cli_katello/package.rb

@@ -3,6 +3,9 @@ module HammerCLIKatello
     resource :packages
 
     class ListCommand < HammerCLIKatello::ListCommand
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
+      include LifecycleEnvironmentNameMapping
+
       output do
         field :id, _("ID")
         field :filename, _("Filename")
@@ -34,7 +37,6 @@ module HammerCLIKatello
               :option_environment_name).required
         end
       end
-
       build_options do |o|
         o.expand.including(:products, :content_views)
       end

data/lib/hammer_cli_katello/repository.rb

@@ -443,9 +443,9 @@ module HammerCLIKatello
         params = {:id => get_identifier,
                   :uploads => uploads,
                   publish_repository: publish_repository,
-                  sync_capsule: sync_capsule,
-                  content_type: option_content_type
+                  sync_capsule: sync_capsule
         }
+        params[:content_type] = options["option_content_type"] if options["option_content_type"]
         resource.call(:import_uploads, params)
       end
 

data/lib/hammer_cli_katello/srpm.rb

@@ -0,0 +1,61 @@
+module HammerCLIKatello
+  class SrpmCommand < HammerCLIKatello::Command
+    resource :srpms
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      include LifecycleEnvironmentNameMapping
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :filename, _("Filename")
+      end
+
+      validate_options :before, 'IdResolution' do
+        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? || 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, :content_views)
+      end
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :version, _("Version")
+        field :arch, _("Architecture")
+        field :epoch, _("Epoch")
+        field :release, _("Release")
+        field :filename, _("Filename")
+        field :summary, _("Description")
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/version.rb

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

data/lib/hammer_cli_katello.rb

@@ -136,6 +136,11 @@ module HammerCLIKatello
                                          'hammer_cli_katello/module_stream'
                                         )
 
+  HammerCLI::MainCommand.lazy_subcommand("srpm", _("Manipulate source RPMs"),
+                                        'HammerCLIKatello::SrpmCommand',
+                                        'hammer_cli_katello/srpm'
+                                        )
+
   # subcommands to hammer_cli_foreman commands
   require 'hammer_cli_katello/host'
   require 'hammer_cli_katello/hostgroup'

data/test/functional/content_view/create_test.rb

@@ -8,14 +8,11 @@ describe 'content-view create' do
   let(:error_heading) { "Could not create the content view" }
   let(:name) { 'test-cv' }
   let(:org_id) { 1 }
-  let(:product) do
-    { 'name' => 'product-1', 'id' => 1 }
-  end
   let(:repositories) do
     [
-      {'name' => 'repo-1', 'id' => '1'},
-      {'name' => 'repo-2', 'id' => '2'},
-      {'name' => 'repo-3', 'id' => '3'}
+      {'id' => '1'},
+      {'id' => '2'},
+      {'id' => '3'}
     ]
   end
 
@@ -34,87 +31,4 @@ describe 'content-view create' do
     result = run_cmd(@cmd + @base_params + params)
     assert_cmd(expected_result, result)
   end
-
-  it 'create the content view with repositories specified by product id and names' do
-    wanted = repositories.take(2)
-    ids = wanted.map { |repo| repo['id'] }
-    names = wanted.map { |repo| repo['name'] }
-    params = %W(--product-id=#{product['id']} --repositories=#{names.join(',')})
-
-    api_repositories = api_expects(:repositories, :index,
-                                   'Find repositories belonging to product') do |par|
-      par['product_id'] == product['id'] &&
-        par['names'] == names &&
-        !par.key?('name')
-    end
-    api_repositories.returns(repositories)
-
-    api_expects(:content_views, :create, 'Create content view') do |par|
-      par['organization_id'] == org_id &&
-        par['name'] == name &&
-        par['repository_ids'] == ids
-    end
-
-    expected_result = success_result("Content view created.\n")
-    result = run_cmd(@cmd + @base_params + params)
-    assert_cmd(expected_result, result)
-  end
-
-  it 'create the content view with repositories specified by product name and names' do
-    wanted = repositories.take(2)
-    ids = wanted.map { |repo| repo['id'] }
-    names = wanted.map { |repo| repo['name'] }
-    params = %W(--product=#{product['name']} --repositories=#{names.join(',')})
-
-    api_products = api_expects(:products, :index, 'Find ID of product') do |par|
-      par['organization_id'] == org_id && par['name'] == product['name']
-    end
-    api_products.returns(product)
-
-    api_repositories = api_expects(:repositories, :index,
-                                   'Find repositories belonging to product') do |par|
-      par['product_id'] == product['id'] &&
-        par['names'] == names &&
-        !par.key?('name')
-    end
-    api_repositories.returns(repositories)
-
-    api_expects(:content_views, :create, 'Create content view') do |par|
-      par['organization_id'] == org_id &&
-        par['name'] == name &&
-        par['repository_ids'] == ids
-    end
-
-    expected_result = success_result("Content view created.\n")
-    result = run_cmd(@cmd + @base_params + params)
-    assert_cmd(expected_result, result)
-  end
-
-  it 'fails on providing repository names without product' do
-    params = %w(--repositories=repo-1,repo-2)
-
-    expected_result = usage_error_result(
-      @cmd,
-      'At least one of options --product-id, --product is required.',
-      error_heading
-    )
-
-    api_expects_no_call
-    result = run_cmd(@cmd + @base_params + params)
-    assert_cmd(expected_result, result)
-  end
-
-  it 'fails on providing product and repository ids' do
-    params = %w(--product=testproduct --repository-ids=1,2,3,4,5)
-
-    expected_result = usage_error_result(
-      @cmd,
-      "You can't set any of options --product-id, --product.",
-      error_heading
-    )
-
-    api_expects_no_call
-    result = run_cmd(@cmd + params)
-    assert_cmd(expected_result, result)
-  end
 end

data/test/functional/content_view/update_test.rb

@@ -48,32 +48,6 @@ module HammerCLIKatello
         end
         run_cmd(%w(content-view update --name cv2 --organization-label org1))
       end
-
-      it 'requires organization if product name is supplied along with repository' do
-        id = 122
-        repo_id = 100
-        product_name = "foo"
-        api_expects_no_call
-        cmd = %W(content-view update --id=#{id}\
-                 --repository-ids=#{repo_id} --product=#{product_name})
-        result = run_cmd(cmd)
-        expected_error = "--organization-id, --organization, --organization-label is required"
-        assert(result.err.include?(expected_error),
-               "Invalid Error Message")
-      end
-
-      it 'requires product if repository names are provided' do
-        id = 122
-        repo_id = 100
-        organization_id = 5
-        api_expects_no_call
-        cmd = %W(content-view update --id=#{id}\
-                 --repositories=#{repo_id} --organization-id=#{organization_id})
-        result = run_cmd(cmd)
-        expected_error = "--product-id, --product is required"
-        assert(result.err.include?(expected_error),
-               "Invalid Error Message")
-      end
     end
   end
 end

data/test/functional/content_view/version/update_test.rb

@@ -0,0 +1,48 @@
+require_relative '../../test_helper'
+require 'hammer_cli_katello/content_view_version'
+
+module HammerCLIKatello
+  describe ContentViewVersion::UpdateCommand do
+    include OrganizationHelpers
+    it 'allows minimal options' do
+      ex = api_expects(:content_view_versions, :update).with_params('description' => 'pizza')
+      ex.returns('id' => '2', 'description' => 'pizza')
+
+      result = run_cmd(%w(content-view version update --id 2 --description pizza))
+      assert_equal(result.exit_code, 0)
+    end
+  end
+
+  describe 'content view options' do
+    it 'allows content view id with one version' do
+      ex = api_expects(:content_view_versions, :index)
+      ex.returns('id' => '1', 'content_view' => [{'id' => '2'}])
+
+      ex = api_expects(:content_view_versions, :update).with_params('description' => 'pizza')
+      ex.returns('id' => '1', 'description' => 'pizza', 'content_view' => [{'id' => '2'}])
+
+      result = run_cmd(%w(content-view version update --description pizza --content-view-id 2))
+      assert_equal(result.exit_code, 0)
+    end
+
+    it 'allows content view id with multiple versions' do
+      ex = api_expects(:content_view_versions, :index)
+      ex.returns('id' => '2', 'content_view' => [{'id' => '3'}])
+
+      ex = api_expects(:content_view_versions, :update).with_params('description' => 'pizza')
+      ex.returns('id' => '2', 'description' => 'pizza', 'content_view' => [{'id' => '3'}])
+
+      result = run_cmd(%w(content-view version update --description pizza
+                          --content-view-id 3 --version 2))
+      assert_equal(result.exit_code, 0)
+    end
+
+    it 'blocks update without description' do
+      ex = api_expects(:content_view_versions, :index)
+      ex.returns('id' => '1', 'content_view' => [{'id' => '2'}])
+
+      result = run_cmd(%w(content-view version update --content-view-id 2))
+      assert_equal(result.exit_code, 64)
+    end
+  end
+end

data/test/functional/package/list_test.rb

@@ -2,11 +2,14 @@ require_relative '../test_helper'
 require_relative '../repository/repository_helpers'
 require_relative '../product/product_helpers'
 require_relative '../organization/organization_helpers'
+require_relative '../lifecycle_environment/lifecycle_environment_helpers'
 require 'hammer_cli_katello/package'
 
+# rubocop:disable ModuleLength
 module HammerCLIKatello
   describe PackageCommand::ListCommand do
     include OrganizationHelpers
+    include LifecycleEnvironmentHelpers
     include RepositoryHelpers
     include ProductHelpers
 
@@ -66,6 +69,28 @@ module HammerCLIKatello
       end
     end
 
+    describe 'environment options' do
+      it 'may be specified environment name' do
+        org_id = 2
+        env_name = "dev"
+        expected_id = 6
+        expect_lifecycle_environment_search(org_id, env_name, expected_id)
+
+        api_expects(:packages, :index).with_params("organization_id" => org_id,
+                                                   "environment_id" => expected_id,
+                                                   "page" => 1, "per_page" => 1000)
+
+        run_cmd(%W(package list --environment=#{env_name} --organization-id=#{org_id}))
+      end
+
+      it 'may be specified environment name no org fails' do
+        api_expects_no_call
+        r = run_cmd(%w(package list --environment Library))
+        expected_error = "--organization, --organization-label, --organization-id"
+        assert(r.err.include?(expected_error), "Invalid error message")
+      end
+    end
+
     describe 'product options' do
       it 'may be specified by ID' do
         api_expects(:repositories, :index)

data/test/functional/srpm/list_test.rb

@@ -0,0 +1,91 @@
+require_relative '../test_helper'
+require_relative '../repository/repository_helpers'
+require_relative '../product/product_helpers'
+require_relative '../organization/organization_helpers'
+require 'hammer_cli_katello/srpm'
+
+module HammerCLIKatello
+  describe PackageCommand::ListCommand do
+    include OrganizationHelpers
+    include RepositoryHelpers
+    include ProductHelpers
+
+    it 'allows minimal options' do
+      api_expects(:srpms, :index)
+
+      run_cmd(%w(srpm list))
+    end
+
+    describe 'repository options' do
+      it 'may be specified by ID' do
+        api_expects(:srpms, :index).with_params('repository_id' => 1)
+
+        run_cmd(%w(srpm list --repository-id 1))
+      end
+
+      it 'require product ID when given repository name' do
+        api_expects_no_call
+
+        r = run_cmd(%w(srpm list --repository repo1))
+        assert(r.err.include?("--product-id, --product is required"), "Invalid error message")
+      end
+
+      it 'may be specified by name and product ID' do
+        expect_repository_search(2, 'repo1', 1)
+
+        api_expects(:srpms, :index).with_params('repository_id' => 1)
+
+        run_cmd(%w(srpm list --repository repo1 --product-id 2))
+      end
+    end
+
+    describe 'organization options' do
+      it 'may be specified by ID' do
+        api_expects(:srpms, :index).with_params('organization_id' => 1)
+
+        run_cmd(%w(srpm list --organization-id 1))
+      end
+
+      it 'may be specified by name' do
+        expect_organization_search('org3', 1)
+        api_expects(:srpms, :index).with_params('organization_id' => 1)
+
+        run_cmd(%w(srpm list --organization org3))
+      end
+
+      it 'may be specified by label' do
+        expect_organization_search('org3', 1, field: 'label')
+        api_expects(:srpms, :index).with_params('organization_id' => 1)
+
+        run_cmd(%w(srpm list --organization-label org3))
+      end
+    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(:srpms, :index).with_params('content_view_version_id' => 5)
+
+        run_cmd(%w(srpm 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(srpm 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 number' do
+        api_expects_no_call
+
+        r = run_cmd(%w(srpm list --content-view-version cvv1))
+        assert(r.err.include?("--content-view-id, --content-view is required"),
+               "Invalid error message")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -293,6 +293,7 @@ files:
 - lib/hammer_cli_katello/repository_scoped_to_product.rb
 - lib/hammer_cli_katello/repository_set.rb
 - lib/hammer_cli_katello/search_options_creators.rb
+- lib/hammer_cli_katello/srpm.rb
 - lib/hammer_cli_katello/subscription.rb
 - lib/hammer_cli_katello/sync_plan.rb
 - lib/hammer_cli_katello/version.rb
@@ -380,6 +381,7 @@ files:
 - test/functional/content_view/version/list_test.rb
 - test/functional/content_view/version/promote_test.rb
 - test/functional/content_view/version/republish_repositories_test.rb
+- test/functional/content_view/version/update_test.rb
 - test/functional/erratum/erratum_helpers.rb
 - test/functional/erratum/info_test.rb
 - test/functional/erratum/list_test.rb
@@ -461,6 +463,7 @@ files:
 - test/functional/repository_set/list_test.rb
 - test/functional/repository_set/repository_set_helpers.rb
 - test/functional/search_helpers.rb
+- test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb
 - test/functional/sync_plan/delete_test.rb
@@ -494,8 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
@@ -568,6 +570,7 @@ test_files:
 - test/functional/content_view/version/list_test.rb
 - test/functional/content_view/version/promote_test.rb
 - test/functional/content_view/version/republish_repositories_test.rb
+- test/functional/content_view/version/update_test.rb
 - test/functional/erratum/erratum_helpers.rb
 - test/functional/erratum/info_test.rb
 - test/functional/erratum/list_test.rb
@@ -649,6 +652,7 @@ test_files:
 - test/functional/repository_set/list_test.rb
 - test/functional/repository_set/repository_set_helpers.rb
 - test/functional/search_helpers.rb
+- test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb
 - test/functional/sync_plan/delete_test.rb