hammer_cli_foreman 0.11.0 → 0.12.0

data/lib/hammer_cli_foreman/organization.rb

@@ -53,7 +53,7 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
       include HammerCLIForeman::ResourceSupportedTest
 
-      success_message _("Organization created")
+      success_message _("Organization created.")
       failure_message _("Could not create the organization")
 
       build_options
@@ -65,7 +65,7 @@ module HammerCLIForeman
 
       option "--id", "ID", " ", :referenced_resource => 'organization'
 
-      success_message _("Organization updated")
+      success_message _("Organization updated.")
       failure_message _("Could not update the organization")
 
       build_options
@@ -77,7 +77,7 @@ module HammerCLIForeman
 
       option "--id", "ID", " ", :referenced_resource => 'organization'
 
-      success_message _("Organization deleted")
+      success_message _("Organization deleted.")
       failure_message _("Could not delete the organization")
 
       build_options do |o|
@@ -87,7 +87,7 @@ module HammerCLIForeman
 
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
-      desc _("Create or update parameter for an organization.")
+      desc _("Create or update parameter for an organization")
 
       success_message_for :update, _("Parameter [%{name}] updated to value [%{value}]")
       success_message_for :create, _("Parameter [%{name}] created with value [%{value}]")
@@ -98,9 +98,9 @@ module HammerCLIForeman
 
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
-      desc _("Delete parameter for an organization.")
+      desc _("Delete parameter for an organization")
 
-      success_message _("Parameter [%{name}] deleted")
+      success_message _("Parameter [%{name}] deleted.")
       failure_message _("Could not delete organization parameter")
 
       build_options
@@ -122,6 +122,3 @@ module HammerCLIForeman
   end
 
 end
-
-
-

data/lib/hammer_cli_foreman/output/formatters.rb

@@ -35,7 +35,7 @@ module HammerCLIForeman::Output
       end
 
       def format(reference, field_params={})
-        return "" if reference.nil?
+        return "" if reference.nil? || reference == ""
 
         id_key = field_params[:id_key] || :id
         name_key = field_params[:name_key] || :name

data/lib/hammer_cli_foreman/parameter.rb

@@ -46,9 +46,9 @@ module HammerCLIForeman
 
 
     class SetCommand < AbstractParameterCommand
-      option "--name", "NAME", _("parameter name"), :required => true
-      option "--value", "VALUE", _("parameter value"), :required => true
-      option "--hidden-value", "HIDDEN_VALUE", _("should the value be hidden"), :format => HammerCLI::Options::Normalizers::Bool.new
+      option "--name", "NAME", _("Parameter name"), :required => true
+      option "--value", "VALUE", _("Parameter value"), :required => true
+      option "--hidden-value", "HIDDEN_VALUE", _("Should the value be hidden"), :format => HammerCLI::Options::Normalizers::Bool.new
 
       def self.command_name(name=nil)
         (super(name) || "set-parameter").gsub('_', '-')
@@ -116,5 +116,3 @@ module HammerCLIForeman
 
   end
 end
-
-

data/lib/hammer_cli_foreman/partition_table.rb

@@ -21,6 +21,7 @@ module HammerCLIForeman
         field :locked, _("Locked"), Fields::Boolean
         HammerCLIForeman::References.operating_systems(self)
         HammerCLIForeman::References.timestamps(self)
+        HammerCLIForeman::References.taxonomies(self)
       end
 
       build_options
@@ -29,7 +30,7 @@ module HammerCLIForeman
 
     class DumpCommand < HammerCLIForeman::InfoCommand
       command_name "dump"
-      desc _("View partition table content.")
+      desc _("View partition table content")
 
       def print_data(partition_table)
         puts partition_table["layout"]
@@ -44,7 +45,7 @@ module HammerCLIForeman
       option "--file", "LAYOUT", _("Path to a file that contains the partition layout"), :attribute_name => :option_layout,
         :required => true, :format => HammerCLI::Options::Normalizers::File.new
 
