hiiro 0.1.281 → 0.1.282

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2971b824a362f42ccbe96d8b7f0dd1c149564d13608cb6c7b516fb0061a97b4e
-  data.tar.gz: 3f157760a16af934d3a6539d2dc0d446a1c80717479730d777f51d1c24d0d6b3
+  metadata.gz: 8d10dfb2efdc2e68a768eacd602f68a4bbf135cd85a7b86266563a7c3b8bab4b
+  data.tar.gz: e1cf50a2868b1faa6564720784df11f7da44e8fc7c6491e71ae2dbb0a490566b
 SHA512:
-  metadata.gz: cb190b23192eb0a4d6a2f7ceb46ed74dcb5250c292afab7d85050ea5baf81bf4b240b45e1ac4b19102a24921c7268e7c3b150f54c4b9bc5cffba6750f6da530a
-  data.tar.gz: 000f1e725f76ed5e001d45c0df1c4f9f5f43132508c9da4c5d71053526b62cd7e3ff5fda6fed635534599d15f733fede30ac70ab278394bf78013c6a460b1ecb
+  metadata.gz: c35dadabe8a27c255bf5e9a77de91e4f8b321f51f8713ea480b432b7723c2227cc84ecbe8abf94ce7a277787ed1e92ea7b32f3fe33b374c3398d593242775063
+  data.tar.gz: 4ae9ad2431d999aff919959d071978c9a420d34eb898f08ca61fe46688d68117c5b8f7aa4245cf02d650cd6fe2b884a43fe3578aa35f071832aae867de1de003

data/CHANGELOG.md

@@ -1 +1,9 @@
-Done.
+## [0.1.282] - 2026-03-25
+
+### Changed
+- **h task path/cd/sh**: Reworked to accept `-f`/`-t` flags for task selection
+- **h task path**: Enhanced to support multi-argument glob patterns for file listing within task apps
+- **h task cd/sh**: Now use the same task selection mechanism as `h task path`
+- **TaskManager#send_cd**: Promoted from private to public method
+
+## [0.1.281] - Previous release

data/lib/hiiro/tasks.rb

@@ -523,6 +523,15 @@ class Hiiro
       hiiro.fuzzyfind_from_map(name_map)
     end
 
+    def send_cd(path)
+      pane = ENV['TMUX_PANE']
+      if pane
+        system('tmux', 'send-keys', '-t', pane, "cd #{path}\n")
+      else
+        system('tmux', 'send-keys', "cd #{path}\n")
+      end
+    end
+
     # --- Private helpers ---
 
     private
@@ -591,15 +600,6 @@ class Hiiro
       Hiiro::Git.new(nil, path).sparse_checkout(path, dirs)
     end
 
