hiiro 0.1.81 → 0.1.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f87285ddecfdb583f432a5017f6261299b44090af65809fd4a8840f7c497a0a
-  data.tar.gz: 41376a591fe399529e5eb4d2dd33cd01c55eb9f1a9f9f5cc1a56691608e1a631
+  metadata.gz: 31fd73a56f9bbcc10a8a9e62ecdd0dcbc391eb65e0bcf5886ab289986f81a198
+  data.tar.gz: dd392dc066b2ec7c894a2d7c2d14c8d2921f157a4b998dde9ee7ffdb83400844
 SHA512:
-  metadata.gz: f055d30b6555898fee3011e99ed35085c0989bfb786478815c7e42ece61eba17d7e4c5462b788ca220fa1b06432ebfe17f09cf5d4a84143b8f55b0e0d31da782
-  data.tar.gz: 40f214d34537a625a9ecea49d9ba57d9c96cf2e6a85c586b9854eabc18960d2b14009743458008c4127b822dc5c4e630db293fc55b41b0384586702ff0398029
+  metadata.gz: 705c6f8c3aa58a2f356272a647d67fb84a7b7c6c39b271c2372e4b3498a0d644415a75d2fad9ff16c80a73949fdc432052e6ef7d00e97149c412eb290c1fb13a
+  data.tar.gz: df6abb83f94c9433a992f359d66393c8c3c9db28c5d920d32529bf58a3fe536114da0396298fdf4400b062058acb054e57dc83696d5d5ada96a9319ef8ee5e86

data/bin/h-pr

@@ -295,7 +295,7 @@ class PinnedPRManager
   end
 
   def fetch_pr_info(pr_number)
-    fields = 'number,title,url,headRefName,state,statusCheckRollup'
+    fields = 'number,title,url,headRefName,state,statusCheckRollup,reviewDecision,reviews,isDraft,mergeable'
     output = `gh pr view #{pr_number} --json #{fields} 2>/dev/null`.strip
     return nil if output.empty?
     JSON.parse(output)
@@ -325,6 +325,10 @@ class PinnedPRManager
     pr['state'] = info['state']
     pr['title'] = info['title']
     pr['checks'] = summarize_checks(info['statusCheckRollup'])
+    pr['reviews'] = summarize_reviews(info['reviews'])
+    pr['review_decision'] = info['reviewDecision']
+    pr['is_draft'] = info['isDraft']
+    pr['mergeable'] = info['mergeable']
     pr['last_checked'] = Time.now.iso8601
     pr
   end
@@ -343,28 +347,124 @@ class PinnedPRManager
     { 'total' => total, 'success' => success, 'pending' => pending, 'failed' => failed }
   end
 
+  def summarize_reviews(reviews)
+    return nil unless reviews.is_a?(Array) && !reviews.empty?
+
+    # Get the latest review state per author
+    latest_by_author = {}
+    reviews.each do |review|
+      author = review['author']['login'] rescue nil
+      next unless author
+      # Only track if it's a meaningful state
+      state = review['state']
+      next unless %w[APPROVED CHANGES_REQUESTED COMMENTED].include?(state)
+      latest_by_author[author] = state
+    end
+
+    approved = latest_by_author.values.count { |s| s == 'APPROVED' }
+    changes_requested = latest_by_author.values.count { |s| s == 'CHANGES_REQUESTED' }
+    commented = latest_by_author.values.count { |s| s == 'COMMENTED' }
+
+    { 'approved' => approved, 'changes_requested' => changes_requested, 'commented' => commented, 'reviewers' => latest_by_author }
+  end
+
   def display_pinned(pr, idx = nil)
     num = idx ? "#{(idx + 1).to_s.rjust(3)}." : ""
     state_icon = case pr['state']
     when 'MERGED' then '[M]'
     when 'CLOSED' then '[X]'
-    else '[O]'
+    else pr['is_draft'] ? '[D]' : '[O]'
     end
 
     checks_str = if pr['checks']
       c = pr['checks']
       if c['failed'] > 0
-        " [#{c['success']}/#{c['total']} FAIL:#{c['failed']}]"
+        " checks:#{c['success']}/#{c['total']} FAIL:#{c['failed']}"
       elsif c['pending'] > 0
-        " [#{c['success']}/#{c['total']} pending:#{c['pending']}]"
+        " checks:#{c['success']}/#{c['total']} pending:#{c['pending']}"
       else
