hammer_cli_foreman 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ce3b2c0a42afcc7d60fac9440b1363e089277c6682f8a1adf43b2954b67a02
-  data.tar.gz: 02a3da3459817db5e6dd1e87e75daba6ef121f3ac3aceb3beed8c7e9a7a32049
+  metadata.gz: 9a7510aa3b7250c6c467a18d128bc575f5a79f40c3a07283bb65def698e9c4cc
+  data.tar.gz: e5b1cbbd810d718b84f6a0102883bd4825880efe10250bbd8af1688966f209f1
 SHA512:
-  metadata.gz: 9a915023e0332a5bfd827fa75158d00bce3a71bd2cd69564296cddea4657e90e4582d7eaf8144dfa419c1b5a3b4edf79efe63135cf91dd4c60b5ec87650f865a
-  data.tar.gz: f17200f55885f6508c155f412d14d9d0630c814803255f6e496389efca1494891226aa15ec86b5f24f805b1e459a83f8dc2a352654b26464b5a78459690a0539
+  metadata.gz: e4112d9f91de37bfac6af33daf9d6e31d58d880889d421a873147dd75ac151c981849b641a90eb3322ca27add6b9dc8596f5a7fd8f6f95e830e1ffb3b8d3c5a5
+  data.tar.gz: 137ee8f5c12f70577b438132a4b5c2a68bb12c0f54f06fbdf6ad4d6db4b514bdea654c6daf3f1150132061a4e519f43c3d75828df4b2ac1fd96e767be9f45894

data/doc/release_notes.md

@@ -1,5 +1,8 @@
 Release notes
 =============
