hiiro 0.1.227 → 0.1.228

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c832fea90f5aa6d0ffffceb6a1817d9987ccf8985aca28d3c8ce12d58da94747
-  data.tar.gz: 6886300526738f72f6ed8ec60888fdb859da3891ee0bc17fde211b984fb1ad10
+  metadata.gz: 354d3ef34e0e04716eb2f66882c970c9f46b20b14b9347140829578551f1b19f
+  data.tar.gz: faaeedd7571edee922c3545882f11c1d9889be5f09fa4df625ee4ec3c9623b30
 SHA512:
-  metadata.gz: bd484c3c4c7d830e9d4ead7170bf68b4ba4bddc9b4121b54fac562aabf1c9a811aad42b2a35005b00781fd377c85154f39c73d258b0567b1e2040b3cc5eaa6db
-  data.tar.gz: '05984ff6d73d36ab51281b1481c0674b99868fa50ef4ed3c91a8b9370bb105753863944b02af65c6906fbe8a638736ebb63e0e98c4ac12c82ba9a756a7a27191'
+  metadata.gz: d2583bef9b597c20a7a786623c78d55f46c8eb9d37f96d2d27a15f7e460c6785ce3cc5da04ef7bcba42c96f2104edb8f68876dfcfacbb5a97794bc2aa2d940bc
+  data.tar.gz: ed9202b8ab05c8586a4e1bf7e68a7176502000e8f355c14c792d6a22ee7f193acfdf7a2f7a21aa29ea7aeaf8a67d9d6d06c65c642e6ca653227cd90302852ad0

data/bin/h-pr

@@ -334,54 +334,46 @@ class PinnedPRManager
   def display_pinned(pr, idx = nil)
     num = idx ? "#{(pr['slot'] || idx + 1).to_s.rjust(3)}." : ""
 
-    check_emoji = if pr['checks']
-      c = pr['checks']
-      has_failed  = c['failed'].to_i > 0
-      has_pending = c['pending'].to_i > 0
-      if has_failed && has_pending
-        "⏳❌"
-      elsif has_failed
-        "❌"
-      elsif has_pending
-        "⏳"
+    check_emoji, checks_count_str =
+      if pr['checks']
+        c = pr['checks']
+        has_failed  = c['failed'].to_i > 0
+        has_pending = c['pending'].to_i > 0
+        emoji = if has_failed && has_pending
+          "⏳❌"
+        elsif has_failed
+          "❌"
+        elsif has_pending
+          "⏳"
+        else
+          "✅"
+        end
+        [emoji, "#{c['success']}/#{c['total']}"]
       else
-        "✅"
+        ["", nil]
       end
-    else
-      ""
-    end
 
     state_label = case pr['state']
     when 'MERGED' then 'M'
     when 'CLOSED' then 'X'
-    else pr['is_draft'] ? 'D' : 'O'
+    else pr['is_draft'] ? 'd' : 'o'
     end
 
-    bracket = [state_label, check_emoji].reject(&:empty?).join(' ')
-    state_icon = "[#{bracket}]"
+    bracket_parts = [state_label, check_emoji, checks_count_str].reject { |p| p.nil? || p.empty? }
+    state_icon = "[#{bracket_parts.join(' ')}]"
 
-    checks_str = if pr['checks']
-      c = pr['checks']
-      " checks:#{c['success']}/#{c['total']}"
-    else
-      ""
-    end
+    r = pr['reviews'] || {}
+    as = r['approved'].to_i
+    crs = r['changes_requested'].to_i
 
-    reviews_str =
-      if pr['reviews']
-        r = pr['reviews']
-        parts = []
-        parts << "#{r['approved']} approved" if r['approved'].to_i > 0
-        parts << "#{r['changes_requested']} changes" if r['changes_requested'].to_i > 0
-        parts.empty? ? "" : " | #{parts.join(', ')}"
-      else
-        ""
-      end
+    as_str  = as  > 0 ? "\e[1;92m#{as}\e[0m"  : '-'
+    crs_str = crs > 0 ? "\e[1;33m#{crs}\e[0m" : '-'
+    reviews_str = "#{as_str}a/#{crs_str}cr"
 
     repo = pr_repo(pr)
     repo_label = (repo && repo != 'instacart/carrot') ? " [#{repo}]" : ""
 
-    "#{num} #{state_icon} ##{pr['number']}#{repo_label} #{pr['title']}#{checks_str}#{reviews_str}".strip
+    "#{num} #{state_icon} #{reviews_str} ##{pr['number']}#{repo_label} #{pr['title']}".strip
   end
 
   def display_detailed(pr, idx = nil)
@@ -1202,7 +1194,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       end
 
       add_subcmd(:vim) do
-        editor PinnedPRManager::PINNED_FILE
+        edit_files PinnedPRManager::PINNED_FILE
       end
     end.run
   end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.227"
+  VERSION = "0.1.228"
 end

metadata

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