hiiro 0.1.24 → 0.1.25

data/bin/h-note

@@ -0,0 +1,119 @@
+#!/usr/bin/env ruby
+
+require "hiiro"
+require "open3"
+require "pathname"
+require "tmpdir"
+
+hiiro = Hiiro.init(*ARGV)
+
+# Helper class for directory operations
+class Directory
+  # Temporarily change to a directory, run block, then change back
+  def self.temp_cd(dir, &block)
+    original_dir = Dir.pwd
+    Dir.chdir(dir)
+    yield
+  ensure
+    Dir.chdir(original_dir)
+  end
+
+  # Print directory tree with indentation
+  def self.dir_tree(dir, prefix = "", base_dir = nil)
+    base_dir ||= dir
+    entries = Dir.entries(dir).reject { |e| e.start_with?('.') }.sort
+
+    entries.each do |entry|
+      path = File.join(dir, entry)
+      relative_path = Pathname.new(path).relative_path_from(base_dir)
+
+      if File.directory?(path)
+        puts "#{prefix}#{entry}/"
+        dir_tree(path, prefix + "  ", base_dir)
+      else
+        puts "#{prefix}#{relative_path}"
+      end
+    end
+  end
+end
+
+notes_dir = ENV['NOTES_DIR'] || File.join(Dir.home, 'notes')
+
+hiiro.add_subcmd(:edit) { |*args|
+  system(ENV['EDITOR'] || 'nvim', __FILE__)
+}
+
+hiiro.add_subcmd(:new) { |*args|
+  unless Dir.exist?(notes_dir)
+    Dir.mkdir(notes_dir)
+  end
+
+  Directory.temp_cd(notes_dir) {
+    system(ENV['EDITOR'] || 'vim', '-O', *args)
+  }
+}
+
+hiiro.add_subcmd(:categories) { |*args|
+  unless Dir.exist?(notes_dir)
+    Dir.mkdir(notes_dir)
+  end
+
+  Directory.temp_cd(notes_dir) {
+    Directory.dir_tree(notes_dir)
+  }
+}
+
+hiiro.add_subcmd(:tagged_files) { |*args|
+  unless Dir.exist?(notes_dir)
+    Dir.mkdir(notes_dir)
+  end
+
+  Directory.temp_cd(notes_dir) {
+    args.each do |tag|
+      tag = tag.sub(/^#+/, '')
+      tag_pattern = format('#%s\\b', tag)
+      cmd = format('rg -S %s %s', tag_pattern.inspect, notes_dir)
+      out, err, status = Open3.capture3(cmd)
+
+      if status.success?
+        puts format('#%s', tag)
+        puts format('#%s', tag).gsub(/./, ?-)
+        out.lines.each do |line|
+          file = line.sub(/:.*/, '')
+          puts Pathname.new(file).relative_path_from(notes_dir)
+        end
+      end
+
+      puts
+    end
+  }
+}
+
+hiiro.add_subcmd(:ls) { |*args|
+  unless Dir.exist?(notes_dir)
+    Dir.mkdir(notes_dir)
+  end
+
+  Directory.temp_cd(notes_dir) {
+    Dir.glob('**/*').each(&method(:puts))
+  }
+}
+
+hiiro.add_subcmd(:tags) { |*args|
+  unless Dir.exist?(notes_dir)
+    Dir.mkdir(notes_dir)
+  end
+
+  Directory.temp_cd(notes_dir) {
+    tag_pattern = '#[^#[:space:]]+'
+    cmd = format('rg -SI %s %s', tag_pattern.inspect, notes_dir)
+    out, err, status = Open3.capture3(cmd)
+
+    if status.success?
+      puts out.scan(Regexp.new(tag_pattern)).sort.uniq
+    end
+  }
+}
+
+hiiro.run
+

data/bin/h-plugin

@@ -2,7 +2,7 @@
 
 require 'json'
 
-load File.join(Dir.home, 'bin', 'h')
+require 'hiiro'
 
 BASE_DIR = File.join(Dir.home, '.config/hiiro/plugins')
 o = Hiiro.init(*ARGV, plugins: [Tmux, Pins], dir: BASE_DIR)

data/bin/h-pr

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
 require "hiiro"
+require "time"
 require "fileutils"
 require "yaml"
 require "json"
 
 Hiiro.load_env
-hiiro = Hiiro.init(*ARGV, plugins: [Task])
+hiiro = Hiiro.init(*ARGV, plugins: [Task, Tmux, Pins])
 
 class PRManager
   attr_reader :hiiro
@@ -243,8 +244,77 @@ class PRManager
   end
 end
 
+WATCH_BLOCK = lambda { |original_pr_number=nil, *args|
+  watch = hiiro.get_value(:watch)
+  fail_fast = hiiro.get_value(:fail_fast)
+
+  pr_valid = false
+  pr_number = nil
+  if !original_pr_number.nil? && pin_value = hiiro.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) }
@@ -252,6 +322,6 @@ 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.add_default { manager.help }
 
 hiiro.run

