hammer_cli_foreman 0.0.18 → 0.1.0

data/lib/hammer_cli_foreman/model.rb

@@ -1,16 +1,16 @@
 module HammerCLIForeman
 
-  class Model < HammerCLI::Apipie::Command
+  class Model < HammerCLIForeman::Command
 
-    resource ForemanApi::Resources::Model
+    resource :models
 
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        field :id, "Id"
-        field :name, "Name"
-        field :vendor_class, "Vendor class"
-        field :hardware_model, "HW model"
+        field :id, _("Id")
+        field :name, _("Name")
+        field :vendor_class, _("Vendor class")
+        field :hardware_model, _("HW model")
       end
 
       apipie_options
@@ -20,9 +20,9 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       output ListCommand.output_definition do
-        field :info, "Info"
-        field :created_at, "Created at", Fields::Date
-        field :updated_at, "Updated at", Fields::Date
+        field :info, _("Info")
+        field :created_at, _("Created at"), Fields::Date
+        field :updated_at, _("Updated at"), Fields::Date
       end
 
       apipie_options
@@ -30,23 +30,23 @@ module HammerCLIForeman
 
 
     class CreateCommand < HammerCLIForeman::CreateCommand
-      success_message "Hardware model created"
-      failure_message "Could not create the hardware model"
+      success_message _("Hardware model created")
+      failure_message _("Could not create the hardware model")
 
       apipie_options
     end
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message "Hardware model deleted"
-      failure_message "Could not delete the hardware model"
+      success_message _("Hardware model deleted")
+      failure_message _("Could not delete the hardware model")
 
       apipie_options
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      success_message "Hardware model updated"
-      failure_message "Could not update the hardware model"
+      success_message _("Hardware model updated")
+      failure_message _("Could not update the hardware model")
 
       apipie_options
     end
@@ -57,5 +57,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'model', "Manipulate hardware models.", HammerCLIForeman::Model
+HammerCLI::MainCommand.subcommand 'model', _("Manipulate hardware models."), HammerCLIForeman::Model
 

data/lib/hammer_cli_foreman/operating_system.rb

@@ -1,16 +1,16 @@
 module HammerCLIForeman
 
-  class OperatingSystem < HammerCLI::Apipie::Command
+  class OperatingSystem < HammerCLIForeman::Command
 
-    resource ForemanApi::Resources::OperatingSystem
+    resource :operatingsystems
 
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        field :id, "Id"
-        field :_os_name, "Name", Fields::OSName
-        field :release_name, "Release name"
-        field :family, "Family"
+        field :id, _("Id")
+        field :_os_name, _("Name"), Fields::OSName
+        field :release_name, _("Release name")
+        field :family, _("Family")
       end
 
       def extend_data(os)
@@ -27,11 +27,11 @@ module HammerCLIForeman
       identifiers :id
 
       output ListCommand.output_definition do
-        field :media_names, "Installation media", Fields::List
-        field :architecture_names, "Architectures", Fields::List
-        field :ptable_names, "Partition tables", Fields::List
-        field :config_template_names, "Config templates", Fields::List
-        collection :parameters, "Parameters" do
+        field :media_names, _("Installation media"), Fields::List
+        field :architecture_names, _("Architectures"), Fields::List
+        field :ptable_names, _("Partition tables"), Fields::List
+        field :config_template_names, _("Config templates"), Fields::List
+        collection :parameters, _("Parameters") do
           field nil, nil, Fields::KeyValue
         end
       end
@@ -39,10 +39,10 @@ module HammerCLIForeman
       #FIXME: remove custom retrieve_data after the api has support for listing names
       def extend_data(os)
         os["_os_name"] = Hash[os.select { |k, v| ["name", "major", "minor"].include? k }]
-        os["media_names"] = os["media"].collect{|m| m["medium"]["name"] } rescue []
-        os["architecture_names"] = os["architectures"].collect{|m| m["architecture"]["name"] } rescue []
-        os["ptable_names"] = os["ptables"].collect{|m| m["ptable"]["name"] } rescue []
-        os["config_template_names"] = os["config_templates"].collect{|m| m["config_template"]["name"] } rescue []
+        os["media_names"] = os["media"].collect{|m| m["name"] } rescue []
+        os["architecture_names"] = os["architectures"].collect{|m| m["name"] } rescue []
+        os["ptable_names"] = os["ptables"].collect{|m| m["name"] } rescue []
+        os["config_template_names"] = os["config_templates"].collect{|m| m["name"] } rescue []
         os["parameters"] = HammerCLIForeman::Parameter.get_parameters(resource_config, :operatingsystem, os)
         os
       end
