hammer_cli_foreman 0.11.0 → 0.12.0

data/lib/hammer_cli_foreman/image.rb

@@ -78,7 +78,7 @@ module HammerCLIForeman
 
       include HammerCLIForeman::Image::ComputeResourceOptions
 
-      success_message _("Image created")
+      success_message _("Image created.")
       failure_message _("Could not create the image")
     end
 
@@ -87,7 +87,7 @@ module HammerCLIForeman
 
       include HammerCLIForeman::Image::ComputeResourceOptions
 
-      success_message _("Image updated")
+      success_message _("Image updated.")
       failure_message _("Could not update the image")
     end
 
@@ -96,7 +96,7 @@ module HammerCLIForeman
 
       include HammerCLIForeman::Image::ComputeResourceOptions
 
-      success_message _("Image deleted")
+      success_message _("Image deleted.")
       failure_message _("Could not delete the image")
     end
 
@@ -104,4 +104,3 @@ module HammerCLIForeman
   end
 
 end
-

data/lib/hammer_cli_foreman/interface.rb

@@ -74,8 +74,8 @@ module HammerCLIForeman
     module InterfaceUpdate
 
       def self.included(base)
-        base.option "--primary", :flag, _("Should this interface be used for constructing the FQDN of the host? Each managed hosts needs to have one primary interface.")
-        base.option "--provision", :flag, _("Should this interface be used for TFTP of PXELinux (or SSH for image-based hosts)? Each managed hosts needs to have one provision interface.")
+        base.option "--primary", :flag, _("Should this interface be used for constructing the FQDN of the host? Each managed hosts needs to have one primary interface")
+        base.option "--provision", :flag, _("Should this interface be used for TFTP of PXELinux (or SSH for image-based hosts)? Each managed hosts needs to have one provision interface")
       end
 
       def get_interfaces(host_id)
@@ -125,10 +125,10 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("Interface created")
+      success_message _("Interface created.")
       failure_message _("Could not create the interface")
 
-      option "--compute-attributes", "COMPUTE_ATTRS", _("Compute resource specific attributes."),
+      option "--compute-attributes", "COMPUTE_ATTRS", _("Compute resource specific attributes"),
         :format => HammerCLI::Options::Normalizers::KeyValueList.new
 
       include InterfaceUpdate
@@ -138,10 +138,10 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Interface updated")
+      success_message _("Interface updated.")
       failure_message _("Could not update the interface")
 
-      option "--compute-attributes", "COMPUTE_ATTRS", _("Compute resource specific attributes."),
+      option "--compute-attributes", "COMPUTE_ATTRS", _("Compute resource specific attributes"),
         :format => HammerCLI::Options::Normalizers::KeyValueList.new
 
       include InterfaceUpdate
@@ -151,7 +151,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Interface deleted")
+      success_message _("Interface deleted.")
       failure_message _("Could not delete the interface")
 
       build_options
@@ -161,5 +161,3 @@ module HammerCLIForeman
   end
 
 end
-
-

data/lib/hammer_cli_foreman/location.rb

@@ -52,7 +52,7 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
       include HammerCLIForeman::ResourceSupportedTest
 
-      success_message _("Location created")
+      success_message _("Location created.")
       failure_message _("Could not create the location")
 
       build_options
@@ -64,7 +64,7 @@ module HammerCLIForeman
 
       option '--id', 'ID', _("Location numeric id to search by")
 
-      success_message _("Location updated")
+      success_message _("Location updated.")
       failure_message _("Could not update the location")
 
       build_options
@@ -76,7 +76,7 @@ module HammerCLIForeman
 
       option '--id', 'ID', _("Location numeric id to search by")
 
-      success_message _("Location deleted")
+      success_message _("Location deleted.")
       failure_message _("Could not delete the location")
 
       build_options do |o|
@@ -86,7 +86,7 @@ module HammerCLIForeman
 
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
-      desc _("Create or update parameter for a location.")
+      desc _("Create or update parameter for a location")
 
       success_message_for :update, _("Parameter [%{name}] updated to value [%{value}]")
       success_message_for :create, _("Parameter [%{name}] created with value [%{value}]")
@@ -97,9 +97,9 @@ module HammerCLIForeman
 
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
-      desc _("Delete parameter for a location.")
+      desc _("Delete parameter for a location")
 
-      success_message _("Parameter [%{name}] deleted")
+      success_message _("Parameter [%{name}] deleted.")
       failure_message _("Could not delete location parameter")
 
       build_options
@@ -120,6 +120,3 @@ module HammerCLIForeman
   end
 
 end
-
-
-

data/lib/hammer_cli_foreman/media.rb

@@ -29,7 +29,7 @@ module HammerCLIForeman
 
     class CreateCommand < HammerCLIForeman::CreateCommand
 
