hammer_cli_foreman 0.0.18 → 0.1.0

data/lib/hammer_cli_foreman/commands.rb

@@ -1,5 +1,44 @@
 module HammerCLIForeman
 
+  CONNECTION_NAME = 'foreman'
+
+  def self.credentials
+    @credentials ||= Credentials.new(
+      :username => (HammerCLI::Settings.get(:_params, :username) || ENV['FOREMAN_USERNAME'] || HammerCLI::Settings.get(:foreman, :username)),
+      :password => (HammerCLI::Settings.get(:_params, :password) || ENV['FOREMAN_PASSWORD'] || HammerCLI::Settings.get(:foreman, :password))
+    )
+    @credentials
+  end
+
+  def self.resource_config
+    config = {}
+    config[:uri] = HammerCLI::Settings.get(:foreman, :host)
+    config[:credentials] = credentials
+    config[:logger] = Logging.logger['API']
+    config[:api_version] = 2
+    config[:aggressive_cache_checking] = HammerCLI::Settings.get(:foreman, :refresh_cache) || true
+    config[:headers] = { "Accept-Language" => HammerCLI::I18n.locale }
+    config[:timeout] = HammerCLI::Settings.get(:foreman, :request_timeout)
+    config
+  end
+
+  def self.foreman_resource(resource)
+    HammerCLI::Connection.create(
+        CONNECTION_NAME,
+        HammerCLI::Apipie::Command.resource_config.merge(resource_config),
+        HammerCLI::Apipie::Command.connection_options).api.resource(resource)
+  end
+
+  module ConnectionSetup
+    def connection_name(resource_class)
+      CONNECTION_NAME
+    end
+
+    def resource_config
+      super.merge(HammerCLIForeman.resource_config)
+    end
+  end
+
   def self.collection_to_common_format(data)
     if data.class <= Hash && data.has_key?('total') && data.has_key?('results')
       col = HammerCLI::Output::RecordCollection.new(data['results'],
@@ -17,7 +56,7 @@ module HammerCLIForeman
       # produce [ { 'attr' => 'val' }, ... ]
       col = HammerCLI::Output::RecordCollection.new(data.map { |r| r.keys.length == 1 ? r[r.keys[0]] : r })
     else
-      raise RuntimeError.new("Received data of unknown format")
+      raise RuntimeError.new(_("Received data of unknown format"))
     end
     col
   end
@@ -26,15 +65,23 @@ module HammerCLIForeman
       data.class <= Hash && data.keys.length == 1 ? data[data.keys[0]] : data
   end
 
+  class ReadCommand < HammerCLI::Apipie::ReadCommand
+    extend HammerCLIForeman::ConnectionSetup
+  end
+
+  class Command < ReadCommand
+  end
+
   class WriteCommand < HammerCLI::Apipie::WriteCommand
+    extend HammerCLIForeman::ConnectionSetup
 
     def send_request
-      HammerCLIForeman.record_to_common_format(resource.call(action, request_params, request_headers)[0])
+      HammerCLIForeman.record_to_common_format(super)
     end
 
   end
 
-  class ListCommand < HammerCLI::Apipie::ReadCommand
+  class ListCommand < ReadCommand
 
     action :index
 
@@ -60,9 +107,9 @@ module HammerCLIForeman
     end
 
     def execute
-      if respond_to?(:page) && respond_to?(:per_page)
-        self.page ||= 1
-        self.per_page ||= HammerCLI::Settings.get(:ui, :per_page) || DEFAULT_PER_PAGE
+      if respond_to?(:option_page) && respond_to?(:option_per_page)
+        self.option_page ||= 1
+        self.option_per_page ||= HammerCLI::Settings.get(:ui, :per_page) || DEFAULT_PER_PAGE
         browse_collection
       else
         retrieve_and_print
@@ -79,10 +126,10 @@ module HammerCLIForeman
       while list_next do
         d = retrieve_and_print
 
-        if (d.size >= self.per_page.to_i) && interactive?
-          answer = ask("List next page? (Y/n): ").downcase
+        if (d.size >= self.option_per_page.to_i) && interactive?
+          answer = ask(_("List next page? (%s): ") % 'Y/n').downcase
           list_next = (answer == 'y' || answer == '')
-          self.page += 1
+          self.option_page += 1
         else
           list_next = false
         end
@@ -99,7 +146,7 @@ module HammerCLIForeman
   end
 
 
-  class InfoCommand < HammerCLI::Apipie::ReadCommand
+  class InfoCommand < ReadCommand
 
     action :show
 
@@ -110,7 +157,8 @@ module HammerCLIForeman
     identifiers :id, :name
 
     def request_params
-      {'id' => get_identifier[0]}
+      params = method_options
+      params.update('id' => get_identifier[0])
     end
 
     def retrieve_data
@@ -153,7 +201,7 @@ module HammerCLIForeman
 
     def self.setup_identifier_options
       super
-      option "--new-name", "NEW_NAME", "new name for the resource", :attribute_name => :option_name if identifier? :name
+      option "--new-name", "NEW_NAME", _("new name for the resource"), :attribute_name => :option_name if identifier? :name
     end
 
     def request_params
@@ -199,7 +247,7 @@ module HammerCLIForeman
     end
 
     def self.setup_associated_identifier_options
-      name = associated_resource.name.to_s
+      name = associated_resource.singular_name
       option_switch = "--"+name.gsub('_', '-')
 
       option option_switch, name.upcase, " ", :attribute_name => :associated_name do |value|
@@ -210,11 +258,11 @@ module HammerCLIForeman
 
 
     def associated_resource
-      HammerCLI::Apipie::ResourceInstance.from_definition(self.class.associated_resource, resource_config)
+      self.class.associated_resource
     end
 
     def self.associated_resource(resource_class=nil)
-      @associated_api_resource = HammerCLI::Apipie::ResourceDefinition.new(resource_class) unless resource_class.nil?
+      @associated_api_resource = HammerCLIForeman.foreman_resource(resource_class) unless resource_class.nil?
       return @associated_api_resource
     end
 
@@ -241,41 +289,45 @@ module HammerCLIForeman
     end
 
     def get_current_ids
-      item = HammerCLIForeman.record_to_common_format(resource.call('show', {'id' => get_identifier[0]})[0])
-      if item.has_key?(associated_resource.plural_name)
-        item[associated_resource.plural_name].map { |assoc| assoc['id'] }
+      item = HammerCLIForeman.record_to_common_format(resource.call(:show, {:id => get_identifier[0]}))
+      if item.has_key?(association_name(true))
+        item[association_name(true)].map { |assoc| assoc['id'] }
       else
-        item[associated_resource.name+'_ids'] || []
+        item[association_name+'_ids'] || []
       end
     end
 
     def get_required_id
-      item = HammerCLIForeman.record_to_common_format(associated_resource.call('show', {'id' => associated_id || associated_name})[0])
+      item = HammerCLIForeman.record_to_common_format(associated_resource.call(:show, {:id => associated_id || associated_name}))
       item['id']
     end
 
     def request_params
-      params = {}
-      if params.key?(resource.name)
-        params[resource.name] = {"#{associated_resource.name}_ids" => get_new_ids }
+      params = super
+      if params.key?(resource.singular_name)
+        params[resource.singular_name] = {"#{association_name}_ids" => get_new_ids }
       else
-        params["#{associated_resource.name}_ids"] = get_new_ids
+        params["#{association_name}_ids"] = get_new_ids
       end
-
       params['id'] = get_identifier[0]
       params
     end
 
+    def association_name(plural = false)
+      plural ? associated_resource.name.to_s : associated_resource.singular_name.to_s
+    end
+
   end
 
   class AddAssociatedCommand < AssociatedCommand
 
     def self.command_name(name=nil)
-      super(name) || (associated_resource ? "add_"+associated_resource.name : nil)
+      name = super(name) || (associated_resource ? "add-"+associated_resource.singular_name : nil)
+      name.respond_to?(:gsub) ? name.gsub('_', '-') : name
     end
 
     def self.desc(desc=nil)
-      "Associate a resource"
+      _("Associate a resource")
     end
 
     def get_new_ids
@@ -291,11 +343,12 @@ module HammerCLIForeman
   class RemoveAssociatedCommand < AssociatedCommand
 
     def self.command_name(name=nil)
-      super(name) || (associated_resource ? "remove_"+associated_resource.name : nil)
+      name = super(name) || (associated_resource ? "remove-"+associated_resource.singular_name : nil)
+      name.respond_to?(:gsub) ? name.gsub('_', '-') : name
     end
 
     def self.desc(desc=nil)
-      "Disassociate a resource"
+      _("Disassociate a resource")
     end
 
     def get_new_ids

data/lib/hammer_cli_foreman/common_parameter.rb

@@ -1,17 +1,16 @@
 require 'hammer_cli'
-require 'foreman_api'
 
 module HammerCLIForeman
 
-  class CommonParameter < HammerCLI::AbstractCommand
+  class CommonParameter < HammerCLIForeman::Command
 
+    resource :common_parameters
 
     class ListCommand < HammerCLIForeman::ListCommand
-      resource ForemanApi::Resources::CommonParameter, "index"
 
       output do
-        field :name, "Name"
-        field :value, "Value"
+        field :name, _("Name")
+        field :value, _("Value")
       end
 
       apipie_options
@@ -20,15 +19,13 @@ module HammerCLIForeman
     class SetCommand < HammerCLIForeman::WriteCommand
 
       command_name "set"
-      desc "Set a global parameter."
+      desc _("Set a global parameter.")
 
-      success_message_for :create, "Created parameter [%{name}s] with value [%{value}s]."
-      success_message_for :update, "Parameter [%{name}s] updated to [%{value}s]."
+      success_message_for :create, _("Created parameter [%{name}s] with value [%{value}s].")
+      success_message_for :update, _("Parameter [%{name}s] updated to [%{value}s].")
 
-      resource ForemanApi::Resources::CommonParameter
-
-      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 action
         @action ||= parameter_exist? ? :update : :create
@@ -40,7 +37,7 @@ module HammerCLIForeman
       end
 
       def parameter_exist?
-        params = resource.call(:index)[0]
+        params = resource.call(:index)
         params = HammerCLIForeman.collection_to_common_format(params)
         params.find { |p| p["name"] == option_name }
       end
@@ -58,9 +55,8 @@ module HammerCLIForeman
 
       identifiers :name
 
-      success_message "Global parameter [%{name}s] deleted."
-      failure_message "Could not delete the global parameter [%{name}s]"
-      resource ForemanApi::Resources::CommonParameter, "destroy"
+      success_message _("Global parameter [%{name}s] deleted.")
+      failure_message _("Could not delete the global parameter [%{name}s]")
 
       apipie_options :without => :id
     end
@@ -69,4 +65,4 @@ module HammerCLIForeman
   end
 end
 
-HammerCLI::MainCommand.subcommand 'global_parameter', "Manipulate global parameters.", HammerCLIForeman::CommonParameter
+HammerCLI::MainCommand.subcommand 'global-parameter', _("Manipulate global parameters."), HammerCLIForeman::CommonParameter

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -2,15 +2,15 @@ require 'hammer_cli_foreman/image'
 
 module HammerCLIForeman
 
-  class ComputeResource < HammerCLI::Apipie::Command
-    resource ForemanApi::Resources::ComputeResource
+  class ComputeResource < HammerCLIForeman::Command
+    resource :compute_resources
 
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        field :id, "Id"
-        field :name, "Name"
-        field :provider, "Provider"
+        field :id, _("Id")
+        field :name, _("Name")
+        field :provider, _("Provider")
       end
 
       apipie_options
@@ -21,31 +21,31 @@ module HammerCLIForeman
 
       PROVIDER_SPECIFIC_FIELDS = {
         'ovirt' => [
-          Fields::DataField.new(:label => 'UUID', :path => ["compute_resource", "uuid"])
+          Fields::Field.new(:label => _('UUID'), :path => ["compute_resource", "uuid"])
         ],
         'ec2' => [
-          Fields::DataField.new(:label => 'Region', :path => ["compute_resource", "region"])
+          Fields::Field.new(:label => _('Region'), :path => ["compute_resource", "region"])
         ],
         'vmware' => [
-          Fields::DataField.new(:label => 'UUID', :path => ["compute_resource", "uuid"]),
-          Fields::DataField.new(:label => 'Server', :path => ["compute_resource", "server"])
+          Fields::Field.new(:label => _('UUID'), :path => ["compute_resource", "uuid"]),
+          Fields::Field.new(:label => _('Server'), :path => ["compute_resource", "server"])
         ],
         'openstack' => [
-          Fields::DataField.new(:label => 'Tenant', :path => ["compute_resource", "tenant"])
+          Fields::Field.new(:label => _('Tenant'), :path => ["compute_resource", "tenant"])
         ],
         'rackspace' => [
-          Fields::DataField.new(:label => 'Region', :path => ["compute_resource", "region"])
+          Fields::Field.new(:label => _('Region'), :path => ["compute_resource", "region"])
         ],
         'libvirt' => [
         ]
       }
 
       output ListCommand.output_definition do
-        field :url, "Url"
-        field :description, "Description"
-        field :user, "User"
-        field :created_at, "Created at", Fields::Date
-        field :updated_at, "Updated at", Fields::Date
+        field :url, _("Url")
+        field :description, _("Description")
+        field :user, _("User")
+        field :created_at, _("Created at"), Fields::Date
+        field :updated_at, _("Updated at"), Fields::Date
       end
 
       def print_data(data)
@@ -60,8 +60,8 @@ module HammerCLIForeman
 
     class CreateCommand < HammerCLIForeman::CreateCommand
 
-      success_message "Compute resource created"
-      failure_message "Could not create the compute resource"
+      success_message _("Compute resource created")
+      failure_message _("Could not create the compute resource")
 
       apipie_options
 
@@ -73,8 +73,8 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      success_message "Compute resource updated"
-      failure_message "Could not update the compute resource"
+      success_message _("Compute resource updated")
+      failure_message _("Could not update the compute resource")
 
       apipie_options
     end
@@ -82,8 +82,8 @@ module HammerCLIForeman
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
 
-      success_message "Compute resource deleted"
-      failure_message "Could not delete the compute resource"
+      success_message _("Compute resource deleted")
+      failure_message _("Could not delete the compute resource")
 
       apipie_options
     end
@@ -95,6 +95,6 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'compute_resource', "Manipulate compute resources.", HammerCLIForeman::ComputeResource
+HammerCLI::MainCommand.subcommand 'compute-resource', _("Manipulate compute resources."), HammerCLIForeman::ComputeResource
 
 

data/lib/hammer_cli_foreman/credentials.rb

@@ -0,0 +1,36 @@
+module HammerCLIForeman
+  class Credentials < HammerCLI::Apipie::AbstractCredentials
+
+    def initialize(params={})
+      @username = params[:username]
+      @password = params[:password]
+    end
+
+    def username
+      @username ||= ask_user(_("[Foreman] username: ")) if HammerCLI.interactive?
+      @username
+    end
+
+    def password
+      @password ||= ask_user(_("[Foreman] password for %s: ") % @username, true) if HammerCLI.interactive?
+      @password
+    end
+
+    def empty?
+      !@username && !@password
+    end
+
+    def clear
+      @username = nil
+      @password = nil
+    end
+
+    def to_params
+      {
+        :username => username,
+        :password => password
+      }
+    end
+
+  end
+end

data/lib/hammer_cli_foreman/domain.rb

@@ -1,12 +1,14 @@
 module HammerCLIForeman
 
-  class Domain < HammerCLI::AbstractCommand
+  class Domain < HammerCLIForeman::Command
+
+    resource :domains
+
     class ListCommand < HammerCLIForeman::ListCommand
-      resource ForemanApi::Resources::Domain, "index"
 
       output do
-        field :id, "Id"
-        field :name, "Name"
+        field :id, _("Id")
+        field :name, _("Name")
       end
 
       apipie_options
@@ -15,14 +17,12 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      resource ForemanApi::Resources::Domain, "show"
-
       output ListCommand.output_definition do
-        field :fullname, "Description"
-        field :dns_id, "DNS Id"
-        field :created_at, "Created at", Fields::Date
-        field :updated_at, "Updated at", Fields::Date
-        collection :parameters, "Parameters" do
+        field :fullname, _("Description")
+        field :dns_id, _("DNS Id")
+        field :created_at, _("Created at"), Fields::Date
+        field :updated_at, _("Updated at"), Fields::Date
+        collection :parameters, _("Parameters") do
           field nil, nil, Fields::KeyValue
         end
       end
@@ -38,31 +38,28 @@ module HammerCLIForeman
 
     class CreateCommand < HammerCLIForeman::CreateCommand
 
-      success_message "Domain [%{name}s] created"
-      failure_message "Could not create the domain"
-      resource ForemanApi::Resources::Domain, "create"
+      success_message _("Domain [%{name}s] created")
+      failure_message _("Could not create the domain")
 
       apipie_options :without => [:domain_parameters_attributes, :fullname]
-      option "--description", "DESC", "Full name describing the domain", :attribute_name => :option_fullname
+      option "--description", "DESC", _("Full name describing the domain"), :attribute_name => :option_fullname
     end
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      success_message "Domain [%{name}s] updated"
-      failure_message "Could not update the domain"
-      resource ForemanApi::Resources::Domain, "update"
+      success_message _("Domain [%{name}s] updated")
+      failure_message _("Could not update the domain")
 
       apipie_options :without => [:domain_parameters_attributes, :name, :id, :fullname]
-      option "--description", "DESC", "Full name describing the domain", :attribute_name => :option_fullname
+      option "--description", "DESC", _("Full name describing the domain"), :attribute_name => :option_fullname
     end
 
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
 
-      success_message "Domain [%{name}s] deleted"
-      failure_message "Could not delete the domain"
-      resource ForemanApi::Resources::Domain, "destroy"
+      success_message _("Domain [%{name}s] deleted")
+      failure_message _("Could not delete the domain")
 
       apipie_options
     end
@@ -70,16 +67,16 @@ module HammerCLIForeman
 
     class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
 
-      resource ForemanApi::Resources::Parameter
+      resource :parameters
 
-      desc "Create or update parameter for a domain."
+      desc _("Create or update parameter for a domain.")
 
-      option "--domain-name", "DOMAIN_NAME", "name of the domain the parameter is being set for"
-      option "--domain-id", "DOMAIN_ID", "id of the domain the parameter is being set for"
+      option "--domain-name", "DOMAIN_NAME", _("name of the domain the parameter is being set for")
+      option "--domain-id", "DOMAIN_ID", _("id of the domain the parameter is being set for")
 
-      success_message_for :update, "Domain parameter updated"
-      success_message_for :create, "New domain parameter created"
-      failure_message "Could not set domain parameter"
+      success_message_for :update, _("Domain parameter updated")
+      success_message_for :create, _("New domain parameter created")
+      failure_message _("Could not set domain parameter")
 
       def validate_options
         super
@@ -96,14 +93,14 @@ module HammerCLIForeman
 
     class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
 
-      resource ForemanApi::Resources::Parameter
+      resource :parameters
 
-      desc "Delete parameter for a domain."
+      desc _("Delete parameter for a domain.")
 
-      option "--domain-name", "DOMAIN_NAME", "name of the domain the parameter is being deleted for"
-      option "--domain-id", "DOMAIN_ID", "id of the domain the parameter is being deleted for"
+      option "--domain-name", "DOMAIN_NAME", _("name of the domain the parameter is being deleted for")
+      option "--domain-id", "DOMAIN_ID", _("id of the domain the parameter is being deleted for")
 
-      success_message "Domain parameter deleted"
+      success_message _("Domain parameter deleted")
 
       def validate_options
         super
@@ -122,5 +119,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'domain', "Manipulate domains.", HammerCLIForeman::Domain
+HammerCLI::MainCommand.subcommand 'domain', _("Manipulate domains."), HammerCLIForeman::Domain