hiiro 0.1.62 → 0.1.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64e567473d1f22a48e6a9dddca4584e1c6accce026dedf317e566c9d5e573faf
-  data.tar.gz: 1720931f9d35a2eadf0660038eddf092b80732594352d523900a6e791ef93932
+  metadata.gz: c505661bb1e4b879e297ae88561006366b956e544a20e1442c050eab22fb0b09
+  data.tar.gz: d337405e4dbf36553e20959ce2d321551901f56b28458561ef47bfee6e960053
 SHA512:
-  metadata.gz: 39a5eef676bf3a3a19ae08203a224ad207ee6f13933e446de05f3c35218cc9335a765e9048464e1e0b9ffa4cd000d58eccb06ab36be4b1eb4688e2fdc9ba2fb6
-  data.tar.gz: d43e3a2c7746da724c70c48be1e14bd59a99634936cf6ab7b987d3fc7a4e3e3b9b393a175028ff02454ca3564564dc3a0d21170ae88175dd1ac41b1f14cb9c2c
+  metadata.gz: d49b68d063f8e294e2803dab97182f79f3722d5ffca0d63a11839001e7a9ea99d20811749b5c7b718a55192e3276d24300370aa80bc0d3d58d0d938d7e1c7919
+  data.tar.gz: 41cdea8ce3225a72df6ade9a76192c9e41a5d435afa525263741981bb5a2bfb5a7976be1169d7f996703fa20650e703bfdc13a5a983bb6580de149e85fc0a197

data/bin/h-branch

@@ -225,7 +225,7 @@ hiiro.add_subcmd(:select) do |*args|
   end
 end
 
