hammer_cli_foreman 0.0.11 → 0.0.12

data/lib/hammer_cli_foreman/puppet_class.rb

@@ -12,10 +12,8 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "puppetclass" do
-          field :id, "Id"
-          field :name, "Name"
-        end
+        field :id, "Id"
+        field :name, "Name"
       end
 
       def retrieve_data
@@ -23,7 +21,10 @@ module HammerCLIForeman
       end
 
       def self.unhash_classes(classes)
-        classes.inject([]) { |list, (pp_module, pp_module_classes)| list + pp_module_classes }
+        clss = classes.first.inject([]) { |list, (pp_module, pp_module_classes)| list + pp_module_classes }
+
+        HammerCLI::Output::RecordCollection.new(clss, :meta => classes.meta)
+
       end
 
       apipie_options
@@ -32,14 +33,12 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      #FIXME: show environments and hostgroups
+      #FIXME: show environments, hostgroups, variables and parameters
       output ListCommand.output_definition do
-        from "puppetclass" do
-          collection :lookup_keys, "Smart variables" do
-            from :lookup_key do
-              field :key, "Parameter"
-              field :default_value, "Default value"
-            end
+        collection :lookup_keys, "Smart variables" do
+          from :lookup_key do
+            field :key, "Parameter"
+            field :default_value, "Default value"
           end
         end
       end
@@ -50,7 +49,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
 

data/lib/hammer_cli_foreman/report.rb

@@ -11,18 +11,16 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "report" do
-          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"
-          end
+        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"
         end
       end
 
@@ -35,44 +33,42 @@ module HammerCLIForeman
       identifiers :id
 
       output do
-        from "report" 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"
-            end
+        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"
           end
-          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"
-              end
+        end
+        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"
             end
           end
-          field :logs, "Logs", Fields::Collection do
-            from :log do
-              from :source do
-                field :source, "Resource"
-              end
-              from :message do
-                field :message, "Message"
-              end
+        end
+        field :logs, "Logs", Fields::Collection do
+          from :log do
+            from :source do
+              field :source, "Resource"
+            end
+            from :message do
+              field :message, "Message"
             end
           end
         end

data/lib/hammer_cli_foreman/smart_class_parameter.rb

@@ -21,19 +21,19 @@ module HammerCLIForeman
       # FIXME: API returns doubled records, probably just if filtered by puppetclasses
       # it seems group by environment is missing
       # having the uniq to fix that
-      res["smart_class_parameters"].uniq 
+      HammerCLI::Output::RecordCollection.new(res.uniq, :meta => res.meta)
     end
   end
 
   class SmartClassParametersList < SmartClassParametersBriefList
 
-    output do 
+    output do
       from :puppetclass do
         field :name, "Puppet class"
         field :id, "Class Id", Fields::Id
       end
     end
-  end 
+  end
 
   class SmartClassParameter < HammerCLI::Apipie::Command
 
@@ -63,7 +63,7 @@ module HammerCLIForeman
             label  "Value" do
               field :id, 'Id'
               field :match, 'Match'
-              field :value, 'Value' 
+              field :value, 'Value'
             end
           end
         end
@@ -71,9 +71,8 @@ module HammerCLIForeman
         field :updated_at, "Updated at", Fields::Date
       end
 
-      def retrieve_data
-        res = super['smart_class_parameter']
-        res['override_value_order'] = res['override_value_order'].split("\n") 
+      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

data/lib/hammer_cli_foreman/smart_proxy.rb

@@ -13,11 +13,9 @@ module HammerCLIForeman
 
       #FIXME: search by unknown type returns 500 from the server, propper error handling should resove this
       output do
-        from "smart_proxy" do
-          field :id, "Id"
-          field :name, "Name"
-          field :url, "URL"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :url, "URL"
       end
 
       apipie_options
@@ -28,18 +26,15 @@ module HammerCLIForeman
 
       action :show
 
-      def retrieve_data
-        sp = super
-        sp['smart_proxy']['_features'] = sp['smart_proxy']['features'].map { |f| f['feature']['name'] }
-        sp
+      output ListCommand.output_definition do
+        field :_features,  "Features",   Fields::List
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
-      output ListCommand.output_definition do
-        from "smart_proxy" do
-          field :_features,  "Features",   Fields::List
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+      def extend_data(proxy)
+        proxy['_features'] = proxy['features'].map { |f| f['feature']['name'] }
+        proxy
       end
 
     end
@@ -57,7 +52,7 @@ module HammerCLIForeman
 
 
     class UpdateCommand < HammerCLIForeman::UpdateCommand
-      
+
       action :update
 
       success_message "Smart proxy updated"
@@ -97,7 +92,6 @@ module HammerCLIForeman
       end
     end
 
-
     autoload_subcommands
   end
 

data/lib/hammer_cli_foreman/subnet.rb

@@ -9,12 +9,10 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Subnet, "index"
 
       output do
-        from "subnet" do
-          field :id, "Id"
-          field :name, "Name"
-          field :network, "Network"
-          field :mask, "Mask"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :network, "Network"
+        field :mask, "Mask"
       end
 
       apipie_options
@@ -26,21 +24,19 @@ module HammerCLIForeman
       resource ForemanApi::Resources::Subnet, "show"
 
       output ListCommand.output_definition do
-        from "subnet" 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"
-        end
+        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"
       end
 
     end

data/lib/hammer_cli_foreman/template.rb

@@ -12,22 +12,18 @@ module HammerCLIForeman
     class ListCommand < HammerCLIForeman::ListCommand
 
       output do
