hiiro 0.1.293 → 0.1.295

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e69313f458dee5ff24926e4c905ea46bcfa67146f45df57f08e5692c0c9005
-  data.tar.gz: cf1b62233a0c03e1bc024ec966b88b9687cbc384b2cbf593dae30b9587ade3ff
+  metadata.gz: 11e1f44deb6626f97123e066d0c746e82174392c5c60b28a508f4730b62a85f7
+  data.tar.gz: b72bf798fe7e23b2e1df95746f6f3c07482fd19f620f9114bc356dc4226c3d92
 SHA512:
-  metadata.gz: d3db13bf516d8dfa5db32bd1480de76d886ed1dc51f9465749b4ee6f7b2ce75e420cc035bf3446828fe70383aa6b2fd315c6f76ae8f7bfb7dd2943250dc7a7ff
-  data.tar.gz: 402ff47ab1de9c80d226c853914ed7c2a9d21a03e2d275138545a73551bdbc62275a8e53bf884dafdfa8037b6f55b93ecb98cf90b63cf89eb32f2c512f6ad4dc
+  metadata.gz: '06915243bcc868b2ea77def9c9ead108409dd85a3fe6a1a3ca2fbdbfb1b421bb3c5e86ef58ec2535b0e4878f5c8384e8d3b13f04f533f577403a9c3d8181741d'
+  data.tar.gz: 4d75730e12195c1945af43b348932a0fcd0ae5b4cc7d7da6f1f2b8b4b1c5f6bbc8176523d9919ebbd7f044bf77f6922477d03d396550a8820a3344cd8763f10a

data/CHANGELOG.md

@@ -1,4 +1,14 @@
 ```markdown
+## v0.1.295 (2026-03-26)
+
+### Changed
+- `h pr ls`/`h pr update`: filter flags now use AND-across-dimensions logic — state flags (`-o`, `-m`, `-D`, `-c`) OR within their group, check flags (`-r`, `-g`, `-p`) OR within theirs, and the two groups AND together; e.g. `-o -g` shows open PRs with passing checks, `-o -r -g` shows open PRs with failing or passing checks
+
+## v0.1.294 (2026-03-26)
+
+### Fixed
+- `h pr ls`/`h pr update`: filter flags (`-r`, `-g`, `-p`, etc.) from `pm.add_options` now register correctly; switched from `pm.add_options(self)` inside implicit `instance_eval` block to explicit block parameter `|o|` with `pm.add_options(o)`, matching the pattern already used by `h pr green`/`red`/`old`
+
 ## v0.1.293 (2026-03-26)
 
 ### Changed

data/bin/h-pr

@@ -221,14 +221,14 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   end
 
   add_subcmd(:ls) do |*ls_args|
-    opts = Hiiro::Options.parse(ls_args) {
-      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')
-      flag(:all,      short: 'a', desc: 'show all tracked PRs (no filter)')
-      pm.add_options(self)
-      mutual_exclusion(:all, :active, :merged, :drafts, :red, :green, :pending, :conflicts)
+    opts = Hiiro::Options.parse(ls_args) { |o|
+      o.flag(:update,   short: 'u', desc: 'update status before listing')
+      o.flag(:verbose,  short: 'v', desc: 'multi-line output per PR')
+      o.flag(:checks,   short: 'C', desc: 'show individual check run details')
+      o.flag(:diff,     short: 'd', desc: 'open diff for selected PR')
+      o.flag(:all,      short: 'a', desc: 'show all tracked PRs (no filter)')
+      pm.add_options(o)
+      o.mutual_exclusion(:all, :active, :merged, :drafts, :red, :green, :pending, :conflicts)
     }
 
     if opts.help
@@ -314,11 +314,11 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   end
 
   add_subcmd(:update) do |*update_args|
-    opts = Hiiro::Options.parse(update_args) {
-      flag(:force_update, long: 'force-update', short: 'u', desc: 'force refresh even if recently checked')
-      flag(:all, short: 'a', desc: 'show all tracked PRs (no filter)')
-      pm.add_options(self)
-      mutual_exclusion(:all, :active, :merged, :drafts, :red, :green, :pending, :conflicts)
+    opts = Hiiro::Options.parse(update_args) { |o|
+      o.flag(:force_update, long: 'force-update', short: 'u', desc: 'force refresh even if recently checked')
+      o.flag(:all, short: 'a', desc: 'show all tracked PRs (no filter)')
+      pm.add_options(o)
+      o.mutual_exclusion(:all, :active, :merged, :drafts, :red, :green, :pending, :conflicts)
     }
 
     pinned = pinned_manager.load_pinned

data/lib/hiiro/pinned_pr_manager.rb

@@ -15,6 +15,15 @@ class Hiiro
       active:    ->(pr) { !pr.merged? && !pr.closed? },
     }.freeze
 
+    # Filters are split into two orthogonal dimensions:
+    #   state  — what lifecycle state the PR is in (active, merged, draft, conflicting)
+    #   checks — what the CI check status is (red, green, pending)
+    # Flags within each dimension OR together; dimensions AND together.
+    # e.g. -o -g  →  (active) AND (green checks)
+    #      -o -r -g →  (active) AND (red OR green)
+    STATE_FILTER_KEYS  = %i[active merged drafts conflicts].freeze
+    CHECK_FILTER_KEYS  = %i[red green pending].freeze
+
     def self.add_resolvers(hiiro)
       pm = new
       hiiro.add_resolver(:pr,
@@ -392,7 +401,14 @@ class Hiiro
       active = FILTER_PREDICATES.keys.select { |f| opts.respond_to?(f) && opts.send(f) }
       active = (active + forced).uniq
 
-      results = active.empty? ? prs : prs.select { |pr| active.any? { |f| FILTER_PREDICATES[f]&.call(pr) } }
+      state_flags = active & STATE_FILTER_KEYS
+      check_flags = active & CHECK_FILTER_KEYS
+
+      results = prs.select do |pr|
+        state_match = state_flags.empty? || state_flags.any? { |f| FILTER_PREDICATES[f]&.call(pr) }
+        check_match = check_flags.empty? || check_flags.any? { |f| FILTER_PREDICATES[f]&.call(pr) }
+        state_match && check_match
+      end
 
       # Tags are an AND post-filter; multiple tags are OR'd among themselves
       tag_filter = Array(opts.respond_to?(:tag) ? opts.tag : nil).map(&:to_s).reject(&:empty?)

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.293"
+  VERSION = "0.1.295"
 end

metadata

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