-hiiro.add_subcmd(:checkout, :co) { |branch = nil, *args|
+checkout_branch = lambda { |branch = nil, *args|
   unless branch
     # Use sk to select a branch
     branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
@@ -241,7 +241,10 @@ hiiro.add_subcmd(:checkout, :co) { |branch = nil, *args|
   system('git', 'checkout', branch, *args)
 }
 
-hiiro.add_subcmd(:rm, :remove) { |branch = nil, *args|
+hiiro.add_subcmd(:checkout, checkout_branch)
+hiiro.add_subcmd(:co, checkout_branch)
+
+remove_branch = lambda { |branch = nil, *args|
   unless branch
     # Use sk to select a branch
     branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
@@ -257,6 +260,9 @@ hiiro.add_subcmd(:rm, :remove) { |branch = nil, *args|
   system('git', 'branch', '-d', branch, *args)
 }
 
+hiiro.add_subcmd(:remove, &remove_branch)
+hiiro.add_subcmd(:rm, &remove_branch)
+
 hiiro.add_subcmd(:duplicate) { |new_name = nil, source = nil|
   unless new_name
     puts "Usage: h branch duplicate <new_name> [source_branch]"

data/exe/h

@@ -2,17 +2,12 @@
 
 require "hiiro"
 require "fileutils"
-require "pry"
 
 Hiiro.run(*ARGV, cwd: Dir.pwd, plugins: [Tasks]) do
   add_subcommand(:version) { |*args|
     puts Hiiro::VERSION
   }
 
-  add_subcommand(:pry) { |*args|
-    binding.pry
-  }
-
   add_subcommand(:ping) { |*args|
     puts "pong"
   }

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.62"
+  VERSION = "0.1.63"
 end

data/lib/hiiro.rb

@@ -1,6 +1,7 @@
 require "fileutils"
 require "yaml"
 require "shellwords"
+require "pry"
 
 require_relative "hiiro/version"
 require_relative "hiiro/prefix_matcher"
@@ -39,6 +40,10 @@ class Hiiro
       History.load(hiiro)
       hiiro.load_plugins(*plugins)
 
+      hiiro.add_subcommand(:pry) { |*args|
+        binding.pry
+      }
+
       hiiro.add_subcmd(:edit, **values) { |*args|
         system(ENV['EDITOR'] || 'nvim', hiiro.bin)
       }

data/plugins/tasks.rb

@@ -100,6 +100,14 @@ class Task
     !subtask?
   end
 
+  def tree
+    @task ||= Environment.current&.find_tree(tree_name)
+  end
+
+  def branch
+    tree&.branch
+  end
+
   def ==(other)
     other.is_a?(Task) && name == other.name
   end
@@ -505,6 +513,30 @@ class TaskManager
     end
   end
 
+  def branch(task_name = nil)
+    branch_name = nil
+
+    if task_name.nil?
+      selected_task = select_branch_interactive
+      return unless selected_task
+      task_name, branch_name = selected_task.split(/\s\s*[|]\s\s*/)
+    end
+ 
+    task = task_by_name(task_name)
+    unless task
+      puts "Task not found: #{task_name}"
+      return
+    end
+ 
+    if task.branch
+      print task.branch
+    elsif task.tree&.detached?
+      puts "(detached HEAD)"
+    else
+      puts "(no branch)"
+    end
+  end
+
   def cd_to_task(task)
     unless task
       puts "Task not found"
@@ -574,6 +606,7 @@ class TaskManager
     puts "  list, ls              List #{scope_name}s"
     puts "  start NAME [APP]      Start a new #{scope_name}"
     puts "  switch [NAME]         Switch to a #{scope_name} (interactive if no name)"
+    puts "  branch [NAME]         Print git branch for a #{scope_name} (interactive if no name)"
     puts "  app [APP_NAME]        Open app in new tmux window (interactive if no name)"
     puts "  apps                  List configured apps"
     puts "  cd [APP_NAME]         Change directory to app"
@@ -596,6 +629,17 @@ class TaskManager
     sk_select(names.sort)
   end
 
+  def select_branch_interactive(prompt = nil)
+    names = if scope == :subtask
+      tasks.map { |t| format('%-25s  | %s', t.short_name, t.branch) }
+    else
+      environment.all_tasks.map { |t| format('%-25s  | %s', t.name, t.branch) }
+    end
+    return nil if names.empty?
+
+    sk_select(names.sort)
+  end
+
   # --- Private helpers ---
 
   private
@@ -790,54 +834,59 @@ module Tasks
   def self.build_hiiro(parent_hiiro, mgr)
     bin_name = [parent_hiiro.bin, parent_hiiro.subcmd || ''].join('-')
 
-    Hiiro.init(bin_name:, args: parent_hiiro.args) do |h|
-      h.add_subcmd(:list) { mgr.list }
-      h.add_subcmd(:ls) { mgr.list }
+    Hiiro.init(bin_name:, args: parent_hiiro.args, task_manager: mgr) do |h|
+      tm = h.get_value(:task_manager)
+      h.add_subcmd(:list) { tm.list }
+      h.add_subcmd(:ls) { tm.list }
 
       h.add_subcmd(:start) do |task_name, app_name=nil|
-        mgr.start_task(task_name, app_name: app_name)
+        tm.start_task(task_name, app_name: app_name)
       end
 
       h.add_subcmd(:switch) do |task_name=nil, app_name=nil|
         if task_name.nil?
-          task_name = mgr.select_task_interactive
+          task_name = tm.select_task_interactive
           next unless task_name
         end
-        task = mgr.task_by_name(task_name)
-        mgr.switch_to_task(task, app_name: app_name)
+        task = tm.task_by_name(task_name)
+        tm.switch_to_task(task, app_name: app_name)
       end
 
       h.add_subcmd(:app) do |app_name=nil|
         if app_name.nil?
-          names = mgr.environment.all_apps.map(&:name)
-          app_name = mgr.send(:sk_select, names)
+          names = tm.environment.all_apps.map(&:name)
+          app_name = tm.send(:sk_select, names)
           next unless app_name
         end
-        mgr.open_app(app_name)
+        tm.open_app(app_name)
       end
 
-      h.add_subcmd(:apps) { mgr.list_apps }
+      h.add_subcmd(:apps) { tm.list_apps }
 
       h.add_subcmd(:cd) do |app_name=nil|
-        mgr.cd_to_app(app_name)
+        tm.cd_to_app(app_name)
       end
 
       h.add_subcmd(:path) do |app_name=nil|
-        mgr.app_path(app_name)
+        tm.app_path(app_name)
+      end
+
+      h.add_subcmd(:branch) do |task_name=nil|
+        tm.branch(task_name)
       end
 
-      h.add_subcmd(:status) { mgr.status }
-      h.add_subcmd(:st) { mgr.status }
+      h.add_subcmd(:status) { tm.status }
+      h.add_subcmd(:st) { tm.status }
 
-      h.add_subcmd(:save) { mgr.save }
+      h.add_subcmd(:save) { tm.save }
 
       h.add_subcmd(:stop) do |task_name=nil|
         if task_name.nil?
-          task_name = mgr.select_task_interactive
+          task_name = tm.select_task_interactive
           next unless task_name
         end
-        task = mgr.task_by_name(task_name)
-        mgr.stop_task(task)
+        task = tm.task_by_name(task_name)
+        tm.stop_task(task)
       end
 
       h.add_subcmd(:edit) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.62
+  version: 0.1.63
 platform: ruby
 authors:
 - Joshua Toyota
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-09 00:00:00.000000000 Z
+date: 2026-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry