hiiro 0.1.342 → 0.1.344

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1496be512bebac30ab2a5fc84922bf0eefb05b3ff1632b04a6488142c805b388
-  data.tar.gz: 215d5c29421e45abd0b8c5fe2984e372d776e5510cab0d71cd178e1c390081fe
+  metadata.gz: dfbd49f6a3303a03b9568647851914d4a1c30e7c81a6f9aa8ef5d9808728769d
+  data.tar.gz: 1245ec1dcc474ff962d48405c357ac315734c30a2cc573697e5c28ee3b35057f
 SHA512:
-  metadata.gz: 3a25d21e45c9bdea4c7ca56a850f6f00b71fb62990a03eb545f0bc379a6881504bf213079ef25f50df99f9a624ae2571f1d3522089f3a837439b363ab8bbbc61
-  data.tar.gz: a17b9aeccf2740727d1f4f306a4ad446b74cc7cf996f062bb6d8f37eef74660e84162ea9a3edf1542004412e86d2d2b547d81cc1b66493860afe6e018da1c6ad
+  metadata.gz: dfaa031a3b826d422c64f8378108278cc845d4ec09a26da1f37fa85da34edb3c326c919d612873c1213331883cead770cd684d688ab521d38ec77dd50645d273
+  data.tar.gz: 1d0eb4479c705c13f898da37389b65d60104830d5daae7e9af38dba289cf871feeef60d8b6efd7fe9461cdfa490ba00a6fa53303520f4214b7d28ff0868a3faa

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.1.343] - 2026-04-12
+
+### Added
+- Task subcommands now fall back to `~/proj/*` directories when no task matches
+  - `h task path hiiro` → resolves to `~/proj/hiiro` if no task named "hiiro" exists
+  - Works for: `cd`, `path`, `sh`, `branch`, `tree`, `session`, and any subcommand using `-t` flag
+  - `FallbackTarget` class duck-types as `Task` for seamless integration
+  - Ambiguous project matches print a warning to stderr
+
+### Fixed
+- `Hiiro::Git::Pr.is_link?` is now a class method (was instance method)
+
 ## [0.1.342] - 2026-04-08
 
 ### Added

data/lib/hiiro/git/pr.rb

@@ -20,7 +20,7 @@ class Hiiro
         []
       end
 
-      def is_link?(link)
+      def self.is_link?(link)
         temp_link = link.to_s
         return false unless temp_link.match?('github.com') && temp_link.match?(/pull\/[0-9]+/)
 

data/lib/hiiro/shell.rb

@@ -22,5 +22,119 @@ class Hiiro
 
       selected&.chomp
     end
