hammer_cli_foreman 0.0.18 → 0.1.0

data/lib/hammer_cli_foreman/puppet_class.rb

@@ -2,15 +2,15 @@ require 'hammer_cli_foreman/smart_class_parameter'
 
 module HammerCLIForeman
 
-  class PuppetClass < HammerCLI::Apipie::Command
+  class PuppetClass < HammerCLIForeman::Command
 
-    resource ForemanApi::Resources::Puppetclass
+    resource :puppetclasses
 
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        field :id, "Id"
-        field :name, "Name"
+        field :id, _("Id")
+        field :name, _("Name")
       end
 
       def retrieve_data
@@ -32,10 +32,10 @@ module HammerCLIForeman
 
       #FIXME: show environments, hostgroups, variables and parameters
       output ListCommand.output_definition do
-        collection :lookup_keys, "Smart variables" do
+        collection :lookup_keys, _("Smart variables") do
           from :lookup_key do
-            field :key, "Parameter"
-            field :default_value, "Default value"
+            field :key, _("Parameter")
+            field :default_value, _("Default value")
           end
         end
       end
@@ -47,7 +47,7 @@ module HammerCLIForeman
     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',
+      option ['--id', '--name'], 'PUPPET_CLASS_ID', _('puppet class id/name'),
               :attribute_name => :puppetclass_id, :required => true
     end
 
@@ -57,5 +57,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'puppet_class', "Search puppet modules.", HammerCLIForeman::PuppetClass
+HammerCLI::MainCommand.subcommand 'puppet-class', _("Search puppet modules."), HammerCLIForeman::PuppetClass
 

data/lib/hammer_cli_foreman/report.rb

@@ -1,22 +1,22 @@
 module HammerCLIForeman
 
-  class Report < HammerCLI::Apipie::Command
+  class Report < HammerCLIForeman::Command
 
-    resource ForemanApi::Resources::Report
+    resource :reports
 
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        field :id, "Id"
-        field :host_name, "Host"
-        field :reported_at, "Last report", Fields::Date
+        field :id, _("Id")
+        field :host_name, _("Host")
+        field :reported_at, _("Last report"), Fields::Date
         from "status" do
-          field :applied, "Applied"
-          field :restarted, "Restarted"
-          field :failed, "Failed"
-          field :failed_restarts, "Restart Failures"
-          field :skipped, "Skipped"
-          field :pending, "Pending"
+          field :applied, _("Applied")
+          field :restarted, _("Restarted")
+          field :failed, _("Failed")
+          field :failed_restarts, _("Restart Failures")
+          field :skipped, _("Skipped")
+          field :pending, _("Pending")
         end
       end
 
@@ -29,42 +29,42 @@ module HammerCLIForeman
       identifiers :id
 
       output do
-        field :id, "Id"
-        field :host_name, "Host"
-        field :reported_at, "Reported at", Fields::Date
-        label "Report status" do
+        field :id, _("Id")
+        field :host_name, _("Host")
+        field :reported_at, _("Reported at"), Fields::Date
+        label _("Report status") do
           from "status" do
-            field :applied, "Applied"
-            field :restarted, "Restarted"
-            field :failed, "Failed"
-            field :failed_restarts, "Restart Failures"
-            field :skipped, "Skipped"
-            field :pending, "Pending"
+            field :applied, _("Applied")
+            field :restarted, _("Restarted")
+            field :failed, _("Failed")
+            field :failed_restarts, _("Restart Failures")
+            field :skipped, _("Skipped")
+            field :pending, _("Pending")
           end
         end
-        label "Report metrics" do
+        label _("Report metrics") do
           from "metrics" do
             from "time" do
-              field :config_retrieval, "config_retrieval"
-              field :exec, "exec"
-              field :file, "file"
-              field :package, "package"
-              field :service, "service"
-              field :user, "user"
-              field :yumrepo, "yumrepo"
-              field :filebucket, "filebucket"
-              field :cron, "cron"
-              field :total, "total"
+              field :config_retrieval, _("config_retrieval")
+              field :exec, _("exec")
+              field :file, _("file")
+              field :package, _("package")
+              field :service, _("service")
+              field :user, _("user")
+              field :yumrepo, _("yumrepo")
+              field :filebucket, _("filebucket")
+              field :cron, _("cron")
+              field :total, _("total")
             end
           end
         end
