hammer_cli_foreman 2.3.2 → 3.0.0

data/test/unit/option_sources/id_params_test.rb

@@ -26,5 +26,14 @@ describe HammerCLIForeman::OptionSources::IdParams do
       params = id_params_source.get_options([], option_data)
       _(params).must_equal expected_data
     end
+
+    it 'resolves param when set but different name' do
+      hg_cmd.stubs(:get_resource_id).returns(nil)
+      hg_cmd.expects(:get_resource_id).with { |res| res.name == :domains }.returns(3)
+      option_data = { 'option_domain_id' => 1, 'option_domain_name' => 'test3' }
+      expected_data = { 'option_domain_id' => 3, 'option_domain_name' => 'test3' }
+      params = id_params_source.get_options([], option_data)
+      _(params).must_equal expected_data
+    end
   end
 end

data/test/unit/option_sources/ids_params_test.rb

@@ -26,5 +26,14 @@ describe HammerCLIForeman::OptionSources::IdsParams do
       params = ids_params_source.get_options([], option_data)
       _(params).must_equal expected_data
     end
+
+    it "resolves param when set but different name" do
+      cmd.stubs(:get_resource_ids).returns(nil)
+      cmd.expects(:get_resource_ids).with { |res| res.name == :locations }.returns([3])
+      option_data = { 'option_location_ids' => [1], 'option_location_names' => 'test3' }
+      expected_data = { 'option_location_ids' => [3], 'option_location_names' => 'test3' }
+      params = ids_params_source.get_options([], option_data)
+      _(params).must_equal expected_data
+    end
   end
 end

data/test/unit/settings_test.rb

@@ -18,6 +18,8 @@ describe HammerCLIForeman::Settings do
     context "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
+      it_should_accept 'organization', ['--organization-id=1']
+      it_should_accept 'location', ['--location-id=1']
     end
 
     context "output" do
@@ -38,6 +40,8 @@ describe HammerCLIForeman::Settings do
     context "parameters" do
       it_should_accept "name", ["--name=setting1", "--value=setting2"]
       it_should_accept "id", ["--id=1", "--value=setting2"]
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
 
   end

data/test/unit/smart_proxy_test.rb

@@ -90,18 +90,6 @@ describe HammerCLIForeman::SmartProxy do
 
   end
 
-  context "ImportPuppetClassesCommand" do
-
-    let(:cmd) { HammerCLIForeman::SmartProxy::ImportPuppetClassesCommand.new("", ctx) }
-
-    context "parameters" do
-      it_should_accept "id, environment-id and dryrun", ["--id=1", "--environment-id=1", "--dryrun"]
-      # it_should_fail_with "id missing", []
-      # TODO: temporarily disabled, parameters are checked in the id resolver
-    end
-
-  end
-
   context "RefreshFeaturesCommand" do
 
     let(:cmd) { HammerCLIForeman::SmartProxy::RefreshFeaturesCommand.new("", ctx) }

data/test/unit/usergroup_test.rb

@@ -18,6 +18,8 @@ describe HammerCLIForeman::Usergroup do
     context "parameters" do
       it_should_accept "no arguments"
       it_should_accept_search_params
+      it_should_accept 'organization', ['--organization-id=1']
+      it_should_accept 'location', ['--location-id=1']
     end
 
     context "output" do
@@ -35,6 +37,8 @@ describe HammerCLIForeman::Usergroup do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=ug"]
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
 
     context "output" do
@@ -58,6 +62,8 @@ describe HammerCLIForeman::Usergroup do
     context "parameters" do
       it_should_accept "name", ["--name=ug"]
       it_should_accept "name, role ids, user group ids and user ids", ["--name=ug", "--role-ids=1,2,3", "--user-group-ids=1,2,3", "--user-ids=1,2,3"]
+      it_should_accept 'organization', %w[--name=ug --organization-id=1]
+      it_should_accept 'location', %w[--name=ug --location-id=1]
     end
   end
 
@@ -68,6 +74,8 @@ describe HammerCLIForeman::Usergroup do
     context "parameters" do
       it_should_accept "name", ["--name=ug"]
       it_should_accept "id", ["--id=1"]
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
   end
 
@@ -80,6 +88,8 @@ describe HammerCLIForeman::Usergroup do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name and new name", ["--name=ug", "--new-name=ug2"]
       it_should_accept "id, new name, role ids, user group ids and user ids", ["--id=1", "--new-name=ug", "--role-ids=1,2,3", "--user-group-ids=1,2,3", "--user-ids=1,2,3"]
