hiiro 0.1.47 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1ea1add31307647c6784fda9c3281c244e6116ec2d11424c5c4adf14f4282d4
-  data.tar.gz: 7969d6fc61a6ffd64f117461d1ffccecf8f1078d85ca02251866047c5db0ed04
+  metadata.gz: ca5fd8cc7a86be8ac4dca336cc5283ce37eb788eb9d31bb1721ee6cdf339b40d
+  data.tar.gz: 8d781bbe42948a4a3143c23e2e560dbe6e756a8b6a40080810e458a12a2c2e43
 SHA512:
-  metadata.gz: 0fc94013ef9991b0c74dd40dd4286e4807de5dc78a31e40ffc64e6545d1f558e5a42f6d7f1f507544766df974979cb4e1d5902de4565503d407eec586af4492c
-  data.tar.gz: 8b8d905567c2936c339be5c3f6b6ddf01e0a38ace229d2a7f1cc00fa231e09656b715ef4d0cf9b30ad82ff115fd592286abf7087877c486358533f53eaf50dfb
+  metadata.gz: 36f287505cae5cf1dab0d39657c4ee2a3718e058298975843ef6e173a09070827c22320216d22b744a3858885dab49d527242f53767f4e498f1195a91b7c8f5b
+  data.tar.gz: 721e1a27f2de6207743e70aefbafa32d22724f4eb3d13af99a6bd9937ebf0306ea300cf15d4a2dffd253c528ec00d2a7dd0bf7b950c5b61c7de48b83662f3b89

data/bin/h-branch

@@ -5,7 +5,7 @@ require "fileutils"
 require "yaml"
 
 Hiiro.load_env
-hiiro = Hiiro.init(*ARGV, plugins: [OldTask])
+hiiro = Hiiro.init(*ARGV, plugins: [Tasks])
 
 class BranchManager
   attr_reader :hiiro
@@ -112,13 +112,13 @@ class BranchManager
   end
 
   def build_entry(branch_name)
-    task_info = hiiro.task_manager.send(:current_task)
+    current_task = Environment.current.task
     tmux_info = capture_tmux_info
 
     {
       name: branch_name,
-      worktree: task_info&.[](:tree),
-      task: task_info&.[](:task),
+      worktree: current_task&.tree_name,
+      task: current_task&.name,
       tmux: tmux_info
     }
   end

data/bin/h-pr

@@ -7,7 +7,7 @@ require "yaml"
 require "json"
 
 Hiiro.load_env
-hiiro = Hiiro.init(*ARGV, plugins: [OldTask, Tmux, Pins])
+hiiro = Hiiro.init(*ARGV, plugins: [Tasks, Tmux, Pins])
 
 class PRManager
   attr_reader :hiiro
@@ -144,7 +144,7 @@ class PRManager
   end
 
   def build_entry(pr_info)
-    task_info = hiiro.task_manager.send(:current_task)
+    current_task = Environment.current.task
     tmux_info = capture_tmux_info
 
     {
@@ -153,8 +153,8 @@ class PRManager
       url: pr_info['url'],
       branch: pr_info['headRefName'],
       state: pr_info['state'],
-      worktree: task_info&.[](:tree),
-      task: task_info&.[](:task),
+      worktree: current_task&.tree_name,
+      task: current_task&.name,
       tmux: tmux_info
     }
   end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.47"
+  VERSION = "0.1.49"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.49
 platform: ruby
 authors:
 - Joshua Toyota
@@ -39,33 +39,24 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- bin/g-pr
 - bin/h
 - bin/h-app
 - bin/h-branch
 - bin/h-buffer
 - bin/h-config
-- bin/h-dot
-- bin/h-dotfiles
 - bin/h-home
 - bin/h-html
 - bin/h-link
 - bin/h-mic
 - bin/h-note
-- bin/h-osubtask
-- bin/h-otask
 - bin/h-pane
 - bin/h-plugin
 - bin/h-pr
-- bin/h-pr-monitor
-- bin/h-pr-watch
 - bin/h-project
-- bin/h-runtask
 - bin/h-serve
 - bin/h-session
 - bin/h-sha
 - bin/h-video
-- bin/h-vim
 - bin/h-window
 - bin/h-wtree
 - docs/README.md
@@ -84,7 +75,6 @@ files:
 - lib/hiiro/version.rb
 - notes
 - plugins/notify.rb
-- plugins/old_task.rb
 - plugins/pins.rb
 - plugins/project.rb
 - plugins/tasks.rb

data/bin/g-pr

@@ -1,327 +0,0 @@
-#!/usr/bin/env ruby
-
-require "hiiro"
-require "time"
-require "fileutils"
-require "yaml"
-require "json"
-
-Hiiro.load_env
-hiiro = Hiiro.init(*ARGV, plugins: [OldTask, 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-dot

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

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

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby
-
-# Shorthand for `h task subtask`
-
-require "hiiro"
-require "fileutils"
-require "yaml"
-require "time"
-
-Hiiro.load_env
-hiiro = Hiiro.init(*ARGV, plugins: [Tmux, OldTask])
-
-tasks = hiiro.task_manager
-
-hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
-hiiro.add_subcmd(:list) { tasks.list_subtasks }
-hiiro.add_subcmd(:ls) { tasks.list_subtasks }
-hiiro.add_subcmd(:new) { |subtask_name| tasks.new_subtask(subtask_name) }
-hiiro.add_subcmd(:switch) { |subtask_name=nil| tasks.switch_subtask(subtask_name) }
-hiiro.add_subcmd(:app) { |app_name| tasks.subtask_open_app(app_name) }
-hiiro.add_subcmd(:path) { |app_name=nil| tasks.subtask_app_path(app_name) }
-hiiro.add_subcmd(:cd) { |*args| tasks.subtask_cd_app(*args) }
-hiiro.add_subcmd(:apps) { tasks.list_configured_apps }
-hiiro.add_subcmd(:status) { tasks.subtask_status }
-hiiro.add_subcmd(:st) { tasks.subtask_status }
-hiiro.add_subcmd(:save) { tasks.save_subtask }
-hiiro.add_subcmd(:stop) { |subtask_name=nil| subtask_name ? tasks.stop_subtask(subtask_name) : tasks.stop_subtask }
-hiiro.add_subcmd(:current) { print tasks.current_subtask_name }
-
-hiiro.add_default { tasks.subtask_help }
-
-hiiro.run