hiiro 0.1.294 → 0.1.296

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca86bd25276511b4190cdde354a65a71243a2fad0b94604e10ac14d466d8c33
-  data.tar.gz: 9cb9807c855963e1b5c260f9be734c7b3032a1cca941bed1432e40e06d144f33
+  metadata.gz: 367fe7c933727ce4c7345b14ee3cab47596540d8b46ac1a144a5a89fee546a51
+  data.tar.gz: 576f659f1565b3a9c78adf366ad6880e07f2738fc09aac0665fba70dc8a909fb
 SHA512:
-  metadata.gz: d3d792f804941b33782102e92a81e8a12abdafcfd01182db74a98b9e2553b4286a4cb135a4da44b81e7cd707af38429c7b976d84d86768c02be0ed0f3b7d3dd6
-  data.tar.gz: a4147e91c73d2aed9cd89868d5830eca7b2db4d5361e74062df995b9cd5d4d692276c075abadb3beaf5a8ac69f9ba696043cd7600ffa27d3505d8e1ef062c845
+  metadata.gz: 42e9998efb966a27319ea9d49b4ae5e989391c427a5052c04976fa42bd7660ed4374b406d288e400430ce22a1d2009b4e5870eeb370e386d85fd68f0e2b039e7
+  data.tar.gz: b90c3c8df288b570aa5465b2f858065da93af8ce5d47ad10b837a0ca4fab74038dbb46777e55dcfa07ee7d3213d1e19bb1dcf3efc11bf7bde01db54ced04fa9f

data/CHANGELOG.md

@@ -1,5 +1,15 @@
-
 ```markdown
+## v0.1.296 (2026-03-27)
+
+### Changed
+- `Hiiro::Git::Pr`: added `red?`, `green?`, `pending?`, `active?`, `drafts?`, `conflicts?` predicate methods and `matches_filters?(opts, forced: [])` — filter logic now lives on the `Pr` object instead of in `PinnedPRManager` lambdas
+- `PinnedPRManager`: removed `FILTER_PREDICATES` constant; `apply_filters` and `filter_active?` now delegate to `Pr#matches_filters?`
+
+## 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

data/lib/hiiro/git/pr.rb

@@ -201,6 +201,33 @@ class Hiiro
       def draft?       = is_draft == true
       def conflicting? = mergeable == 'CONFLICTING'
 
+      # Check-status predicates
+      def red?     = (c = checks) && c['failed'].to_i > 0
+      def green?   = (c = checks) && c['failed'].to_i == 0 && c['pending'].to_i == 0 && c['success'].to_i > 0
+      def pending? = (c = checks) && c['pending'].to_i > 0 && c['failed'].to_i == 0
+
+      # Aliases matching filter option names
+      def active?    = !merged? && !closed?
+      def drafts?    = draft?
+      def conflicts? = conflicting?
+
+      # Filter dimensions. Flags within each group OR together; groups AND together.
+      # e.g. -o -g → (active?) AND (green?), -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
+
+      # Returns true if this PR satisfies the filter options set in opts.
+      # forced: injects additional filter keys as if the user had set them.
+      def matches_filters?(opts, forced: [])
+        state_active = STATE_FILTER_KEYS.select { |k| forced.include?(k) || (opts.respond_to?(k) && opts.send(k)) }
+        check_active = CHECK_FILTER_KEYS.select { |k| forced.include?(k) || (opts.respond_to?(k) && opts.send(k)) }
+
+        state_match = state_active.empty? || state_active.any? { |k| send(:"#{k}?") }
+        check_match = check_active.empty? || check_active.any? { |k| send(:"#{k}?") }
+
+        state_match && check_match
+      end
+
       def view     = system('gh', 'pr', 'view', number.to_s)
       def checkout = system('gh', 'pr', 'checkout', number.to_s)
 

data/lib/hiiro/pinned_pr_manager.rb

@@ -5,15 +5,6 @@ require 'fileutils'
 
 class Hiiro
   class PinnedPRManager
-    FILTER_PREDICATES = {
-      red:       ->(pr) { (c = pr.checks) && c['failed'].to_i > 0 },
-      green:     ->(pr) { (c = pr.checks) && c['failed'].to_i == 0 && c['pending'].to_i == 0 && c['success'].to_i > 0 },
-      conflicts: ->(pr) { pr.conflicting? },
-      drafts:    ->(pr) { pr.draft? },
-      pending:   ->(pr) { (c = pr.checks) && c['pending'].to_i > 0 && c['failed'].to_i == 0 },
-      merged:    ->(pr) { pr.merged? },
-      active:    ->(pr) { !pr.merged? && !pr.closed? },
-    }.freeze
 
     def self.add_resolvers(hiiro)
       pm = new
@@ -384,17 +375,14 @@ class Hiiro
     end
 
     def filter_active?(opts)
-      FILTER_PREDICATES.keys.any? { |f| opts.respond_to?(f) && opts.send(f) } ||
+      all_keys = Hiiro::Git::Pr::STATE_FILTER_KEYS + Hiiro::Git::Pr::CHECK_FILTER_KEYS
+      all_keys.any? { |f| opts.respond_to?(f) && opts.send(f) } ||
         (opts.respond_to?(:tag) && Array(opts.tag).any?)
     end
 
     def apply_filters(prs, opts, forced: [])
-      active = FILTER_PREDICATES.keys.select { |f| opts.respond_to?(f) && opts.send(f) }
-      active = (active + forced).uniq
+      results = prs.select { |pr| pr.matches_filters?(opts, forced: forced) }
 
-      results = active.empty? ? prs : prs.select { |pr| active.any? { |f| FILTER_PREDICATES[f]&.call(pr) } }
-
-      # 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?)
       unless tag_filter.empty?
         results = results.select { |pr| (Array(pr.tags) & tag_filter).any? }

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.294"
+  VERSION = "0.1.296"
 end

metadata

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