From 10c73649f9af9a02975351a83dea43dc204f90b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Guzm=C3=A1n?= <aguzman@redborder.com>
Date: Fri, 27 Mar 2026 15:02:28 +0000
Subject: [PATCH 1/2] Fix column size in rbcli service list

---
 resources/lib/service.rb | 74 ++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/resources/lib/service.rb b/resources/lib/service.rb
index 3db5a26..c5fdc32 100644
--- a/resources/lib/service.rb
+++ b/resources/lib/service.rb
@@ -209,7 +209,7 @@ def execute()
     # Paint service list
     if $parser.data[:show_runtime] && $parser.data[:show_memory]
       printf("=========================================== Services =====================================================\n")
-      printf("%-33s %-33s %-15s %-10s %-33s\n", "Service", "Status(#{node_name})", "Runtime", "Memory", "Cgroup")
+      printf("%-33s %-33s %-23s %-25s %-33s\n", "Service", "Status(#{node_name})", "Runtime", "Cgroup", "Memory")
       printf("----------------------------------------------------------------------------------------------------------\n")
     elsif $parser.data[:show_runtime]
       printf("================================= Services =========================================\n")
@@ -283,23 +283,23 @@ def execute()
 
           if $parser.data[:show_runtime] && $parser.data[:show_memory]
             if runtime.match?(/^\d+\s*s/)
-              printf("%-33s #{green}%-33s#{reset} #{blink}%-15s#{reset} %-10s %-25s\n",
-                    "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+              printf("%-33s #{green}%-33s#{reset} #{blink}%-23s#{reset} %-25s %-25s\n",
+                    "#{systemd_service}:", ret, runtime, cgroup, memory_used)
             else
-              printf("%-33s #{green}%-33s#{reset} %-15s %-10s %-25s\n",
-                    "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+              printf("%-33s #{green}%-33s#{reset} %-23s %-25s %-25s\n",
+                    "#{systemd_service}:", ret, runtime, cgroup, memory_used)
             end
           elsif $parser.data[:show_runtime]
             if runtime.match?(/^\d+\s*s/)