-      success_message _("Installation medium created")
+      success_message _("Installation medium created.")
       failure_message _("Could not create the installation medium")
 
       build_options
@@ -38,7 +38,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Installation medium updated")
+      success_message _("Installation medium updated.")
       failure_message _("Could not update the installation media")
 
       build_options
@@ -47,7 +47,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Installation medium deleted")
+      success_message _("Installation medium deleted.")
       failure_message _("Could not delete the installation media")
 
       build_options
@@ -60,6 +60,3 @@ module HammerCLIForeman
   end
 
 end
-
-
-

data/lib/hammer_cli_foreman/model.rb

@@ -28,14 +28,14 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("Hardware model created")
+      success_message _("Hardware model created.")
       failure_message _("Could not create the hardware model")
 
       build_options
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Hardware model deleted")
+      success_message _("Hardware model deleted.")
       failure_message _("Could not delete the hardware model")
 
       build_options
@@ -43,7 +43,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Hardware model updated")
+      success_message _("Hardware model updated.")
       failure_message _("Could not update the hardware model")
 
       build_options
@@ -54,6 +54,3 @@ module HammerCLIForeman
   end
 
 end
-
-
-

data/lib/hammer_cli_foreman/operating_system.rb

@@ -41,7 +41,7 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message _("Operating system created")
+      success_message _("Operating system created.")
       failure_message _("Could not create the operating system")
 
       build_options
@@ -49,7 +49,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message _("Operating system updated")
+      success_message _("Operating system updated.")
       failure_message _("Could not update the operating system")
 
       build_options
@@ -57,7 +57,7 @@ module HammerCLIForeman
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Operating system deleted")
+      success_message _("Operating system deleted.")
       failure_message _("Could not delete the operating system")
 
       build_options
@@ -65,7 +65,7 @@ module HammerCLIForeman
 
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
-      desc _("Create or update parameter for an operating system.")
+      desc _("Create or update parameter for an operating system")
 
       success_message_for :update, _("Operating system parameter updated")
       success_message_for :create, _("New operating system parameter created")
@@ -81,9 +81,9 @@ module HammerCLIForeman
 
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
-      desc _("Delete parameter for an operating system.")
+      desc _("Delete parameter for an operating system")
 
-      success_message _("operating system parameter deleted")
+      success_message _("operating system parameter deleted.")
 
       def validate_options
         super
@@ -98,11 +98,11 @@ module HammerCLIForeman
       command_name "set-default-template"
       resource :os_default_templates
 
-      option "--id", "OS ID", _("operatingsystem id"), :required => true, :referenced_resource => 'operatingsystem'
-      option "--config-template-id", "TPL ID", _("config template id to be set"), :required => true
+      option "--id", "OS ID", _("Operatingsystem id"), :required => true, :referenced_resource => 'operatingsystem'
+      option "--config-template-id", "TPL ID", _("Config template id to be set"), :required => true
 
 
-      success_message _("[%{config_template_name}] was set as default %{template_kind_name} template")
+      success_message _("[%{config_template_name}] was set as default %{template_kind_name} template.")
       failure_message _("Could not set the os default template")
 
       def option_type_name
@@ -164,10 +164,10 @@ module HammerCLIForeman
       command_name "delete-default-template"
       resource :os_default_templates
 
-      option "--id", "OS ID", _("operatingsystem id"), :required => true, :referenced_resource => 'operatingsystem'
+      option "--id", "OS ID", _("Operatingsystem id"), :required => true, :referenced_resource => 'operatingsystem'
       option "--type", "TPL TYPE", _("Type of the config template"), :required => true
 
-      success_message _("Default template deleted")
+      success_message _("Default template deleted.")
       failure_message _("Could not delete the default template")
 
       def execute
@@ -204,4 +204,3 @@ module HammerCLIForeman
   end
 
 end
-

data/lib/hammer_cli_foreman/option_sources.rb

@@ -0,0 +1,4 @@
+require 'hammer_cli_foreman/option_sources/id_params'
+require 'hammer_cli_foreman/option_sources/ids_params'
+require 'hammer_cli_foreman/option_sources/self_param'
+require 'hammer_cli_foreman/option_sources/user_params'

data/lib/hammer_cli_foreman/option_sources/id_params.rb

