hammer_cli_katello 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b724181082827487def5bd163bd3ede79f92d898
-  data.tar.gz: c479307f8e19564413bb8e0b29da2582e98b4625
+  metadata.gz: 34a1348383dad332efc75464f45b02aaef671e79
+  data.tar.gz: 7f0d409d51d8f89a6dd715aac1f5ac26f808ca46
 SHA512:
-  metadata.gz: 6ff728a57e711d064752fc75f721fc283634f4cb0cc50df4b80813e9d01b11099c6654ab3b9c440610511023c49892c6fb1dbfff04e9dbf41bb318ece1978efa
-  data.tar.gz: 99dc2f0ba6c14a6e1cf1388d6b4c9f7712b2db6089f3295e24bc196efa7d60657e276a62ace84d15b5f2630d6a3205d30a94dacf83d2d2e75d5cce45336086b8
+  metadata.gz: 73aa44488ec1e56a04395f9daf2eef057b330eced91641b39f1ede196953fb46bcc2d96a9d35670c3eb9aefdeae076098049631cc924bf1f7a82c39378fd46e0
+  data.tar.gz: 48517150eb035d7c60752bc93f48bd8d4c62778a463ae73c11b4706b0b6ff6f2e144a6ffa9c9fe872a09a444eefe074e5ea618d0971115086c5ba7e4040bdb79

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -53,22 +53,7 @@ module HammerCLIKatello
       success_message _("Puppet module removed from content view")
       failure_message _("Couldn't remove puppet module from the content view")
 
-      def resolve_puppet_module_id_from_uuid(options)
-        uuid = options.delete HammerCLI.option_accessor_name("id")
-        options[HammerCLI.option_accessor_name("uuid")] = uuid
-        resolver.content_view_puppet_module_id(options)
-      end
-
-      def all_options
-        if super['option_id']
-          super.merge(HammerCLI.option_accessor_name("id") =>
-                      resolve_puppet_module_id_from_uuid(super))
-        else
-          super
-        end
-      end
-
-      build_options :without => :uuid
+      build_options
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/ping.rb

@@ -44,7 +44,12 @@ module HammerCLIKatello
     def execute
       d = send_request
       print_data d
-      d['status'] != _("FAIL") ? HammerCLI::EX_OK : 1
+      service_statuses = d['services'].values.map { |v| v['status'] }
+      if d['status'] == _("FAIL") || service_statuses.include?(_("FAIL"))
+        1
+      else
+        HammerCLI::EX_OK
+      end
     end
 
     def send_request

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/capsule/capsule_helpers.rb

@@ -0,0 +1,13 @@
+require_relative '../search_helpers'
+
+module CapsuleHelpers
+  include SearchHelpers
+
+  def expect_generic_capsule_search(opts = {params: {}, returns: {}})
+    expect_generic_search(:smart_proxies, opts)
+  end
+
+  def expect_capsule_info(params = {})
+    api_expects(:smart_proxies, :show).with_params(params)
+  end
+end

data/test/functional/capsule/content/add_lifecycle_environment_test.rb

@@ -0,0 +1,40 @@
+require_relative '../../test_helper'
+require_relative 'capsule_content_helpers'
+require_relative '../../lifecycle_environment/lifecycle_environment_helpers'
+require_relative '../../organization/organization_helpers'
+require 'hammer_cli_katello/capsule'
+
+module HammerCLIKatello
+  module Capsule
+    class Content
+      describe Content::AddLifecycleEnvironmentCommand do
+        include CapsuleContentHelpers
+        include LifecycleEnvironmentHelpers
+        include OrganizationHelpers
+
+        it 'allows minimal options' do
+          expect_lifecycle_environment_add('id' => '1', 'environment_id' => 2)
+
+          run_cmd(%w(capsule content add-lifecycle-environment --id 1 --environment-id 2))
+        end
+
+        it 'resolves environment ID from name' do
+          expect_lifecycle_environment_search('3', 'env2', 2)
+          expect_lifecycle_environment_add('id' => '1', 'environment_id' => 2)
+
+          run_cmd(%w(capsule content add-lifecycle-environment --id 1 --environment env2
+                     --organization-id 3))
+        end
+
+        it 'resolves organization ID from name' do
+          expect_organization_search('org3', 3)
+          expect_lifecycle_environment_search(3, 'env2', 2)
+          expect_lifecycle_environment_add('id' => '1', 'environment_id' => 2)
+
+          run_cmd(%w(capsule content add-lifecycle-environment --id 1 --environment env2
+                     --organization org3))
+        end
+      end
+    end
+  end
+end