-        " [#{c['success']}/#{c['total']}]"
+        " checks:#{c['success']}/#{c['total']}"
       end
     else
       ""
     end
 
-    "#{num} #{state_icon} ##{pr['number']} #{pr['title']}#{checks_str}".strip
+    reviews_str = if pr['reviews']
+      r = pr['reviews']
+      parts = []
+      parts << "#{r['approved']} approved" if r['approved'] > 0
+      parts << "#{r['changes_requested']} changes" if r['changes_requested'] > 0
+      parts.empty? ? "" : " | #{parts.join(', ')}"
+    else
+      ""
+    end
+
+    "#{num} #{state_icon} ##{pr['number']} #{pr['title']}#{checks_str}#{reviews_str}".strip
+  end
+
+  def display_detailed(pr, idx = nil)
+    lines = []
+    num = idx ? "#{idx + 1}." : ""
+
+    state_str = case pr['state']
+    when 'MERGED' then 'MERGED'
+    when 'CLOSED' then 'CLOSED'
+    else pr['is_draft'] ? 'DRAFT' : 'OPEN'
+    end
+
+    lines << "#{num} ##{pr['number']} - #{pr['title']}"
+    lines << "   State: #{state_str}"
+    lines << "   Branch: #{pr['headRefName']}" if pr['headRefName']
+    lines << "   URL: #{pr['url']}" if pr['url']
+
+    # Checks
+    if pr['checks']
+      c = pr['checks']
+      check_status = if c['failed'] > 0
+        "FAILING (#{c['success']}/#{c['total']} passed, #{c['failed']} failed)"
+      elsif c['pending'] > 0
+        "PENDING (#{c['success']}/#{c['total']} passed, #{c['pending']} pending)"
+      else
+        "PASSING (#{c['success']}/#{c['total']})"
+      end
+      lines << "   Checks: #{check_status}"
+    else
+      lines << "   Checks: (none)"
+    end
+
+    # Reviews
+    if pr['reviews']
+      r = pr['reviews']
+      review_parts = []
+      review_parts << "#{r['approved']} approved" if r['approved'] > 0
+      review_parts << "#{r['changes_requested']} requesting changes" if r['changes_requested'] > 0
+      review_parts << "#{r['commented']} commented" if r['commented'] > 0
+
+      if review_parts.any?
+        lines << "   Reviews: #{review_parts.join(', ')}"
+        if r['reviewers'] && !r['reviewers'].empty?
+          r['reviewers'].each do |author, state|
+            icon = case state
+            when 'APPROVED' then '+'
+            when 'CHANGES_REQUESTED' then '-'
+            else '?'
+            end
+            lines << "      #{icon} #{author}: #{state.downcase.gsub('_', ' ')}"
+          end
+        end
+      else
+        lines << "   Reviews: (none)"
+      end
+    else
+      lines << "   Reviews: (not fetched)"
+    end
+
+    # Mergeable
+    if pr['mergeable']
+      lines << "   Mergeable: #{pr['mergeable']}"
+    end
+
+    lines.join("\n")
   end
 end
 
@@ -586,16 +686,23 @@ hiiro.add_subcmd(:status) do |*args|
     next
   end
 
+  compact = args.include?('-c') || args.include?('--compact')
+
   puts "Refreshing status for #{pinned.length} pinned PR(s)..."
   puts
 
   pinned.each_with_index do |pr, idx|
     pinned_manager.refresh_status(pr)
-    puts pinned_manager.display_pinned(pr, idx)
+    if compact
+      puts pinned_manager.display_pinned(pr, idx)
+    else
+      puts pinned_manager.display_detailed(pr, idx)
+      puts
+    end
   end
 
   pinned_manager.save_pinned(pinned)
-  puts
+  puts "---"
   puts "Status updated at #{Time.now.strftime('%H:%M:%S')}"
 end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.81"
+  VERSION = "0.1.82"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.81
+  version: 0.1.82
 platform: ruby
 authors:
 - Joshua Toyota
@@ -72,21 +72,14 @@ files:
 - bin/h-buffer
 - bin/h-commit
 - bin/h-config
-- bin/h-home
-- bin/h-html
 - bin/h-link
-- bin/h-mic
-- bin/h-note
 - bin/h-pane
 - bin/h-plugin
 - bin/h-pr
 - bin/h-project
-- bin/h-remind
-- bin/h-serve
 - bin/h-session
 - bin/h-sha
 - bin/h-todo
