hiiro 0.1.120 → 0.1.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4228d9ef6828f2bd8b1ea62b1bd21958d972d188cefffdb657c8e17643140cd
-  data.tar.gz: 24f37894e366246fd54e5f6f89df9d1082134f5af9426eb0a99fd0f8b9b50922
+  metadata.gz: c90e9b67e7fb70d0d3e70f9d7dbc1eb8916e5a4ba86b97955272166f03236162
+  data.tar.gz: f73b8ffa8190bf6925a0c241a7526b2e603c3cf8dc8b25eef679bb1e66c69927
 SHA512:
-  metadata.gz: 38b09f4aaf83d18e9a94357d0a071400f93cab138ee93dadd75faf81a1673565a8e5a53ed6399545d67f3607537da2a7c5e7f308b4fb202f9004a9dd51d77e2e
-  data.tar.gz: e464c1e0786c665deccc5ed69f93d4b3413655b1f40c48b041fc5587ec22b193e92d1b8a0ae703a6e12a52d91e10d53c229ac192c9dcd1cf31c6ff3e0e9a8eec
+  metadata.gz: cfacec47bfb07793e2a24065aec67a36e349ec4c8afc091b917d4c3878967a2a8e6ba9ae62ef6ec7099f8c4a7df40fd0266ff2ee068b64d73ac21331ea7e8655
+  data.tar.gz: d7b0f171daae8303df10299994c512a758f33024f3d1f433997729acb5213a919a9955f3725ea72b4c1646388685137496d79e501d5345c24c51fc3fb6c42f5c

data/lib/hiiro/tasks.rb

@@ -177,21 +177,15 @@ class Hiiro
 
       items.each do |task|
         marker = (current && current.name == task.name) ? "*" : " "
-        tree = environment.find_tree(task.tree_name)
-        branch = tree&.branch || (tree&.detached? ? '(detached)' : nil)
-        branch_str = branch ? "  [#{branch}]" : ""
-
-        display_name = scope == :subtask ? task.short_name : task.name
-        puts format("%s %-25s  tree: %-20s%s", marker, display_name, task.tree_name || '(none)', branch_str)
+        line = task.display_line(scope: scope, environment: environment)
+        puts "#{marker} #{line}"
 
         if scope == :task
           subs = subtasks(task)
           subs.each do |st|
             sub_marker = (current && current.name == st.name) ? "*" : " "
-            sub_tree = environment.find_tree(st.tree_name)
-            sub_branch = sub_tree&.branch || (sub_tree&.detached? ? '(detached)' : nil)
-            sub_branch_str = sub_branch ? "  [#{sub_branch}]" : ""
-            puts format("%s - %-23s  tree: %-20s%s", sub_marker, st.short_name, st.tree_name || '(none)', sub_branch_str)
+            sub_line = st.display_line(scope: :subtask, environment: environment)
+            puts "#{sub_marker} - #{sub_line}"
           end
         end
       end
@@ -352,14 +346,20 @@ class Hiiro
     # --- Interactive selection with sk ---
 
     def select_task_interactive(prompt = nil)
-      names = if scope == :subtask
-        tasks.map(&:short_name)
+      task_list = if scope == :subtask
+        tasks.sort_by(&:short_name)
       else
-        environment.all_tasks.map(&:name)
+        environment.all_tasks.sort_by(&:name)
       end
-      return nil if names.empty?
+      return nil if task_list.empty?
 
-      hiiro.fuzzyfind(names.sort)
+      mapping = task_list.each_with_object({}) do |task, h|
+        display_name = scope == :subtask ? task.short_name : task.name
+        line = task.display_line(scope: scope, environment: environment)
+        h[line] = display_name
+      end
+
+      hiiro.fuzzyfind_from_map(mapping)
     end
 
     def value_for_task(task_name = nil, &block)
@@ -893,6 +893,19 @@ class Hiiro
       h[:session] = session_name if session_name != name
       h
     end
+
+    def display_line(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)'
+
+      format("%-25s  tree: %-20s  branch: %-20s  session: %s",
+             display_name,
+             tree_name || '(none)',
+             branch,
+             session)
+    end
   end
 
   class App

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.120"
+  VERSION = "0.1.121"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.120
+  version: 0.1.121
 platform: ruby
 authors:
 - Joshua Toyota
@@ -147,7 +147,6 @@ files:
 - scripts/sync
 - scripts/test
 - scripts/update
-- sync.sh
 homepage: https://github.com/unixsuperhero/hiiro
 licenses:
 - MIT

data/sync.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-safe_nvim -d bin/h-app /Users/josh/bin/h-app
-safe_nvim -d bin/h-branch /Users/josh/bin/h-branch
-safe_nvim -d bin/h-link /Users/josh/bin/h-link
-safe_nvim -d bin/h-pr /Users/josh/bin/h-pr
-safe_nvim -d bin/h-session /Users/josh/bin/h-session
-safe_nvim -d bin/h-window /Users/josh/bin/h-window
-safe_nvim -d plugins/tasks.rb /Users/josh/.config/hiiro/plugins/tasks.rb