data/test/functional/capsule/content/capsule_content_helpers.rb

@@ -1,8 +1,24 @@
+require_relative '../capsule_helpers'
+
 module CapsuleContentHelpers
+  include CapsuleHelpers
+
   def expect_capsule_search(name, id)
-    ex = api_expects(:smart_proxies, :index, 'Find the proxy') do |par|
-      par[:search] == "name = \"#{name}\""
-    end
-    ex.returns(index_response([{'id' => id}]))
+    expect_generic_capsule_search(params: {search: "name = \"#{name}\""}, returns: {'id' => id})
+  end
+
+  def expect_lifecycle_environments_list(args = {params: {}, returns: []})
+    api_expects(:capsule_content, :lifecycle_environments)
+      .with_params(args[:params]).returns(index_response(args[:returns]))
+  end
+
+  def expect_lifecycle_environment_add(params = {})
+    api_expects(:capsule_content, :add_lifecycle_environment)
+      .with_params(params)
+  end
+
+  def expect_lifecycle_environment_remove(params = {})
+    api_expects(:capsule_content, :remove_lifecycle_environment)
+      .with_params(params)
   end
 end

data/test/functional/capsule/content/lifecycle_environments_test.rb

@@ -0,0 +1,19 @@
+require_relative '../../test_helper'
+require_relative 'capsule_content_helpers'
+require 'hammer_cli_katello/capsule'
+
+module HammerCLIKatello
+  module Capsule
+    class Content
+      describe Content::ListLifecycleEnvironmentsCommand do
+        include CapsuleContentHelpers
+
+        it 'allows minimal options' do
+          expect_lifecycle_environments_list(params: {'id' => '1'}, returns: {})
+
+          run_cmd(%w(capsule content lifecycle-environments --id 1))
+        end
+      end
+    end
+  end
+end

data/test/functional/capsule/content/remove_lifecycle_environment_test.rb

@@ -0,0 +1,40 @@
+require_relative '../../test_helper'
+require_relative 'capsule_content_helpers'
+require_relative '../../lifecycle_environment/lifecycle_environment_helpers'
+require_relative '../../organization/organization_helpers'
+require 'hammer_cli_katello/capsule'
+
+module HammerCLIKatello
+  module Capsule
+    class Content
+      describe Content::RemoveLifecycleEnvironmentCommand do
+        include CapsuleContentHelpers
+        include LifecycleEnvironmentHelpers
+        include OrganizationHelpers
+
+        it 'allows minimal options' do
+          expect_lifecycle_environment_remove('id' => '1', 'environment_id' => 2)
+
+          run_cmd(%w(capsule content remove-lifecycle-environment --id 1 --environment-id 2))
+        end
+
+        it 'resolves environment ID from name' do
+          expect_lifecycle_environment_search('3', 'env2', 2)
+          expect_lifecycle_environment_remove('id' => '1', 'environment_id' => 2)
+
+          run_cmd(%w(capsule content remove-lifecycle-environment --id 1 --environment env2
+                     --organization-id 3))
+        end
+
+        it 'resolves organization ID from name' do
+          expect_organization_search('org3', 3)
+          expect_lifecycle_environment_search(3, 'env2', 2)
+          expect_lifecycle_environment_remove('id' => '1', 'environment_id' => 2)
+
+          run_cmd(%w(capsule content remove-lifecycle-environment --id 1 --environment env2
+                     --organization org3))
+        end
+      end
+    end
+  end
+end

data/test/functional/capsule/info_test.rb

@@ -0,0 +1,25 @@
+require_relative '../test_helper'
+require_relative 'capsule_helpers'
+require 'hammer_cli_katello/capsule'
+
+module HammerCLIKatello
+  describe Capsule do
+    describe InfoCommand do
+      include CapsuleHelpers
+
+      it 'allows minimal options' do
+        expect_capsule_info('id' => '1')
+
+        run_cmd(%w(capsule info --id 1))
+      end
+
+      it 'resolves capsule ID from name' do
+        expect_generic_capsule_search(
+          params: { search: "name = \"capsule1\"" }, returns: {'id' => 1})
+        expect_capsule_info('id' => 1)
+
+        run_cmd(%w(capsule info --name capsule1))
+      end
+    end
+  end
+end