@@ -0,0 +1,51 @@
+module HammerCLIForeman
+  module OptionSources
+    class IdParams
+      def initialize(command)
+        @command = command
+      end
+
+      def param_updatable?(param_resource)
+        param_resource && @command.respond_to?(HammerCLI.option_accessor_name("#{param_resource.singular_name}_id"))
+      end
+
+      def available_id_params
+        IdParamsFilter.new(:only_required => false).for_action(@command.resource.action(@command.action))
+      end
+
+      def get_options(defined_options, result)
+        # resolve all '<resource_name>_id' parameters if they are defined as options
+        # (they can be skipped using .without or .expand.except)
+        return result if @command.action.nil?
+        available_id_params.each do |api_param|
+          param_resource = HammerCLIForeman.param_to_resource(api_param.name)
+          if result[HammerCLI.option_accessor_name(api_param.name)].nil? && param_updatable?(param_resource)
+            resource_id = @command.get_resource_id(param_resource, :scoped => true, :required => api_param.required?, :all_options => result)
+            result[HammerCLI.option_accessor_name(api_param.name)] = resource_id if resource_id
+          end
+        end
+        result
+
+      rescue HammerCLIForeman::MissingSearchOptions => e
+
+        switches = @command.class.find_options(:referenced_resource => e.resource.singular_name).map(&:long_switch)
+
+        if switches.empty?
+          error_message = _("Could not find %{resource}. Some search options were missing, please see --help.")
+        elsif switches.length == 1
+          error_message = _("Could not find %{resource}, please set option %{switches}.")
+        else
+          error_message = _("Could not find %{resource}, please set one of options %{switches}.")
+        end
+
+        raise MissingSearchOptions.new(
+          error_message % {
+            :resource => e.resource.singular_name,
+            :switches => switches.join(", ")
+          },
+          e.resource
+        )
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/option_sources/ids_params.rb

@@ -0,0 +1,30 @@
+module HammerCLIForeman
+  module OptionSources
+    class IdsParams
+      def initialize(command)
+        @command = command
+      end
+
+      def param_updatable?(param_resource)
+        param_resource && @command.respond_to?(HammerCLI.option_accessor_name("#{param_resource.singular_name}_ids"))
+      end
+
+      def available_ids_params
+        IdArrayParamsFilter.new(:only_required => false).for_action(@command.resource.action(@command.action))
+      end
+
+      def get_options(defined_options, result)
+        return result if @command.action.nil?
+        # resolve all '<resource_name>_ids' parameters if they are defined as options
+        available_ids_params.each do |api_param|
+          param_resource = HammerCLIForeman.param_to_resource(api_param.name)
+          if result[HammerCLI.option_accessor_name(api_param.name)].nil? && param_updatable?(param_resource)
+            resource_ids = @command.get_resource_ids(param_resource, :scoped => true, :required => api_param.required?, :all_options => result)
+            result[HammerCLI.option_accessor_name(api_param.name)] = resource_ids if resource_ids
+          end
+        end
+        result
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/option_sources/self_param.rb

@@ -0,0 +1,16 @@
+module HammerCLIForeman
+  module OptionSources
+    class SelfParam
+      def initialize(command)
+        @command = command
+      end
+
+      def get_options(defined_options, result)
+        # resolve 'id' parameter if it's defined as an option
+        id_option_name = HammerCLI.option_accessor_name('id')
+        result[id_option_name] ||= @command.get_identifier(result) if @command.respond_to?(id_option_name)
+        result
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/option_sources/user_params.rb

@@ -0,0 +1,59 @@
+module HammerCLIForeman
+  module OptionSources
+    class UserParams
+      def initialize(command)
+        @command = command
+      end
+
+      def get_options(defined_options, result)
+        org_id = organization_id(result[option_name(:default_organization)])
+        result[option_name(:default_organization_id)] ||= org_id unless org_id.nil?
+        loc_id = location_id(result[option_name(:default_location)])
+        result[option_name(:default_location_id)] ||= loc_id unless loc_id.nil?
+
+        if @command.action == :update
+          if result[option_name(:password)] || result[option_name(:ask_password)]
+            if current_logged_user["id"].to_s == result[option_name(:id)].to_s
+              unless result[option_name(:current_password)]
+                result[option_name(:current_password)] = ask_password(:current)
+              end
+            end
+          end
+        end
+
+        if result[option_name(:ask_password)]
+          result[option_name(:password)] = ask_password(:new)
+        end
+
+        result
+      end
+
+      private
+
+      def option_name(opt_name)
+        HammerCLI.option_accessor_name(opt_name)
+      end
+
+      def ask_password(type)
+        if type == :current
+          prompt = _("Enter user's current password:") + " "
+        elsif type == :new
+          prompt = _("Enter user's new password:") + " "
+        end
+        ask(prompt) {|q| q.echo = false}
+      end
+
+      def organization_id(name)
+        @command.resolver.organization_id('option_name' => name) if name
+      end
+
+      def location_id(name)
+        @command.resolver.location_id('option_name' => name) if name
+      end
+
+      def current_logged_user
+        HammerCLIForeman.foreman_api_connection.resource(:users).call(:show, :id => HammerCLIForeman.foreman_api_connection.authenticator.user(true))
+      end
+    end
+  end
+end