hiiro 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a46d6691bc65a663bdbcb63dfe0fe6643572ee377c5f1448bbd34a5e9efe3f1
-  data.tar.gz: 2edd95e23a40d0910b88c0844e70f7839da22dbce3f86c2f2518b238abf68706
+  metadata.gz: f5855f3252099301231f987ede7f80a670e1684b5173b196f2578626dca25de1
+  data.tar.gz: a4a4809a5448317290336b03f5f49786cc10d402e85529a15c34913419f07cdb
 SHA512:
-  metadata.gz: 8d402b962e9e2c51870a586a8f83ea0209b43109b92135d468ac33336d15e37e882b564a1848e1c8efcf0fd6acf1739d6b356a8cf06bfc7069ea1f251457f280
-  data.tar.gz: df17f16075ceff456b6ee512424b962f207a25b72a1eaa2867fabbccaf91a64a9c015bdb5706f0a37bce3882d7c6ec927e0325984bfebc5828f6810a03562092
+  metadata.gz: 4b061b0524532726d82d09652d700e09bbdf72b9bded349907b1da7a4990f63edf827bd55ed6288de9aa7bac1af1cdc5d023bc14ea386d0514107885921f5bfe
+  data.tar.gz: d611d34f3cceda9ab8a16b70dc1921fbc4575214b531af702bc0ab20eb6c3c6b5dac6cfe29bd272bbddd8c9ea670f48ddfc2402f63619caa9299c065383c81e4

data/bin/g-pr