data/bin/h-pr-monitor

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+h-watchprs

data/bin/h-pr-watch

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+h-watchprs

data/bin/h-project

@@ -0,0 +1,173 @@
+#!/usr/bin/env ruby
+
+require "hiiro"
+
+o = Hiiro.init(*ARGV)
+
+# Helper to start or attach to a tmux session
+def start_tmux_session(session_name)
+  session_name = session_name.to_s
+
+  unless system('tmux', 'has-session', '-t', session_name)
+    system('tmux', 'new', '-d', '-A', '-s', session_name)
+  end
+
+  if ENV['TMUX']
+    system('tmux', 'switchc', '-t', session_name)
+  elsif ENV['NVIM']
+    puts "Can't attach to tmux inside a vim terminal"
+  else
+    system('tmux', 'new', '-A', '-s', session_name)
+  end
+end
+
+# Get project directories from ~/proj/
+def project_dirs
+  Dir.glob(File.join(Dir.home, 'proj', '*/')).map { |path|
+    [File.basename(path), path]
+  }.to_h
+end
+
+# Get projects from config file
+def projects_from_config
+  projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
+
+  return {} unless File.exist?(projects_file)
+
+  require 'yaml'
+  YAML.safe_load_file(projects_file)
+end
+
+# === OPEN PROJECT (default) ===
+
+o.add_subcmd(:open) { |project_name|
+  re = /#{project_name}/i
+
+  conf_matches = (projects_from_config || {}).select { |k, v| k.match?(re) }
+  dir_matches = (project_dirs || {}).select { |proj, path| proj.match?(re) }
+
+  matches = dir_matches.merge(conf_matches)
+  if matches.count > 1
+    matches = matches.select { |name, path| name == project_name }
+  end
+
+  case matches.count
+  when 0
+    name = 'proj'
+    path = File.join(Dir.home, 'proj')
+
+    unless Dir.exist?(path)
+      puts "Error: #{path.inspect} does not exist"
+      exit 1
+    end
+
+    puts "changing dir: #{path}"
+    Dir.chdir(path)
+
+    start_tmux_session(name)
+  when 1
+    name, path = matches.first
+
+    puts "changing dir: #{path}"
+    Dir.chdir(path)
+
+    start_tmux_session(name)
+  when (2..)
+    puts "ERROR: Multiple matches found"
+    puts
+    puts "Matches:"
+    matches.each { |name, path|
+      puts format("  %s: %s", name, path)
+    }
+  end
+}
+
+# === LIST PROJECTS ===
+
+o.add_subcmd(:list) { |*args|
+  dirs = project_dirs
+  conf = projects_from_config
+
+  all_projects = dirs.merge(conf)
+
+  puts "Projects:"
+  puts
+  all_projects.keys.sort.each do |name|
+    path = all_projects[name]
+    source = conf.key?(name) ? '[config]' : '[dir]'
+    puts format("  %-12s %-8s %s", name, source, path)
+  end
+}
+
+o.add_subcmd(:ls) { |*args|
+  o.run_subcmd(:list, *args)
+}
+
+# === SHOW CONFIG FILE ===
+
+o.add_subcmd(:config) { |*args|
+  projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
+
+  if File.exist?(projects_file)
+    puts File.read(projects_file)
+  else
+    puts "No config file found at: #{projects_file}"
+    puts
+    puts "Create it with YAML format:"
+    puts "  project_name: /path/to/project"
+  end
+}
+
+# === EDIT CONFIG FILE ===
+
+o.add_subcmd(:edit) { |*args|
+  projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
+  editor = ENV['EDITOR'] || 'vim'
+
+  # Create config dir if needed
+  config_dir = File.dirname(projects_file)
+  Dir.mkdir(config_dir) unless Dir.exist?(config_dir)
+
+  # Create empty file if it doesn't exist
+  unless File.exist?(projects_file)
+    File.write(projects_file, "# Project aliases\n# project_name: /path/to/project\n")
+  end
+
+  exec(editor, projects_file)
+}
+
+# === HELP ===
+
+o.add_subcmd(:help) { |*args|
+  puts <<~HELP
+    h-project - Project directory and tmux session manager
+
+    USAGE:
+      h-project <project_name>        Open project (fuzzy match) and start tmux session
+      h-project open <project_name>   Same as above
+      h-project list                  List all known projects
+      h-project ls                    Alias for list
+      h-project config                Show config file contents
+      h-project edit                  Edit config file
+
+    SOURCES:
+      Projects are discovered from two sources:
+      1. Directories in ~/proj/
+      2. Entries in ~/.config/hiiro/projects.yml
+
+    CONFIG FORMAT (projects.yml):
+      project_name: /path/to/project
+      another: /some/other/path
+
+    MATCHING:
+      Project names are matched using regex (case insensitive).
+      If multiple matches are found, an exact match is preferred.
+      If still ambiguous, all matches are displayed.
+  HELP
+}
+
+if o.runnable?
+  o.run
+else
+  o.run_subcmd(:help)
+end