+
+    def self.run(*command, **env)
+      env = env.transform_keys(&:to_s).transform_values(&:to_s)
+      stdout, status = Open3.capture2(env, *command)
+      Result.new(stdout, status)
+    end
+
+    def self.run_combined(*command, **env)
+      env = env.transform_keys(&:to_s).transform_values(&:to_s)
+      output, status = Open3.capture2e(env, *command)
+      Result.new(output, status)
+    end
+
+    def self.run3(*command, **env)
+      env = env.transform_keys(&:to_s).transform_values(&:to_s)
+      stdout, stderr, status = Open3.capture3(env, *command)
+      Result.new(stdout, status, stderr: stderr)
+    end
+
+    # Stream stdout live to $stdout as chunks arrive, buffering for Result.
+    # stderr passes through to the parent process (not captured).
+    #
+    # ~/bin/h-tds does this manually with popen2e for Chromatic:
+    #
+    #   Open3.popen2e('unbuffer pnpm chromatic') do |stdin, stdout_err, wait_thr|
+    #     stdin.close
+    #     loop do
+    #       chunk = stdout_err.readpartial(4096)
+    #       $stdout.write(chunk)
+    #       @output << chunk
+    #     rescue EOFError
+    #       break
+    #     end
+    #     @exit_status = wait_thr.value
+    #   end
+    #
+    # stream_combined replaces that pattern — stderr merged in, one Result back.
+    def self.stream(*command, tee: $stdout, **env)
+      env = env.transform_keys(&:to_s).transform_values(&:to_s)
+      Open3.popen2(env, *command) do |stdin, stdout, wait_thr|
+        stdin.close
+        return Result.collect_chunks(stdout, wait_thr, tee: tee)
+      end
+    end
+
+    def self.stream_combined(*command, tee: $stdout, **env)
+      env = env.transform_keys(&:to_s).transform_values(&:to_s)
+      Open3.popen2e(env, *command) do |stdin, stdout_err, wait_thr|
+        stdin.close
+        return Result.collect_chunks(stdout_err, wait_thr, tee: tee)
+      end
+    end
+  end
+
+  class Result
+    # Matches the full ANSI/VT100 escape sequence spec:
+    # cursor movement, erase, colors, SGR — everything a terminal interprets.
+    # [^[] catches all single-char Fe sequences (e.g. \eM, \eD); \[...] catches CSI.
+    ANSI_PATTERN = /\e(?:\[[0-?]*[ -/]*[@-~]|[^[])/
+
+    attr_reader :stdout, :stderr, :status
+
+    def initialize(stdout, status, stderr: nil)
+      @stdout = stdout
+      @stderr = stderr
+      @status = status
+    end
+
+    def success?
+      status.success?
+    end
+
+    def failed?
+      !success?
+    end
+
+    def exit_code
+      status.exitstatus
+    end
+
+    # Replay buffered output to the terminal with ANSI sequences intact —
+    # colors, cursor movement, line clears all work as they did live.
+    # Returns self so you can chain: result.display.lines
+    def display(out: $stdout)
+      out.write(stdout)
+      out.flush
+      self
+    end
+
+    # Strip ANSI escape codes for text processing or filtering.
+    # Also strips bare \r (carriage-return-only, used by progress bars).
+    def plain_text
+      stdout.gsub(ANSI_PATTERN, '').gsub(/\r(?!\n)/, '')
+    end
+
+    # Plain text split into non-empty lines.
+    def lines
+      plain_text.split("\n").reject(&:empty?)
+    end
+
+    # Factory: reads chunks from an IO (popen handle), optionally tee-ing
+    # each chunk to `tee` as it arrives. Used by Shell.stream / stream_combined.
+    # Pass tee: nil to capture without printing.
+    def self.collect_chunks(io, wait_thr, tee: $stdout)
+      output = +""
+      loop do
+        chunk = io.readpartial(4096)
+        tee&.write(chunk)
+        output << chunk
+      rescue EOFError
+        break
+      end
+      new(output, wait_thr.value)
+    end
   end
 end

data/lib/hiiro/tasks.rb

@@ -63,6 +63,37 @@ class Hiiro
       Hiiro::Matcher.new(tasks, key).by_prefix(name).first&.item
     end
 
+    # Resolve a name to a Task or FallbackTarget (~/proj/* directory).
+    # Falls back to ~/proj/* prefix match when no task matches.
+    def resolve_name(name)
+      return nil if name.nil?
+
+      task = task_by_name(name)
+      return task if task
+
+      proj_dirs = Dir.glob(File.expand_path('~/proj/*/'))
+      dir_names = proj_dirs.map { |d| File.basename(d) }
+      result = Hiiro::Matcher.by_prefix(dir_names, name)
+      if result.one?
+        dir_name = result.first.item
+        return FallbackTarget.from_project(dir_name, File.expand_path("~/proj/#{dir_name}"))
+      elsif result.ambiguous?
+        STDERR.puts "Ambiguous project match for '#{name}': #{result.matches.map(&:item).join(', ')}"
+      end
+
+      nil
+    end
+
+    # Resolve the filesystem path for a Task or FallbackTarget.
+    def resolve_path(target)
+      return nil unless target
+
+      return target.path if target.is_a?(FallbackTarget)
+
+      tree = environment.find_tree(target.tree_name)
+      tree ? tree.path : File.join(Hiiro::WORK_DIR, target.tree_name)
+    end
+
     def task_by_tree(tree_name)
       environment.task_matcher.resolve(tree_name, :tree_name).resolved&.item
     end
@@ -499,8 +530,8 @@ class Hiiro
 
     def value_for_task(task_name = nil, &block)
       if task_name
-        task = task_by_name(task_name)
-        return block.call(task) if task
+        target = resolve_name(task_name)
+        return block.call(target) if target
       end
 
       task_list = scope == :subtask ? tasks.sort_by(&:short_name) : environment.all_tasks.sort_by(&:name)
@@ -769,9 +800,9 @@ class Hiiro
             task = sel.is_a?(Hiiro::Task) ? sel : nil
             [task, positional]
           elsif opts.task
-            [tm.task_by_name(opts.task), positional]
+            [tm.resolve_name(opts.task), positional]
           elsif positional.any?
-            found = tm.task_by_name(positional.first)
+            found = tm.resolve_name(positional.first)
             found ? [found, positional[1..]] : [tm.current_task, positional]
           else
             [tm.current_task, positional]
@@ -1001,8 +1032,7 @@ class Hiiro
             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)
+          tree_path = tm.resolve_path(task)
           app_name = positional[0]
           if app_name.nil?
             tm.send_cd(tree_path)
@@ -1023,8 +1053,7 @@ class Hiiro
             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)
+          tree_path = tm.resolve_path(task)
 
           app_name = positional[0]
           globs    = positional[1..]
@@ -1099,8 +1128,7 @@ class Hiiro
             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)
+          path = tm.resolve_path(task)
 
           if opts.session
             session_name = opts.session
@@ -1446,6 +1474,53 @@ class Hiiro
     end
   end
 
+  class FallbackTarget
+    attr_reader :name, :type
+
+    def self.from_project(name, path)
+      new(name: name, path: path, type: :project)
+    end
+
+    def initialize(name:, path:, type:)
+      @name = name
+      @_path = path
+      @type = type
+    end
+
+    def session_name = name
+    def tree_name = nil
+    def color_index = nil
+    def subtask? = false
+    def top_level? = true
+    def short_name = name
+    def parent_name = nil
+    def tree = nil
+
+    def path
+      @_path
+    end
+
+    def branch
+      return nil unless @_path
+      out = IO.popen(['git', '-C', @_path, 'rev-parse', '--abbrev-ref', 'HEAD'], err: File::NULL, &:read)
+      out&.strip&.then { |b| b.empty? ? nil : b }
+    end
+
+    def display_data(scope: :task, environment:)
+      br = branch
+      {
+        name: name,
+        tree: '(project)',
+        branch: br ? "[#{br}]" : '(none)',
+        session: "(#{name})"
+      }
+    end
+
+    def to_s
+      name
+    end
+  end
+
   class App
     attr_reader :name, :relative_path
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.342"
+  VERSION = "0.1.344"
 end

metadata

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