-    def send_cd(path)
-      pane = ENV['TMUX_PANE']
-      if pane
-        system('tmux', 'send-keys', '-t', pane, "cd #{path}\n")
-      else
-        system('tmux', 'send-keys', "cd #{path}\n")
-      end
-    end
-
     def capture_tmux_windows(session)
       output = `tmux list-windows -t #{session} -F '\#{window_index}:\#{window_name}:\#{pane_current_path}' 2>/dev/null`
       output.lines.map(&:strip).map { |line|
@@ -708,6 +708,32 @@ class Hiiro
   module Tasks
     def self.build_hiiro(parent_hiiro, tm)
       task_hiiro = parent_hiiro.make_child do |h|
+
+        # Shared task resolver: given parsed opts and remaining positional args,
+        # returns [task, remaining_positional]. First positional arg is treated as
+        # a task name (prefix-matched) if no -f/-t flag is given; falls back to
+        # current task if no match.
+        resolve_task = lambda do |opts, positional|
+          if opts.find
+            sel = tm.select_task_interactive
+            next [nil, positional] unless sel
+            task = sel.is_a?(Hiiro::Task) ? sel : nil
+            [task, positional]
+          elsif opts.task
+            [tm.task_by_name(opts.task), positional]
+          elsif positional.any?
+            found = tm.task_by_name(positional.first)
+            found ? [found, positional[1..]] : [tm.current_task, positional]
+          else
+            [tm.current_task, positional]
+          end
+        end
+
+        task_opts_block = proc {
+          option(:task, short: :t, desc: 'Task name')
+          flag(:find,   short: :f, desc: 'Choose task interactively')
+        }
+
         h.add_subcmd(:list) do |*args|
           opts = Hiiro::Options.parse(args) { option(:tag, short: 't', desc: 'filter by tag (OR when multiple)', multi: true) }
           tm.list(tags_filter: Array(opts.tag).reject(&:empty?))
@@ -903,12 +929,61 @@ class Hiiro
 
         h.add_subcmd(:apps) { tm.list_apps }
 
-        h.add_subcmd(:cd) do |app_name=nil|
-          tm.cd_to_app(app_name)
+        h.add_subcmd(:cd) do |*raw_args|
+          opts = Hiiro::Options.parse(raw_args, &task_opts_block)
+          task, positional = resolve_task.call(opts, opts.args)
+          unless task
+            puts "No task found"
+            next
+          end
+          tree = tm.environment.find_tree(task.tree_name)
+          tree_path = tree ? tree.path : File.join(Hiiro::WORK_DIR, task.tree_name)
+          app_name = positional[0]
+          if app_name.nil?
+            tm.send_cd(tree_path)
+          else
+            result = tm.environment.app_matcher.find(app_name)
+            unless result.match?
+              STDERR.puts "App '#{app_name}' not found"
+              next
+            end
+            tm.send_cd(File.join(tree_path, result.first.item.relative_path))
+          end
         end
 
-        h.add_subcmd(:path) do |app_name=nil|
-          tm.app_path(app_name)
+        h.add_subcmd(:path) do |*raw_args|
+          opts = Hiiro::Options.parse(raw_args, &task_opts_block)
+          task, positional = resolve_task.call(opts, opts.args)
+          unless task
+            STDERR.puts "No task found"
+            next
+          end
+          tree = tm.environment.find_tree(task.tree_name)
+          tree_path = tree ? tree.path : File.join(Hiiro::WORK_DIR, task.tree_name)
+
+          app_name = positional[0]
+          globs    = positional[1..]
+
+          if app_name.nil?
+            print tree_path
+            next
+          end
+
+          result = tm.environment.app_matcher.find(app_name)
+          unless result.match?
+            STDERR.puts "App '#{app_name}' not found"
+            next
+          end
+          app_path = File.join(tree_path, result.first.item.relative_path)
+
+          if globs.empty?
+            print app_path
+            next
+          end
+
+          globs.each do |pattern|
+            Dir.glob(File.join(app_path, pattern)).sort.each { |f| puts f }
+          end
         end
 
         h.add_subcmd(:branch) do |task_name=nil|
@@ -947,16 +1022,17 @@ class Hiiro
           print task.session_name if task.session_name
         end
 
-        h.add_subcmd(:sh) do |task_name=nil, *args|
-          task = task_name ? tm.task_by_name(task_name) : tm.current_task
+        h.add_subcmd(:sh) do |*raw_args|
+          opts = Hiiro::Options.parse(raw_args, &task_opts_block)
+          task, positional = resolve_task.call(opts, opts.args)
           unless task
-            puts task_name ? "Task '#{task_name}' not found" : "Not in a task session"
+            puts "Not in a task session (use -t or -f to specify)"
             next
           end
           tree = tm.environment.find_tree(task.tree_name)
           path = tree ? tree.path : File.join(Hiiro::WORK_DIR, task.tree_name)
           Dir.chdir(path)
-          args.empty? ? exec(ENV['SHELL'] || 'zsh') : exec(*args)
+          positional.empty? ? exec(ENV['SHELL'] || 'zsh') : exec(*positional)
         end
 
         h.add_subcmd(:status) { tm.status }

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.281"
+  VERSION = "0.1.282"
 end

metadata

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