data/bin/h-runtask

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+stamp="$(date +"%Y%m%d%H%M%S")"
+logfile="tmp/run-task.$stamp"
+task_logfile="tmp/run-task.status.$stamp"
+# task_name="generate-sso-config.retailers-domain.customers-backend.customers"
+task_name="generate-sso-config.partners-domain.customers-backend.customers"
+full_sha="$(git log -1 | head -1 | sed 's/commit //;s/[[:space:]].*//')"
+sha="$(echo -n "$full_sha" | sed 's/\(.......\).*/\1/')"
+trusted=${2:-false}
+method_choice=${1:-id}
+
+if test $method_choice = "id"
+then
+  trusted=false
+  SSO_CONFIG="{\"retailer_name\":\"Joshtestidtoken\",\"method_choice\":\"id_token\",\"client_id\":\"updated client id\",\"popup\":true,\"trusted\":${trusted},\"scope\":\"default\",\"activation_status\":\"active\",\"store_config_id\":1459,\"code_challenge_method\":\"S256\",\"user_info_mapping\":{\"provider_uid\":\"sub\",\"first_name\":\"user_first_name\",\"last_name\":\"user_last_name\",\"email\":\"email\",\"phone\":\"default\",\"membership_number\":\"rewards_number\"},\"token_endpoint\":\"http://example.com/token\",\"authorization_endpoint\":\"http://example.com/authorization\",\"logout_endpoint\":\"http://example.com/logout\"}"
+else
+  SSO_CONFIG="{\"retailer_name\":\"Joshuitest\",\"method_choice\":\"userinfo endpoint\",\"client_id\":\"updated client id\",\"popup\":true,\"trusted\":${trusted},\"scope\":\"default\",\"activation_status\":\"active\",\"store_config_id\":1459,\"code_challenge_method\":\"S256\",\"user_info_mapping\":{\"provider_uid\":\"sub\",\"first_name\":\"user_first_name\",\"last_name\":\"user_last_name\",\"email\":\"email\",\"phone\":\"default\",\"membership_number\":\"rewards_number\"},\"token_endpoint\":\"http://example.com/token\",\"authorization_endpoint\":\"http://example.com/authorization\",\"logout_endpoint\":\"http://example.com/logout\",\"user_info_endpoint\":\"http://example.com/user_info\"}"
+fi
+
+echo "stamp: $stamp"
+echo "logfile: $logfile"
+echo "task_name: $task_name"
+echo "full_sha: $full_sha"
+echo "sha: $sha"
+echo "trusted: $trusted"
+echo "method_choice: $method_choice"
+echo "SSO_CONFIG: $SSO_CONFIG"
+echo
+echo "$SSO_CONFIG" | jq
+
+mkdir -pv tmp
+
+if test -f tmp/run-task
+then
+  mv -v tmp/run-task "$logfile"
+fi
+
+if ! test -f $logfile
+then
+  isc task -e production run $task_name $full_sha --command 'bundle exec rake partners_domain:sso_config:generate' --conf "SSO_CONFIG=${SSO_CONFIG}" | tee $logfile
+fi
+
+uuid="$(egrep -o '\b[0-9a-f-]{36}\b' $logfile | head -1)"
+
+
+echo
+echo "UUID: $uuid"
+echo
+
+while true
+do
+  sleep 5
+  clear
+  isc -e production task runs "$task_name" "$uuid" | tee $task_logfile
+  echo
+  egrep 'Status: (pending|in-progress)' $task_logfile || break
+done
+
+log_url="$(egrep -o 'Datadog Logs:.*' $task_logfile | sed 's/Datadog Logs: //')"
+
+if [[ ! -z $log_url ]]
+then
+  open "$log_url"
+fi
+
+if egrep 'Status: failed' $task_logfile
+then
+  say "task failed"
+else
+  if egrep 'Status: succe' $task_logfile
+  then
+    say "task successful"
+  fi
+fi
+
+echo
+rm -v $logfile $task_logfile
+