+      it_should_accept 'organization', %w[--id=1 --organization-id=1]
+      it_should_accept 'location', %w[--id=1 --location-id=1]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 3.0.0
 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-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: apipie-bindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -81,12 +81,12 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - doc/configuration.md
-- doc/developer_docs.md
-- doc/host_create.md
 - doc/name_id_resolution.md
 - doc/option_builder.md
-- doc/plugin.md
 - doc/using_hammer_cli_foreman_command.md
+- doc/developer_docs.md
+- doc/host_create.md
+- doc/plugin.md
 - doc/testing.md
 - doc/release_notes.md
 - README.md
@@ -130,10 +130,9 @@ files:
 - lib/hammer_cli_foreman/command_extensions/hosts/help/interfaces.rb
 - lib/hammer_cli_foreman/command_extensions/option_sources.rb
 - lib/hammer_cli_foreman/command_extensions/ping.rb
-- lib/hammer_cli_foreman/command_extensions/puppet_environment.rb
-- 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
@@ -150,7 +149,6 @@ files:
 - lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb
 - lib/hammer_cli_foreman/compute_resource/utils.rb
 - lib/hammer_cli_foreman/compute_resource/vmware.rb
-- lib/hammer_cli_foreman/config_group.rb
 - lib/hammer_cli_foreman/config_report.rb
 - lib/hammer_cli_foreman/defaults.rb
 - lib/hammer_cli_foreman/dependency_resolver.rb
@@ -181,7 +179,6 @@ files:
 - lib/hammer_cli_foreman/option_sources/id_params.rb
 - lib/hammer_cli_foreman/option_sources/ids_params.rb
 - lib/hammer_cli_foreman/option_sources/new_params.rb
-- lib/hammer_cli_foreman/option_sources/puppet_environment_params.rb
 - lib/hammer_cli_foreman/option_sources/referenced_resource_id_params.rb
 - lib/hammer_cli_foreman/option_sources/self_param.rb
 - lib/hammer_cli_foreman/option_sources/user_params.rb
@@ -194,16 +191,14 @@ files:
 - lib/hammer_cli_foreman/partition_table.rb
 - lib/hammer_cli_foreman/personal_access_token.rb
 - lib/hammer_cli_foreman/ping.rb
-- lib/hammer_cli_foreman/puppet_class.rb
-- lib/hammer_cli_foreman/puppet_environment.rb
 - lib/hammer_cli_foreman/realm.rb
 - lib/hammer_cli_foreman/references.rb
+- lib/hammer_cli_foreman/registration.rb
 - lib/hammer_cli_foreman/report_template.rb
 - lib/hammer_cli_foreman/resource_supported_test.rb
 - lib/hammer_cli_foreman/role.rb
 - lib/hammer_cli_foreman/sessions.rb
 - lib/hammer_cli_foreman/settings.rb
-- lib/hammer_cli_foreman/smart_class_parameter.rb
 - lib/hammer_cli_foreman/smart_proxy.rb
 - lib/hammer_cli_foreman/ssh_keys.rb
 - lib/hammer_cli_foreman/status.rb
@@ -245,7 +240,10 @@ files:
 - test/data/1.24/foreman_api.json
 - test/data/2.0/foreman_api.json
 - test/data/2.1/foreman_api.json
+- test/data/2.4/foreman_api.json
+- test/data/2.5/foreman_api.json
 - test/data/README.md
+- test/functional/architecture_test.rb
 - test/functional/associating_commands_test.rb
 - test/functional/audit_test.rb
 - test/functional/auth_source_test.rb
@@ -262,15 +260,16 @@ files:
 - 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
 - test/functional/personal_access_token_test.rb
 - test/functional/ping_test.rb
-- test/functional/proxy_test.rb
 - test/functional/realm_test.rb
+- test/functional/registration_test.rb
 - test/functional/report_template_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
@@ -279,6 +278,7 @@ files:
 - test/functional/test_helper.rb
 - test/functional/user_mail_notification_test.rb
 - test/functional/user_test.rb
+- test/functional/usergroup_test.rb
 - test/functional/virtual_machine_test.rb
 - test/test_helper.rb
 - test/unit/api/interactive_basic_auth_test.rb
@@ -292,10 +292,11 @@ files:
 - 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
@@ -313,6 +314,7 @@ files:
 - 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
@@ -324,13 +326,10 @@ files:
 - 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/role_test.rb
 - test/unit/sessions_test.rb
 - test/unit/settings_test.rb
-- test/unit/smart_class_parameter_test.rb
 - test/unit/smart_proxy_test.rb
 - test/unit/subnet_test.rb
 - test/unit/template_test.rb