@@ -0,0 +1,327 @@
+#!/usr/bin/env ruby
+
+require "hiiro"
+require "time"
+require "fileutils"
+require "yaml"
+require "json"
+
+Hiiro.load_env
+hiiro = Hiiro.init(*ARGV, plugins: [Task, Tmux, Pins])
+
+class PRManager
+  attr_reader :hiiro
+
+  def initialize(hiiro)
+    @hiiro = hiiro
+  end
+
+  def help
+    puts "Usage: h pr <subcommand> [args]"
+    puts
+    puts "Subcommands:"
+    puts "  save [PR_NUMBER]      Record PR for this task (auto-detects if omitted)"
+    puts "  history               List PR history (oldest to newest)"
+    puts "  history --worktree=X  Filter by worktree"
+    puts "  history --task=X      Filter by task"
+    puts "  history --session=X   Filter by tmux session"
+    puts "  current               Show current branch's PR info"
+    puts "  open [PR_NUMBER]      Open PR in browser"
+    puts "  view [PR_NUMBER]      View PR details in terminal"
+  end
+
+  def save(pr_number = nil)
+    pr_info = fetch_pr_info(pr_number)
+    unless pr_info
+      puts "ERROR: Could not find PR"
+      puts "Make sure you have the gh CLI installed and authenticated."
+      return false
+    end
+
+    entry = build_entry(pr_info)
+    unless entry[:task]
+      puts "WARNING: Not in a task session, saving without task info"
+    end
+
+    data = load_data
+    data['prs'] ||= []
+
+    # Check if this PR is already recorded for this task
+    existing = data['prs'].find do |p|
+      p['number'] == pr_info['number'] && p['task'] == entry[:task]
+    end
+
+    if existing
+      # Update existing entry
+      existing.merge!(entry.transform_keys(&:to_s))
+      existing['updated_at'] = Time.now.iso8601
+      puts "Updated PR ##{pr_info['number']} for task '#{entry[:task]}'"
+    else
+      # Add new entry
+      data['prs'] << entry.transform_keys(&:to_s).merge('created_at' => Time.now.iso8601)
+      puts "Saved PR ##{pr_info['number']} for task '#{entry[:task]}'"
+    end
+
+    save_data(data)
+    show_entry(entry)
+    true
+  end
+
+  def history(args = [])
+    filters = parse_filters(args)
+    data = load_data
+    prs = data['prs'] || []
+
+    if prs.empty?
+      puts "No PRs recorded."
+      puts "Use 'h pr save' to record the current PR."
+      return
+    end
+
+    # Apply filters
+    prs = filter_entries(prs, filters)
+
+    if prs.empty?
+      puts "No PRs match the given filters."
+      return
+    end
+
+    # Sort by created_at (oldest first)
+    prs = prs.sort_by { |p| p['created_at'] || '' }
+
+    puts "PR history (oldest to newest):"
+    puts
+    prs.each_with_index do |pr, idx|
+      puts format_entry(pr, idx + 1)
+    end
+  end
+
+  def current
+    pr_info = fetch_pr_info
+    unless pr_info
+      puts "No PR found for current branch."
+      puts "Create one with 'gh pr create' or specify a PR number."
+      return false
+    end
+
+    entry = build_entry(pr_info)
+    puts "Current PR info:"
+    puts
+    show_entry(entry)
+  end
+
+  def open(pr_number = nil)
+    if pr_number
+      system('gh', 'pr', 'view', pr_number.to_s, '--web')
+    else
+      system('gh', 'pr', 'view', '--web')
+    end
+  end
+
+  def view(pr_number = nil)
+    if pr_number
+      system('gh', 'pr', 'view', pr_number.to_s)
+    else
+      system('gh', 'pr', 'view')
+    end
+  end
+
+  private
+
+  def fetch_pr_info(pr_number = nil)
+    cmd = if pr_number
+      ['gh', 'pr', 'view', pr_number.to_s, '--json', 'number,title,url,headRefName,state']
+    else
+      ['gh', 'pr', 'view', '--json', 'number,title,url,headRefName,state']
+    end
+
+    output = `#{cmd.join(' ')} 2>/dev/null`
+    return nil if output.empty?
+
+    JSON.parse(output)
+  rescue JSON::ParserError
+    nil
+  end
+
+  def build_entry(pr_info)
+    task_info = hiiro.task_manager.send(:current_task)
+    tmux_info = capture_tmux_info
+
+    {
+      number: pr_info['number'],
+      title: pr_info['title'],
+      url: pr_info['url'],
+      branch: pr_info['headRefName'],
+      state: pr_info['state'],
+      worktree: task_info&.[](:tree),
+      task: task_info&.[](:task),
+      tmux: tmux_info
+    }
+  end
+
+  def capture_tmux_info
+    return nil unless ENV['TMUX']
+
+    {
+      'session' => `tmux display-message -p '#S'`.strip,
+      'window' => `tmux display-message -p '#W'`.strip,
+      'pane' => ENV['TMUX_PANE']
+    }
+  end
+
+  def parse_filters(args)
+    filters = {}
+    args.each do |arg|
+      case arg
+      when /^--worktree=(.+)$/
+        filters[:worktree] = $1
+      when /^--task=(.+)$/
+        filters[:task] = $1
+      when /^--session=(.+)$/
+        filters[:session] = $1
+      when /^-w(.+)$/
+        filters[:worktree] = $1
+      when /^-t(.+)$/
+        filters[:task] = $1
+      when /^-s(.+)$/
+        filters[:session] = $1
+      end
+    end
+    filters
+  end
+
+  def filter_entries(entries, filters)
+    entries.select do |entry|
+      next false if filters[:worktree] && !entry['worktree']&.include?(filters[:worktree])
+      next false if filters[:task] && !entry['task']&.include?(filters[:task])
+      next false if filters[:session] && entry.dig('tmux', 'session') != filters[:session]
+      true
+    end
+  end
+
+  def format_entry(entry, num)
+    lines = []
+    lines << "#{num}. PR ##{entry['number']}: #{entry['title']}"
+    lines << "   Branch: #{entry['branch']}"
+    lines << "   State: #{entry['state']}"
+    lines << "   Task: #{entry['task'] || '(none)'}"
+    lines << "   Worktree: #{entry['worktree'] || '(none)'}"
+    if entry['tmux']
+      lines << "   Tmux: #{entry['tmux']['session']}/#{entry['tmux']['window']}"
+    end
+    lines << "   Created: #{entry['created_at']}"
+    lines << "   URL: #{entry['url']}"
+    lines.join("\n")
+  end
+
+  def show_entry(entry)
+    puts "  PR: ##{entry[:number]}"
+    puts "  Title: #{entry[:title]}"
+    puts "  Branch: #{entry[:branch]}"
+    puts "  State: #{entry[:state]}"
+    puts "  URL: #{entry[:url]}"
+    puts "  Task: #{entry[:task] || '(none)'}"
+    puts "  Worktree: #{entry[:worktree] || '(none)'}"
+    if entry[:tmux]
+      puts "  Tmux session: #{entry[:tmux]['session']}"
+      puts "  Tmux window: #{entry[:tmux]['window']}"
+      puts "  Tmux pane: #{entry[:tmux]['pane']}"
+    end
+  end
+
+  def data_file
+    File.join(Dir.home, '.config', 'hiiro', 'prs.yml')
+  end
+
+  def load_data
+    return {} unless File.exist?(data_file)
+    YAML.safe_load_file(data_file) || {}
+  end
+
+  def save_data(data)
+    FileUtils.mkdir_p(File.dirname(data_file))
+    File.write(data_file, YAML.dump(data))
+  end
+end
+
+WATCH_BLOCK = lambda { |original_pr_number=nil, *args|
+  watch = o.get_value(:watch)
+  fail_fast = o.get_value(:fail_fast)
+
+  pr_valid = false
+  pr_number = nil
+  if !original_pr_number.nil? && pin_value = o.pins.get(original_pr_number)
+    pr_valid = true
+    pr_number = pin_value
+  end
+
+  pr_args = [pr_valid ? pr_number : original_pr_number].compact
+  args = [*pr_args, *args]
+
+  base_cmd = %w[gh pr checks]
+  base_cmd << '--watch' if watch
+  base_cmd << '--fail-fast' if fail_fast
+
+  command = [
+    *base_cmd,
+    *args,
+  ]
+
+  puts command: command, base_cmd: base_cmd, args: args;
+
+  result = system(*command)
+
+  pr_info = JSON.parse(`gh pr view #{pr_args.first} --json url,number,title`)
+  pr_url = pr_info['url']
+  pr_number = pr_info['number']
+  pr_title = pr_info['title']
+
+  if result
+    system('say', 'pr good')
+    system('terminal-notifier', '-title', 'PR Good', '-message', "##{pr_number}: #{pr_title}", '-open', pr_url)
+  else
+    system('say', 'pr bad')
+    system('terminal-notifier', '-title', 'PR Bad', '-message', "##{pr_number}: #{pr_title}", '-open', pr_url)
+  end
+}
+
+manager = PRManager.new(hiiro)
+
+hiiro.add_subcmd(:check, &WATCH_BLOCK)
+hiiro.add_subcmd(:watch, watch: true, &WATCH_BLOCK)
+hiiro.add_subcmd(:fwatch, watch: true, fail_fast: true, &WATCH_BLOCK)
+
+hiiro.add_subcmd(:number) { |*args|
+  stdout = `gh pr view`
+
+  number = stdout[/number:\s*(\d+)/, 1]
+
+  if number
+    print number
+  else
+    puts stdout
+  end
+}
+
+hiiro.add_subcmd(:link) { |*args|
+  stdout = `gh pr view`
+
+  number = stdout[/number:\s*(\d+)/, 1]
+
+  if number
+    print ['https://github.com/instacart/carrot/pull/', number].join
+  else
+    puts stdout
+  end
+}
+
+hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
+hiiro.add_subcmd(:save) { |pr_number=nil| manager.save(pr_number) }
+hiiro.add_subcmd(:history) { |*args| manager.history(args) }
+hiiro.add_subcmd(:current) { manager.current }
+hiiro.add_subcmd(:open) { |pr_number=nil| manager.open(pr_number) }
+hiiro.add_subcmd(:view) { |pr_number=nil| manager.view(pr_number) }
+
+hiiro.add_default { manager.help }
+
+hiiro.run