-- bin/h-video
 - bin/h-window
 - bin/h-wtree
 - docs/README.md

data/bin/h-home

@@ -1,62 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'hiiro'
-
-EDITOR = ENV.fetch('EDITOR', 'nvim')
-BASE_DIR = Dir.home
-
-o = Hiiro.init(*ARGV)
-
-o.add_subcmd(:edit) { |*args|
-  system(EDITOR, __FILE__)
-}
-
-o.add_subcmd(:path) { |*args|
-  print BASE_DIR
-}
-
-o.add_subcmd(:skf) { |*args|
-  Dir.chdir(BASE_DIR)
-  system('skf', *args)
-}
-
-o.add_subcmd(:rg) { |*args|
-  Dir.chdir(BASE_DIR)
-  system('rg', '-S', *args)
-}
-
-o.add_subcmd(:rgall) { |*args|
-  Dir.chdir(BASE_DIR)
-  system('rg', '-S', '--no-ignore-vcs', *args)
-}
-
-o.add_subcmd(:ebin) { |*args|
-  Dir.chdir(File.join(Dir.home, 'bin'))
-
-  glob_patterns = []
-  globs = []
-
-  files = args.filter_map { |arg|
-    matches = 
-      if arg.end_with?('*')
-        glob_patterns << arg
-        Dir.glob(arg)
-      elsif arg.is_a?(String)
-        glob_patterns << '*' + arg.to_s + '*'
-        Dir.glob('*' + arg.to_s + '*')
-      end
-
-    globs << matches
-    
-    matches unless matches.empty?
-  }.flatten
-
-  system(EDITOR, *files.flatten)
-}
-
-if o.runnable?
-  o.run
-else
-  puts :no_runnable_found
-end
-

data/bin/h-html