-        field :logs, "Logs", Fields::Collection do
+        field :logs, _("Logs"), Fields::Collection do
           from :log do
             from :source do
-              field :source, "Resource"
+              field :source, _("Resource")
             end
             from :message do
-              field :message, "Message"
+              field :message, _("Message")
             end
           end
         end
@@ -76,8 +76,8 @@ module HammerCLIForeman
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       identifiers :id
-      success_message "Report has been deleted"
-      failure_message "Could not delete the report"
+      success_message _("Report has been deleted")
+      failure_message _("Could not delete the report")
 
       apipie_options
     end
@@ -88,5 +88,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'report', "Browse and read reports.", HammerCLIForeman::Report
+HammerCLI::MainCommand.subcommand 'report', _("Browse and read reports."), HammerCLIForeman::Report
 

data/lib/hammer_cli_foreman/resource_supported_test.rb

@@ -8,7 +8,7 @@ module HammerCLIForeman
       if resource_supported?
         super
       else
-        raise OperationNotSupportedError, "The server does not support such operation."
+        raise OperationNotSupportedError, _("The server does not support such operation.")
       end
     end
 

data/lib/hammer_cli_foreman/smart_class_parameter.rb

@@ -1,15 +1,15 @@
 module HammerCLIForeman
 
   class SmartClassParametersBriefList < HammerCLIForeman::ListCommand
-    resource ForemanApi::Resources::SmartClassParameter, "index"
-    command_name 'sc_params'
+    resource :smart_class_parameters, :index
+    command_name 'sc-params'
 
     output do
-      field :id, "Id"
+      field :id, _("Id")
 
-      field :parameter, "Parameter"
-      field :default_value, "Default Value"
-      field :override, "Override"
+      field :parameter, _("Parameter")
+      field :default_value, _("Default Value")
+      field :override, _("Override")
     end
 
     def retrieve_data
@@ -25,15 +25,15 @@ module HammerCLIForeman
 
     output do
       from :puppetclass do
-        field :name, "Puppet class"
-        field :id, "Class Id", Fields::Id
+        field :name, _("Puppet class")
+        field :id, _("Class Id"), Fields::Id
       end
     end
   end
 
-  class SmartClassParameter < HammerCLI::Apipie::Command
+  class SmartClassParameter < HammerCLIForeman::Command
 
-    resource ForemanApi::Resources::SmartClassParameter
+    resource :smart_class_parameters
 
     class ListCommand < HammerCLIForeman::SmartClassParametersList
       command_name 'list'
@@ -43,34 +43,34 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
 
       output ListCommand.output_definition do
-        field :description, "Description"
-        field :parameter_type, "Type"
-        field :required, "Required"
-        field :_environments, "Environments", Fields::List
-        field :_environment_ids, "Environment Ids", Fields::List
-        label "Validator" do
-          field :validator_type, "Type"
-          field :validator_rule, "Rule"
+        field :description, _("Description")
+        field :parameter_type, _("Type")
+        field :required, _("Required")
+        field :_environments, _("Environments"), Fields::List
+        field :_environment_ids, _("Environment Ids"), Fields::List
+        label _("Validator") do
+          field :validator_type, _("Type")
+          field :validator_rule, _("Rule")
         end
-        label "Override values" do
-          field :override_value_order, "Order", Fields::List
-          field :override_values_count, "Count"
+        label _("Override values") do
+          field :override_value_order, _("Order"), Fields::List
+          field :override_values_count, _("Count")
           collection :override_values, "Values" do
-            label  "Value" do
-              field :id, 'Id'
-              field :match, 'Match'
-              field :value, 'Value'
+            label  _("Value") do
+              field :id, _('Id')
+              field :match, _('Match')
+              field :value, _('Value')
             end
           end
         end
