hiiro 0.1.225 → 0.1.227

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8622f37a2f49e596a45a319829d7d8f020489123d950e5e8ed8dde8fac73f2c6
-  data.tar.gz: 1e3fa41fac296a630a1929be540dea6aeb52409d7ec5788a40a7300e2d790c19
+  metadata.gz: c832fea90f5aa6d0ffffceb6a1817d9987ccf8985aca28d3c8ce12d58da94747
+  data.tar.gz: 6886300526738f72f6ed8ec60888fdb859da3891ee0bc17fde211b984fb1ad10
 SHA512:
-  metadata.gz: e23a370cc227ec5253b490d278f733c2de8c18c6d82a1435236f77a63268b2b5ba9077303bdbd598c0632bc407ae080ccdedcc7e9ba5787515faedeaadcdfb86
-  data.tar.gz: dae40a4c0d04ce912d63591bd07420be7b351aeed493594189797d4874642ea185e1ef3dcda1805d57cec958918b4cee3881bf220be6afa82f697fa3e9a70d9b
+  metadata.gz: bd484c3c4c7d830e9d4ead7170bf68b4ba4bddc9b4121b54fac562aabf1c9a811aad42b2a35005b00781fd377c85154f39c73d258b0567b1e2040b3cc5eaa6db
+  data.tar.gz: '05984ff6d73d36ab51281b1481c0674b99868fa50ef4ed3c91a8b9370bb105753863944b02af65c6906fbe8a638736ebb63e0e98c4ac12c82ba9a756a7a27191'

data/bin/h-pr

@@ -7,10 +7,8 @@ require "yaml"
 require "json"
 require "tempfile"
 
-Hiiro.load_env
-
 class PinnedPRManager
-  PINNED_FILE = File.join(Dir.home, '.config/hiiro/pinned_prs.yml')
+  PINNED_FILE = Hiiro::Config.path('pinned_prs.yml')
 
   def self.repo_from_url(url)
     return nil unless url
@@ -568,6 +566,13 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
 
   add_subcmd(:edit) { edit_files(__FILE__) }
   add_subcmd(:open) { |pr_number=nil|
+    if pr_number.nil?
+      current = pinned_manager.fetch_current_branch_pr
+      if current
+        system('gh', 'pr', 'view', current['number'].to_s, '--web')
+        next
+      end
+    end
     pr_number = resolve_pr.call(pr_number)
     system('gh', 'pr', 'view', pr_number.to_s, '--web') if pr_number
   }
@@ -636,30 +641,27 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     pr_info = nil
 
     case ref
-    when nil
-      # Select from my open PRs
-      my_prs = pinned_manager.fetch_my_prs
-      if my_prs.empty?
-        puts "No open PRs found"
-        next
-      end
-
-      lines = my_prs.each_with_object({}) do |pr, h|
-        display = "##{pr['number']} [#{pr['headRefName']}] #{pr['title']}"
-        h[display] = pr
-      end
-
-      pr_info = fuzzyfind_from_map(lines)
-      unless pr_info
-        puts "No PR selected"
-        next
-      end
-    when '-'
-      # Track current branch's PR
+    when nil, '-'
+      # Try current branch's PR first, fall back to fuzzy select
       pr_info = pinned_manager.fetch_current_branch_pr
+
       unless pr_info
-        puts "No PR found for current branch"
-        next
+        my_prs = pinned_manager.fetch_my_prs
+        if my_prs.empty?
+          puts "No open PRs found"
+          next
+        end
+
+        lines = my_prs.each_with_object({}) do |pr, h|
+          display = "##{pr['number']} [#{pr['headRefName']}] #{pr['title']}"
+          h[display] = pr
+        end
+
+        pr_info = fuzzyfind_from_map(lines)
+        unless pr_info
+          puts "No PR selected"
+          next
+        end
       end
     when /^\d+$/
       # Track by PR number
@@ -692,6 +694,8 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
 
     pinned_manager.pin(pr_info.merge(context))
     puts "Now tracking ##{pr_info['number']}: #{pr_info['title']}"
+    puts
+    run_subcmd(:update)
   end
 
   add_subcmd(:ls) do |*ls_args|
@@ -1191,4 +1195,15 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     matches.each_with_index { |pr, i| puts pinned_manager.display_pinned(pr, i) }
   end
 
+  add_subcmd(:config) do |*args|
+    make_child do
+      add_subcmd(:path) do
+        puts PinnedPRManager::PINNED_FILE
+      end
+
+      add_subcmd(:vim) do
+        editor PinnedPRManager::PINNED_FILE
+      end
+    end.run
+  end
 end

data/bin/h-pr-monitor