@@ -54,17 +54,17 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
 
       #FIXME: replace with apipie_options when they are added to the api docs
-      option "--architecture-ids", "ARCH_IDS", "set associated architectures",
+      option "--architecture-ids", "ARCH_IDS", _("set associated architectures"),
         :format => HammerCLI::Options::Normalizers::List.new
-      option "--config-template-ids", "CONFIG_TPL_IDS", "set associated templates",
+      option "--config-template-ids", "CONFIG_TPL_IDS", _("set associated templates"),
         :format => HammerCLI::Options::Normalizers::List.new
-      option "--medium-ids", "MEDIUM_IDS", "set associated installation media",
+      option "--medium-ids", "MEDIUM_IDS", _("set associated installation media"),
         :format => HammerCLI::Options::Normalizers::List.new
-      option "--ptable-ids", "PTABLE_IDS", "set associated partition tables",
+      option "--ptable-ids", "PTABLE_IDS", _("set associated partition tables"),
         :format => HammerCLI::Options::Normalizers::List.new
 
-      success_message "Operating system created"
-      failure_message "Could not create the operating system"
+      success_message _("Operating system created")
+      failure_message _("Could not create the operating system")
 
       def request_params
         params = method_options
@@ -82,19 +82,19 @@ module HammerCLIForeman
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
       #FIXME: replace with apipie_options when they are added to the api docs
-      option "--architecture-ids", "ARCH_IDS", "set associated architectures",
+      option "--architecture-ids", "ARCH_IDS", _("set associated architectures"),
         :format => HammerCLI::Options::Normalizers::List.new
-      option "--config-template-ids", "CONFIG_TPL_IDS", "set associated templates",
+      option "--config-template-ids", "CONFIG_TPL_IDS", _("set associated templates"),
         :format => HammerCLI::Options::Normalizers::List.new
-      option "--medium-ids", "MEDIUM_IDS", "set associated installation media",
+      option "--medium-ids", "MEDIUM_IDS", _("set associated installation media"),
         :format => HammerCLI::Options::Normalizers::List.new
-      option "--ptable-ids", "PTABLE_IDS", "set associated partition tables",
+      option "--ptable-ids", "PTABLE_IDS", _("set associated partition tables"),
         :format => HammerCLI::Options::Normalizers::List.new
 
       identifiers :id
 
-      success_message "Operating system updated"
-      failure_message "Could not update the operating system"
+      success_message _("Operating system updated")
+      failure_message _("Could not update the operating system")
 
       def request_params
         params = method_options
@@ -113,24 +113,24 @@ module HammerCLIForeman
 
       identifiers :id
 
-      success_message "Operating system deleted"
-      failure_message "Could not delete the operating system"
+      success_message _("Operating system deleted")
+      failure_message _("Could not delete the operating system")
 
       apipie_options
     end
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
 
-      resource ForemanApi::Resources::Parameter
+      resource :parameters
 
-      desc "Create or update parameter for an operating system."
+      desc _("Create or update parameter for an operating system.")
 
       #FIXME: add option --os-label when api supports it
-      option "--os-id", "OS_ID", "id of the operating system the parameter is being set for"
+      option "--os-id", "OS_ID", _("id of the operating system the parameter is being set for")
 
-      success_message_for :update, "Operating system parameter updated"
-      success_message_for :create, "New operating system parameter created"
-      failure_message "Could not set operating system parameter"
+      success_message_for :update, _("Operating system parameter updated")
+      success_message_for :create, _("New operating system parameter created")
+      failure_message _("Could not set operating system parameter")
 
       def validate_options
         super
@@ -147,13 +147,13 @@ module HammerCLIForeman
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
 
-      resource ForemanApi::Resources::Parameter
+      resource :parameters
 
-      desc "Delete parameter for an operating system."
+      desc _("Delete parameter for an operating system.")
 
       #FIXME: add option --os-label when api supports it