-              printf("%-33s #{green}%-33s#{reset} #{blink}%-15s#{reset} %-25s\n",
+              printf("%-33s #{green}%-33s#{reset} #{blink}%-23s#{reset} %-25s\n",
                     "#{systemd_service}:", ret, runtime, cgroup)
             else
-              printf("%-33s #{green}%-33s#{reset} %-15s %-25s\n",
+              printf("%-33s #{green}%-33s#{reset} %-23s %-25s\n",
                     "#{systemd_service}:", ret, runtime, cgroup)
             end
           elsif $parser.data[:show_memory]
-            printf("%-33s #{green}%-33s#{reset} %-10s %-25s\n",
-                  "#{systemd_service}:", ret, memory_used, cgroup)
+            printf("%-33s #{green}%-33s#{reset} %-25s %-25s\n",
+                  "#{systemd_service}:", ret, cgroup, memory_used)
           else
             printf("%-33s #{green}%-33s#{reset} %-25s\n",
                   "#{systemd_service}:", ret, cgroup)
@@ -311,14 +311,14 @@ def execute()
           memory_used = "0B"
 
           if $parser.data[:show_runtime] && $parser.data[:show_memory]
-            printf("%-33s #{red}%-33s#{reset} %-15s %-10s %-25s\n",
-                  "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+            printf("%-33s #{red}%-33s#{reset} %-23s %-25s %-25s\n",
+                  "#{systemd_service}:", ret, runtime, cgroup, memory_used)
           elsif $parser.data[:show_runtime]
-            printf("%-33s #{red}%-33s#{reset} %-15s %-25s\n",
+            printf("%-33s #{red}%-33s#{reset} %-23s %-25s\n",
                   "#{systemd_service}:", ret, runtime, cgroup)
           elsif $parser.data[:show_memory]
-            printf("%-33s #{red}%-33s#{reset} %-10s %-25s\n",
-                  "#{systemd_service}:", ret, memory_used, cgroup)
+            printf("%-33s #{red}%-33s#{reset} %-25s %-25s\n",
+                  "#{systemd_service}:", ret, cgroup, memory_used)
           else
             printf("%-33s #{red}%-33s#{reset} %-25s\n",
                   "#{systemd_service}:", ret, cgroup)
@@ -336,23 +336,23 @@ def execute()
 
         if $parser.data[:show_runtime] && $parser.data[:show_memory]
           if runtime.match?(/^\d+\s*s/)
-            printf("%-33s #{green}%-33s#{reset} #{blink}%-15s#{reset} %-10s %-25s\n",
-                  "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+            printf("%-33s #{green}%-33s#{reset} #{blink}%-23s#{reset} %-25s %-25s\n",
+                  "#{systemd_service}:", ret, runtime, cgroup, memory_used)
           else
-            printf("%-33s #{green}%-33s#{reset} %-15s %-10s %-25s\n",
-                  "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+            printf("%-33s #{green}%-33s#{reset} %-23s %-25s %-25s\n",
+                  "#{systemd_service}:", ret, runtime, cgroup, memory_used)
           end
         elsif $parser.data[:show_runtime]
           if runtime.match?(/^\d+\s*s/)
-            printf("%-33s #{green}%-33s#{reset} #{blink}%-15s#{reset} %-25s\n",
+            printf("%-33s #{green}%-33s#{reset} #{blink}%-23s#{reset} %-25s\n",
                   "#{systemd_service}:", ret, runtime, cgroup)
           else
-            printf("%-33s #{green}%-33s#{reset} %-15s %-25s\n",
+            printf("%-33s #{green}%-33s#{reset} %-23s %-25s\n",
                   "#{systemd_service}:", ret, runtime, cgroup)
           end
         elsif $parser.data[:show_memory]
-          printf("%-33s #{green}%-33s#{reset} %-10s %-25s\n",
-                "#{systemd_service}:", ret, memory_used, cgroup)
+          printf("%-33s #{green}%-33s#{reset} %-25s %-25s\n",
+                "#{systemd_service}:", ret, cgroup, memory_used)
         else
           printf("%-33s #{green}%-33s#{reset} %-25s\n",
                 "#{systemd_service}:", ret, cgroup)
@@ -365,14 +365,14 @@ def execute()
         memory_used = "0B"
 
         if $parser.data[:show_runtime] && $parser.data[:show_memory]
-          printf("%-33s #{yellow}%-33s#{reset} %-15s %-10s %-25s\n",
-                "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+          printf("%-33s #{yellow}%-33s#{reset} %-23s %-25s %-25s\n",
+                "#{systemd_service}:", ret, runtime, cgroup, memory_used)
         elsif $parser.data[:show_runtime]
-          printf("%-33s #{yellow}%-33s#{reset} %-15s %-25s\n",
+          printf("%-33s #{yellow}%-33s#{reset} %-23s %-25s\n",
                 "#{systemd_service}:", ret, runtime, cgroup)
         elsif $parser.data[:show_memory]
-          printf("%-33s #{yellow}%-33s#{reset} %-10s %-25s\n",
-                "#{systemd_service}:", ret, memory_used, cgroup)
+          printf("%-33s #{yellow}%-33s#{reset} %-25s %-25s\n",
+                "#{systemd_service}:", ret, cgroup, memory_used)
         else
           printf("%-33s #{yellow}%-33s#{reset} %-25s\n",
                 "#{systemd_service}:", ret, cgroup)
@@ -386,14 +386,14 @@ def execute()
         memory_used = "0B"
 
         if $parser.data[:show_runtime] && $parser.data[:show_memory]
-          printf("%-33s #{blue}%-33s#{reset} %-15s %-10s %-25s\n",
-                "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+          printf("%-33s #{blue}%-33s#{reset} %-23s %-25s %-25s\n",
+                "#{systemd_service}:", ret, runtime, cgroup, memory_used)
         elsif $parser.data[:show_runtime]
-          printf("%-33s #{blue}%-33s#{reset} %-15s %-25s\n",
+          printf("%-33s #{blue}%-33s#{reset} %-23s %-25s\n",
                 "#{systemd_service}:", ret, runtime, cgroup)
         elsif $parser.data[:show_memory]
-          printf("%-33s #{blue}%-33s#{reset} %-10s %-25s\n",
-                "#{systemd_service}:", ret, memory_used, cgroup)
+          printf("%-33s #{blue}%-33s#{reset} %-25s %-25s\n",
+                "#{systemd_service}:", ret, cgroup, memory_used)
         else
           printf("%-33s #{blue}%-33s#{reset} %-25s\n",
                 "#{systemd_service}:", ret, cgroup)
@@ -406,14 +406,14 @@ def execute()
         memory_used = "0B"
 
         if $parser.data[:show_runtime] && $parser.data[:show_memory]
-          printf("%-33s #{red}%-33s#{reset} %-15s %-10s %-25s\n",
-                "#{systemd_service}:", ret, runtime, memory_used, cgroup)
+          printf("%-33s #{red}%-33s#{reset} %-23s %-25s %-25s\n",
+                "#{systemd_service}:", ret, runtime, cgroup, memory_used)
         elsif $parser.data[:show_runtime]
-          printf("%-33s #{red}%-33s#{reset} %-15s %-25s\n",
+          printf("%-33s #{red}%-33s#{reset} %-23s %-25s\n",
                 "#{systemd_service}:", ret, runtime, cgroup)
         elsif $parser.data[:show_memory]
-          printf("%-33s #{red}%-33s#{reset} %-10s %-25s\n",
-                "#{systemd_service}:", ret, memory_used, cgroup)
+          printf("%-33s #{red}%-33s#{reset} %-25s %-25s\n",
+                "#{systemd_service}:", ret, cgroup, memory_used)
         else
           printf("%-33s #{red}%-33s#{reset} %-25s\n",
                 "#{systemd_service}:", ret, cgroup)

From e16e5edb6a32a9ecfa0900d7103f7b6e1b757704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Guzm=C3=A1n?= <aguzman@redborder.com>
Date: Fri, 27 Mar 2026 15:49:28 +0000
Subject: [PATCH 2/2] Fix column spacing and alignment in rbcli service list

---
 resources/lib/service.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lib/service.rb b/resources/lib/service.rb
index c5fdc32..1047c87 100644
--- a/resources/lib/service.rb
+++ b/resources/lib/service.rb
@@ -208,9 +208,9 @@ def execute()
 
     # Paint service list
     if $parser.data[:show_runtime] && $parser.data[:show_memory]
-      printf("=========================================== Services =====================================================\n")
+      printf("====================================================== Services ===========================================================================\n")
       printf("%-33s %-33s %-23s %-25s %-33s\n", "Service", "Status(#{node_name})", "Runtime", "Cgroup", "Memory")
-      printf("----------------------------------------------------------------------------------------------------------\n")
+      printf("-------------------------------------------------------------------------------------------------------------------------------------------\n")
     elsif $parser.data[:show_runtime]
       printf("================================= Services =========================================\n")
       printf("%-33s %-33s %-10s %-33s\n", "Service", "Status(#{node_name})", "Runtime", "Cgroup")
@@ -422,7 +422,7 @@ def execute()
     end
 
     if $parser.data[:show_runtime] && $parser.data[:show_memory]
-      printf("----------------------------------------------------------------------------------------------------------\n")
+      printf("-------------------------------------------------------------------------------------------------------------------------------------------\n")
     elsif $parser.data[:show_runtime] || $parser.data[:show_memory]
       printf("------------------------------------------------------------------------------------\n")
     else
@@ -443,7 +443,7 @@ def execute()
     end
 
     if $parser.data[:show_memory] && $parser.data[:show_runtime]
-      printf("%-33s %-10s %49s\n","Total:", services.count, total_memory_formatted)
+      printf("%-33s %-10s %-23s %-25s %s\n","Total:", services.count, "", "", total_memory_formatted)
     elsif $parser.data[:show_memory]
       printf("%-33s %-10s %28s\n","Total:", services.count, total_memory_formatted)
     else
@@ -451,7 +451,7 @@ def execute()
     end
 
     if $parser.data[:show_runtime] && $parser.data[:show_memory]
-      printf("----------------------------------------------------------------------------------------------------------\n")
+      printf("-------------------------------------------------------------------------------------------------------------------------------------------\n")
     elsif $parser.data[:show_runtime] || $parser.data[:show_memory]
       printf("------------------------------------------------------------------------------------\n")
     else