hammer_cli_foreman 0.1.0 → 0.1.1

data/lib/hammer_cli_foreman/organization.rb

@@ -14,19 +14,34 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      apipie_options
+      build_options
     end
 
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       include HammerCLIForeman::ResourceSupportedTest
 
+      option "--id", "ID", " "
+
       output ListCommand.output_definition do
-        field :created_at, _("Created at"), Fields::Date
-        field :updated_at, _("Updated at"), Fields::Date
+        HammerCLIForeman::References.users(self)
+        HammerCLIForeman::References.smart_proxies(self)
+        HammerCLIForeman::References.subnets(self)
+        HammerCLIForeman::References.compute_resources(self)
+        HammerCLIForeman::References.media(self)
+        HammerCLIForeman::References.config_templates(self)
+        HammerCLIForeman::References.domains(self)
+        HammerCLIForeman::References.environments(self)
+        HammerCLIForeman::References.hostgroups(self)
+        HammerCLIForeman::References.parameters(self)
+        collection :locations, _("Locations"), :numbered => false, :hide_blank => true do
+          custom_field Fields::Reference
+        end
+        HammerCLIForeman::References.timestamps(self)
       end
 
-      apipie_options
+
+      build_options
     end
 
 
@@ -36,38 +51,43 @@ module HammerCLIForeman
       success_message _("Organization created")
       failure_message _("Could not create the organization")
 
-      apipie_options
+      build_options
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       include HammerCLIForeman::ResourceSupportedTest
 
+      option "--id", "ID", " "
+
       success_message _("Organization updated")
       failure_message _("Could not update the organization")
 
-      apipie_options
+      build_options
     end
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       include HammerCLIForeman::ResourceSupportedTest
 
+      option "--id", "ID", " "
+
       success_message _("Organization deleted")
       failure_message _("Could not delete the organization")
 
-      apipie_options
+      build_options
     end
 
-    include HammerCLIForeman::AssociatingCommands::Hostgroup
-    include HammerCLIForeman::AssociatingCommands::Environment
-    include HammerCLIForeman::AssociatingCommands::Domain
-    include HammerCLIForeman::AssociatingCommands::Medium
-    include HammerCLIForeman::AssociatingCommands::Subnet
-    include HammerCLIForeman::AssociatingCommands::ComputeResource
-    include HammerCLIForeman::AssociatingCommands::SmartProxy
-    include HammerCLIForeman::AssociatingCommands::User
-    include HammerCLIForeman::AssociatingCommands::ConfigTemplate
+
+    HammerCLIForeman::AssociatingCommands::Hostgroup.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::Environment.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::Domain.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::Medium.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::Subnet.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::ComputeResource.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::SmartProxy.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::User.extend_command(self)
+    HammerCLIForeman::AssociatingCommands::ConfigTemplate.extend_command(self)
 
     autoload_subcommands
   end

data/lib/hammer_cli_foreman/output/fields.rb

@@ -2,10 +2,18 @@ require 'hammer_cli'
 
 module Fields
 
-  class OSName < Field
+  class SingleReference < Field
   end
 
-  class Server < Field
+  class Reference < Field
+  end
+
+  class Template < Reference
+
+    def initialize(options={})
+      options[:details] ||= [:template_kind_name]
+      super(options)
+    end
   end
 
 end

data/lib/hammer_cli_foreman/output/formatters.rb

@@ -1,44 +1,70 @@
 module HammerCLIForeman::Output
   module Formatters
 
-    class OSNameFormatter < HammerCLI::Output::Formatters::FieldFormatter
+    class SingleReferenceFormatter < HammerCLI::Output::Formatters::FieldFormatter
 
       def tags
         [:flat]
       end
 
-      def format(os)
-        return nil if os.nil?
+      def format(resource, field_params={})
+        return "" if resource.nil?
 
-        name = os['name'] || os[:name]
-        major = os['major'] || os[:major]
-        minor = os['minor'] || os[:minor]
+        key = field_params[:key]
 
-        formatted_name = "%s %s" % [name, major]
-        formatted_name += ".%s" % minor if (!minor.nil? && !minor.empty?)
-        formatted_name
+        id_key = "#{key}_id"
+        name_key = "#{key}_name"
+
+        name = resource[name_key.to_sym] || resource[name_key]
+        id = resource[id_key.to_sym] || resource[id_key]
+
+        context = field_params[:context] || {}
+
+        if context[:show_ids]
+          "#{name} (id: #{id})" if id && name
+        else
+          "#{name}" if name
+        end
       end
+
     end
 
