hiiro 0.1.234 → 0.1.236

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8460afefae6d7bd3f6ba3d2fb8f71a11b6c78afab3056bc103e3ed3c7a20eba1
-  data.tar.gz: ec62d0166213c073e62040fa456732e1b75cd3060a0d76ee2061bd921fa69047
+  metadata.gz: 57a61c731baafeb477c3f8a1acca82b825ec432019744221b87721bce49d0da3
+  data.tar.gz: b51a6debe29e2b95b4fd0f489bf905e041637c06ec971ec73d8cf09ae204bc3a
 SHA512:
-  metadata.gz: 211bafbcf686e09654a3b983cb99fb8327f43273b89bb0e9a9c1c52971572f17eb8fafc4b95bcb96b3ff182b83e65218a3aa62df05b2ef75e2b3be390c1adfc8
-  data.tar.gz: feaa58f7885e1b8ecc0fc3f06f4b8e40b4f1f1b319ae37110772544f96abfb6ba1197d18966f6af4540dafadf3122fdcea2abcb0409470e514291ec1c23e49f7
+  metadata.gz: a3e55905cbfc8c4f80d28fd3b4cfdfc04c5cf7566e20efb091a9ed945d0aa45907d45b085d3828506f20d43a07eb79e7991af6f9adb47b0ed197a6474ee66934
+  data.tar.gz: 3ecc52af4a2d7d822a10df2e78a994929280640cbe76ac7badd1039911cf54784437bbbb2961065972b0ad06e61c950dc092e3cd031c482f831919258e7a4965

data/bin/h-pr

@@ -295,7 +295,7 @@ class PinnedPRManager
     drafts:    ->(pr) { pr['is_draft'] == true },
     pending:   ->(pr) { (c = pr['checks']) && c['pending'].to_i > 0 && c['failed'].to_i == 0 },
     merged:    ->(pr) { pr['state'] == 'MERGED' },
-    open:      ->(pr) { pr['state'] != 'MERGED' && pr['state'] != 'CLOSED' },
+    active:    ->(pr) { pr['state'] != 'MERGED' && pr['state'] != 'CLOSED' },
   }.freeze
 
   def summarize_checks(rollup)
@@ -384,18 +384,30 @@ class PinnedPRManager
     repo = pr_repo(pr)
     repo_label = (repo && repo != 'instacart/carrot') ? " [#{repo}]" : ""
 
-    "#{num} #{state_icon} #{reviews_str} ##{pr['number']}#{repo_label} #{pr['title']}".strip
+    tags = Array(pr['tags'])
+    tags_str = tags.any? ? " " + tags.map { |t| "\e[30;104m#{t}\e[0m" }.join(' ') : ""
+
+    "#{num} #{state_icon} #{reviews_str} ##{pr['number']}#{repo_label}#{tags_str} #{pr['title']}".strip
   end
 
   def filter_active?(opts)
-    FILTER_PREDICATES.keys.any? { |f| opts.respond_to?(f) && opts.send(f) }
+    FILTER_PREDICATES.keys.any? { |f| opts.respond_to?(f) && opts.send(f) } ||
+      (opts.respond_to?(:tag) && opts.tag)
   end
 
   def apply_filters(prs, opts, forced: [])
     active = FILTER_PREDICATES.keys.select { |f| opts.respond_to?(f) && opts.send(f) }
     active = (active + forced).uniq
-    return prs if active.empty?
-    prs.select { |pr| active.any? { |f| FILTER_PREDICATES[f]&.call(pr) } }
+
+    results = active.empty? ? prs : prs.select { |pr| active.any? { |f| FILTER_PREDICATES[f]&.call(pr) } }
+
+    # Tag is an AND post-filter — narrows whatever the flag filters returned
+    if opts.respond_to?(:tag) && opts.tag
+      tag = opts.tag.to_s
+      results = results.select { |pr| Array(pr['tags']).include?(tag) }
+    end
+
+    results
   end
 
   def display_detailed(pr, idx = nil)
@@ -474,8 +486,9 @@ FILTER_OPTS = Proc.new {
   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(:open,      short: 'o', desc: 'filter: open (non-merged) PRs')
+  flag(:active,    short: 'o', desc: 'filter: open (non-merged) PRs')
   flag(:numbers,   short: 'n', desc: 'output PR numbers only (no #)')
+  option(:tag,     short: 't', desc: 'filter by tag (AND with other filters)')
 }
 
 Hiiro.run(*ARGV, plugins: [Pins]) do
@@ -729,6 +742,11 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       instance_eval(&FILTER_OPTS)
     }
 
+    if opts.help
+      puts opts.help_text
+      exit 1
+    end
+
     pinned = pinned_manager.load_pinned
     next puts "No tracked PRs" if pinned.empty?
 
@@ -1312,6 +1330,77 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     matches.each_with_index { |pr, i| puts pinned_manager.display_pinned(pr, i) }
   end
 
+  # === Tags ===
+
+  add_subcmd(:tag) do |ref = nil, *tag_names|
+    if ref.nil? || tag_names.empty?
+      puts "Usage: h pr tag <ref> <tag> [tag2 ...]"
+      next
+    end
+
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+
+    pinned = pinned_manager.load_pinned
+    pr = pinned.find { |p| p['number'].to_s == pr_number.to_s }
+    unless pr
+      puts "PR ##{pr_number} not in tracked list"
+      next
+    end
+
+    pr['tags'] = (Array(pr['tags']) + tag_names).uniq
+    pinned_manager.save_pinned(pinned)
+    puts "Tagged ##{pr_number} with: #{tag_names.join(', ')}"
+    puts "  Tags now: #{pr['tags'].join(', ')}"
+  end
+
+  add_subcmd(:untag) do |ref = nil, *tag_names|
+    if ref.nil?
+      puts "Usage: h pr untag <ref> [tag ...]  (omit tags to clear all)"
+      next
+    end
+
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+
+    pinned = pinned_manager.load_pinned
+    pr = pinned.find { |p| p['number'].to_s == pr_number.to_s }
+    unless pr
+      puts "PR ##{pr_number} not in tracked list"
+      next
+    end
+
+    if tag_names.empty?
+      pr.delete('tags')
+      puts "Cleared all tags from ##{pr_number}"
+    else
+      pr['tags'] = Array(pr['tags']) - tag_names
+      pr.delete('tags') if pr['tags'].empty?
+      puts "Removed tag(s) #{tag_names.join(', ')} from ##{pr_number}"
+    end
+
+    pinned_manager.save_pinned(pinned)
+  end
+
+  add_subcmd(:tags) do
+    pinned = pinned_manager.load_pinned
+    by_tag = Hash.new { |h, k| h[k] = [] }
+
+    pinned.each do |pr|
+      Array(pr['tags']).each { |t| by_tag[t] << pr }
+    end
+
+    if by_tag.empty?
+      puts "No tagged PRs."
+      next
+    end
+
+    by_tag.sort.each do |tag, prs|
+      puts "\e[30;104m#{tag}\e[0m (#{prs.length})"
+      prs.each { |pr| puts "  ##{pr['number']} #{pr['title']}" }
+    end
+  end
+
   # === Multi-PR action commands (mCMD) ===
   # Each accepts composable filter flags and applies the action to all matching PRs.
   # Without filters, falls back to fuzzy-select.

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.234"
+  VERSION = "0.1.236"
 end

metadata

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