hiiro 0.1.242 → 0.1.243

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c64038815390689951d01cb646238dff574581c7aa1cd73b25ff7520f5fcc18
-  data.tar.gz: 3cf588abdac607b3a171fec89f627739336fd253132ff806290315285ae62368
+  metadata.gz: 451f995a33a97fcc96f14d46d9e5db921bd0fd7d3c82e3398f36b38c11acdcbe
+  data.tar.gz: 297b009bba497838b4c9c2b1958632feb84e4348fcbd5027e7663f146e3c3cf1
 SHA512:
-  metadata.gz: 4c4f1c4e6602efcef678b6f229e41b9050c49a734770dccc9e4878611e9c77a0720f1878e9a8e8cf88c5303f636e3ce530b6f8642c14edcaeeaed88aa97b7e5a
-  data.tar.gz: 5a6523eaf01e06c0f2889a66d30fd74b35d0a8533c4925b1d01cb89c07faf99f675f949e454acf060638c99b330264fc1f45cc0cd3bf9d31c975ee7bf5ed2bb2
+  metadata.gz: c7c71c733b7be2b9a12ba342d681bef838a3a79b54eda8e4f0ca05a996f7738104a709079591d36465d9dc52eddcca0a3e681ea54b5433c2c82b38a97b9c1c40
+  data.tar.gz: '0295aa80f43ab13e2b8f1bae5a0a1fa37f1527d90384bc4167365eb183ab42d5743338f4aab8c4c9d754b8de5625f638434e79358595e44f9316dd0f9ef28514'

data/bin/h-pr

@@ -341,8 +341,16 @@ class PinnedPRManager
     { 'approved' => approved, 'changes_requested' => changes_requested, 'commented' => commented, 'reviewers' => latest_by_author }
   end
 
-  def display_pinned(pr, idx = nil)
-    num = idx ? "#{(pr['slot'] || idx + 1).to_s.rjust(3)}." : ""
+  def display_pinned(pr, idx = nil, widths: {})
+    slot_w  = widths[:slot]  || 1
+    succ_w  = widths[:succ]  || 1
+    total_w = widths[:total] || 1
+    as_w    = widths[:as]    || 1
+    crs_w   = widths[:crs]   || 1
+
+    slot_num = (pr['slot'] || (idx ? idx + 1 : 1)).to_s
+    num    = "#{slot_num.rjust(slot_w)}."
+    indent = " " * (slot_w + 2)
 
     check_emoji, checks_count_str =
       if pr['checks']
@@ -352,13 +360,15 @@ class PinnedPRManager
         emoji = if has_failed && has_pending
           "⏳❌"
         elsif has_failed
-          "❌"
+          "　❌"
         elsif has_pending
-          "⏳"
+          "⏳　"
         else
-          "✅"
+          "　✅"
         end
-        [emoji, "#{c['success']}/#{c['total']}"]
+        succ  = c['success'].to_i.to_s.rjust(succ_w)
+        total = c['total'].to_i.to_s.rjust(total_w)
+        [emoji, "#{succ}/#{total}"]
       else
         ["", nil]
       end
@@ -373,21 +383,31 @@ class PinnedPRManager
     state_icon = "[#{bracket_parts.join(' ')}]"
 
     r = pr['reviews'] || {}
-    as = r['approved'].to_i
+    as  = r['approved'].to_i
     crs = r['changes_requested'].to_i
 
-    as_str  = as  > 0 ? "\e[30;102m#{as}\e[0m"  : '-'
-    crs_str = crs > 0 ? "\e[30;103m#{crs}\e[0m" : '-'
+    as_val  = as  > 0 ? as.to_s  : '-'
+    crs_val = crs > 0 ? crs.to_s : '-'
+    as_colored  = as  > 0 ? "\e[30;102m#{as_val}\e[0m"  : as_val
+    crs_colored = crs > 0 ? "\e[30;103m#{crs_val}\e[0m" : crs_val
+    as_pad  = " " * [as_w  - as_val.length,  0].max
+    crs_pad = " " * [crs_w - crs_val.length, 0].max
     conflict_str = pr['mergeable'] == 'CONFLICTING' ? " \e[30;101mC\e[0m" : ""
-    reviews_str = "#{as_str}a/#{crs_str}cr#{conflict_str}"
+    reviews_str = "#{as_pad}#{as_colored}a/#{crs_pad}#{crs_colored}cr#{conflict_str}"
 
     repo = pr_repo(pr)
-    repo_label = (repo && repo != 'instacart/carrot') ? " [#{repo}]" : ""
+    repo_label = (repo && repo != 'instacart/carrot') ? "[#{repo}] " : ""
 
     tags = Array(pr['tags'])
-    tags_str = tags.any? ? " " + tags.map { |t| "\e[30;104m#{t}\e[0m" }.join(' ') : ""
+    tags_str = tags.any? ? tags.map { |t| "\e[30;104m#{t}\e[0m" }.join(' ') : nil
+
+    branch_str = pr['headRefName'] ? " #{pr['headRefName']}" : ""
+    line1 = "#{num} ##{pr['number']} #{state_icon} #{reviews_str}#{branch_str}"
+    line2 = "#{indent}#{repo_label}#{pr['title']}"
+    line3 = pr['url'] ? "#{indent}#{pr['url']}" : nil
+    line4 = tags_str ? "#{indent}#{tags_str}" : nil
 
-    "#{num} #{state_icon} #{reviews_str} ##{pr['number']}#{repo_label}#{tags_str} #{pr['title']}".strip
+    [line1, line2, line3, line4].compact.join("\n")
   end
 
   def filter_active?(opts)
@@ -767,7 +787,13 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     if opts.numbers
       results.each { |pr| puts pr['number'] }
     else
-      results.each_with_index { |pr, idx| puts pinned_manager.display_pinned(pr, idx) }
+      slot_w  = results.map { |pr| (pr['slot'] || 1).to_s.length }.max
+      succ_w  = results.filter_map { |pr| pr.dig('checks', 'success')&.to_i&.to_s&.length }.max || 1
+      total_w = results.filter_map { |pr| pr.dig('checks', 'total')&.to_i&.to_s&.length }.max || 1
+      as_w    = results.map { |pr| [pr.dig('reviews', 'approved').to_i.to_s.length, 1].max }.max
+      crs_w   = results.map { |pr| [pr.dig('reviews', 'changes_requested').to_i.to_s.length, 1].max }.max
+      widths  = { slot: slot_w, succ: succ_w, total: total_w, as: as_w, crs: crs_w }
+      results.each_with_index { |pr, idx| puts pinned_manager.display_pinned(pr, idx, widths: widths) }
       last_checked = pinned.filter_map { |pr| pr['last_checked'] }.max
       puts "---"
       puts "Last updated: #{last_checked || 'never'}"

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.242"
+  VERSION = "0.1.243"
 end

metadata

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