data/bin/h-serve

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+system('miniserve', '-p', '1111')
+

data/bin/h-session

@@ -1,6 +1,26 @@
 #!/usr/bin/env ruby
 
-load File.join(Dir.home, 'bin', 'h')
+require 'hiiro'
+require 'pry'
+require 'rspec'
+
+# $> h session
+#
+#  Subcommand required!
+#
+#  Possible subcommands:
+#    pin       (subcommand)  /Users/unixsuperhero/.config/hiiro/plugins/pins.rb:12
+#    edit      (subcommand)  /Users/unixsuperhero/.rbenv/versions/3.1.2/lib/ruby/gems/3.1.0/gems/hiiro-0.1.8/lib/hiiro.rb:14
+#    ses       (subcommand)  /Users/unixsuperhero/bin/h-session:99
+#    ls        (subcommand)  /Users/unixsuperhero/bin/h-session:111
+#    new       (subcommand)  /Users/unixsuperhero/bin/h-session:115
+#    kill      (subcommand)  /Users/unixsuperhero/bin/h-session:119
+#    attach    (subcommand)  /Users/unixsuperhero/bin/h-session:123
+#    rename    (subcommand)  /Users/unixsuperhero/bin/h-session:127
+#    switch    (subcommand)  /Users/unixsuperhero/bin/h-session:131
+#    detach    (subcommand)  /Users/unixsuperhero/bin/h-session:135
+#    has       (subcommand)  /Users/unixsuperhero/bin/h-session:139
+#    info      (subcommand)  /Users/unixsuperhero/bin/h-session:143
 
 o = Hiiro.init(*ARGV, plugins: [Pins])
 

data/bin/h-sha

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+BASE_DIR = File.join(Dir.home, 'work/carrot')
+
+Hiiro.init(*ARGV, plugins: [Tmux, Pins, Project]) { |hiiro|
+
+}.run
+

data/bin/h-subtask

@@ -5,6 +5,7 @@
 require "hiiro"
 require "fileutils"
 require "yaml"
+require "time"
 
 Hiiro.load_env
 hiiro = Hiiro.init(*ARGV, plugins: [Tmux, Task])
@@ -16,6 +17,6 @@ hiiro.add_subcmd(:ls) { tasks.list_subtasks }
 hiiro.add_subcmd(:new) { |subtask_name| tasks.new_subtask(subtask_name) }
 hiiro.add_subcmd(:switch) { |subtask_name| tasks.switch_subtask(subtask_name) }
 
-hiiro.add_default { tasks.subtask_help }
+# hiiro.add_default { tasks.subtask_help }
 
 hiiro.run

data/bin/h-task

@@ -3,6 +3,7 @@
 require "hiiro"
 require "fileutils"
 require "yaml"
+require "pathname"
 
 Hiiro.load_env
 hiiro = Hiiro.init(*ARGV, plugins: [Tmux])
@@ -20,7 +21,7 @@ class TaskManager
     puts "Subcommands:"
     puts "  list, ls              List all worktrees and their active tasks"
     puts "  start TASK [APP]      Start a task (reuses available worktree or creates new)"
-    puts "  switch TASK           Switch to an existing task"
+    puts "  switch [TASK]         Switch to an existing task (interactive if no task given)"
     puts "  app APP_NAME          Open a tmux window for an app in current worktree"
     puts "  apps                  List configured apps from apps.yml"
     puts "  save                  Save current tmux session info for this task"