@@ -1,380 +0,0 @@
-#!/usr/bin/env ruby
-require "hiiro"
-
-o = Hiiro.init(*ARGV)
-o.add_subcmd(:vids) { |outfile, *args|
-  outfile = 'index.html' if outfile.nil?
-
-  hash = Digest::SHA1.hexdigest(Dir.pwd)
-  puts hash: hash
-
-  videos = Dir.glob('*.mp4').map { |vid|
-    next if File.directory?(vid)
-
-    vid.inspect
-  }.compact
-
-  puts video_count: videos.count
-
-  videos = videos.join(",\n")
-
-  template = <<~TEMPLATE
-<html>
-  <head>
-    <style>
-      /* a, p, video {
-        margin-top: 20px;
-      } */
-      select, textarea {
-        margin-top: 20px;
-        width: 80%;
-        display: block;
-      }
-      .flex_links {
-        display: flex;
-        gap: 70px;
-        margin-top: 38px;
-        margin-bottom: 38px;
-      }
-      * {
-        font-size: 16pt;
-      }
-
-      a {
-        font-size: 26pt;
-      }
-    </style>
-    <script type="text/javascript">
-      var favs = localStorage.getItem('favs-#{hash}') || '[]';
-      console.log({ favs: favs });
-
-      var videos = [
-        #{videos.gsub(/\n/, "\n        ")}
-      ];
-
-      function create_links() {
-        var container = document.getElementById('links');
-        var player = document.getElementById('player');
-
-        for(var x=0; x < videos.length; x++) {
-          var link = document.createElement('option');
-          link.value = x;
-          link.innerText = videos[x];
-
-          container.appendChild(link);
-        }
-      }
-
-      function load_video() {
-        var player = document.getElementById('player');
-        var src = document.getElementById('player_src');
-        var links = document.getElementById('links');
-        var idx = links.value;
-        var id = parseInt(idx);
-        src.src = videos[id];
-        player.load();
-        player.currentTime = 5;
-        player.play();
-        load_stats();
-      }
-
-      function save_video() {
-        var fav_videos = localStorage.getItem('favs-#{hash}') || '[]';
-        var json = JSON.parse(fav_videos);
-        console.log({ favs: fav_videos, json: json });
-
-        var vid = document.getElementById('links').value;
-        vid = videos[parseInt(vid)];
-
-        if(vid !== undefined) {
-          json.push(vid);
-
-          localStorage.setItem('favs-#{hash}', JSON.stringify(json));
-          fav_videos = localStorage.getItem('favs-#{hash}') || '[]';
-          json = JSON.parse(fav_videos);
-          console.log({ favs: fav_videos, json: json });
-        }
-
-        display_favs();
-      }
-
-      function rm_fav() {
-        var fav_videos = localStorage.getItem('favs-#{hash}') || '[]';
-        var json = JSON.parse(fav_videos);
-        console.log({ favs: fav_videos, json: json });
-
-        var sel = document.getElementById('favs_select');
-        var current_index = sel.selectedIndex;
-        vid = json[current_index];
-
-        json.splice(current_index, 1)
-
-        if(vid !== undefined) {
-          localStorage.setItem('favs-#{hash}', JSON.stringify(json));
-          fav_videos = localStorage.getItem('favs-#{hash}') || '[]';
-          json = JSON.parse(fav_videos);
-          console.log({ favs: fav_videos, json: json });
-        }
-
-        display_favs();
-
-        if(sel.length == 0) return;
-
-        if(current_index >= sel.length) {
-          current_index = sel.length - 1;
-        }
-
-        sel.selectedIndex = current_index;
-        load_fav();
-      }
-
-      function load_fav() {
-        var sel = document.getElementById('favs_select');
-
-        var player = document.getElementById('player');
-        var src = document.getElementById('player_src');
-        src.src = sel.value;
-        player.load();
-        player.currentTime = 5;
-        player.play();
-      }
-
-      function prev_fav() {
-        var sel = document.getElementById('favs_select');
-        if(sel.selectedIndex == 0) return;
-        sel.selectedIndex = sel.selectedIndex - 1;
-        load_fav();
-      }
-
-      function next_fav() {
-        var sel = document.getElementById('favs_select');
-        if(sel.selectedIndex >= sel.length - 1) return;
-        sel.selectedIndex = sel.selectedIndex + 1;
-        load_fav();
-      }
-
-      function export_favs() {
-        var text = document.getElementById('export_favs');
-        var data = localStorage.getItem('favs-#{hash}') || '[]';
-        var list = JSON.parse(data);
-        text.innerHTML = list.join("\\n");
-      }
-
-      function display_favs() {
-        var sel = document.getElementById('favs_select');
-        sel.innerHTML = '';
-
-        var data = localStorage.getItem('favs-#{hash}') || '[]';
-        var favs = JSON.parse(data);
-
-        for(var x=0; x<favs.length; x++) {
-          var opt = document.createElement('option');
-          opt.value = favs[x];
-          opt.innerText = favs[x];
-          sel.appendChild(opt);
-        }
-      }
-
-      function clear_last() {
-        localStorage.removeItem('last_vid-#{hash}');
-
-        show_last();
-      }
-
-      function mark_last() {
-        var sel = document.getElementById('links');
-        var idx = sel.value;
-        var id = parseInt(idx);
-
-        localStorage.setItem('last_vid-#{hash}', videos[id]);
-
-        show_last();
-      }
-
-      function show_last() {
-        var links = document.getElementById('links');
-        var div = document.getElementById('last_vid');
-        var last_vid = localStorage.getItem('last_vid-#{hash}') || 'no last vid';
-        div.innerHTML = last_vid;
-        var found = false;
-        if(last_vid != 'no last vid') {
-          for(var x=0; x<videos.length; x++) {
-            if(videos[x] == last_vid) {
-              found = true;
-              links.selectedIndex = x;
-              load_video();
-              break;
-            }
-          }
-        }
-        if(found == false) {
-          links.selectedIndex = 0;
-          load_stats();
-        }
-      }
-
-      function prev_vid() {
-        var sel = document.getElementById('links');
-        if(sel.selectedIndex == 0) return;
-        sel.selectedIndex = sel.selectedIndex - 1;
-        load_video();
-      }
-
-      function next_vid() {
-        var sel = document.getElementById('links');
-        if(sel.selectedIndex >= sel.length - 1) return;
-        sel.selectedIndex = sel.selectedIndex + 1;
-        load_video();
-        mark_last();
-      }
-
-      function load_stats() {
-        var sel = document.getElementById('links');
-        var cur = document.getElementById('current_idx');
-        var total = document.getElementById('total_links');
-
-        cur.innerHTML = sel.selectedIndex + 1;
-        total.innerHTML = sel.length;
-      }
-
-      function trash() {
-        var sel = document.getElementById('links');
-        var idx = sel.selectedIndex;
-
-        var container = document.getElementById('trash');
-        var link = document.createElement('option');
-        link.value = idx;
-        link.innerText = videos[idx];
-
-        container.appendChild(link);
-      }
-
-      function clear_trash() {
-        var container = document.getElementById('trash');
-        container.innerHTML = '';
-      }
-    </script>
-  </head>
-  <body>
-  :r!ls *.mp4 | sed 's@.*@&lt;video height="480" controls&gt;&lt;source src="&" type="video/mp4"&gt;&lt;/video&gt;@'
-  <hr/>
-
-  <div id="last_vid">not loaded</div>
-  <div class="flex_links">
-    <a href="javascript:void(0);" onclick="mark_last()" />Mark Last</a>
-    <a href="javascript:void(0);" onclick="clear_last()" />Clear Last</a>
-  </div>
-
-  <div id="links_stats">
-    <span id="current_idx">0</span> /
-    <span id="total_links">99999</span>
-  </div>
-
-  <select id="links" size="5" onchange="load_stats(); load_video();">
-  </select>
-
-  <div class="flex_links">
-    <a href="javascript:void(0);" onclick="load_video()" />Load</a>
-    <a href="javascript:void(0);" onclick="save_video()" />Save</a>
-    <a href="javascript:void(0);" onclick="prev_vid()">Prev Vid</a>
-    <a href="javascript:void(0);" onclick="next_vid()">Next Vid</a>
-  </div>
-
-  <select id="favs_select" size="5" onchange="load_fav();">
-  </select>
-
-  <div class="flex_links">
-    <a href="javascript:void(0);" onclick="rm_fav()" />Remove Fav</a>
-    <a href="javascript:void(0);" onclick="load_fav()" />Load Fav</a>
-    <a href="javascript:void(0);" onclick="prev_fav()" />Prev Fav</a>
-    <a href="javascript:void(0);" onclick="next_fav()" />Next Fav</a>
-  </div>
-
-  <select id="trash" size="5">
-  </select>
-
-  <div class="flex_links">
-    <a href="javascript:void(0);" onclick="trash()" />Trash</a>
-    <a href="javascript:void(0);" onclick="clear_trash()" />Clear</a>
-  </div>
-
-  <textarea id="export_favs" rows="5" cols="40">
-  </textarea>
-
-  <div class="flex_links">
-    <a href="javascript:void(0);" onclick="localStorage.removeItem('favs-#{hash}'); display_favs();" />Clear Favs</a>
-    <a href="javascript:void(0);" onclick="export_favs()" />Export Favs</a>
-  </div>
-
-  <div id="player_wrapper">
-    <video id="player" height="480" controls>
-      <source id="player_src" src="">
-    </video>
-  </div>
-
-  <script type="text/javascript">
-    create_links();
-    display_favs();
-    show_last();
-    load_stats();
-  </script>
-  </body>
-</html>
-  TEMPLATE
-
-  size = IO.write(outfile, template)
-
-  puts size: size
-}
-
-o.add_subcmd(:videos) { |outfile, *args|
-  puts :in_html_videos
-
-  if outfile&.match?(/^-/)
-    args = [outfile, *args]
-    outfile = nil
-  end
-
-  outfile = 'index.html' if outfile.nil?
-
-  if File.exist?(outfile) && args.none?{|a| a.match?(/-f/) }
-    puts 'File Exists: use -f flag to force'
-  else
-    tags = Dir.glob('**/*').map { |vid|
-      next if File.directory?(vid)
-
-      file_cmd = format('file --mime-type "%s"', vid)
-      result = %x[ #{file_cmd} ]
-      next unless result.match?(/video\//)
-
-      format('<p>%s</p><video height="480" controls><source src="%s"></video>', vid, vid)
-    }.compact
-
-    template = <<~TEMPLATE
-    <html>
-      <head>
-        <style>
-          a, p, video {
-            display: block;
-            margin-top: 20px;
-          }
-        </style>
-      </head>
-      <body>
-:r!ls *.mp4 | sed 's@.*@&lt;video height="480" controls&gt;&lt;source src="&" type="video/mp4"&gt;&lt;/video&gt;@'
-<hr/>
-      %s
-      </body>
-    </html>
-    TEMPLATE
-
-    contents = format(template, tags.join("\n"))
-    bytes = IO.write(outfile, contents)
-
-    printf("video count: %d\n", tags.count)
-    printf("bytes_written: %d\n", bytes)
-  end
-}
-
-o.run
-