-      option "--os-id", "OS_ID", "id of the operating system the parameter is being deleted for"
-      success_message "operating system parameter deleted"
+      option "--os-id", "OS_ID", _("id of the operating system the parameter is being deleted for")
+      success_message _("operating system parameter deleted")
 
       def validate_options
         super

data/lib/hammer_cli_foreman/organization.rb

@@ -2,16 +2,16 @@ require 'hammer_cli_foreman/resource_supported_test'
 
 module HammerCLIForeman
 
-  class Organization < HammerCLI::Apipie::Command
+  class Organization < HammerCLIForeman::Command
 
-    resource ForemanApi::Resources::Organization
+    resource :organizations
 
     class ListCommand < HammerCLIForeman::ListCommand
       include HammerCLIForeman::ResourceSupportedTest
 
       output do
-        field :id, "Id"
-        field :name, "Name"
+        field :id, _("Id")
+        field :name, _("Name")
       end
 
       apipie_options
@@ -22,8 +22,8 @@ module HammerCLIForeman
       include HammerCLIForeman::ResourceSupportedTest
 
       output ListCommand.output_definition do
-        field :created_at, "Created at", Fields::Date
-        field :updated_at, "Updated at", Fields::Date
+        field :created_at, _("Created at"), Fields::Date
+        field :updated_at, _("Updated at"), Fields::Date
       end
 
       apipie_options
@@ -33,8 +33,8 @@ module HammerCLIForeman
     class CreateCommand < HammerCLIForeman::CreateCommand
       include HammerCLIForeman::ResourceSupportedTest
 
-      success_message "Organization created"
-      failure_message "Could not create the organization"
+      success_message _("Organization created")
+      failure_message _("Could not create the organization")
 
       apipie_options
     end
@@ -43,8 +43,8 @@ module HammerCLIForeman
     class UpdateCommand < HammerCLIForeman::UpdateCommand
       include HammerCLIForeman::ResourceSupportedTest
 
-      success_message "Organization updated"
-      failure_message "Could not update the organization"
+      success_message _("Organization updated")
+      failure_message _("Could not update the organization")
 
       apipie_options
     end
@@ -53,8 +53,8 @@ module HammerCLIForeman
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       include HammerCLIForeman::ResourceSupportedTest
 
-      success_message "Organization deleted"
-      failure_message "Could not delete the organization"
+      success_message _("Organization deleted")
+      failure_message _("Could not delete the organization")
 
       apipie_options
     end
@@ -74,5 +74,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'organization', "Manipulate organizations.", HammerCLIForeman::Organization
+HammerCLI::MainCommand.subcommand 'organization', _("Manipulate organizations."), HammerCLIForeman::Organization
 

data/lib/hammer_cli_foreman/output/fields.rb

@@ -2,10 +2,10 @@ require 'hammer_cli'
 
 module Fields
 
-  class OSName < DataField
+  class OSName < Field
   end
 
-  class Server < DataField
+  class Server < Field
   end
 
 end

data/lib/hammer_cli_foreman/output/formatters.rb

@@ -9,9 +9,14 @@ module HammerCLIForeman::Output
 
       def format(os)
         return nil if os.nil?
-        name = "%s %s" % [os[:name], os[:major]]
-        name += ".%s" % os[:minor] unless (!os.has_key?(:minor) || os[:minor].empty?)
-        name
+
+        name = os['name'] || os[:name]
+        major = os['major'] || os[:major]
+        minor = os['minor'] || os[:minor]
+
+        formatted_name = "%s %s" % [name, major]
+        formatted_name += ".%s" % minor if (!minor.nil? && !minor.empty?)
+        formatted_name
       end
     end
 
@@ -22,7 +27,13 @@ module HammerCLIForeman::Output
       end
 
       def format(server)
-        "%s (%s)" % [server[:name], server[:url]] unless server.nil?
+        if server.kind_of? Hash
+          name = server[:name] || server['name']
+          url = server[:url] || server['url']
+          "#{name} (#{url})"
+        else
+          server
+        end
       end
     end
 

data/lib/hammer_cli_foreman/parameter.rb

@@ -9,23 +9,24 @@ module HammerCLIForeman
         resource_type.to_s+"_id" => resource["id"] || resource["name"]
       }
 
-      params = ForemanApi::Resources::Parameter.new(resource_config).index(params)[0]
+      params = HammerCLIForeman.foreman_resource(:parameters).call(:index, params)
       HammerCLIForeman.collection_to_common_format(params)
     end
 