-    class ServerFormatter < HammerCLI::Output::Formatters::FieldFormatter
+    class ReferenceFormatter < HammerCLI::Output::Formatters::FieldFormatter
 
       def tags
         [:flat]
       end
 
-      def format(server)
-        if server.kind_of? Hash
-          name = server[:name] || server['name']
-          url = server[:url] || server['url']
-          "#{name} (#{url})"
+      def format(reference, field_params={})
+        return "" if reference.nil?
+
+        id_key = field_params[:id_key] || :id
+        name_key = field_params[:name_key] || :name
+
+        name = reference[name_key] || reference[name_key.to_s]
+        id = reference[id_key] || reference[id_key.to_s]
+
+        context = field_params[:context] || {}
+
+        details = field_params[:details] || []
+        details = [details] unless details.is_a? Array
+        values = details.collect do |key|
+          reference[key] || reference[key.to_s]
+        end
+        values << "id: #{id}" if context[:show_ids]
+
+        if values.empty?
+          "#{name}" if name
         else
-          server
+          "#{name} (#{values.join(', ')})" if name && !values.empty?
         end
       end
+
     end
 
-    HammerCLI::Output::Output.register_formatter(OSNameFormatter.new, :OSName)
-    HammerCLI::Output::Output.register_formatter(ServerFormatter.new, :Server)
+    HammerCLI::Output::Output.register_formatter(SingleReferenceFormatter.new, :SingleReference)
+    HammerCLI::Output::Output.register_formatter(ReferenceFormatter.new, :Reference)
+    HammerCLI::Output::Output.register_formatter(ReferenceFormatter.new, :Template)
 
   end
 end

data/lib/hammer_cli_foreman/parameter.rb

@@ -4,20 +4,46 @@ module HammerCLIForeman
 
   module Parameter
 
-    def self.get_parameters(resource_config, resource_type, resource)
-      params = {
-        resource_type.to_s+"_id" => resource["id"] || resource["name"]
-      }
+    class AbstractParameterCommand < HammerCLIForeman::Command
 
-      params = HammerCLIForeman.foreman_resource(:parameters).call(:index, params)
-      HammerCLIForeman.collection_to_common_format(params)
-    end
+      def self.parameter_resource
+        HammerCLIForeman.foreman_resource(:parameters)
+      end
+
+      def parameter_resource
+        self.class.parameter_resource
+      end
 
-    class SetCommand < HammerCLIForeman::Command
+      def get_identifier
+        @identifier ||= get_resource_id(resource, :scoped => true)
+        @identifier
+      end
+
+      def get_parameter_identifier
+        if @parameter_identifier.nil?
+          opts = all_options
+          opts[HammerCLI.option_accessor_name("#{resource.singular_name}_id")] ||= get_identifier
+          @parameter_identifier = resolver.send("#{parameter_resource.singular_name}_id", opts)
+        end
+        @parameter_identifier
+      end
+
+      def base_action_params
+        {
+          "#{resource.singular_name}_id" => get_identifier
+        }
+      end
+
+      def self.custom_option_builders
+        [
+          DependentSearchablesOptionBuilder.new(resource, searchables)
+        ]
+      end
+
+    end
 
-      include HammerCLI::Messages
-      include HammerCLIForeman::ConnectionSetup
 
+    class SetCommand < AbstractParameterCommand
       option "--name", "NAME", _("parameter name"), :required => true
       option "--value", "VALUE", _("parameter value"), :required => true
 
@@ -25,10 +51,6 @@ module HammerCLIForeman
         (super(name) || "set-parameter").gsub('_', '-')
       end
 
-      def self.resource(resource=nil)
-        super(resource) || HammerCLIForeman.foreman_resource(:parameters)
-      end
-
       def execute
         if parameter_exist?
           update_parameter
@@ -40,24 +62,18 @@ module HammerCLIForeman
         HammerCLI::EX_OK
       end
 
-      def base_action_params
-        {}
-      end
-
       def parameter_exist?
-        params = HammerCLIForeman.collection_to_common_format(resource.call(:index, base_action_params))
-        params.find { |p| p["name"] == option_name }
+        get_parameter_identifier rescue false
       end
 
       def update_parameter
         params = {
-          "id" => option_name,
+          "id" => get_parameter_identifier,
           "parameter" => {
             "value" => option_value
           }
-        }.merge base_action_params
-
-        HammerCLIForeman.record_to_common_format(resource.call(:update, params))
+        }.merge(base_action_params)
+        HammerCLIForeman.record_to_common_format(parameter_resource.call(:update, params))
       end
 
       def create_parameter
@@ -66,43 +82,31 @@ module HammerCLIForeman
             "name" => option_name,
             "value" => option_value
           }