+### 2.5.1 (2021-06-08)
+* Show new msg for empty update commands, [#32454](http://projects.theforeman.org/issues/32454)
+
 ### 2.5.0 (2021-05-04)
 * Update test data to latest foreman
 *  change to resource_type_label, [#11454](http://projects.theforeman.org/issues/11454)

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -1,3 +1,4 @@
+require 'hammer_cli_foreman/command_extensions/update_common'
 require 'hammer_cli_foreman/command_extensions/fields'
 require 'hammer_cli_foreman/command_extensions/puppet_environment'
 require 'hammer_cli_foreman/command_extensions/puppet_environments'

data/lib/hammer_cli_foreman/command_extensions/update_common.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module HammerCLIForeman
+  module CommandExtensions
+    class UpdateCommon < HammerCLI::CommandExtensions
+      inheritable true
+
+      request_params do |params, command_object|
+        update_params = params[command_object.resource.singular_name]
+        command_object.context[:action_message] = :nothing_to_do if update_params && update_params.empty?
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/commands.rb

@@ -548,6 +548,19 @@ module HammerCLIForeman
       builder
     end
 
+    def self.inherited(child)
+      child.success_message_for(:nothing_to_do, _('Nothing to update.'))
+    end
+
+    def clean_up_context
+      super
+      context.delete(:action_message)
+    end
+
+    def success_message
+      success_message_for(context[:action_message] || :default)
+    end
+
     def method_options_for_params(params, options)
       opts = super
       # overwrite searchables with correct values
@@ -560,6 +573,7 @@ module HammerCLIForeman
       opts
     end
 
+    extend_with(HammerCLIForeman::CommandExtensions::UpdateCommon.new)
   end
 
 

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "2.5.0"
+    @version ||= Gem::Version.new "2.5.1"
   end
 end

data/test/functional/architecture_test.rb

@@ -45,5 +45,35 @@ describe 'architecture' do
       _(result.exit_code).must_equal HammerCLI::EX_OK
     end
   end
-end
 
+  describe 'update' do
+    before do
+      @cmd = %w[architecture update]
+      @architecture = {
+        id: 1,
+        name: 'x86_64',
+      }
+    end
+
+    it 'should update an architecture with id' do
+      params = %w[--id=1 --new-name=x86_64]
+      api_expects(:architectures, :update, 'Update architecture').returns(@architecture)
+
+      expected_result = success_result("Architecture updated.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'updates nothing without architecture related parameters' do
+      params = %w[--id=1]
+      api_expects(:architectures, :update, 'Update architecture with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+  end
+end

data/test/functional/bookmark_test.rb

@@ -158,7 +158,8 @@ describe 'bookmark' do
         api_expects(:bookmarks, :update) do |par|
           par['id'] == '1'
         end
-        run_cmd(%w[bookmark update --id 1])
+        result = run_cmd(%w[bookmark update --id 1])
+        assert_cmd(success_result("Nothing to update.\n"), result)
       end
 
       it 'update bookmark' do

data/test/functional/compute_profile_test.rb

@@ -40,6 +40,17 @@ describe "parameters" do
       result = run_cmd(@cmd + params)
       assert_cmd(success_result("Compute profile updated.\n"), result)
     end
+
+    it 'updates nothing without profile related parameters' do
+      params = %w[--id=1]
+      api_expects(:compute_profiles, :update, 'Update profile with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
   end
 
   describe "delete compute profile" do

data/test/functional/host_test.rb

@@ -404,7 +404,7 @@ describe 'host update' do
   it 'updates nothing without host related parameters' do
     api_expects(:hosts, :update, 'Update host with no host params').returns({})
 
-    expected_result = success_result("Host updated.\n")
+    expected_result = success_result("Nothing to update.\n")
 
     result = run_cmd(cmd + minimal_params)
     assert_cmd(expected_result, result)

data/test/functional/http_proxy_test.rb

@@ -61,9 +61,21 @@ describe 'httpproxy' do
   end
 
   it 'deletes an http proxy' do
+    api_expects(:http_proxies, :destroy, 'Delete proxy').returns(http_proxy)
+
     expected_result = success_result("Http proxy deleted.\n")
 
     result = run_cmd(%w(http-proxy delete --id 1))
     assert_cmd(expected_result, result)
   end
+
+  it 'updates nothing without related parameters' do
+    api_expects(:http_proxies, :update, 'Update proxy with no params').returns({})
+
+    expected_result = success_result("Nothing to update.\n")
+
+    result = run_cmd(%w(http-proxy update --id 1))
+    assert_cmd(expected_result, result)
+  end
+
 end

data/test/functional/location_test.rb

@@ -272,4 +272,17 @@ describe 'update' do
     result = run_cmd(@cmd + params)
     assert_cmd(success_result("Location updated.\n"), result)
   end
+
+  it 'updates nothing without related parameters' do
+    params = %w[--id=1]
+
+    api_expects(:locations, :index)
+    api_expects(:locations, :update, 'Update location with no params').returns({})
+
+    expected_result = success_result("Nothing to update.\n")
+
+    result = run_cmd(@cmd + params)
+    assert_cmd(expected_result, result)
+  end
+
 end

data/test/functional/media_test.rb

@@ -126,5 +126,16 @@ describe 'medium' do
       result = run_cmd(@cmd + params)
       assert_cmd(success_result("Installation medium updated.\n"), result)
     end
+
+    it 'updates nothing without medium related parameters' do
+      params = %w[--id=1]
+
+      api_expects(:media, :update, 'Update medium with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
   end
 end

data/test/functional/realm_test.rb

@@ -99,5 +99,16 @@ describe 'realm' do
       result = run_cmd(@cmd + params)
       assert_cmd(success_result("Realm [%{name}] updated.\n"), result)
     end
+
+    it 'updates nothing without realm related parameters' do
+      params = %w[--id=1]
+
+      api_expects(:realms, :update, 'Update realm with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
   end
 end

data/test/functional/report_template_test.rb

@@ -195,6 +195,17 @@ describe 'report-template' do
       result = run_cmd(cmd + params)
       assert_cmd(success_result("Report template updated.\n"), result)
     end
+
+    it 'updates nothing without template related parameters' do
+      params = %w[--id=1]
+
+      api_expects(:report_templates, :update, 'Update template with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
   end
 
   describe 'dump' do

data/test/functional/template_test.rb

@@ -95,6 +95,18 @@ describe 'template' do
 
       assert_cmd(success_result("Provisioning template updated.\n"), result)
     end
+
+    it 'updates nothing without template related parameters' do
+      params = %w[--id=1 --organization-id=1 --location-id=1]
+
+      api_expects(:template_kinds, :index, 'Get list of template kinds').returns(index_response([]))
+      api_expects(:provisioning_templates, :update, 'Update template with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
   end
 
   describe 'create' do

data/test/functional/user_test.rb

@@ -82,6 +82,17 @@ describe "user" do
       assert_cmd(expected_result, result)
     end
 
+    it 'updates nothing without user related parameters' do
+      params = %w[--id=1]
+
+      api_expects(:users, :update, 'Update user with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
     describe "update password" do
       def replace_foreman_connection(connection)
         HammerCLI.context[:api_connection].drop('foreman')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -86,8 +86,8 @@ extra_rdoc_files:
 - doc/name_id_resolution.md
 - doc/option_builder.md
 - doc/plugin.md
-- doc/using_hammer_cli_foreman_command.md
 - doc/testing.md
+- doc/using_hammer_cli_foreman_command.md
 - doc/release_notes.md
 - README.md
 files:
@@ -134,6 +134,7 @@ files:
 - lib/hammer_cli_foreman/command_extensions/puppet_environments.rb
 - lib/hammer_cli_foreman/command_extensions/status.rb
 - lib/hammer_cli_foreman/command_extensions/subnet.rb
+- lib/hammer_cli_foreman/command_extensions/update_common.rb
 - lib/hammer_cli_foreman/command_extensions/user.rb
 - lib/hammer_cli_foreman/commands.rb
 - lib/hammer_cli_foreman/common_parameter.rb
@@ -369,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Foreman commands for Hammer
@@ -388,107 +389,107 @@ test_files:
 - test/data/1.24/foreman_api.json
 - test/data/2.0/foreman_api.json
 - test/data/2.1/foreman_api.json
-- test/data/README.md
 - test/data/2.4/foreman_api.json
 - test/data/2.5/foreman_api.json
+- test/data/README.md
 - test/functional/associating_commands_test.rb
+- test/functional/audit_test.rb
 - test/functional/auth_source_test.rb
 - test/functional/commands/list_test.rb
 - test/functional/compute_attribute_test.rb
+- test/functional/compute_resource_test.rb
+- test/functional/config_group_test.rb
+- test/functional/filter_test.rb
 - test/functional/hostgroup/create_test.rb
 - test/functional/hostgroup/update_test.rb
-- test/functional/http_proxy_test.rb
+- test/functional/mail_notification_test.rb
+- test/functional/model_test.rb
+- test/functional/operating_system_test.rb
+- test/functional/organization_test.rb
 - test/functional/personal_access_token_test.rb
+- test/functional/ping_test.rb
 - test/functional/proxy_test.rb
-- test/functional/report_template_test.rb
+- test/functional/registration_test.rb
+- test/functional/role_test.rb
+- test/functional/settings_test.rb
 - test/functional/smart_class_parameter_test.rb
 - test/functional/ssh_keys_test.rb
+- test/functional/status_test.rb
 - test/functional/subnet/create_test.rb
 - test/functional/subnet/update_test.rb
-- test/functional/template_test.rb
 - test/functional/test_helper.rb
 - test/functional/user_mail_notification_test.rb
+- test/functional/usergroup_test.rb
 - test/functional/virtual_machine_test.rb
+- test/functional/architecture_test.rb
+- test/functional/bookmark_test.rb
+- test/functional/compute_profile_test.rb
+- test/functional/host_test.rb
+- test/functional/http_proxy_test.rb
 - test/functional/location_test.rb
 - test/functional/media_test.rb
 - test/functional/realm_test.rb
-- test/functional/role_test.rb
-- test/functional/bookmark_test.rb
-- test/functional/compute_profile_test.rb
-- test/functional/compute_resource_test.rb
-- test/functional/config_group_test.rb
-- test/functional/mail_notification_test.rb
-- test/functional/ping_test.rb
-- test/functional/registration_test.rb
-- test/functional/status_test.rb
-- test/functional/filter_test.rb
-- test/functional/model_test.rb
-- test/functional/settings_test.rb
-- test/functional/audit_test.rb
-- test/functional/organization_test.rb
+- test/functional/report_template_test.rb
 - test/functional/user_test.rb
-- test/functional/architecture_test.rb
-- test/functional/host_test.rb
-- test/functional/operating_system_test.rb
-- test/functional/usergroup_test.rb
+- test/functional/template_test.rb
+- test/test_helper.rb
+- test/unit/api/interactive_basic_auth_test.rb
 - test/unit/api/oauth/oauth_authentication_code_grant_test.rb
 - test/unit/api/oauth/oauth_password_grant_test.rb
 - test/unit/api/session_authenticator_wrapper_test.rb
 - test/unit/api/void_auth_test.rb
-- test/unit/api/interactive_basic_auth_test.rb
+- test/unit/api_test.rb
+- test/unit/apipie_resource_mock.rb
+- test/unit/architecture_test.rb
 - test/unit/audit_test.rb
 - test/unit/auth_source_external.rb
 - test/unit/auth_source_ldap_test.rb
+- test/unit/bookmark_test.rb
+- test/unit/commands_test.rb
+- test/unit/common_parameter_test.rb
+- test/unit/compute_profile_test.rb
 - test/unit/compute_resource_test.rb
+- test/unit/config_group_test.rb
+- test/unit/config_report_test.rb
 - test/unit/data/test_api.json
 - test/unit/defaults_test.rb
+- test/unit/dependency_resolver_test.rb
 - test/unit/domain_test.rb
+- test/unit/exception_handler_test.rb
 - test/unit/external_usergroup_test.rb
 - test/unit/fact_test.rb
 - test/unit/filter_test.rb
-- test/unit/helpers/fake_searchables.rb
 - test/unit/helpers/command.rb
+- test/unit/helpers/fake_searchables.rb
 - test/unit/helpers/resource_disabled.rb
-- test/unit/hostgroup_test.rb
+- test/unit/id_resolver_test.rb
 - test/unit/image_test.rb
 - test/unit/location_test.rb
+- test/unit/mail_notification_test.rb
+- test/unit/media_test.rb
 - test/unit/messages_test.rb
+- test/unit/model_test.rb
+- test/unit/operating_system_test.rb
+- test/unit/option_builders_test.rb
 - test/unit/option_sources/id_params_test.rb
 - test/unit/option_sources/ids_params_test.rb
 - test/unit/organization_test.rb
 - test/unit/output/formatters_test.rb
+- test/unit/param_filters_test.rb
+- test/unit/partition_table_test.rb
 - test/unit/puppet_class_test.rb
-- test/unit/puppet_environment_test.rb
 - test/unit/realm_test.rb
-- test/unit/smart_class_parameter_test.rb
-- test/unit/smart_proxy_test.rb
+- test/unit/role_test.rb
+- test/unit/sessions_test.rb
+- test/unit/settings_test.rb
 - test/unit/subnet_test.rb
+- test/unit/template_test.rb
 - test/unit/test_helper.rb
 - test/unit/test_output_adapter.rb
 - test/unit/user_test.rb
-- test/unit/api_test.rb
-- test/unit/commands_test.rb
-- test/unit/common_parameter_test.rb
-- test/unit/dependency_resolver_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/host_test.rb
-- test/unit/id_resolver_test.rb
-- test/unit/media_test.rb
-- test/unit/option_builders_test.rb
-- test/unit/param_filters_test.rb
-- test/unit/partition_table_test.rb
-- test/unit/role_test.rb
-- test/unit/sessions_test.rb
-- test/unit/template_test.rb
 - test/unit/usergroup_test.rb
-- test/unit/architecture_test.rb
-- test/unit/compute_profile_test.rb
-- test/unit/config_group_test.rb
-- test/unit/mail_notification_test.rb
-- test/unit/model_test.rb
-- test/unit/settings_test.rb
-- test/unit/apipie_resource_mock.rb
-- test/unit/bookmark_test.rb
-- test/unit/config_report_test.rb
-- test/unit/operating_system_test.rb
-- test/test_helper.rb
+- test/unit/host_test.rb
+- test/unit/hostgroup_test.rb
+- test/unit/puppet_environment_test.rb
+- test/unit/smart_class_parameter_test.rb
+- test/unit/smart_proxy_test.rb