hiiro 0.1.276 → 0.1.277

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb35ade8607567d50414b9afd843402eb78317a3c3c2354a3361e582050850d
-  data.tar.gz: d2f02c76fc3121282ab489c7e997b3b54e60ab8f8103e7a1f7fb69ccdd65313b
+  metadata.gz: 3c0ebae864202a90016b7b7df7f65a32836cc11c144ea85638a9c75b22279b72
+  data.tar.gz: 9a5e414ec3dc428f932acdaf47f989c80d2ca50a1fd19fe4d2d7fa9e4c634a76
 SHA512:
-  metadata.gz: 69a8cf3d7cdf9cac920e4c9c7ab671931918f58e6b83bf431eeff7548729cda101466b00d8e04eb2697ce9048511e9af48580ab5983eccf5b953547e308868aa
-  data.tar.gz: c8a03d151fdd60e32325f00f5a93b3cca71297eb215cd22f059db913325cbfef9fde163b368bfc0fd7f7e109a929ff2752c8a82653192c07f7fc965741a9b5b6
+  metadata.gz: 4cbdc7c7029c4acfbf6720c47d63d330bb71c270ba1546d76e743a6c05fef40f98229458a39d981627fb49767fac3c63e745b681e12ddde30e180b251ac94087
+  data.tar.gz: 3a95e13a5ebc85325d8426d398812499924bc8605f7e5e0e785cbb16b3ffafa6161ec7d04d1ff72387286779f8142bcff3f338348c35791192b1d97c72e5f780

data/CHANGELOG.md

@@ -1 +1,6 @@
-Done. CHANGELOG.md updated with v0.1.276 entry at the top.
+Done. Updated CHANGELOG.md:
+
+- Moved `Hiiro#add_resolver` and `Hiiro#resolve` from the Unreleased section to the new v0.1.277 release section (2026-03-24)
+- Added them to the Added subsection of v0.1.277
+- Added a Changed entry documenting the `h pr` refactoring that uses these new methods
+- Updated the Unreleased section to remove these items and add a note in Changed about the `h pr` refactoring

data/bin/h-pr