@@ -357,7 +356,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
@@ -376,96 +375,100 @@ 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/2.4/foreman_api.json
+- test/data/2.5/foreman_api.json
 - test/data/README.md
-- test/functional/associating_commands_test.rb
 - test/functional/auth_source_test.rb
 - test/functional/commands/list_test.rb
-- test/functional/compute_attribute_test.rb
+- test/functional/compute_profile_test.rb
 - test/functional/hostgroup/create_test.rb
 - test/functional/hostgroup/update_test.rb
-- test/functional/http_proxy_test.rb
-- test/functional/personal_access_token_test.rb
-- test/functional/proxy_test.rb
-- test/functional/report_template_test.rb
-- test/functional/smart_class_parameter_test.rb
+- test/functional/template_test.rb
 - test/functional/ssh_keys_test.rb
-- test/functional/subnet/create_test.rb
 - test/functional/subnet/update_test.rb
-- test/functional/template_test.rb
+- test/functional/subnet/create_test.rb
 - test/functional/test_helper.rb
-- test/functional/user_mail_notification_test.rb
-- test/functional/virtual_machine_test.rb
-- test/functional/location_test.rb
+- test/functional/filter_test.rb
+- test/functional/http_proxy_test.rb
 - test/functional/media_test.rb
-- test/functional/realm_test.rb
-- test/functional/role_test.rb
-- test/functional/settings_test.rb
+- test/functional/registration_test.rb
 - test/functional/bookmark_test.rb
-- test/functional/compute_profile_test.rb
+- test/functional/mail_notification_test.rb
+- test/functional/settings_test.rb
+- test/functional/user_mail_notification_test.rb
 - test/functional/compute_resource_test.rb
-- test/functional/ping_test.rb
-- test/functional/status_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/filter_test.rb
+- test/functional/virtual_machine_test.rb
+- test/functional/architecture_test.rb
+- test/functional/model_test.rb
+- test/functional/compute_attribute_test.rb
 - test/functional/host_test.rb
-- test/functional/mail_notification_test.rb
+- test/functional/associating_commands_test.rb
+- test/functional/audit_test.rb
+- test/functional/ping_test.rb
+- test/functional/realm_test.rb
+- test/functional/role_test.rb
+- test/functional/status_test.rb
+- test/functional/operating_system_test.rb
+- test/functional/usergroup_test.rb
+- test/functional/personal_access_token_test.rb
+- test/functional/location_test.rb
+- test/unit/api/void_auth_test.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/audit_test.rb
-- test/unit/auth_source_external.rb
+- test/unit/test_output_adapter.rb
+- test/unit/host_test.rb
 - test/unit/auth_source_ldap_test.rb
+- test/unit/config_report_test.rb
 - test/unit/compute_resource_test.rb
 - test/unit/data/test_api.json
 - test/unit/defaults_test.rb
-- test/unit/domain_test.rb
+- test/unit/architecture_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/resource_disabled.rb
-- test/unit/hostgroup_test.rb
+- test/unit/helpers/command.rb
 - test/unit/image_test.rb
 - test/unit/location_test.rb
 - test/unit/messages_test.rb
+- test/unit/bookmark_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/puppet_class_test.rb
-- test/unit/puppet_environment_test.rb
+- test/unit/common_parameter_test.rb
 - test/unit/realm_test.rb
-- test/unit/smart_class_parameter_test.rb
-- test/unit/smart_proxy_test.rb
+- test/unit/usergroup_test.rb
+- test/unit/option_builders_test.rb
 - test/unit/subnet_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/hostgroup_test.rb
+- test/unit/mail_notification_test.rb
+- test/unit/model_test.rb
+- test/unit/operating_system_test.rb
+- test/unit/audit_test.rb
+- test/unit/auth_source_external.rb
+- test/unit/dependency_resolver_test.rb
+- test/unit/exception_handler_test.rb
+- test/unit/filter_test.rb
+- test/unit/media_test.rb
 - test/unit/sessions_test.rb
-- test/unit/template_test.rb
 - test/unit/apipie_resource_mock.rb
-- test/unit/architecture_test.rb
-- test/unit/config_report_test.rb
-- test/unit/operating_system_test.rb
+- test/unit/api_test.rb
+- test/unit/smart_proxy_test.rb
 - test/unit/settings_test.rb
-- test/unit/usergroup_test.rb
-- test/unit/config_group_test.rb
-- test/unit/model_test.rb
+- test/unit/commands_test.rb
+- test/unit/id_resolver_test.rb
+- test/unit/template_test.rb
+- test/unit/compute_profile_test.rb
+- test/unit/domain_test.rb
 - test/test_helper.rb