-        from "config_template" do
-          field :id, "Id"
-          field :name, "Name"
-          field :type, "Type"
-        end
+        field :id, "Id"
+        field :name, "Name"
+        field :type, "Type"
       end
 
-      def retrieve_data
-        templates = super
-        templates.each do |tpl|
-          if tpl["config_template"]["snippet"]
-            tpl["config_template"]["type"] = "snippet"
-          else
-            tpl["config_template"]["type"] = tpl["config_template"]["template_kind"]["name"] if tpl["config_template"]["template_kind"]
-          end
+      def extend_data(tpl)
+        if tpl["snippet"]
+          tpl["type"] = "snippet"
+        else
+          tpl["type"] = tpl["template_kind"]["name"] if tpl["template_kind"]
         end
+        tpl
       end
 
       apipie_options
@@ -41,19 +37,16 @@ module HammerCLIForeman
       identifiers :id
 
       output ListCommand.output_definition do
-        from "config_template" do
-          field :operatingsystem_ids, "OS ids", Fields::List
-        end
+        field :operatingsystem_ids, "OS ids", Fields::List
       end
 
-      def retrieve_data
-        template = super
-        if template["config_template"]["snippet"]
-          template["config_template"]["type"] = "snippet"
+      def extend_data(tpl)
+        if tpl["snippet"]
+          tpl["type"] = "snippet"
         else
-          template["config_template"]["type"] = template["config_template"]["template_kind"]["name"]
+          tpl["type"] = tpl["template_kind"]["name"] if tpl["template_kind"]
         end
-        template
+        tpl
       end
 
     end
@@ -65,14 +58,13 @@ module HammerCLIForeman
       desc "List available config template kinds."
 
       output do
-        from "template_kind" do
-          field :name, "Name"
-        end
+        field :name, "Name"
       end
 
       def retrieve_data
-        snippet = { "template_kind" => { "name" => "snippet" }}
-        super << snippet
+        kinds = super
+        kinds << { "name" => "snippet" }
+        kinds
       end
 
       resource ForemanApi::Resources::TemplateKind, "index"
@@ -87,7 +79,7 @@ module HammerCLIForeman
       identifiers :id
 
       def print_data(template)
-        puts template["config_template"]["template"]
+        puts template["template"]
       end
 
     end
@@ -107,8 +99,9 @@ module HammerCLIForeman
       end
 
       def template_kind_id
-        kinds = ForemanApi::Resources::TemplateKind.new(resource_config).index()[0]
-        table = kinds.inject({}){ |result, k| result.update(k["template_kind"]["name"] => k["template_kind"]["id"]) }
+        kinds = HammerCLIForeman.collection_to_common_format(
+                  ForemanApi::Resources::TemplateKind.new(resource_config).index()[0])
+        table = kinds.inject({}){ |result, k| result.update(k["name"] => k["id"]) }
         table[type]
       end
 
@@ -132,8 +125,9 @@ module HammerCLIForeman
       end
 
       def template_kind_id
-        kinds = ForemanApi::Resources::TemplateKind.new(resource_config).index()[0]
-        table = kinds.inject({}){ |result, k| result.update(k["template_kind"]["name"] => k["template_kind"]["id"]) }
+        kinds = HammerCLIForeman.collection_to_common_format(
+                  ForemanApi::Resources::TemplateKind.new(resource_config).index()[0])
+        table = kinds.inject({}){ |result, k| result.update(k["name"] => k["id"]) }
         table[type]
       end
 
@@ -154,6 +148,7 @@ module HammerCLIForeman
 
 
     autoload_subcommands
+
   end
 
 end

data/lib/hammer_cli_foreman/user.rb

@@ -4,25 +4,21 @@ require 'hammer_cli_foreman/commands'
 
 module HammerCLIForeman
 
-  class User < HammerCLI::AbstractCommand
+  class User < HammerCLI::Apipie::Command
+    resource ForemanApi::Resources::User
+
     class ListCommand < HammerCLIForeman::ListCommand
-      resource ForemanApi::Resources::User, "index"
-
-      def retrieve_data
-        data = super
-        data.map do |d|
-          d["user"]["full_name"] = [d["user"]["firstname"], d["user"]["lastname"]].join(' ')
-          d
-        end
-      end
 
       output do
-        from "user" do
-          field :id, "Id"
-          field :login, "Login"
-          field :full_name, "Name"
-          field :mail, "Email"
-        end
+        field :id, "Id"
+        field :login, "Login"
+        field :full_name, "Name"
+        field :mail, "Email"
+      end
+
+      def extend_data(user)
+        user["full_name"] = [user["firstname"], user["lastname"]].join(' ')
+        user
       end
 
       apipie_options
@@ -31,21 +27,17 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
 
-      resource ForemanApi::Resources::User, "show"
       identifiers :id
 
-      def retrieve_data
-        data = super
-        data["user"]["full_name"] = [data["user"]["firstname"], data["user"]["lastname"]].join(' ')
-        data
+      output ListCommand.output_definition do
+        field :last_login_on, "Last login", Fields::Date
+        field :created_at, "Created at", Fields::Date
+        field :updated_at, "Updated at", Fields::Date
       end
 
-      output ListCommand.output_definition do
-        from "user" do
-          field :last_login_on, "Last login", Fields::Date
-          field :created_at, "Created at", Fields::Date
-          field :updated_at, "Updated at", Fields::Date
-        end
+      def extend_data(user)
+        user["full_name"] = [user["firstname"], user["lastname"]].join(' ')
+        user
       end
 
     end