@@ -589,46 +589,48 @@ FILTER_OPTS = Proc.new {
 Hiiro.run(*ARGV, plugins: [Pins]) do
   pinned_manager = PinnedPRManager.new
 
-  resolve_pr = ->(ref) {
-    if ref.nil?
+  add_resolver(:pr,
+    -> {
       pinned = pinned_manager.load_pinned
       if pinned.empty?
         STDERR.puts "No tracked PRs. Use a PR number or 'h pr track' to track PRs."
-        return nil
-      end
-      lines = pinned.each_with_index.each_with_object({}) do |(pr, idx), h|
-        h[pinned_manager.strip_ansi(pinned_manager.display_pinned(pr, idx, oneline: true))] = pr.number.to_s
+        nil
+      else
+        lines = pinned.each_with_index.each_with_object({}) do |(pr, idx), h|
+          h[pinned_manager.strip_ansi(pinned_manager.display_pinned(pr, idx, oneline: true))] = pr.number.to_s
+        end
+        fuzzyfind_from_map(lines)
       end
-      return fuzzyfind_from_map(lines)
-    end
-
+    }
+  ) do |ref|
     if (pin_value = pins.get(ref.to_s))
-      return pin_value
-    end
-
-    pinned = pinned_manager.load_pinned
-
-    if pinned.any? { |pr| pr.number.to_s == ref.to_s }
-      return ref.to_s
-    end
-
-    if ref.to_s =~ /^\d+$/ && ref.to_i > 0
-      slot = ref.to_i
-      by_slot = pinned.find { |p| p.slot.to_i == slot }
-      return by_slot.number.to_s if by_slot
-      # Fall back to 1-based index for unslotted data
-      idx = slot - 1
-      return pinned[idx].number.to_s if idx < pinned.length
+      pin_value
+    else
+      pinned = pinned_manager.load_pinned
+      if pinned.any? { |pr| pr.number.to_s == ref.to_s }
+        ref.to_s
+      elsif ref.to_s =~ /^\d+$/ && ref.to_i > 0
+        slot = ref.to_i
+        by_slot = pinned.find { |p| p.slot.to_i == slot }
+        if by_slot
+          by_slot.number.to_s
+        elsif slot - 1 < pinned.length
+          # Fall back to 1-based index for unslotted data
+          pinned[slot - 1].number.to_s
+        else
+          ref.to_s
+        end
+      else
+        ref.to_s
+      end
     end
-
-    ref.to_s
-  }
+  end
 
   watch_block = ->(original_pr_number=nil, *watch_args) {
     watch = get_value(:watch)
     fail_fast = get_value(:fail_fast)
 
-    pr_number = resolve_pr.call(original_pr_number)
+    pr_number = resolve(:pr, original_pr_number)
     return unless pr_number
 
     base_cmd = %w[gh pr checks]
@@ -678,7 +680,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:link) { |ref=nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
 
     pinned = pinned_manager.load_pinned
@@ -709,14 +711,14 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
         next
       end
     end
-    pr_number = resolve_pr.call(pr_number)
+    pr_number = resolve(:pr, pr_number)
     next unless pr_number
     pinned = pinned_manager.load_pinned
     pr = pinned.find { |p| p.number.to_s == pr_number.to_s }
     pr&.url ? system('open', pr.url) : system('gh', 'pr', 'view', pr_number.to_s, '--web')
   }
   add_subcmd(:view) { |pr_number=nil|
-    pr_number = resolve_pr.call(pr_number)
+    pr_number = resolve(:pr, pr_number)
     system('gh', 'pr', 'view', pr_number.to_s) if pr_number
   }
 
@@ -1124,7 +1126,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   end
 
   add_subcmd(:attach) do |ref = nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
 
     pinned = pinned_manager.load_pinned
@@ -1222,13 +1224,13 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   # === PR State ===
 
   add_subcmd(:ready) do |ref = nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
     system('gh', 'pr', 'ready', pr_number.to_s)
   end
 
   add_subcmd(:'to-draft') do |ref = nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
     system('gh', 'pr', 'ready', '--draft', pr_number.to_s)
   end
@@ -1236,25 +1238,25 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   # === PR Actions ===
 
   add_subcmd(:diff) do |ref = nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
     system('gh', 'pr', 'diff', pr_number.to_s)
   end
 
   add_subcmd(:checkout) do |ref = nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
     system('gh', 'pr', 'checkout', pr_number.to_s)
   end
 
   add_subcmd(:merge) do |ref = nil, *merge_args|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
     system('gh', 'pr', 'merge', pr_number.to_s, *merge_args)
   end
 
   add_subcmd(:sync) do |ref = nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
 
     print "Syncing ##{pr_number} with base branch (rebase)... "
@@ -1299,7 +1301,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     else
       # Resolve each positional arg as a PR ref
       opts.args.map { |ref|
-        pr_num = resolve_pr.call(ref)
+        pr_num = resolve(:pr, ref)
         next nil unless pr_num
         pinned.find { |p| p.number.to_s == pr_num.to_s }
       }.compact
@@ -1343,7 +1345,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   end
 
   add_subcmd(:comment) do |ref = nil|
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
 
     tmpfile = Tempfile.new(['pr-comment-', '.md'])
@@ -1419,7 +1421,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     template_path = fuzzyfind_from_map(template_map)
     next unless template_path
 
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
 
     body = File.read(template_path).strip
@@ -1525,7 +1527,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
         next
       end
 
-      pr_number = resolve_pr.call(ref)
+      pr_number = resolve(:pr, ref)
       next unless pr_number
 
       pinned = pinned_manager.load_pinned
@@ -1548,7 +1550,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       next
     end
 
-    pr_number = resolve_pr.call(ref)
+    pr_number = resolve(:pr, ref)
     next unless pr_number
 
     pinned = pinned_manager.load_pinned
@@ -1900,10 +1902,10 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
           next
         end
 
-        pr_number = resolve_pr.call(ref)
+        pr_number = resolve(:pr, ref)
         next unless pr_number
 
-        dep_numbers = dep_refs.map { |r| resolve_pr.call(r) }.compact
+        dep_numbers = dep_refs.map { |r| resolve(:pr, r) }.compact
         if dep_numbers.empty?
           puts "No valid dependency PRs resolved"
           next
@@ -1927,7 +1929,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
           next
         end
 
-        pr_number = resolve_pr.call(ref)
+        pr_number = resolve(:pr, ref)
         next unless pr_number
 
         pinned = pinned_manager.load_pinned
@@ -1941,7 +1943,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
           pr.depends_on = nil
           puts "Cleared all dependencies from ##{pr_number}"
         else
-          dep_numbers = dep_refs.map { |r| resolve_pr.call(r) }.compact.map(&:to_i)
+          dep_numbers = dep_refs.map { |r| resolve(:pr, r) }.compact.map(&:to_i)
           pr.depends_on = (Array(pr.depends_on) - dep_numbers).then { |d| d.empty? ? nil : d }
           puts "Removed dep(s) #{dep_numbers.map { |n| "##{n}" }.join(', ')} from ##{pr_number}"
           puts "  Remaining: #{Array(pr.depends_on).map { |n| "##{n}" }.join(', ').then { |s| s.empty? ? '(none)' : s }}"
@@ -1954,7 +1956,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
         pinned = pinned_manager.load_pinned
 
         if ref
-          pr_number = resolve_pr.call(ref)
+          pr_number = resolve(:pr, ref)
           next unless pr_number
           pr = pinned.find { |p| p.number.to_s == pr_number.to_s }
           unless pr

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.276"
+  VERSION = "0.1.277"
 end

data/lib/hiiro.rb

@@ -199,7 +199,14 @@ class Hiiro
 
     child_bin_name = [bin, child_subcmd.to_s].join(?-)
 
-    Hiiro.init(bin_name: child_bin_name, args: child_args, **kwargs, &block)
+    parent_resolvers = @resolvers&.dup
+
+    wrapper = lambda do |h|
+      h.instance_variable_set(:@resolvers, parent_resolvers.dup) if parent_resolvers
+      block.arity == 1 ? block.call(h) : h.instance_eval(&block) if block
+    end
+
+    Hiiro.init(bin_name: child_bin_name, args: child_args, **kwargs, &wrapper)
   end
 
   def run_child(custom_subcmd=nil, custom_args=nil, **kwargs, &block)
@@ -286,6 +293,22 @@ class Hiiro
     options.flag(name, **kwargs)
   end
 
+  def add_resolver(name, current = nil, &lookup)
+    @resolvers ||= {}
+    @resolvers[name.to_sym] = { current:, lookup: }
+  end
+
+  def resolve(name, ref = nil)
+    @resolvers ||= {}
+    r = @resolvers[name.to_sym] or raise "No resolver registered for :#{name}"
+    if ref.nil?
+      c = r[:current]
+      c.respond_to?(:call) ? c.call : c
+    else
+      r[:lookup]&.call(ref)
+    end
+  end
+
   def add_cmd(*names, args: [], opts: [], &block)
     cmd_opts = options.select(opts)
 

metadata

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