-        }.merge base_action_params
+        }.merge(base_action_params)
 
-        HammerCLIForeman.record_to_common_format(resource.call(:create, params))
+        HammerCLIForeman.record_to_common_format(parameter_resource.call(:create, params))
       end
 
     end
 
 
-    class DeleteCommand < HammerCLIForeman::Command
-
-      include HammerCLI::Messages
-      include HammerCLIForeman::ConnectionSetup
-
+    class DeleteCommand < AbstractParameterCommand
       option "--name", "NAME", _("parameter name"), :required => true
 
       def self.command_name(name=nil)
         (super(name) || "delete-parameter").gsub('_', '-')
       end
 
-      def self.resource(resource=nil)
-        super(resource) || HammerCLIForeman.foreman_resource(:parameters)
-      end
-
       def execute
         params = {
-          "id" => option_name
+          "id" => get_parameter_identifier
         }.merge base_action_params
 
-        HammerCLIForeman.record_to_common_format(resource.call(:destroy, params))
+        HammerCLIForeman.record_to_common_format(parameter_resource.call(:destroy, params))
         print_message success_message if success_message
         HammerCLI::EX_OK
       end
 
-      def base_action_params
-        {}
-      end
-
     end
 
   end

data/lib/hammer_cli_foreman/partition_table.rb

@@ -12,23 +12,21 @@ module HammerCLIForeman
         field :os_family, _("OS Family")
       end
 
-      apipie_options
+      build_options
     end
 
 
     class InfoCommand < HammerCLIForeman::InfoCommand
-
       output ListCommand.output_definition do
-        field :created_at, _("Created at"), Fields::Date
-        field :updated_at, _("Updated at"), Fields::Date
+        HammerCLIForeman::References.operating_systems(self)
+        HammerCLIForeman::References.timestamps(self)
       end
 
-      apipie_options
+      build_options
     end
 
 
     class DumpCommand < HammerCLIForeman::InfoCommand
-
       command_name "dump"
       desc _("View partition table content.")
 
@@ -36,7 +34,7 @@ module HammerCLIForeman
         puts partition_table["layout"]
       end
 
-      apipie_options
+      build_options
     end
 
 
@@ -48,19 +46,18 @@ module HammerCLIForeman
       success_message _("Partition table created")
       failure_message _("Could not create the partition table")
 
-      apipie_options :without => [:layout] + declared_identifiers.keys
+      build_options :without => [:layout]
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-
       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")
       failure_message _("Could not update the partition table")
 
-      apipie_options :without => [:layout] + declared_identifiers.keys
+      build_options :without => [:layout]
     end
 
 
@@ -68,11 +65,11 @@ module HammerCLIForeman
       success_message _("Partition table deleted")
       failure_message _("Could not delete the partition table")
 
-      apipie_options
+      build_options
     end
 
 
-    include HammerCLIForeman::AssociatingCommands::OperatingSystem
+    HammerCLIForeman::AssociatingCommands::OperatingSystem.extend_command(self)
 
 
     autoload_subcommands

data/lib/hammer_cli_foreman/puppet_class.rb

@@ -13,7 +13,7 @@ module HammerCLIForeman
         field :name, _("Name")
       end
 
-      def retrieve_data
+      def send_request
         self.class.unhash_classes(super)
       end
 
@@ -24,31 +24,31 @@ module HammerCLIForeman
 
       end
 
-      apipie_options
+      build_options
     end
 
 
     class InfoCommand < HammerCLIForeman::InfoCommand
-
-      #FIXME: show environments, hostgroups, variables and parameters
       output ListCommand.output_definition do
-        collection :lookup_keys, _("Smart variables") do
-          from :lookup_key do
-            field :key, _("Parameter")
-            field :default_value, _("Default value")
-          end
+        collection :smart_variables, _("Smart variables") do
+          field :key, _("Parameter")
+          field :default_value, _("Default value")
+        end
+        collection :smart_class_parameters, _("Smart class parameters"), :numbered => false do
+          custom_field Fields::Reference, :name_key => :parameter
         end
+        HammerCLIForeman::References.hostgroups(self)
+        HammerCLIForeman::References.environments(self)
+        HammerCLIForeman::References.parameters(self)
       end
 
-      apipie_options
+      build_options
     end
 
 
     class SCParamsCommand < HammerCLIForeman::SmartClassParametersBriefList
-
-      apipie_options :without => [:host_id, :hostgroup_id, :puppetclass_id, :environment_id]
-      option ['--id', '--name'], 'PUPPET_CLASS_ID', _('puppet class id/name'),
-              :attribute_name => :puppetclass_id, :required => true
+      parent_resource :puppetclasses
+      build_options
     end