data/test/functional/capsule/list_test.rb

@@ -0,0 +1,24 @@
+require_relative '../test_helper'
+require_relative 'capsule_helpers'
+require 'hammer_cli_katello/capsule'
+
+module HammerCLIKatello
+  describe Capsule do
+    describe ListCommand do
+      include CapsuleHelpers
+
+      it 'allows minimal options' do
+        expect_generic_capsule_search
+
+        run_cmd(%w(capsule list))
+      end
+
+      it 'allows search' do
+        expect_generic_capsule_search(
+          params: { 'search' => 'search' }, returns: {})
+
+        run_cmd(%w(capsule list --search search))
+      end
+    end
+  end
+end

data/test/functional/content_view/content_view_helpers.rb

@@ -1,8 +1,14 @@
+require_relative '../search_helpers'
+
 module ContentViewHelpers
+  include SearchHelpers
+
   def expect_content_view_search(org_id, name, id)
-    ex = api_expects(:content_views, :index, 'Find the content view') do |par|
-      par['name'] == name && par['organization_id'] == org_id
-    end
-    ex.returns(index_response([{'id' => id}]))
+    expect_generic_content_view_search(params: {'name' => name, 'organization_id' => org_id},
+                                       returns: {'id' => id})
+  end
+
+  def expect_generic_content_view_search(args)
+    expect_generic_search(:content_views, args)
   end
 end

data/test/functional/content_view/puppet_module/remove_test.rb

@@ -0,0 +1,54 @@
+require_relative '../../test_helper'
+require_relative '../../content_view/content_view_helpers'
+require_relative '../../organization/organization_helpers'
+require 'hammer_cli_katello/content_view_puppet_module'
+
+module HammerCLIKatello
+  describe ContentViewPuppetModule::DeleteCommand do
+    include ContentViewHelpers
+    include OrganizationHelpers
+
+    def expect_module_destroy(opts)
+      api_expects(:content_view_puppet_modules, :destroy).with_params(opts[:params])
+    end
+
+    it 'allows minimal options' do
+      expect_module_destroy(params: {'content_view_id' => 1, 'id' => '2'})
+
+      run_cmd(%w(content-view puppet-module remove --content-view-id 1 --id 2))
+    end
+
+    it 'resolves puppet module ID from UUID' do
+      expect_generic_search(:content_view_puppet_modules,
+                            params: {'uuid' => 'abcd1234', 'content_view_id' => 1},
+                            returns: {'id' => 2})
+      expect_module_destroy(params: {'content_view_id' => 1, 'id' => 2})
+
+      run_cmd(%w(content-view puppet-module remove --content-view-id 1 --uuid abcd1234))
+    end
+
+    it 'resolves content view ID from name' do
+      expect_content_view_search('3', 'cv1', 1)
+      expect_module_destroy(params: {'content_view_id' => 1, 'id' => '2'})
+
+      run_cmd(%w(content-view puppet-module remove --content-view cv1 --organization-id 3 --id 2))
+    end
+
+    it 'resolves organization ID from name' do
+      expect_organization_search('org3', 3)
+      expect_content_view_search(3, 'cv1', 1)
+      expect_module_destroy(params: {'content_view_id' => 1, 'id' => '2'})
+
+      run_cmd(%w(content-view puppet-module remove --content-view cv1 --organization org3 --id 2))
+    end
+
+    it 'resolves organization ID from label' do
+      expect_organization_search('org3', 3, field: 'label')
+      expect_content_view_search(3, 'cv1', 1)
+      expect_module_destroy(params: {'content_view_id' => 1, 'id' => '2'})
+
+      run_cmd(%w(content-view puppet-module remove --content-view cv1 --organization-label
+                 org3 --id 2))
+    end
+  end
+end

data/test/functional/lifecycle_environment/lifecycle_environment_helpers.rb

@@ -1,9 +1,12 @@
+require_relative '../search_helpers'
+
 module LifecycleEnvironmentHelpers
+  include SearchHelpers
+
   def expect_lifecycle_environment_search(org_id, name, id)
-    ex = api_expects(:lifecycle_environments, :index, 'Find the lifecycle environment') do |par|
-      par['name'] == name && par['organization_id'] == org_id
-    end
-    ex.returns(index_response([{'id' => id}]))
+    expect_generic_search(:lifecycle_environments,
+                          params: {'name' => name, 'organization_id' => org_id},
+                          returns: {'id' => id})
   end
 
   def expect_lifecycle_environments_request(org_id, results)