-        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
 
       def extend_data(res)
         res['override_value_order'] = res['override_value_order'].split("\n")
-        res['_environments'] = res['environments'].map { |e| e['environment']['name']}
-        res['_environment_ids'] = res['environments'].map { |e| e['environment']['id']}
+        res['_environments'] = res['environments'].map { |e| e['name']}
+        res['_environment_ids'] = res['environments'].map { |e| e['id']}
         res
       end
 
@@ -79,19 +79,19 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      success_message "Parameter updated"
-      failure_message "Could not update the parameter"
+      success_message _("Parameter updated")
+      failure_message _("Could not update the parameter")
 
       apipie_options :without => [:parameter_type, :validator_type, :id, :override, :required]
 
-      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', ''])
     end
 
@@ -100,6 +100,6 @@ module HammerCLIForeman
 
   end
 
-  HammerCLI::MainCommand.subcommand 'sc_param', "Manipulate smart class parameters.", HammerCLIForeman::SmartClassParameter
+  HammerCLI::MainCommand.subcommand 'sc-param', _("Manipulate smart class parameters."), HammerCLIForeman::SmartClassParameter
 
 end

data/lib/hammer_cli_foreman/smart_proxy.rb

@@ -1,7 +1,8 @@
 module HammerCLIForeman
 
-  class SmartProxy < HammerCLI::Apipie::Command
-    resource ForemanApi::Resources::SmartProxy
+  class SmartProxy < HammerCLIForeman::Command
+
+    resource :smart_proxies
 
     class ListCommand < HammerCLIForeman::ListCommand
 
@@ -9,9 +10,9 @@ module HammerCLIForeman
 
       #FIXME: search by unknown type returns 500 from the server, propper error handling should resove this
       output do
-        field :id, "Id"
-        field :name, "Name"
-        field :url, "URL"
+        field :id, _("Id")
+        field :name, _("Name")
+        field :url, _("URL")
       end
 
       apipie_options
@@ -23,9 +24,9 @@ module HammerCLIForeman
       action :show
 
       output ListCommand.output_definition do
-        field :_features,  "Features",   Fields::List
-        field :created_at, "Created at", Fields::Date
-        field :updated_at, "Updated at", Fields::Date
+        field :_features, _( "Features"),   Fields::List
+        field :created_at, _("Created at"), Fields::Date
+        field :updated_at, _("Updated at"), Fields::Date
       end
 
       def extend_data(proxy)
@@ -41,8 +42,8 @@ module HammerCLIForeman
 
       action :create
 
-      success_message "Smart proxy created"
-      failure_message "Could not create the proxy"
+      success_message _("Smart proxy created")
+      failure_message _("Could not create the proxy")
 
       apipie_options
     end
@@ -52,8 +53,8 @@ module HammerCLIForeman
 
       action :update
 
-      success_message "Smart proxy updated"
-      failure_message "Could not update the proxy"
+      success_message _("Smart proxy updated")
+      failure_message _("Could not update the proxy")
 
       apipie_options
     end
@@ -63,28 +64,28 @@ module HammerCLIForeman
 
       action :destroy
 
-      success_message "Smart proxy deleted"
-      failure_message "Could not delete the proxy"
+      success_message _("Smart proxy deleted")
+      failure_message _("Could not delete the proxy")
 
       apipie_options
     end
 
 
-    class ImportPuppetClassesCommand < HammerCLI::Apipie::WriteCommand
+    class ImportPuppetClassesCommand < HammerCLIForeman::WriteCommand
 
       action :import_puppetclasses
 
-      command_name    "import_classes"
-      success_message "Puppet classes were imported"
-      failure_message "Import of puppet classes failed"
+      command_name    "import-classes"
+      success_message _("Puppet classes were imported")
+      failure_message _("Import of puppet classes failed")
 