-    class SetCommand < HammerCLI::Apipie::Command
+    class SetCommand < HammerCLIForeman::Command
 
       include HammerCLI::Messages
+      include HammerCLIForeman::ConnectionSetup
 
-      option "--name", "NAME", "parameter name", :required => true
-      option "--value", "VALUE", "parameter value", :required => true
+      option "--name", "NAME", _("parameter name"), :required => true
+      option "--value", "VALUE", _("parameter value"), :required => true
 
       def self.command_name(name=nil)
-        super(name) || "set_parameter"
+        (super(name) || "set-parameter").gsub('_', '-')
       end
 
       def self.resource(resource=nil)
-        super(resource) || HammerCLI::Apipie::ResourceDefinition.new(ForemanApi::Resources::Parameter)
+        super(resource) || HammerCLIForeman.foreman_resource(:parameters)
       end
 
       def execute
@@ -44,7 +45,7 @@ module HammerCLIForeman
       end
 
       def parameter_exist?
-        params = HammerCLIForeman.collection_to_common_format(resource.call(:index, base_action_params)[0])
+        params = HammerCLIForeman.collection_to_common_format(resource.call(:index, base_action_params))
         params.find { |p| p["name"] == option_name }
       end
 
@@ -73,18 +74,19 @@ module HammerCLIForeman
     end
 
 
-    class DeleteCommand < HammerCLI::Apipie::Command
+    class DeleteCommand < HammerCLIForeman::Command
 
       include HammerCLI::Messages
+      include HammerCLIForeman::ConnectionSetup
 
-      option "--name", "NAME", "parameter name", :required => true
+      option "--name", "NAME", _("parameter name"), :required => true
 
       def self.command_name(name=nil)
-        super(name) || "delete_parameter"
+        (super(name) || "delete-parameter").gsub('_', '-')
       end
 
       def self.resource(resource=nil)
-        super(resource) || HammerCLI::Apipie::ResourceDefinition.new(ForemanApi::Resources::Parameter)
+        super(resource) || HammerCLIForeman.foreman_resource(:parameters)
       end
 
       def execute

data/lib/hammer_cli_foreman/partition_table.rb

@@ -1,15 +1,15 @@
 module HammerCLIForeman
 
-  class PartitionTable < HammerCLI::Apipie::Command
+  class PartitionTable < HammerCLIForeman::Command
 
-    resource ForemanApi::Resources::Ptable
+    resource :ptables
 
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        field :id, "Id"
-        field :name, "Name"
-        field :os_family, "OS Family"
+        field :id, _("Id")
+        field :name, _("Name")
+        field :os_family, _("OS Family")
       end
 
       apipie_options
@@ -19,8 +19,8 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       output ListCommand.output_definition do
-        field :created_at, "Created at", Fields::Date
-        field :updated_at, "Updated at", Fields::Date
+        field :created_at, _("Created at"), Fields::Date
+        field :updated_at, _("Updated at"), Fields::Date
       end
 
       apipie_options
@@ -30,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"]
@@ -42,11 +42,11 @@ module HammerCLIForeman
 
     class CreateCommand < HammerCLIForeman::CreateCommand
 
-      option "--file", "LAYOUT", "Path to a file that contains the partition layout", :attribute_name => :option_layout,
+      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"
-      failure_message "Could not create the partition table"
+      success_message _("Partition table created")
+      failure_message _("Could not create the partition table")
 
       apipie_options :without => [:layout] + declared_identifiers.keys
     end
@@ -54,19 +54,19 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      option "--file", "LAYOUT", "Path to a file that contains the partition layout", :attribute_name => :option_layout,
+      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"
+      success_message _("Partition table updated")
+      failure_message _("Could not update the partition table")
 
       apipie_options :without => [:layout] + declared_identifiers.keys
     end
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message "Partition table deleted"
-      failure_message "Could not delete the partition table"
+      success_message _("Partition table deleted")
+      failure_message _("Could not delete the partition table")
 
       apipie_options
     end
@@ -80,5 +80,4 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'partition_table', "Manipulate partition tables.", HammerCLIForeman::PartitionTable
-
+HammerCLI::MainCommand.subcommand 'partition-table', _("Manipulate partition tables."), HammerCLIForeman::PartitionTable