-      success_message _("Partition table created")
+      success_message _("Partition table created.")
       failure_message _("Could not create the partition table")
 
       build_options :without => [:layout]
@@ -55,7 +56,7 @@ module HammerCLIForeman
       option "--file", "LAYOUT", _("Path to a file that contains the partition layout"), :attribute_name => :option_layout,
         :format => HammerCLI::Options::Normalizers::File.new
 
-      success_message _("Partition table updated")
+      success_message _("Partition table updated.")
       failure_message _("Could not update the partition table")
 
       build_options :without => [:layout]
@@ -63,7 +64,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Partition table deleted")
+      success_message _("Partition table deleted.")
       failure_message _("Could not delete the partition table")
 
       build_options
@@ -77,5 +78,3 @@ module HammerCLIForeman
   end
 
 end
-
-

data/lib/hammer_cli_foreman/realm.rb

@@ -26,7 +26,7 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("Realm [%{name}] created")
+      success_message _("Realm [%{name}] created.")
       failure_message _("Could not create the realm")
 
       build_options
@@ -34,7 +34,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Realm [%{name}] updated")
+      success_message _("Realm [%{name}] updated.")
       failure_message _("Could not update the realm")
 
       build_options
@@ -42,7 +42,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Realm [%{name}] deleted")
+      success_message _("Realm [%{name}] deleted.")
       failure_message _("Could not delete the realm")
 
       build_options

data/lib/hammer_cli_foreman/report.rb

@@ -73,7 +73,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Report has been deleted")
+      success_message _("Report has been deleted.")
       failure_message _("Could not delete the report")
 
       build_options
@@ -84,6 +84,3 @@ module HammerCLIForeman
   end
 
 end
-
-
-

data/lib/hammer_cli_foreman/role.rb

@@ -57,7 +57,7 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("User role [%<name>s] created")
+      success_message _("User role [%<name>s] created.")
       failure_message _("Could not create the user role")
 
       build_options
@@ -65,7 +65,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("User role [%<name>s] updated")
+      success_message _("User role [%<name>s] updated.")
       failure_message _("Could not update the user role")
 
       build_options
@@ -82,7 +82,7 @@ module HammerCLIForeman
         option(:option_new_name).required
       end
 
-      success_message _("User role cloned")
+      success_message _("User role cloned.")
       failure_message _("Could not clone the user role")
 
       build_options
@@ -90,7 +90,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("User role [%<name>s] deleted")
+      success_message _("User role [%<name>s] deleted.")
       failure_message _("Could not delete the user roles")
 
       build_options
@@ -100,6 +100,3 @@ module HammerCLIForeman
   end
 
 end
-
-
-

data/lib/hammer_cli_foreman/settings.rb

@@ -25,7 +25,7 @@ module HammerCLIForeman
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       command_name 'set'
 
-      success_message _("Setting [%{name}] updated to [%{value}]")
+      success_message _("Setting [%{name}] updated to [%{value}].")
       failure_message _("Could not update the setting")
 
       build_options

data/lib/hammer_cli_foreman/smart_class_parameter.rb

@@ -102,7 +102,7 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      success_message _("Parameter updated")
+      success_message _("Parameter updated.")
       failure_message _("Could not update the parameter")
 
       build_options do |options|
@@ -110,14 +110,14 @@ module HammerCLIForeman
         options.without(:parameter_type, :validator_type, :override, :required, :override_value_order)
       end
 
-      option "--override", "OVERRIDE", _("Override this parameter."),
+      option "--override", "OVERRIDE", _("Override this parameter"),
         :format => HammerCLI::Options::Normalizers::Bool.new
-      option "--required", "REQUIRED", _("This parameter is required."),
+      option "--required", "REQUIRED", _("This parameter is required"),
         :format => HammerCLI::Options::Normalizers::Bool.new
-      option "--parameter-type", "PARAMETER_TYPE", _("Type of the parameter."),
+      option "--parameter-type", "PARAMETER_TYPE", _("Type of the parameter"),
         :format => HammerCLI::Options::Normalizers::Enum.new(
             ['string', 'boolean', 'integer', 'real', 'array', 'hash', 'yaml', 'json'])