data/test/functional/organization/organization_helpers.rb

@@ -1,8 +1,10 @@
+require_relative '../search_helpers'
+
 module OrganizationHelpers
+  include SearchHelpers
+
   def expect_organization_search(name_or_label, id, field: 'name')
-    ex = api_expects(:organizations, :index, 'Find the organization') do |par|
-      par[:search] == "#{field} = \"#{name_or_label}\""
-    end
-    ex.at_least_once.returns(index_response([{'id' => id}]))
+    expect_generic_search(:organizations, params: {search: "#{field} = \"#{name_or_label}\""},
+                                          returns: {'id' => id}).at_least_once
   end
 end

data/test/functional/search_helpers.rb

@@ -0,0 +1,6 @@
+module SearchHelpers
+  def expect_generic_search(resource, args)
+    ex = api_expects(resource, :index, "Find the #{resource}").with_params(args[:params])
+    ex.returns(index_response([args[:returns]]))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Adam Price
@@ -34,7 +34,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -311,13 +311,19 @@ files:
 - test/functional/activation_key/remove_host_collection_test.rb
 - test/functional/activation_key/subscriptions_test.rb
 - test/functional/activation_key/update_test.rb
+- test/functional/capsule/capsule_helpers.rb
+- test/functional/capsule/content/add_lifecycle_environment_test.rb
 - test/functional/capsule/content/cancel_synchronization_test.rb
 - test/functional/capsule/content/capsule_content_helpers.rb
 - test/functional/capsule/content/data/library_env.json
 - test/functional/capsule/content/data/sync_status.json
 - test/functional/capsule/content/data/sync_tasks.json
 - test/functional/capsule/content/info_test.rb
+- test/functional/capsule/content/lifecycle_environments_test.rb
+- test/functional/capsule/content/remove_lifecycle_environment_test.rb
 - test/functional/capsule/content/synchronization_status_test.rb
+- test/functional/capsule/info_test.rb
+- test/functional/capsule/list_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
 - test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/component/add_test.rb
@@ -336,6 +342,7 @@ files:
 - test/functional/content_view/list_test.rb
 - test/functional/content_view/publish_test.rb
 - test/functional/content_view/puppet_module/add_test.rb
+- test/functional/content_view/puppet_module/remove_test.rb
 - test/functional/content_view/purge_test.rb
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
@@ -405,6 +412,7 @@ files:
 - test/functional/repository/synchronize_test.rb
 - test/functional/repository/update_test.rb
 - test/functional/repository/upload_test.rb
+- test/functional/search_helpers.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/sync_plan_helpers.rb
 - test/functional/test_helper.rb
@@ -451,13 +459,19 @@ test_files:
 - test/functional/activation_key/remove_host_collection_test.rb
 - test/functional/activation_key/subscriptions_test.rb
 - test/functional/activation_key/update_test.rb
+- test/functional/capsule/capsule_helpers.rb
+- test/functional/capsule/content/add_lifecycle_environment_test.rb
 - test/functional/capsule/content/cancel_synchronization_test.rb
 - test/functional/capsule/content/capsule_content_helpers.rb
 - test/functional/capsule/content/data/library_env.json
 - test/functional/capsule/content/data/sync_status.json
 - test/functional/capsule/content/data/sync_tasks.json
 - test/functional/capsule/content/info_test.rb
+- test/functional/capsule/content/lifecycle_environments_test.rb
+- test/functional/capsule/content/remove_lifecycle_environment_test.rb
 - test/functional/capsule/content/synchronization_status_test.rb
+- test/functional/capsule/info_test.rb
+- test/functional/capsule/list_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
 - test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/component/add_test.rb
@@ -476,6 +490,7 @@ test_files:
 - test/functional/content_view/list_test.rb
 - test/functional/content_view/publish_test.rb
 - test/functional/content_view/puppet_module/add_test.rb
+- test/functional/content_view/puppet_module/remove_test.rb
 - test/functional/content_view/purge_test.rb
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
@@ -545,6 +560,7 @@ test_files:
 - test/functional/repository/synchronize_test.rb
 - test/functional/repository/update_test.rb
 - test/functional/repository/upload_test.rb
+- test/functional/search_helpers.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/sync_plan_helpers.rb
 - test/functional/test_helper.rb