hiiro 0.1.189 → 0.1.190

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf7f34eba756cd700353c1e568ddcaafc2b980b3f8a4faa5efa090aa218f841
-  data.tar.gz: 2babf005e1b1101cce317a9b4540409a52736392b1b5000d7ca5926313c4a523
+  metadata.gz: 40ab3fcde780b920c3f1ce71f90c0545bb7d7b81ad469abcc03c0d1bb663fcad
+  data.tar.gz: 5528cb4426cb749e241efcec029a2b8e0aa9197743b684c216b7394e9f4c8052
 SHA512:
-  metadata.gz: 6cdc6fa5ed62af55be31b7c10dc2ddc9a689b4f0a640ee6d6368dec575ba524bfc50c4578d0b810bce9a9844ee97dd7d981899f0e3d62d9f880e5e27c679b864
-  data.tar.gz: 3345968d87115030681877cf3ce3ed017286ced7065e55947fde6823b0fdcc047359bc99ba7112a4e35e6921d6dc1008fe6efc606eda574610737441a429b88e
+  metadata.gz: 796b245499c2ceb2ac1afae24e5e729c8f5404009f104285fffb826126c44f673714f32d44c93d71eea0a88fee41fe9db9a41955e1bdf8063a80eb760d6b2296
+  data.tar.gz: 3c65112758d952b7492aa5c1c0956f6acb4091050da3839648f077c59fc95e9f750c52ccedeb87bfb6301910a92d20cc688ac147a70172ec92a0c3e21b55734a

data/lib/hiiro/tasks.rb

@@ -185,30 +185,44 @@ class Hiiro
       puts "#{label}:"
       puts
 
+      # Collect rows as {prefix, name, tree, branch, session} so we can
+      # compute max column widths before rendering.
+      rows = []
       items.each do |task|
         marker = (current && current.name == task.name) ? "*" : " "
-        line = task.display_line(scope: scope, environment: environment)
-        puts "#{marker} #{line}"
+        rows << { prefix: "#{marker} ", **task.display_data(scope: scope, environment: environment) }
 
         if scope == :task
-          subs = subtasks(task)
-          subs.each do |st|
+          subtasks(task).each do |st|
             sub_marker = (current && current.name == st.name) ? "*" : " "
-            sub_line = st.display_line(scope: :subtask, environment: environment)
-            puts "#{sub_marker} - #{sub_line}"
+            rows << { prefix: "#{sub_marker} - ", **st.display_data(scope: :subtask, environment: environment) }
           end
         end
       end
 
+      # Column widths: the name column absorbs the variable-length prefix so
+      # that tree/branch/session always start at the same position.
+      name_col   = rows.map { |r| r[:prefix].length + r[:name].length }.max
+      tree_col   = rows.map { |r| r[:tree].length }.max
+      branch_col = rows.map { |r| r[:branch].length }.max
+
+      rows.each do |r|
+        name_pad = name_col - r[:prefix].length
+        print r[:prefix]
+        puts format("%-#{name_pad}s  %-#{tree_col}s  %-#{branch_col}s  %s",
+                    r[:name], r[:tree], r[:branch], r[:session])
+      end
+
       available = environment.all_trees.reject { |t|
         environment.all_tasks.any? { |task| task.tree_name == t.name }
       }
 
       if available.any?
         puts
+        avail_name_col = [available.map { |t| t.name.length }.max, name_col].max
         available.each do |tree|
-          branch_str = tree.branch ? "  [#{tree.branch}]" : tree.detached? ? "  [(detached)]" : ""
-          puts format("  %-25s  (available)%s", tree.name, branch_str)
+          branch_str = tree.branch ? "[#{tree.branch}]" : tree.detached? ? "[(detached)]" : ""
+          puts format("  %-#{avail_name_col}s  (available)  %s", tree.name, branch_str).rstrip
         end
       end
     end
@@ -364,9 +378,15 @@ class Hiiro
 
       mapping = {}
 
-      task_list.each do |task|
+      all_data = task_list.map { |t| [t, t.display_data(scope: scope, environment: environment)] }
+      name_col   = all_data.map { |_, d| d[:name].length }.max || 0
+      tree_col   = all_data.map { |_, d| d[:tree].length }.max || 0
+      branch_col = all_data.map { |_, d| d[:branch].length }.max || 0
+
+      all_data.each do |task, d|
         display_name = scope == :subtask ? task.short_name : task.name
-        line = task.display_line(scope: scope, environment: environment)
+        line = format("%-#{name_col}s  %-#{tree_col}s  %-#{branch_col}s  %s",
+                      d[:name], d[:tree], d[:branch], d[:session])
         mapping[line] = { type: :task, name: display_name }
       end
 
@@ -957,19 +977,16 @@ class Hiiro
       h
     end
 
-    def display_line(scope: :task, environment:)
+    def display_data(scope: :task, environment:)
       display_name = (scope == :subtask) ? short_name : name
       tree = environment.find_tree(tree_name)
       branch = tree&.branch || (tree&.detached? ? '(detached)' : '(none)')
-      session = session_name || '(none)'
-
-      branch_str = "[#{branch}]"
-      session_str = "(#{session})"
-      format("%-25s  %-25s  %-30s  %s",
-             display_name,
-             tree_name || '(none)',
-             branch_str,
-             session_str)
+      {
+        name:    display_name,
+        tree:    tree_name || '(none)',
+        branch:  "[#{branch}]",
+        session: "(#{session_name || '(none)'})"
+      }
     end
   end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.189"
+  VERSION = "0.1.190"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.189
+  version: 0.1.190
 platform: ruby
 authors:
 - Joshua Toyota