hammer_cli_foreman_puppet 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb434e53e9e04daa2080f72e8194162bbd4f336e242387ee59324dbb3cd59946
-  data.tar.gz: a09d9b608bd2ed784d7a75fdc4a156d46102b15cceb152bc5ac3dd8625e80615
+  metadata.gz: 70ea47a81549cde7da9bbdce56937da3c20d4936cc7ebc526cf0d671890e2e80
+  data.tar.gz: 042c018b0757d76f33b5284247a4f84edfceb1d102f48aabd0497399ddc2abb8
 SHA512:
-  metadata.gz: fb79af2cd152c7c74abbff609b07515b2cd4bd1e84da31f147676963ff5c152ac7c0045ab9486aedc0be4d2ab01a5768858d3a28a88337c5579f86c1374abc71
-  data.tar.gz: ff88674f1581845eb009a482fa1266102327f370248493181a3f3faf39c8336d5d2213c010cdafb60c86425ef2f7ae1f18cab9fa51de3ac34c6466491471a801
+  metadata.gz: 1f4fd40cca5fba2861777cea022d2aed231594e654f73091f0f9861b5f0c15cfa31258dacbf5334988430eb37fed18bc837e10ad52b3ba070016d144d5cbd3cc
+  data.tar.gz: 833af50bdc2165b5b9f93e9dbc056a57379cec64c21251c0ffb707497699df4c76ec9b125fe80b596e2ca91dad4630b4c89654198149d7801ca05ce379a5b3b3

data/lib/hammer_cli_foreman_puppet/command_extensions/host.rb

@@ -17,6 +17,16 @@ module HammerCLIForemanPuppet
         child '--puppet-classes', 'PUPPET_CLASS_NAMES', '',
               attribute_name: :option_puppetclass_names
       end
+      option_family(
+        format: HammerCLI::Options::Normalizers::List.new,
+        aliased_resource: 'config_group',
+        description: 'Names/Ids of associated config groups'
+      ) do
+        parent '--config-group-ids', 'CONFIG_GROUP_IDS', _('IDs of associated config groups'),
+               attribute_name: :option_config_group_ids
+        child '--config-groups', 'CONFIG_GROUP_NAMES', '',
+              attribute_name: :option_config_group_names
+      end
       option_family associate: 'puppet_proxy' do
         child '--puppet-proxy', 'PUPPET_PROXY_NAME', _('Name of Puppet proxy')
       end
@@ -40,6 +50,17 @@ module HammerCLIForemanPuppet
       def self.proxy_id(resolver, name)
         resolver.smart_proxy_id('option_name' => name)
       end
+
+      def self.delete_deprecated_options(command_class)
+        %w[--puppetclass-ids --environment-id --config-group-ids].each do |switch|
+          family = command_class.option_families.find do |f|
+            f.head.switches.include?(switch)
+          end
+          command_class.declared_options.delete_if do |o|
+            family.all.include?(o)
+          end
+        end
+      end
     end
   end
 end

data/lib/hammer_cli_foreman_puppet/command_extensions/hostgroup.rb

@@ -23,6 +23,16 @@ module HammerCLIForemanPuppet
         child '--puppet-classes', 'PUPPET_CLASS_NAMES', '',
               attribute_name: :option_puppetclass_names
       end
+      option_family(
+        format: HammerCLI::Options::Normalizers::List.new,
+        aliased_resource: 'config_group',
+        description: 'Names/Ids of associated config groups'
+      ) do
+        parent '--config-group-ids', 'CONFIG_GROUP_IDS', _('IDs of associated config groups'),
+               attribute_name: :option_config_group_ids
+        child '--config-groups', 'CONFIG_GROUP_NAMES', '',
+              attribute_name: :option_config_group_names
+      end
       option '--puppet-ca-proxy', 'PUPPET_CA_PROXY_NAME', _('Name of Puppet CA proxy')
       option '--puppet-proxy', 'PUPPET_PROXY_NAME', _('Name of Puppet proxy')
 
@@ -42,6 +52,17 @@ module HammerCLIForemanPuppet
       def self.proxy_id(resolver, name)
         resolver.smart_proxy_id('option_name' => name)
       end
+
+      def self.delete_deprecated_options(command_class)
+        %w[--puppetclass-ids --environment-id --config-group-ids].each do |switch|
+          family = command_class.option_families.find do |f|
+            f.head.switches.include?(switch)
+          end
+          command_class.declared_options.delete_if do |o|
+            family.all.include?(o)
+          end
+        end
+      end
     end
   end
 end

data/lib/hammer_cli_foreman_puppet/host.rb

@@ -55,11 +55,16 @@ module HammerCLIForemanPuppet
     HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new
   )
   HammerCLIForeman::Host::CreateCommand.include(HammerCLIForemanPuppet::EnvironmentNameMapping)
+  # Delete deprecated options explicitly until they are deleted from API
+  HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.delete_deprecated_options(HammerCLIForeman::Host::CreateCommand)
   HammerCLIForeman::Host::CreateCommand.extend_with(
     HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new,
     HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.new
   )
+
   HammerCLIForeman::Host::UpdateCommand.include(HammerCLIForemanPuppet::EnvironmentNameMapping)
+  # Delete deprecated options explicitly until they are deleted from API
+  HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.delete_deprecated_options(HammerCLIForeman::Host::UpdateCommand)
   HammerCLIForeman::Host::UpdateCommand.extend_with(
     HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new,
     HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.new

data/lib/hammer_cli_foreman_puppet/hostgroup.rb

@@ -55,11 +55,16 @@ module HammerCLIForemanPuppet
                                           HammerCLIForemanPuppet::Hostgroup::PuppetSCParamsCommand
 
   HammerCLIForeman::Hostgroup::CreateCommand.include(HammerCLIForemanPuppet::EnvironmentNameMapping)
+  # Delete deprecated options explicitly until they are deleted from API
+  HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.delete_deprecated_options(HammerCLIForeman::Hostgroup::CreateCommand)
   HammerCLIForeman::Hostgroup::CreateCommand.extend_with(
     HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new,
     HammerCLIForemanPuppet::CommandExtensions::HostgroupPuppetProxy.new
   )
+
   HammerCLIForeman::Hostgroup::UpdateCommand.include(HammerCLIForemanPuppet::EnvironmentNameMapping)
+  # Delete deprecated options explicitly until they are deleted from API
+  HammerCLIForemanPuppet::CommandExtensions::HostPuppetProxy.delete_deprecated_options(HammerCLIForeman::Hostgroup::UpdateCommand)
   HammerCLIForeman::Hostgroup::UpdateCommand.extend_with(
     HammerCLIForemanPuppet::CommandExtensions::PuppetEnvironment.new,
     HammerCLIForemanPuppet::CommandExtensions::HostgroupPuppetProxy.new

data/lib/hammer_cli_foreman_puppet/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanPuppet
   def self.version
-    @version ||= Gem::Version.new '0.0.5'
+    @version ||= Gem::Version.new '0.0.6'
   end
 end