hammer_cli_foreman 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0498fc381643ec00359362e585a879ae2e6ef425f8546b6b1f1245ce4dd2891
-  data.tar.gz: 060dfe82dbe23fec7a3a84d89e8077c756c5e87aced3617a5b8923c8a2827967
+  metadata.gz: 153f99e72a9d4a889641be0d5a99e60192ee3dd20a783e86db831b5de9618744
+  data.tar.gz: 4038d91f5d942a78cd5ce71296ed1a07438abadcfc6a5f77eac0abcdfcebbf76
 SHA512:
-  metadata.gz: d913007afab58dbc5b387f3536215f2e1ce9fd7190eb1fbd7e494ee30e6bba325045d864e1f0d1326690922715a506fd44c7df1f5e6ec1340ade26425580e5e2
-  data.tar.gz: ec80e3b7f0386b4786830e0e676ea172ea3472b4ecd771aae5c3239720cd5bcf34846e91e5cda1a816e6f5d864269a72b202ad1b1a164769661584f7dbac7da6
+  metadata.gz: 7290953f2d944f09645d2eb31a868398d8e75e1ea5086d1c84cfb1d2a097914df10d6e0ee76195b6258ca2a8fe8c6ccc755f4a906d1c3fba756c1eb218ffcfe3
+  data.tar.gz: c8624ea106c8daa295010f58ed340763513a919b0463392400df940444f2b3859d879e98160483161e94aeaacee45736e3b4d3329bc0e7b3a7d80ae3bba27a8c

data/doc/release_notes.md

@@ -1,5 +1,11 @@
 Release notes
 =============
