hammer_cli_foreman 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3602bf5d1cda5fed0ace9196b7aa5dbd0622079db5ab77f252cd134d0e05d5d
-  data.tar.gz: e341fb0eb8b606c519199c36fc1a14a520661a010f62bd946cb0b3c394fdd267
+  metadata.gz: efc47b1a544eaf1e63d7328b51210b5d0b4d153bb6ff35156a8e55b9527aa207
+  data.tar.gz: dd374b8958f6a171a43b6b6521ff6f9d919a85c0b5b5daf5d099a49c08b4c2ec
 SHA512:
-  metadata.gz: 75f923de0d55217bf30a6c6d12afe19e5b806b360892f1d429d18aa39bab2443151c7317ed5d39f979af8c934edd8134d1767efacfe52a353b9546a29f1983de
-  data.tar.gz: 833444008fa0f26d711708980a65f39e8cc485409acdb6c23e6afff8998645c2f2c34acd3cf70b84638fe0569c299ee11a5aabb2ba916d5524abcc19b9c78be2
+  metadata.gz: d8d2cd3f5b7232c92a2a6133b23592dca23556f7738de97b8dfc5553306332ec93fefd9e00970c139b630563b08563afc2bd5c1112f1177db34b904c61ebe99e
+  data.tar.gz: 67d74339e57bd0c0e61942ad4ff94d7399877db33e2a2e0f190a4ab6eec4bf8f6070bad6adb7624009c2ecbd0dd7ed54f8589c1438293efc9c62970af65a7845

data/doc/release_notes.md

@@ -1,7 +1,13 @@
 Release notes
 =============