-      option "--validator-type", "VALIDATOR_TYPE", _("Type of the validator."),
+      option "--validator-type", "VALIDATOR_TYPE", _("Type of the validator"),
         :format => HammerCLI::Options::Normalizers::Enum.new(['regexp', 'list', ''])
       option "--override-value-order", "OVERRIDE_VALUE_ORDER", _("The order in which values are resolved"),
              :format => HammerCLI::Options::Normalizers::List.new
@@ -136,11 +136,11 @@ module HammerCLIForeman
       end
     end
 
-    class AddOverrideValueCommand < HammerCLIForeman::CreateCommand
+    class AddMatcherCommand < HammerCLIForeman::CreateCommand
       resource :override_values
-      command_name 'add-override-value'
+      command_name 'add-matcher'
 
-      success_message _("Override value created")
+      success_message _("Override value created.")
       failure_message _("Could not create the override value")
 
       build_options do |options|
@@ -151,7 +151,7 @@ module HammerCLIForeman
 
       validate_options do
         if option(:option_use_puppet_default).value
-          option(:option_value).rejected(:msg => _('Cannot use --value when --use-puppet-default is true'))
+          option(:option_value).rejected(:msg => _('Cannot use --value when --use-puppet-default is true.'))
         end
 
         if option(:option_smart_class_parameter_name).exist?
@@ -160,11 +160,17 @@ module HammerCLIForeman
       end
     end
 
-    class RemoveOverrideValueCommand < HammerCLIForeman::DeleteCommand
+    HammerCLIForeman::SmartClassParameter.lazy_subcommand('add-override-value', _("Create an override value for a specific smart variable"),
+      'HammerCLIForeman::SmartClassParameter::AddMatcherCommand', 'hammer_cli_foreman/smart_class_parameter',
+      :hidden => true,
+      :warning => _('add-override-value command is deprecated and will be removed in one of the future versions. Please use add-matcher command instead.')
+    )
+
+    class RemoveMatcherCommand < HammerCLIForeman::DeleteCommand
       resource :override_values
-      command_name 'remove-override-value'
+      command_name 'remove-matcher'
 
-      success_message _("Override value deleted")
+      success_message _("Override value deleted.")
       failure_message _("Could not delete the override value")
 
       build_options do |options|
@@ -180,10 +186,14 @@ module HammerCLIForeman
       end
     end
 
+    HammerCLIForeman::SmartClassParameter.lazy_subcommand('remove-override-value', _("Remove an override value for a specific smart variable"),
+      'HammerCLIForeman::SmartClassParameter::RemoveMatcherCommand', 'hammer_cli_foreman/smart_class_parameter',
+      :hidden => true,
+      :warning => _('remove-override-value command is deprecated and will be removed in one of the future versions. Please use remove-matcher command instead.')
+    )
+
     autoload_subcommands
 
   end
 
-
-
 end

data/lib/hammer_cli_foreman/smart_proxy.rb

@@ -38,7 +38,7 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("Smart proxy created")
+      success_message _("Smart proxy created.")
       failure_message _("Could not create the proxy")
 
       build_options
@@ -46,7 +46,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Smart proxy updated")
+      success_message _("Smart proxy updated.")
       failure_message _("Could not update the proxy")
 
       build_options
@@ -54,7 +54,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Smart proxy deleted")
+      success_message _("Smart proxy deleted.")
       failure_message _("Could not delete the proxy")
 
       build_options
@@ -66,7 +66,7 @@ module HammerCLIForeman
       action :import_puppetclasses
 
       command_name    "import-classes"
-      success_message _("Puppet classes were imported")
+      success_message _("Puppet classes were imported.")
       failure_message _("Import of puppet classes failed")
 
       option "--dryrun", :flag, _("Do not run the import")
@@ -89,7 +89,7 @@ module HammerCLIForeman
       action :refresh
 
       command_name    "refresh-features"