+### 3.7.0 (2023-05-23)
+* Update rake for hammer-cli-foreman ([PR #613](https://github.com/theforeman/hammer-cli-foreman/pull/613)), [#36337](http://projects.theforeman.org/issues/36337)
+* Update minitest version ([PR #611](https://github.com/theforeman/hammer-cli-foreman/pull/611)), [#36349](http://projects.theforeman.org/issues/36349)
+* Allow to suppress nothing to update message, [#36213](http://projects.theforeman.org/issues/36213)
+* Bump to 3.7.0-develop
+
 ### 3.6.0 (2023-02-23)
 * Support basic auth for external sources, [#11317](http://projects.theforeman.org/issues/11317)
 * Remove underscore from labels ([PR #608](https://github.com/theforeman/hammer-cli-foreman/pull/608)), [#35904](http://projects.theforeman.org/issues/35904)

data/lib/hammer_cli_foreman/command_extensions/update_common.rb

@@ -7,7 +7,7 @@ module HammerCLIForeman
 
       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?
+        command_object.context[:action_message] = :nothing_to_do if update_params && update_params.empty? && command_object.context[:action_message].nil?
       end
     end
   end

data/lib/hammer_cli_foreman/commands.rb

@@ -244,7 +244,7 @@ module HammerCLIForeman
       super
       begin
         output_definition.update_field_sets('THIN', (searchables.for(resource).map(&:name) + ['id']).map(&:to_sym))
-      rescue StandardError => e
+      rescue StandardError
         # Some subcommands may not have such fields or defined resource
       end
     end
@@ -489,7 +489,7 @@ module HammerCLIForeman
       super
       begin
         output_definition.update_field_sets('THIN', (searchables.for(resource).map(&:name) + ['id']).map(&:to_sym))
-      rescue StandardError => e
+      rescue StandardError
         # Some subcommands may not have such fields or defined resource
       end
     end
@@ -585,8 +585,6 @@ module HammerCLIForeman
     action :update
 
     def self.create_option_builder
-      configurator = BuilderConfigurator.new(searchables, dependency_resolver)
-
       builder = ForemanOptionBuilder.new(searchables)
       builder.builders = [
         SearchablesOptionBuilder.new(resource, searchables),

data/lib/hammer_cli_foreman/compute_resource/utils.rb

@@ -13,13 +13,13 @@ module HammerCLIForeman
           HammerCLIForeman.foreman_resource(:hostgroups).call(:show, 'id' => hostgroup_id)
       )
       compute_resource_id = hostgroup['compute_resource_id']
-       if !hostgroup['compute_resource_name'].to_s.strip.empty? && compute_resource_id.nil?
-         compute_resource= HammerCLIForeman.record_to_common_format(
-            HammerCLIForeman.foreman_resource(:compute_resources).call(
-                :index, :search => "name = \"#{hostgroup['compute_resource_name']}\""
-            )
-         )
-         compute_resource_id = compute_resource['results'][0]['id'] if compute_resource['results'][0]
+      if !hostgroup['compute_resource_name'].to_s.strip.empty? && compute_resource_id.nil?
+        compute_resource= HammerCLIForeman.record_to_common_format(
+          HammerCLIForeman.foreman_resource(:compute_resources).call(
+              :index, :search => "name = \"#{hostgroup['compute_resource_name']}\""
+          )
+        )
+        compute_resource_id = compute_resource['results'][0]['id'] if compute_resource['results'][0]
       end
       compute_resource_id
     end

data/lib/hammer_cli_foreman/exception_handler.rb

@@ -99,7 +99,7 @@ module HammerCLIForeman
         response = JSON.parse(e.response)
         response = HammerCLIForeman.record_to_common_format(response) unless response.has_key?('message')
         message = response['message'] || e.message
-      rescue JSON::ParserError => parse_e
+      rescue JSON::ParserError
         message = e.message
       end
 
@@ -123,13 +123,7 @@ module HammerCLIForeman
       host_url = HammerCLI::Settings.get(:_params, :host) || HammerCLI::Settings.get(:foreman, :host)
       uri = URI.parse(host_url)
       ssl_option = HammerCLI::SSLOptions.new.get_options(uri)
-      if uri.host.nil?
-        host = '<FOREMAN_HOST>'
-        cert_name = "#{host}.crt"
-      else
-        host = uri.to_s
-        cert_name = "#{uri.host}.crt"
-      end
+      host = uri.host.nil? ? '<FOREMAN_HOST>' : uri.to_s
 
       cmd = "hammer --fetch-ca-cert #{host}"
 

data/lib/hammer_cli_foreman/external_usergroup.rb

@@ -1,5 +1,3 @@
-require 'hammer_cli_foreman/usergroup'
-
 module HammerCLIForeman
   class ExternalUsergroup < HammerCLIForeman::Command
     resource :external_usergroups

data/lib/hammer_cli_foreman/resource_supported_test.rb

@@ -15,7 +15,7 @@ module HammerCLIForeman
     def resource_supported?
       resource.call(:index)
       true
-    rescue RestClient::ResourceNotFound => e
+    rescue RestClient::ResourceNotFound
       false
     end
 

data/lib/hammer_cli_foreman/testing/api_expectations.rb

@@ -12,12 +12,12 @@ module HammerCLIForeman
         def initialize(resource=nil, action=nil, &block)
           @expected_resource = resource
           @expected_action = action
-          @block = block if block_given?
+          @block = block
           @expected_params = {}
         end
 
         def matches?(actual_parameters)
-          action, params, headers, options = actual_parameters.shift(4)
+          action, params, _headers, _options = actual_parameters.shift(4)
           action_name = action.name.to_s
           resource_name = action.resource.to_s
 

data/lib/hammer_cli_foreman/version.rb

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

data/test/functional/bookmark_test.rb

@@ -87,8 +87,8 @@ describe 'bookmark' do
       it 'should create a bookmark' do
         params = ['--name=newBookmark', '--controller=hosts', '--query=status = failed']
         api_expects(:bookmarks, :create, 'Create bookmark') do |params|
-          (params['bookmark']['name'] == 'newBookmark')
-          (params['bookmark']['controller'] == 'hosts')
+          (params['bookmark']['name'] == 'newBookmark') &&
+          (params['bookmark']['controller'] == 'hosts') &&
           (params['bookmark']['query'] == 'status = failed')
         end
         result = run_cmd(@cmd + params)

data/test/functional/filter_test.rb

@@ -40,7 +40,7 @@ describe 'filter' do
       params = ['--role-id=1', '--permission-ids=[1]']
 
       api_expects(:filters, :create) do |params|
-        (params['filter']['role_id'] == 1)
+        (params['filter']['role_id'] == '1') &&
         (params['filter']['permission_ids'] == [1])
       end
 

data/test/functional/location_test.rb

@@ -262,7 +262,7 @@ describe 'update' do
 
     api_expects(:locations, :index)
     api_expects(:locations, :update, 'Update a location') do |params|
-      (params['location']['id'] == '1')
+      (params['id'] == '1') &&
       (params['location']['name'] == 'Default Location test')
     end
 

data/test/functional/media_test.rb

@@ -77,7 +77,7 @@ describe 'medium' do
       params = ['--name=CentOS mirror', '--path=http://mirror.centos.org/centos/$major/os/$arch']
 
       api_expects(:media, :create) do |params|
-        (params['medium']['name'] == 'CentOS mirror')
+        (params['medium']['name'] == 'CentOS mirror') &&
         (params['medium']['path'] == 'http://mirror.centos.org/centos/$major/os/$arch')
       end
 
@@ -119,7 +119,7 @@ describe 'medium' do
       params = ['--id=1', '--new-name=CentOS mirror test']
 
       api_expects(:media, :update, 'Update a media') do |params|
-        (params['medium']['id'] == '1')
+        (params['id'] == '1') &&
         (params['medium']['name'] == 'CentOS mirror test')
       end
 

data/test/functional/settings_test.rb

@@ -101,7 +101,7 @@ describe 'Settings' do
       params = ['--id=1', '--value=true']
 
       api_expects(:settings, :update, 'Update a setting') do |params|
-        (params['setting']['id'] == '1')
+        (params['id'] == '1') &&
         (params['setting']['value'] == 'true')
       end
 

data/test/unit/api/session_authenticator_wrapper_test.rb

@@ -141,7 +141,7 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
 
     context "when the session file is corrupted" do
       it 'reports error' do
-        dir, out, err = prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
+        _dir, _out, err = prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
           write_session(dir, '{not a valid: json')
 
           wrapped_auth.expects(:authenticate).with(request, args)

data/test/unit/commands_test.rb

@@ -91,7 +91,7 @@ describe HammerCLIForeman do
           }
       })
       arch = HammerCLIForeman::Architecture::CreateCommand.new("", { :adapter => :csv, :interactive => false })
-      out, err = capture_io { arch.run(["--name='i386'"]) }
+      out, _ = capture_io { arch.run(["--name='i386'"]) }
       _(out).must_match("Message,Id,Name\nArchitecture created.,3,i386\n")
     end
   end
@@ -151,7 +151,7 @@ describe HammerCLIForeman do
         end
       end
       comm = DomainOuter::HostsCommand.new("", { :adapter => :csv, :interactive => false })
-      out, err = capture_io { comm.run(["--id=5"]) }
+      out, _ = capture_io { comm.run(["--id=5"]) }
       _(out).must_equal "Id,Name,Operating System,Host Group,IP,MAC\n2,random-host,,,192.168.100.112,6e:4b:3c:2c:8a:0a\n"
     end
   end
@@ -180,7 +180,7 @@ describe HammerCLIForeman::Command do
         HammerCLIForeman.foreman_api_connection.api.resource(:locations)
       )
     )
-    out, err = capture_io do
+    _, err = capture_io do
       _(com.run(['--location', 'loc'])).wont_equal HammerCLI::EX_OK
     end
     _(err).must_equal "Error: Could not find location, please set one of options --location-id, --location, --location-title.\n"
@@ -203,7 +203,7 @@ describe HammerCLIForeman::Command do
 
     ResourceMocks.mock_action_call(:domains, :index, [])
 
-    out, err = capture_io do
+    _out, _err = capture_io do
       _(com.run([])).must_equal HammerCLI::EX_OK
     end
 

data/test/unit/helpers/command.rb

@@ -6,7 +6,31 @@ class IdResolverTestProxy
 
   def initialize(original_resolver)
     @original_resolver = original_resolver
-    define_id_finders
+  end
+
+  def self.for_resolver(original_resolver)
+    resolver = Class.new(IdResolverTestProxy) do |cls|
+      original_resolver.api.resources.each do |resource|
+        method_name = "#{resource.singular_name}_id"
+        cls.define_method(method_name) do |options|
+          value = options[HammerCLI.option_accessor_name("id")]
+          value ||= HammerCLI::NilValue if searchables(resource).any? do |s|
+            options[HammerCLI.option_accessor_name(s.name)] == HammerCLI::NilValue
+          end
+          value ||= 1 if searchables(resource).any? do |s|
+            !options[HammerCLI.option_accessor_name(s.name)].nil?
+          end
+          value
+        end
+
+        method_name = "#{resource.singular_name}_ids"
+        cls.define_method(method_name) do |options|
+          options["option_#{resource.singular_name}_ids"].nil? ? nil : [1]
+        end
+      end
+    end
+
+    resolver.new(original_resolver)
   end
 
   def scoped_options(scope, options, mode = nil)
@@ -16,30 +40,6 @@ class IdResolverTestProxy
   def searchables(resource)
     @original_resolver.searchables(resource)
   end
-
-  protected
-
-  def define_id_finders
-    @original_resolver.api.resources.each do |resource|
-      method_name = "#{resource.singular_name}_id"
-      self.class.send(:define_method, method_name) do |options|
-        value = options[HammerCLI.option_accessor_name("id")]
-        value ||= HammerCLI::NilValue if searchables(resource).any? do |s|
-          options[HammerCLI.option_accessor_name(s.name)] == HammerCLI::NilValue
-        end
-        value ||= 1 if searchables(resource).any? do |s|
-          !options[HammerCLI.option_accessor_name(s.name)].nil?
-        end
-        value
-      end
-
-      method_name = "#{resource.singular_name}_ids"
-      self.class.send(:define_method, method_name) do |options|
-        options["option_#{resource.singular_name}_ids"].nil? ? nil : [1]
-      end
-    end
-  end
-
 end
 
 
@@ -50,7 +50,7 @@ module CommandTestHelper
 
     base.before :each do
       resolver = cmd.resolver
-      cmd.stubs(:resolver).returns(IdResolverTestProxy.new(resolver))
+      cmd.stubs(:resolver).returns(IdResolverTestProxy.for_resolver(resolver))
     end
   end
 
@@ -63,7 +63,7 @@ module CommandTestHelper
     def with_params(params, &block)
       context "with params "+params.to_s do
         let(:with_params) { params }
-        self.instance_eval &block
+        self.instance_eval(&block)
       end
     end
 
@@ -95,7 +95,7 @@ module CommandTestHelper
 
     def it_should_accept(message, arguments=[])
       it "should accept " + message.to_s do
-        out, err = capture_io do
+        _out, _err = capture_io do
           _(cmd.run(arguments)).must_equal HammerCLI::EX_OK
         end
       end
@@ -105,7 +105,7 @@ module CommandTestHelper
       it "should output '" + message.to_s + "'" do
         arguments ||= respond_to?(:with_params) ? with_params : []
         cmd.stubs(:context).returns(ctx.update(:adapter => adapter))
-        out, err = capture_io do
+        out, _ = capture_io do
           cmd.run(arguments)
         end
         _(out).must_include message
@@ -117,11 +117,11 @@ module CommandTestHelper
         arguments ||= respond_to?(:with_params) ? with_params : []
 
         cmd.stubs(:context).returns(ctx.update(:adapter => :test))
-        out, err = capture_io do
+        out, _ = capture_io do
           cmd.run(arguments)
         end
 
-        _(out.split("\n")[0]).must_match /.*##{column_name}#.*/
+        _(out.split("\n")[0]).must_match(/.*##{column_name}#.*/)
       end
     end
 
@@ -137,7 +137,7 @@ module CommandTestHelper
 
         cmd.stubs(:context).returns(ctx.update(:adapter => :test))
         count ||= expected_record_count rescue 0
-        out, err = capture_io do
+        out, _ = capture_io do
           cmd.run(arguments)
         end
         _(out.split(/\n/).length).must_equal count+1 # plus 1 for line with column headers

data/test/unit/id_resolver_test.rb

@@ -109,7 +109,7 @@ describe HammerCLIForeman::IdResolver do
       let(:resolver_run) { proc { resolver.comment_id({"option_unknown" => "value"}) } }
 
       it "raises exception" do
-        err = _(resolver_run).must_raise HammerCLIForeman::MissingSearchOptions
+        _(resolver_run).must_raise HammerCLIForeman::MissingSearchOptions
       end
 
       it "builds correct error message" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: apipie-bindings
   requirement: !ruby/object:Gem::Requirement
@@ -395,21 +395,17 @@ test_files:
 - test/functional/associating_commands_test.rb
 - test/functional/audit_test.rb
 - test/functional/auth_source_test.rb
-- test/functional/bookmark_test.rb
 - test/functional/commands/list_test.rb
 - test/functional/compute_attribute_test.rb
 - test/functional/compute_profile_test.rb
 - test/functional/compute_resource_test.rb
 - test/functional/domain/create_test.rb
 - test/functional/domain/update_test.rb
-- test/functional/filter_test.rb
 - test/functional/host_test.rb
 - test/functional/hostgroup/create_test.rb
 - test/functional/hostgroup/update_test.rb
 - test/functional/http_proxy_test.rb
-- test/functional/location_test.rb
 - test/functional/mail_notification_test.rb
-- test/functional/media_test.rb
 - test/functional/model_test.rb
 - test/functional/operating_system_test.rb
 - test/functional/organization_test.rb
@@ -420,7 +416,6 @@ test_files:
 - test/functional/registration_test.rb
 - test/functional/report_template_test.rb
 - test/functional/role_test.rb
-- test/functional/settings_test.rb
 - test/functional/ssh_keys_test.rb
 - test/functional/status_test.rb
 - test/functional/subnet/create_test.rb
@@ -432,12 +427,17 @@ test_files:
 - test/functional/user_test.rb
 - test/functional/usergroup_test.rb
 - test/functional/virtual_machine_test.rb
+- test/functional/bookmark_test.rb
+- test/functional/filter_test.rb
+- test/functional/location_test.rb
+- test/functional/media_test.rb
+- test/functional/settings_test.rb
 - test/test_helper.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/session_authenticator_wrapper_test.rb
 - test/unit/api_test.rb
 - test/unit/apipie_resource_mock.rb
 - test/unit/architecture_test.rb
@@ -445,7 +445,6 @@ test_files:
 - 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
@@ -458,12 +457,11 @@ test_files:
 - test/unit/external_usergroup_test.rb
 - test/unit/fact_test.rb
 - test/unit/filter_test.rb
-- test/unit/helpers/command.rb
 - test/unit/helpers/fake_searchables.rb
 - test/unit/helpers/resource_disabled.rb
+- test/unit/helpers/command.rb
 - test/unit/host_test.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
@@ -489,3 +487,5 @@ test_files:
 - test/unit/test_output_adapter.rb
 - test/unit/user_test.rb
 - test/unit/usergroup_test.rb
+- test/unit/commands_test.rb
+- test/unit/id_resolver_test.rb