-### 2.3.1 (2021-01-27)
+
+### 2.4.0 (2021-02-01)
+* Fix hammer list failure when defaults are set ([PR #551](https://github.com/theforeman/hammer-cli-foreman/pull/551)), [#31384](http://projects.theforeman.org/issues/31384)
 * Deprecating puppetrun command ([PR #554](https://github.com/theforeman/hammer-cli-foreman/pull/554)), [#31536](http://projects.theforeman.org/issues/31536)
+* Set new owner with host update ([PR #556](https://github.com/theforeman/hammer-cli-foreman/pull/556)), [#31609](http://projects.theforeman.org/issues/31609)
+* Consume structured statuses api data ([PR #553](https://github.com/theforeman/hammer-cli-foreman/pull/553)), [#31570](http://projects.theforeman.org/issues/31570)
+* Added missing tests to filter ([PR #549](https://github.com/theforeman/hammer-cli-foreman/pull/549)), [#31074](http://projects.theforeman.org/issues/31074')
+* Bump to 2.4.0-develop
 
 ### 2.3.0 (2020-11-03)
 * Hammer ping skip authentication ([PR #550](https://github.com/theforeman/hammer-cli-foreman/pull/550)), [#31140](http://projects.theforeman.org/issues/31140)

data/lib/hammer_cli_foreman/architecture.rb

@@ -11,7 +11,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -23,7 +23,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -31,7 +31,7 @@ module HammerCLIForeman
       success_message _("Architecture created.")
       failure_message _("Could not create the architecture")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -39,7 +39,7 @@ module HammerCLIForeman
       success_message _("Architecture deleted.")
       failure_message _("Could not delete the architecture")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -47,7 +47,7 @@ module HammerCLIForeman
       success_message _("Architecture updated.")
       failure_message _("Could not update the architecture")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     HammerCLIForeman::AssociatingCommands::OperatingSystem.extend_command(self)

data/lib/hammer_cli_foreman/bookmark.rb

@@ -15,34 +15,34 @@ module HammerCLIForeman
         field :owner_type, _('Owner Type')
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition
-      
-      build_options
+
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _('Bookmark %<name>s created.')
       failure_message _('Failed to create %<name>s bookmark')
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _('Bookmark %<name>s updated successfully.')
       failure_message _('Failed to update %<name>s bookmark')
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _('Bookmark deleted successfully.')
       failure_message _('Failed to delete bookmark')
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/command_extensions/status.rb

@@ -4,7 +4,7 @@ module HammerCLIForeman
       before_print do |data|
         return if data['results'].nil?
 
-        normalize_plugins(data['results']['foreman']['plugins'])
+        normalize_plugins(data['results']['foreman']['plugins']) if data['results']['foreman']['plugins'].any?(String)
         data['results']['foreman']['smart_proxies'].each do |proxy|
           proxy['features'] = normalize_features(proxy['features'])
           proxy['failed_features'] = normalize_failed_features(proxy['failed_features'])

data/lib/hammer_cli_foreman/compute_profile.rb

@@ -9,7 +9,7 @@ module HammerCLIForeman
         field :id, _('Id')
         field :name, _('Name')
       end
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -25,13 +25,13 @@ module HammerCLIForeman
           field :vm_attrs, _('VM attributes')
         end
       end
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _('Compute profile created.')
       failure_message _('Could not create a compute profile')
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
@@ -40,7 +40,7 @@ module HammerCLIForeman
       validate_options do
         any(:option_name,:option_id).required
       end
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
@@ -49,7 +49,7 @@ module HammerCLIForeman
       validate_options do
         any(:option_name,:option_id).required
       end
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     lazy_subcommand('values', _("Create update and delete Compute profile values"),

data/lib/hammer_cli_foreman/config_group.rb

@@ -8,7 +8,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -16,28 +16,28 @@ module HammerCLIForeman
         HammerCLIForeman::References.puppetclasses(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _("Config group created.")
       failure_message _("Could not create the config group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _("Config group updated.")
       failure_message _("Could not update the config group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("Config group has been deleted.")
       failure_message _("Could not delete the config group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -6,7 +6,7 @@ module HammerCLIForeman
         base.option "--owner", "OWNER_LOGIN", _("Login of the owner"),
           :attribute_name => :option_user_login
         base.option "--owner-id", "OWNER_ID", _("ID of the owner"),
-          :attribute_name => :option_user_id
+          :attribute_name => :option_owner_id
 
         base.option "--root-password", "ROOT_PW",
           _("Required if host is managed and value is not inherited from host group or default password in settings")

data/lib/hammer_cli_foreman/mail_notification.rb

@@ -11,7 +11,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -22,7 +22,7 @@ module HammerCLIForeman
         field :subscription_type, _("Subscription type")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     autoload_subcommands

data/lib/hammer_cli_foreman/model.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :hardware_model, _("HW model")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -23,7 +23,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -31,14 +31,14 @@ module HammerCLIForeman
       success_message _("Hardware model created.")
       failure_message _("Could not create the hardware model")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("Hardware model deleted.")
       failure_message _("Could not delete the hardware model")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -46,7 +46,7 @@ module HammerCLIForeman
       success_message _("Hardware model updated.")
       failure_message _("Could not update the hardware model")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 

data/lib/hammer_cli_foreman/operating_system.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :family, _("Family")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -36,7 +36,7 @@ module HammerCLIForeman
         HammerCLIForeman::References.parameters(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -44,7 +44,7 @@ module HammerCLIForeman
       success_message _("Operating system created.")
       failure_message _("Could not create the operating system")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -52,7 +52,7 @@ module HammerCLIForeman
       success_message _("Operating system updated.")
       failure_message _("Could not update the operating system")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -60,7 +60,7 @@ module HammerCLIForeman
       success_message _("Operating system deleted.")
       failure_message _("Could not delete the operating system")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -76,7 +76,7 @@ module HammerCLIForeman
         validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -90,7 +90,7 @@ module HammerCLIForeman
         validator.any(:option_operatingsystem_id, :option_operatingsystem_title).required
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 
@@ -156,7 +156,8 @@ module HammerCLIForeman
         HammerCLI::EX_OK
       end
 
-      build_options :without => [:template_kind_id, :type]
+      build_options expand: { except: %i[organizations locations] },
+                    without: %i[organization_id location_id template_kind_id type]
     end
 
 
@@ -191,7 +192,7 @@ module HammerCLIForeman
         {"operatingsystem_id" => option_id}
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 

data/lib/hammer_cli_foreman/settings.rb

@@ -20,7 +20,7 @@ module HammerCLIForeman
         data
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
@@ -29,7 +29,7 @@ module HammerCLIForeman
       success_message _("Setting [%{name}] updated to [%{value}].")
       failure_message _("Could not update the setting")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -42,7 +42,7 @@ module HammerCLIForeman
         field :value, _("Value")
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
 

data/lib/hammer_cli_foreman/usergroup.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :admin, _("Admin"), Fields::Boolean
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class InfoCommand < HammerCLIForeman::InfoCommand
@@ -25,28 +25,28 @@ module HammerCLIForeman
         HammerCLIForeman::References.timestamps(self)
       end
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class CreateCommand < HammerCLIForeman::CreateCommand
       success_message _("User group [%<name>s] created.")
       failure_message _("Could not create the user group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       success_message _("User group [%<name>s] updated.")
       failure_message _("Could not update the user group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       success_message _("User group [%<name>s] deleted.")
       failure_message _("Could not delete the user group")
 
-      build_options
+      build_options expand: { except: %i[organizations locations] }, without: %i[organization_id location_id]
     end
 
     HammerCLIForeman::AssociatingCommands::Role.extend_command(self)

data/lib/hammer_cli_foreman/version.rb

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

data/test/functional/architecture_test.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe 'architecture' do
+  describe 'list' do
+    before do
+      @cmd = %w[architecture list]
+      @architectures = [{
+                      id: 1,
+                      name: 'i386',
+                    }]
+    end
+
+    it 'should return a list of architectures' do
+      api_expects(:architectures, :index, 'List architectures').returns(@architectures)
+
+      output = IndexMatcher.new([
+                                  %w[ID NAME],
+                                  %w[1 i386]
+                                ])
+      expected_result = success_result(output)
+
+      result = run_cmd(@cmd)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should run list command with defaults' do
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      defaults = HammerCLI::Defaults.new(
+        {
+          organization_id: {
+            provider: 'foreman'
+          },
+          location_id: {
+            provider: 'foreman'
+          }
+        }
+      )
+      defaults.stubs(:write_to_file).returns(true)
+      defaults.stubs(:providers).returns(providers)
+      api_expects(:architectures, :index, 'List architectures').returns(@architectures)
+
+      result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })
+      _(result.exit_code).must_equal HammerCLI::EX_OK
+    end
+  end
+end
+