@@ -0,0 +1,158 @@
+#!/usr/bin/env ruby
+
+require 'pry'
+require 'json'
+require 'digest'
+require 'optparse'
+require 'shellwords'
+
+options = {
+  notify_approvals: true,
+  notify_status: true,
+  notify_publishing: true,
+  mark_ready: false
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: h-watchprs [options]"
+
+  opts.on("-a", "--no-notify-approvals", "Disable notifications for new approvals") do
+    options[:notify_approvals] = false
+  end
+
+  opts.on("-s", "--no-notify-status", "Disable notifications for status changes") do
+    options[:notify_status] = false
+  end
+
+  opts.on("-u", "--no-notify-publishing", "Disable notifications when publishing PR as ready") do
+    options[:notify_publishing] = false
+  end
+
+  opts.on("-r", "--mark-ready", "Enable marking PR as ready when passing") do
+    options[:mark_ready] = true
+  end
+
+  opts.on("-h", "--help", "Prints this help") do
+    puts opts
+    exit
+  end
+end.parse!
+
+SLEEP_TIME = ENV.fetch('sleep_for', 60)
+
+prs = {}
+approvals = {}
+first_run = true
+
+last_prs = {}
+last_json_md5 = nil
+
+loop do
+  stdout = `gh pr status`
+
+  md5 = Digest::MD5.hexdigest(stdout)
+
+  if stdout.match?(/something went wrong/i)
+    sleep SLEEP_TIME
+    next
+  end
+
+  collecting = false
+  current_pr = nil
+  new_statuses = {}
+  new_approvals = {}
+  pr_titles = {}
+  stdout.lines(chomp: true).map do |line|
+    collecting = true if line.match?(/created by you/i)
+    next unless collecting
+
+    if num = line[/[#]\d+/]
+      current_pr = num.sub(?#, '')
+      # Extract PR title: everything after #123 and before [branch-name]
+      if match = line.match(/#\d+\s+(.+?)\s+\[/)
+        pr_titles[current_pr] = match[1].strip
+      end
+      next
+    end
+
+    if current_pr && line.match?(/checks (pending|passing|failing)/i)
+      new_status = line[/pending|passing|failing/]
+
+      old_approval_count = approvals.fetch(current_pr, 0)
+
+      if line.match?(/✓ (\d\d*) Approved/)
+        partial = line[/✓ (\d\d*) Approved/]
+        approval_count = partial[/\d\d*/]
+        new_approvals[current_pr] = approval_count
+      end
+
+      approvals[current_pr]
+      new_statuses[current_pr] = new_status
+      current_pr = nil
+    end
+
+    break if line.match?(/^\s*$/)
+  end
+
+  status_changed = new_statuses.any?{ |pr,new_status| prs[pr] != new_status }
+  approvals_changed = new_approvals.any?{|pr,new_approval_count| approvals[pr] != new_approval_count }
+  puts(
+    prs:,
+    status_changed:,
+    approvals_changed:,
+  )
+
+  if status_changed || approvals_changed
+    puts
+  end
+
+  new_approvals.each do |current_pr, new_approval|
+    old_approval = approvals[current_pr]
+    title = pr_titles[current_pr]
+    if old_approval.nil? || old_approval != new_approval
+      if options[:notify_approvals]
+        if old_approval
+          system('pr_approved', current_pr, title, new_approval, old_approval)
+        else
+          system('pr_approved', current_pr, title, new_approval)
+        end
+      end
+      puts format('%7s (approvals: %s): https://github.com/instacart/carrot/pull/%s', current_pr, new_approval, current_pr)
+    end
+  end
+
+  new_statuses.each do |current_pr, new_status|
+    old_status = prs[current_pr]
+    title = pr_titles[current_pr]
+    puts format('%7s (status: %s => %s): https://github.com/instacart/carrot/pull/%s', current_pr, old_status, new_status, current_pr)
+    if prs.key?(current_pr) && old_status != new_status
+      if options[:notify_status]
+        case new_status
+        when /passing/
+          system('pr_passing', current_pr, title, old_status)
+        when /failing/
+          system('pr_failing', current_pr, title, old_status)
+        when /pending/
+          system('pr_pending', current_pr, title, old_status)
+        end
+      end
+
+      if new_status[/passing/]
+        if options[:mark_ready]
+          if options[:notify_publishing]
+            system('pr_publishing', current_pr, title)
+          end
+          system('gh', 'pr', 'ready', current_pr)
+        end
+        system('gh', 'pr', 'view', '-w', current_pr)
+      end
+
+      puts format('%7s (%s): https://github.com/instacart/carrot/pull/%s', current_pr, new_status, current_pr)
+    end
+  end
+
+  prs = new_statuses
+  approvals = new_approvals
+
+  sleep SLEEP_TIME
+end

data/lib/hiiro/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.225
+  version: 0.1.227
 platform: ruby
 authors:
 - Joshua Toyota
@@ -112,6 +112,7 @@ files:
 - bin/h-pgsync
 - bin/h-plugin
 - bin/h-pr
+- bin/h-pr-monitor
 - bin/h-project
 - bin/h-session
 - bin/h-sha