@@ -42,17 +43,37 @@ class TaskManager
 
     current = current_task
     active, available = trees.partition { |tree_name| task_for_tree(tree_name) }
+    sessions = tmux_sessions
 
     active.each do |tree_name|
       task = task_for_tree(tree_name)
       marker = (current && current[:tree] == tree_name) ? "*" : " "
-      puts format("%s %-20s => %s", marker, tree_name, task)
+
+      # Check if there's a tmux session for this task
+      session_name = session_name_for(task)
+      has_session = sessions.include?(session_name)
+      session_marker = has_session ? "+" : " "
+      session_info = has_session ? " (#{session_name})" : ""
+
+      puts format("%s%s %-20s => %s%s", marker, session_marker, tree_name, task, session_info)
     end
 
     puts if active.any? && available.any?
 
     available.each do |tree_name|
-      puts format("  %-20s    (available)", tree_name)
+      puts format("   %-20s    (available)", tree_name)
+    end
+
+    # List tmux sessions without associated tasks
+    associated_sessions = active.map { |tree_name| session_name_for(task_for_tree(tree_name)) }
+    unassociated_sessions = sessions - associated_sessions
+
+    if unassociated_sessions.any?
+      puts
+      puts "Tmux sessions without tasks:"
+      unassociated_sessions.each do |session|
+        puts format("  %s", session)
+      end
     end
   end
 
@@ -136,7 +157,13 @@ class TaskManager
   end
 
   # Start working on a task
-  def switch_task(task_name)
+  def switch_task(task_name = nil)
+    # If no task name provided, use interactive selection
+    if task_name.nil? || task_name.empty?
+      task_name = select_task_interactive
+      return false unless task_name
+    end
+
     tree, task = assignments.find { |tree, task| task.start_with?(task_name) } || []
 
     unless task
@@ -150,6 +177,34 @@ class TaskManager
     true
   end
 
+  # Interactive task selection using sk
+  def select_task_interactive
+    active_tasks = trees.select { |tree_name| task_for_tree(tree_name) }
+
+    if active_tasks.empty?
+      puts "No active tasks found."
+      return nil
+    end
+
+    # Build selection lines
+    lines = active_tasks.map do |tree_name|
+      task = task_for_tree(tree_name)
+      "#{tree_name.ljust(20)} => #{task}"
+    end
+
+    require 'open3'
+    selected, status = Open3.capture2('sk', stdin_data: lines.join("\n"))
+
+    if status.success? && !selected.strip.empty?
+      # Parse the selected line to extract the task name
+      if selected =~ /=>\s*(\S+)/
+        return $1
+      end
+    end
+
+    nil
+  end
+
   # Open an app window within the current tree
   def open_app(app_name)
     current = current_task
@@ -337,7 +392,8 @@ class TaskManager
       puts printable_apps.keys.sort.map{|k| format("%#{longest_app_name}s => %s", k, printable_apps[k]) }
       exit 1
     when 1
-      print File.join(tree_root, apps_config[matching_apps.first])
+      pwd_to_root = Pathname.new(tree_root).relative_path_from(Pathname.pwd)
+      print File.join(pwd_to_root, apps_config[matching_apps.first])
       exit 0
     else
       puts "Multiple matches found:"
@@ -623,6 +679,13 @@ class TaskManager
       { 'index' => idx, 'name' => name, 'path' => path }
     }
   end
+
+  # Get all tmux sessions
+  def tmux_sessions
+    output = `tmux list-sessions -F '\#{session_name}' 2>/dev/null`
+    return [] unless $?.success?
+    output.lines.map(&:strip)
+  end
 end
 
 # Create task manager instance
@@ -633,7 +696,7 @@ hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
 hiiro.add_subcmd(:list) { tasks.list_trees }
 hiiro.add_subcmd(:ls) { tasks.list_trees }
 hiiro.add_subcmd(:start) { |task_name, app=nil| tasks.start_task(task_name, app: app) }
-hiiro.add_subcmd(:switch) { |task_name| tasks.switch_task(task_name) }
+hiiro.add_subcmd(:switch) { |task_name=nil| tasks.switch_task(task_name) }
 hiiro.add_subcmd(:app) { |app_name| tasks.open_app(app_name) }
 hiiro.add_subcmd(:path) { |app_name=nil, task=nil| tasks.app_path(app_name, task: task) }
 hiiro.add_subcmd(:cd) { |*args| tasks.cd_app(*args) }