-      success_message _("Smart proxy features were refreshed")
+      success_message _("Smart proxy features were refreshed.")
       failure_message _("Refresh of smart proxy features failed")
 
       build_options
@@ -99,5 +99,3 @@ module HammerCLIForeman
   end
 
 end
-
-

data/lib/hammer_cli_foreman/smart_variable.rb

@@ -3,10 +3,10 @@ module HammerCLIForeman
   module SmartVariableUpdateCreateCommons
 
     def self.included(base)
-      base.option "--variable-type", "VARIABLE_TYPE", _("Type of the variable."),
+      base.option "--variable-type", "VARIABLE_TYPE", _("Type of the variable"),
                   :format => HammerCLI::Options::Normalizers::Enum.new(
                       ['string', 'boolean', 'integer', 'real', 'array', 'hash', 'yaml', 'json'])
-      base.option "--validator-type", "VALIDATOR_TYPE", _("Type of the validator."),
+      base.option "--validator-type", "VALIDATOR_TYPE", _("Type of the validator"),
                   :format => HammerCLI::Options::Normalizers::Enum.new(['regexp', 'list', ''])
       base.option "--override-value-order", "OVERRIDE_VALUE_ORDER", _("The order in which values are resolved"),
                   :format => HammerCLI::Options::Normalizers::List.new
@@ -104,14 +104,14 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
       include SmartVariableUpdateCreateCommons
 
-      success_message _("Smart variable [%{variable}] created")
+      success_message _("Smart variable [%{variable}] created.")
       failure_message _("Could not create the smart variable")
     end
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       include SmartVariableUpdateCreateCommons
 
-      success_message _("Smart variable [%{variable}] updated")
+      success_message _("Smart variable [%{variable}] updated.")
       failure_message _("Could not update the smart variable")
     end
 
@@ -119,18 +119,17 @@ module HammerCLIForeman
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       option '--name', 'NAME', _('Smart variable name'), :deprecated => _('Use --variable instead')
 
-      success_message _("Smart variable [%{variable}] deleted")
+      success_message _("Smart variable [%{variable}] deleted.")
       failure_message _("Could not delete the smart variable")
 
       build_options
     end
 
-
-    class AddOverrideValueCommand < HammerCLIForeman::CreateCommand
+    class AddMatcherCommand < HammerCLIForeman::CreateCommand
       resource :override_values
-      command_name 'add-override-value'
+      command_name 'add-matcher'
 
-      success_message _("Override value created")
+      success_message _("Override value created.")
       failure_message _("Could not create the override value")
 
       build_options do |options|
@@ -139,11 +138,18 @@ module HammerCLIForeman
       end
     end
 
-    class RemoveOverrideValueCommand < HammerCLIForeman::DeleteCommand
+    HammerCLIForeman::SmartVariable.lazy_subcommand('add-override-value', _("Create an override value for a specific smart variable"),
+      'HammerCLIForeman::SmartVariable::AddMatcherCommand', 'hammer_cli_foreman/smart_variable',
+      :hidden => true,
+      :warning => _('add-override-value command is deprecated and will be removed in one of the future versions. Please use add-matcher command instead.')
+    )
+
+
+    class RemoveMatcherCommand < HammerCLIForeman::DeleteCommand
       resource :override_values
-      command_name 'remove-override-value'
+      command_name 'remove-matcher'
 
-      success_message _("Override value deleted")
+      success_message _("Override value deleted.")
       failure_message _("Could not delete the override value")
 
       build_options do |options|
@@ -152,6 +158,12 @@ module HammerCLIForeman
       end
     end
 
+    HammerCLIForeman::SmartVariable.lazy_subcommand('remove-override-value', _("Remove an override value for a specific smart variable"),
+      'HammerCLIForeman::SmartVariable::RemoveMatcherCommand', 'hammer_cli_foreman/smart_variable',
+      :hidden => true,
+      :warning => _('remove-override-value command is deprecated and will be removed in one of the future versions. Please use remove-matcher command instead.')
+    )
+
     autoload_subcommands
 
   end