hiiro 0.1.273 → 0.1.275

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b55682a1256d90688f6471b9fd2ae9cd6d0c6ee716692d04d9c52123cc9f2ad
-  data.tar.gz: ac10d9d826855e8eeb43ae48e33eff5b7f1af43fad6e12184334f8dff845d8eb
+  metadata.gz: de15e42b4ef41a39549df14ac619a8fa60d4503fe112838c760ed94565d78426
+  data.tar.gz: 0c1886d398a5f233c2ac4c22c1b8ce25ce231ee4005879507662156fe735e532
 SHA512:
-  metadata.gz: 2846d4b518bdeca084f38090a422e965f027c9df5bc90e8f39984781733227bcf7647ee9cfbba0213892ab406d90bf20f8f1155ee2d06195ddd325cb8278c611
-  data.tar.gz: 5a35953c04c0f089d30b061835cc445b130801aaef4f4dcd28227376811dcb0bce7e4ead0bc8844da16f064d6bed4800873350a409c7ac50c73f7dc4daea2a4a
+  metadata.gz: 7be251d320a685f50cd0ba442fccaff2559c1cfeee2ded2fce185d54b21d3bc8953aa0b73a2c577e3c38c01b1a03317c54f3573922261383f55f067e813096b8
+  data.tar.gz: 0b75738d860076700cad4d0e9b7df3cb7c661f1ef47e7d4ba71e48b6c9e10a40699d46efa6ac2af8b889d0a7e3df3432a2528cc3ef45834ce2d01b75f7b8ce07

data/CHANGELOG.md

@@ -1 +1 @@
-Done. CHANGELOG.md updated for v0.1.273 with today's date (2026-03-23). Changes grouped into Added and Changed sections based on the recent commits.
+Done. CHANGELOG.md updated with v0.1.275 entry at the top, dated 2026-03-24, with the `h-pr sync` subcommand addition.

data/bin/h-bg

@@ -70,10 +70,10 @@ Hiiro.run(*ARGV) do
   end
 
   add_subcmd(:setup) do
-    puts 'Add this to your tmux.conf:'
-    puts
-    puts "  bind-key b display-popup -E -w 80% -h 40% \"h bg popup\""
-    puts
-    puts "Then reload tmux: tmux source-file ~/.tmux.conf"
+    $stderr.puts 'Add this to your tmux.conf:'
+    $stderr.puts
+    puts "bind-key b display-popup -E -w 80% -h 40% \"h bg popup\""
+    $stderr.puts
+    $stderr.puts "Then reload tmux: tmux source-file ~/.tmux.conf"
   end
 end

data/bin/h-pr

@@ -515,6 +515,10 @@ class PinnedPRManager
     end
   end
 
+  def strip_ansi(str)
+    str.gsub(/\e\[[0-9;]*m/, '')
+  end
+
   def display_check_runs(pr, indent: "   ")
     runs = pr.check_runs
     return unless runs.is_a?(Array) && runs.any?
@@ -574,7 +578,7 @@ FILTER_OPTS = Proc.new {
   flag(:red,       short: 'r', desc: 'filter: failing checks')
   flag(:green,     short: 'g', desc: 'filter: passing checks')
   flag(:conflicts, short: 'c', desc: 'filter: merge conflicts')
-  flag(:drafts,    short: 'd', desc: 'filter: draft PRs')
+  flag(:drafts,    short: 'D', desc: 'filter: draft PRs')
   flag(:pending,   short: 'p', desc: 'filter: pending checks')
   flag(:merged,    short: 'm', desc: 'filter: merged PRs')
   flag(:active,    short: 'o', desc: 'filter: open (non-merged) PRs')
@@ -593,7 +597,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
         return nil
       end
       lines = pinned.each_with_index.each_with_object({}) do |(pr, idx), h|
-        h[pinned_manager.display_pinned(pr, idx, oneline: true)] = pr.number.to_s
+        h[pinned_manager.strip_ansi(pinned_manager.display_pinned(pr, idx, oneline: true))] = pr.number.to_s
       end
       return fuzzyfind_from_map(lines)
     end
@@ -834,6 +838,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       flag(:update,   short: 'u', desc: 'update status before listing')
       flag(:verbose,  short: 'v', desc: 'multi-line output per PR')
       flag(:checks,   short: 'C', desc: 'show individual check run details')
+      flag(:diff,     short: 'd', desc: 'open diff for selected PR')
       instance_eval(&FILTER_OPTS)
     }
 
@@ -859,6 +864,16 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       next
     end
 
+    if opts.diff
+      lines = results.each_with_index.each_with_object({}) do |(pr, idx), h|
+        key = pinned_manager.strip_ansi(pinned_manager.display_pinned(pr, idx, oneline: true))
+        h[key] = pr.number.to_s
+      end
+      pr_number = fuzzyfind_from_map(lines)
+      system('gh', 'pr', 'diff', pr_number) if pr_number
+      next
+    end
+
     if opts.numbers
       results.each { |pr| puts pr.number }
     else
@@ -1182,7 +1197,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
 
     if ref.nil?
       lines = pinned.each_with_index.each_with_object({}) do |(pr, idx), h|
-        h[pinned_manager.display_pinned(pr, idx, oneline: true)] = pr.number.to_s
+        h[pinned_manager.strip_ansi(pinned_manager.display_pinned(pr, idx, oneline: true))] = pr.number.to_s
       end
 
       pr_number = fuzzyfind_from_map(lines)
@@ -1238,6 +1253,20 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     system('gh', 'pr', 'merge', pr_number.to_s, *merge_args)
   end
 
+  add_subcmd(:sync) do |ref = nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+
+    print "Syncing ##{pr_number} with base branch (rebase)... "
+    rebase_ok = system('gh', 'pr', 'update-branch', '--rebase', pr_number.to_s,
+                       out: $stdout, err: $stderr)
+
+    unless rebase_ok
+      puts "Rebase failed (conflicts?), falling back to merge..."
+      system('gh', 'pr', 'update-branch', pr_number.to_s)
+    end
+  end
+
   add_subcmd(:fix) do |*fix_args|
     opts = Hiiro::Options.parse(fix_args) do
       flag(:red, short: :r, desc: 'Fix all PRs with failing checks')
@@ -1262,7 +1291,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
         next
       end
       lines = candidates.each_with_index.each_with_object({}) do |(pr, idx), h|
-        h[pinned_manager.display_pinned(pr, idx, oneline: true)] = pr
+        h[pinned_manager.strip_ansi(pinned_manager.display_pinned(pr, idx, oneline: true))] = pr
       end
       selected = fuzzyfind_from_map(lines)
       next unless selected

data/exe/h

@@ -36,7 +36,13 @@ Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
 
     if opts.all
       Hiiro::Rbenv.versions.each do |ver|
-        update_hiiro(ver)
+        shell_cmd = [
+          "(RBENV_VERSION=#{ver.shellescape} rbenv exec gem update hiiro",
+          "|| RBENV_VERSION=#{ver.shellescape} rbenv exec gem install hiiro)",
+          "&& RBENV_VERSION=#{ver.shellescape} rbenv exec h setup",
+        ].join(' ')
+        puts "Queuing update for Ruby #{ver}..."
+        Hiiro::Background.run('sh', '-c', shell_cmd)
       end
     else
       update_hiiro

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.273"
+  VERSION = "0.1.275"
 end

metadata

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