-      option "--dryrun", :flag, "Do not run the import"
+      option "--dryrun", :flag, _("Do not run the import")
 
       apipie_options :without => [:smart_proxy_id, :dryrun]
 
       def request_params
         opts = super
-        opts['dryrun'] = option_dryrun?
+        opts['dryrun'] = option_dryrun? || false
         opts
       end
     end
@@ -94,4 +95,4 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'proxy', "Manipulate smart proxies.", HammerCLIForeman::SmartProxy
+HammerCLI::MainCommand.subcommand 'proxy', _("Manipulate smart proxies."), HammerCLIForeman::SmartProxy

data/lib/hammer_cli_foreman/subnet.rb

@@ -1,14 +1,16 @@
 module HammerCLIForeman
 
-  class Subnet < HammerCLI::AbstractCommand
+  class Subnet < HammerCLIForeman::Command
+
+    resource :subnets
+
     class ListCommand < HammerCLIForeman::ListCommand
-      resource ForemanApi::Resources::Subnet, "index"
 
       output do
-        field :id, "Id"
-        field :name, "Name"
-        field :network, "Network"
-        field :mask, "Mask"
+        field :id, _("Id")
+        field :name, _("Name")
+        field :network, _("Network")
+        field :mask, _("Mask")
       end
 
       apipie_options
@@ -17,22 +19,21 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      resource ForemanApi::Resources::Subnet, "show"
-
       output ListCommand.output_definition do
-        field :priority, "Priority"
-        field :dns, "DNS", Fields::Server
-        field :dns_primary, "Primary DNS"
-        field :dns_secondary, "Secondary DNS"
-        field :domain_ids, "Domain ids", Fields::List
-        field :tftp, "TFTP", Fields::Server
-        field :tftp_id, "TFTP id"
-        field :dhcp, "DHCP", Fields::Server
-        field :dhcp_id, "DHCP id"
-        field :vlanid, "vlan id"
-        field :gateway, "Gateway"
-        field :from, "From"
-        field :to, "To"
+        field :priority, _("Priority")
+        field :dns_id, _("DNS id")
+        field :dns, _("DNS"), Fields::Server
+        field :dns_primary, _("Primary DNS")
+        field :dns_secondary, _("Secondary DNS")
+        field :domain_ids, _("Domain ids"), Fields::List
+        field :tftp, _("TFTP"), Fields::Server
+        field :tftp_id, _("TFTP id")
+        field :dhcp, _("DHCP"), Fields::Server
+        field :dhcp_id, _("DHCP id")
+        field :vlanid, _("vlan id")
+        field :gateway, _("Gateway")
+        field :from, _("From")
+        field :to, _("To")
       end
 
       apipie_options
@@ -41,9 +42,8 @@ module HammerCLIForeman
 
     class CreateCommand < HammerCLIForeman::CreateCommand
 
-      success_message "Subnet created"
-      failure_message "Could not create the subnet"
-      resource ForemanApi::Resources::Subnet, "create"
+      success_message _("Subnet created")
+      failure_message _("Could not create the subnet")
 
       apipie_options
     end
@@ -51,9 +51,8 @@ module HammerCLIForeman
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
 
-      success_message "Subnet updated"
-      failure_message "Could not update the subnet"
-      resource ForemanApi::Resources::Subnet, "update"
+      success_message _("Subnet updated")
+      failure_message _("Could not update the subnet")
 
       apipie_options
     end
@@ -61,9 +60,8 @@ module HammerCLIForeman
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
 
-      success_message "Subnet deleted"
-      failure_message "Could not delete the subnet"
-      resource ForemanApi::Resources::Subnet, "destroy"
+      success_message _("Subnet deleted")
+      failure_message _("Could not delete the subnet")
 
       apipie_options
     end
@@ -73,5 +71,5 @@ module HammerCLIForeman
 
 end
 
-HammerCLI::MainCommand.subcommand 'subnet', "Manipulate subnets.", HammerCLIForeman::Subnet
+HammerCLI::MainCommand.subcommand 'subnet', _("Manipulate subnets."), HammerCLIForeman::Subnet