data/bin/h-branch

@@ -207,6 +207,24 @@ hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
 hiiro.add_subcmd(:save) { manager.save }
 hiiro.add_subcmd(:history) { |*args| manager.history(args) }
 hiiro.add_subcmd(:current) { manager.current }
+hiiro.add_subcmd(:select) do |*args|
+  branches = `git branch -i --sort=authordate`.lines(chomp: true)
+
+  lines = branches.each_with_object({}) do |ln,h|
+    h[ln] = ln.sub(/../, '')
+  end
+
+  if args.any?
+    lines = hash_matches?(lines, *args)
+  end
+
+  require 'open3'
+  selected, status = Open3.capture2('sk', '--no-sort', '--tac', stdin_data: lines.keys.join("\n"))
+
+  if status.success? && !selected.strip.empty?
+    puts lines[selected.chomp]
+  end
+end
 
 hiiro.add_default { manager.help }
 

data/bin/h-dot

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+hiiro = Hiiro.init(*ARGV)
+
+hiiro.add_subcmd(:compare) do |*args|
+  left = File.join(Dir.home, 'proj/home/bin')
+  right = File.join(Dir.home, 'bin')
+  diff = `diff -qrs #{left} #{right}`.lines(chomp: true)
+
+  diff.each do |line|
+    next if line.match?(/[.]DS_Store/)
+
+    case line
+    when /^Only in #{left}:/
+      match = line.match(/^Only in ([^:]+):\s*(\S.*)/)
+      _, fname = match.captures
+      puts "ln -v #{File.join(left, fname).inspect} #{File.join(right, fname).inspect}"
+    when /^Only in #{right}:/
+      match = line.match(/^Only in ([^:]+):\s*(\S.*)/)
+      _, fname = match.captures
+      puts "ln -v #{File.join(right, fname).inspect} #{File.join(left, fname).inspect}"
+    when / differ/
+      match = line.match(/^Files (.*) and (.*) differ/)
+      lname, rname = match.captures
+      puts "vim -d #{lname.inspect} #{rname.inspect}"
+    end
+    puts
+  end
+end
+
+
+hiiro.run
+

data/bin/h-dotfiles

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+EDITOR = ENV.fetch('EDITOR', 'nvim')
+BASE_DIR = File.join(Dir.home, 'proj', '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|
+  system(EDITOR, *args)
+}
+
+if o.runnable?
+  o.run
+else
+  puts :no_runnable_found
+end
+

data/bin/h-home

@@ -0,0 +1,62 @@
+#!/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
+