hiiro 0.1.124 → 0.1.125

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07e567369471f9f5c5aacb65fe7e7a29df6f7125cca138a2788567597abd1a2e
-  data.tar.gz: c6bc9ae5a1d181e15e255ce831ee13b52ef277cfc9e4dd06e35330c5b368207f
+  metadata.gz: 7bbd061adf047bc495716f4499a6018c90563f605d3f7b51536c0df208a27ef3
+  data.tar.gz: a5d4ed3954dded40eba5af8a686972eef5c2cc0ac77e084de0f4d2fb8c94c68b
 SHA512:
-  metadata.gz: 8ee763ca17e6f61efc9ca7e9e5eedb8ceec4609936c2a11c850c5efd63ba7297f1112d852e07f68ab52e6c79c89c6279eb677c385ff4427285af9e4f2d4e446d
-  data.tar.gz: 4f4c032a247b5fb4bdb81420cd92e98bea0cac9853270e05eaa57050b73e7f0ef68a379f3ac758133c4ca9de42d3021b3dce10f93042530bd268aa87b4563bbf
+  metadata.gz: 20575a6c9652705985a3354efe441cb7bd3a4567e0946ddaf67c1cd3a7fde429e707b4d5c9e707b703f9df75396ce8c37d5716db4a64bc90a87fcf17b981c9a4
+  data.tar.gz: 3446a6a497ecda1dd2d3068ab917943d180fd6240c68bb123b99ea04255218ed30ea8bd59a6b88c7518be91064ffa0d3d3938f2ab97b78ef06c1df6f52b38892

data/bin/h-app

@@ -43,7 +43,7 @@ def send_cd(path)
   end
 end
 
-Hiiro.run(*ARGV) {
+Hiiro.run(*ARGV, plugins: [:Tasks]) {
   add_subcmd(:config) {
     editor = ENV['EDITOR'] || 'nvim'
     system(editor, APPS_FILE)

data/bin/h-branch

@@ -116,7 +116,7 @@ class BranchManager
   end
 end
 
-Hiiro.run(*ARGV) do
+Hiiro.run(*ARGV, plugins: [Tasks]) do
   manager = BranchManager.new(self)
 
   add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }

data/bin/h-link

@@ -7,10 +7,6 @@ require 'pry'
 require 'tempfile'
 require "hiiro"
 
-opts = Hiiro::Options.setup {
-  option(:shorthand, short: :s)
-}
-
 class LinkManager
   LINKS_FILE = File.join(Dir.home, '.config/hiiro/links.yml')
   LINK_TEMPLATE = {
@@ -219,12 +215,10 @@ Hiiro.run(*ARGV, plugins: [Pins], links_file: lm.links_file) do
     url = add_args.shift
     description = add_args.join(' ')
 
-    vals = opts.parse!(add_args)
-
     new_link = LinkManager::Link.new(
       url: url,
       description: description,
-      shorthand: vals.shorthand,
+      shorthand: nil,
       created_at: Time.now.iso8601
     )
 

data/bin/h-pr

@@ -16,6 +16,16 @@ class PRManager
     @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 "  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
@@ -256,131 +266,7 @@ class PinnedPRManager
     (authored_prs + assigned_prs).uniq { |pr| pr['number'] }
   end
 
-  def needs_refresh?(pr, force: false)
-    return true if force
-    return true unless pr['last_checked']
-
-    last_check_time = Time.parse(pr['last_checked']) rescue nil
-    return true unless last_check_time
-
-    # Refresh if last check was more than 2 minutes ago
-    (Time.now - last_check_time) > 120
-  end
-
-
-  def batch_fetch_pr_info(pr_numbers)
-    return {} if pr_numbers.empty?
-
-    # Build GraphQL query to fetch multiple PRs at once
-    pr_queries = pr_numbers.map.with_index do |num, idx|
-      <<~GRAPHQL.strip
-        pr#{idx}: pullRequest(number: #{num}) {
-          number
-          title
-          url
-          headRefName
-          state
-          isDraft
-          mergeable
-          reviewDecision
-          statusCheckRollup {
-            contexts {
-              ... on CheckRun {
-                conclusion
-                status
-              }
-              ... on StatusContext {
-                state
-              }
-            }
-          }
-          reviews(last: 50) {
-            nodes {
-              author {
-                login
-              }
-              state
-            }
-          }
-        }
-      GRAPHQL
-    end
-
-    query = <<~GRAPHQL
-      query {
-        repository(owner: "instacart", name: "carrot") {
-          #{pr_queries.join("\n")}
-        }
-      }
-    GRAPHQL
-
-    result = `gh api graphql -f query='#{query.gsub("'", "'\\''")}' 2>/dev/null`
-    return {} if result.empty?
-
-    data = JSON.parse(result)
-    repo_data = data.dig('data', 'repository')
-    return {} unless repo_data
-
-    # Convert GraphQL response to hash keyed by PR number
-    pr_info_by_number = {}
-    pr_numbers.each_with_index do |num, idx|
-      pr_data = repo_data["pr#{idx}"]
-      next unless pr_data
-
-      # Transform GraphQL response to match gh pr view format
-      pr_info_by_number[num] = {
-        'number' => pr_data['number'],
-        'title' => pr_data['title'],
-        'url' => pr_data['url'],
-        'headRefName' => pr_data['headRefName'],
-        'state' => pr_data['state'],
-        'isDraft' => pr_data['isDraft'],
-        'mergeable' => pr_data['mergeable'],
-        'reviewDecision' => pr_data['reviewDecision'],
-        'statusCheckRollup' => pr_data['statusCheckRollup'],
-        'reviews' => pr_data.dig('reviews', 'nodes') || []
-      }
-    end
-
-    pr_info_by_number
-  rescue JSON::ParserError, StandardError
-    {}
-  end
-
-  def refresh_all_status(prs, force: false)
-    # Determine which PRs need refreshing
-    prs_to_refresh = prs.select { |pr| needs_refresh?(pr, force: force) }
-
-    if prs_to_refresh.empty?
-      puts "All PRs recently checked (within last 2 minutes). Use -U to force update." unless force
-      return prs
-    end
-
-    # Batch fetch all PR info at once
-    pr_numbers = prs_to_refresh.map { |pr| pr['number'] }
-    fetched_info = batch_fetch_pr_info(pr_numbers)
-
-    # Update each PR with fetched info
-    prs_to_refresh.each do |pr|
-      info = fetched_info[pr['number']]
-      next unless info
-
-      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
-    end
-
-    prs
-  end
-
-  def refresh_status(pr, force: false)
-    return pr unless needs_refresh?(pr, force: force)
-
+  def refresh_status(pr)
     info = fetch_pr_info(pr['number'])
     return pr unless info
 
@@ -530,7 +416,7 @@ class PinnedPRManager
   end
 end
 
-Hiiro.run(*ARGV, plugins: [Pins]) do
+Hiiro.run(*ARGV, plugins: [Tasks, Tmux, Pins]) do
   manager = PRManager.new(self)
   pinned_manager = PinnedPRManager.new
 
@@ -775,14 +661,12 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
 
     compact = status_args.include?('-c') || status_args.include?('--compact')
-    force = status_args.include?('-U') || status_args.include?('--force-update')
 
     puts "Refreshing status for #{pinned.length} pinned PR(s)..."
     puts
 
-    pinned_manager.refresh_all_status(pinned, force: force)
-
     pinned.each_with_index do |pr, idx|
+      pinned_manager.refresh_status(pr)
       if compact
         puts pinned_manager.display_pinned(pr, idx)
       else
@@ -796,7 +680,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     puts "Status updated at #{Time.now.strftime('%H:%M:%S')}"
   end
 
-  add_subcmd(:update) do |*update_args|
+  add_subcmd(:update) do
     pinned = pinned_manager.load_pinned
 
     if pinned.empty?
@@ -804,19 +688,15 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       next
     end
 
-    force = update_args.include?('-U') || update_args.include?('--force-update')
-
     puts "Updating status for #{pinned.length} PR(s)..."
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
     pinned_manager.save_pinned(pinned)
     puts "Done."
   end
 
-  add_subcmd(:green) do |*green_args|
+  add_subcmd(:green) do
     pinned = pinned_manager.load_pinned
-    force = green_args.include?('-U') || green_args.include?('--force-update')
-
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr|
@@ -834,11 +714,9 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     filtered.each_with_index { |pr, i| puts pinned_manager.display_pinned(pr, i) }
   end
 
-  add_subcmd(:red) do |*red_args|
+  add_subcmd(:red) do
     pinned = pinned_manager.load_pinned
-    force = red_args.include?('-U') || red_args.include?('--force-update')
-
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr|
@@ -856,11 +734,9 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     filtered.each_with_index { |pr, i| puts pinned_manager.display_pinned(pr, i) }
   end
 
-  add_subcmd(:old) do |*old_args|
+  add_subcmd(:old) do
     pinned = pinned_manager.load_pinned
-    force = old_args.include?('-U') || old_args.include?('--force-update')
-
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr| pr['state'] == 'MERGED' }
@@ -884,8 +760,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       next
     end
 
-    force = args.include?('-U') || args.include?('--force-update')
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
 
     merged_or_closed = pinned.select { |pr| pr['state'] == 'MERGED' || pr['state'] == 'CLOSED' }
 
@@ -907,11 +782,9 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     puts "Done. #{pinned_manager.load_pinned.length} PR(s) still tracked."
   end
 
-  add_subcmd(:draft) do |*draft_args|
+  add_subcmd(:draft) do
     pinned = pinned_manager.load_pinned
-    force = draft_args.include?('-U') || draft_args.include?('--force-update')
-
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr| pr['is_draft'] == true }
@@ -954,14 +827,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     missing_numbers = missing.map { |pr| pr['number'] }
 
     tmpfile = Tempfile.new(['missing-prs-', '.yml'])
-    lines = ['---']
-    missing.each do |pr|
-      lines << ''
-      lines << "# [#{pr['headRefName']}] #{pr['title']}"
-      lines << "# url: #{pr['url']}"
-      lines << "- #{pr['number']}"
-    end
-    tmpfile.write(lines.join("\n"))
+    tmpfile.write(missing_numbers.to_yaml)
     tmpfile.close
 
     system(ENV['EDITOR'] || 'nvim', tmpfile.path)
@@ -1078,8 +944,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
 
     # Refresh all statuses first
-    force = args.include?('-U') || args.include?('--force-update')
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
     pinned_manager.save_pinned(pinned)
 
     merged = pinned.select { |pr| pr['state'] == 'MERGED' }
@@ -1110,8 +975,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
 
     # Refresh all statuses first
-    force = args.include?('-U') || args.include?('--force-update')
-    pinned_manager.refresh_all_status(pinned, force: force)
+    pinned.each { |pr| pinned_manager.refresh_status(pr) }
 
     merged_or_closed = pinned.select { |pr| pr['state'] == 'MERGED' || pr['state'] == 'CLOSED' }
 

data/bin/h-session

@@ -4,7 +4,7 @@ require 'hiiro'
 require 'tempfile'
 require 'yaml'
 
-Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
+Hiiro.run(*ARGV, plugins: [Pins, Tasks]) do
   tmux = tmux_client
 
   add_subcmd(:ls, :list) { |*args|
@@ -130,6 +130,7 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   end
 
   add_subcmd(:orphans) do
+    env = Environment.current
     task_session_names = env.all_tasks.map(&:session_name)
     orphans = env.all_sessions.reject { |s| task_session_names.include?(s.name) }
 
@@ -143,6 +144,7 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   end
 
   add_subcmd(:okill) do
+    env = Environment.current
     task_session_names = env.all_tasks.map(&:session_name)
     orphans = env.all_sessions.reject { |s| task_session_names.include?(s.name) }
 

data/bin/h-window

@@ -133,48 +133,4 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       puts "Window not found"
     end
   }
-
-  add_subcmd(:vsplit) {
-    system('tmux', 'select-layout', 'even-horizontal')
-  }
-
-  add_subcmd(:hsplit) {
-    system('tmux', 'select-layout', 'even-vertical')
-  }
-
-  add_subcmd(:layout) { |q=nil|
-    layouts = {
-      mhorizontal: 'main-vertical',
-      main_horizontal: 'main-vertical',
-      ehorizontal: 'even-vertical',
-      horizontal: 'even-vertical',
-      even_horizontal: 'even-vertical',
-
-      even_vertical: 'even-horizontal',
-      evertical: 'even-horizontal',
-      vertical: 'even-horizontal',
-      main_vertical: 'main-horizontal',
-      mvertical: 'main-horizontal',
-      main_vertical_mirrored: 'main-horizontal-mirrored',
-      mmvertical: 'main-horizontal-mirrored',
-
-      tiled: 'tiled',
-    }
-
-    if q.nil?
-      layout = fuzzyfind(layouts)
-    end
-
-    if layouts.values.include?(q)
-      layout = q
-    end
-
-    if layout.nil?
-      begin
-        _, layout = Hiiro::Matcher.resolve(layouts, q) { |k,v| k }
-      end
-    end
-
-    system('tmux', 'select-layout', layout)
-  }
 end

data/exe/h

@@ -3,21 +3,7 @@
 require "hiiro"
 require "fileutils"
 
-def update_hiiro
-  if `gem list hiiro`.strip.empty?
-    system('gem', 'install', 'hiiro')
-  else
-    system('gem', 'update', 'hiiro')
-  end
-
-  system('h', 'setup')
-end
-
-def rbenv_versions
-  versions = `rbenv versions --bare`.lines(chomp: true)
-end
-
-Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
+Hiiro.run(*ARGV, cwd: Dir.pwd, plugins: [Tasks]) do
   add_subcmd(:version) { |*args|
     puts Hiiro::VERSION
   }
@@ -26,21 +12,6 @@ Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
     puts "pong"
   }
 
-  add_subcmd(:install) { |*args|
-    opts = Hiiro::Options.setup {
-      flag(:all, short: :a)
-    }.parse!(ARGV)
-
-    if opts.all
-      rbenv_versions.each do |ver|
-        ENV['RBENV_VERSION'] = ver
-        update_hiiro
-      end
-    else
-      update_hiiro
-    end
-  }
-
   add_subcmd(:setup) do |*args|
     # Detect how the command was invoked to determine prefix
     invoked_as = File.basename($0)
@@ -112,8 +83,4 @@ Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
   add_subcmd(:alert) do |*args|
     Hiiro::Notification.show(self)
   end
-
-  add_subcmd(:queue) do |*args|
-    Hiiro::Queue.build_hiiro(self).run
-  end
 end

data/hiiro.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "pry", "~> 0.14"
-  spec.add_dependency "front_matter_parser"
 
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/hiiro/bins.rb

@@ -0,0 +1,19 @@
+class Hiiro
+  class Bins
+    PATH = ENV['PATH']
+
+    def self.path = PATH
+    def self.paths = path.split(?:).map(&:strip).uniq
+
+    def self.glob(*names)
+      path_glob = [?{, paths.join(?,), ?}].join
+      name_glob = [?{, names.flatten.compact.join(?,), ?}].join
+
+      Dir[File.join(path_glob, name_glob)].select(&File.method(:executable?))
+    end
+
+    def self.all
+      Dir[glob('*')].select(&File.method(:executable?))
+    end
+  end
+end

data/lib/hiiro/tmux.rb

@@ -23,8 +23,8 @@ class Hiiro
       end
     end
 
-    def self.open_session(name, **opts)
-      client.open_session(name, **opts)
+    def self.open_session(name)
+      client.open_session(name)
     end
 
     attr_reader :hiiro
@@ -83,11 +83,11 @@ class Hiiro
       run_success?('has-session', '-t', name)
     end
 
-    def open_session(name, **opts)
+    def open_session(name)
       session_name = name.to_s
 
       unless session_exists?(session_name)
-        new_session(session_name, **opts, detached: true)
+        run_system('new-session', '-d', '-A', '-s', session_name)
       end
 
       if in_tmux?

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.124"
+  VERSION = "0.1.125"
 end

data/lib/hiiro.rb

@@ -4,6 +4,7 @@ require "shellwords"
 require "pry"
 
 require_relative "hiiro/version"
+require_relative "hiiro/bins"
 require_relative "hiiro/matcher"
 require_relative "hiiro/git"
 require_relative "hiiro/options"
@@ -11,8 +12,6 @@ require_relative "hiiro/notification"
 require_relative "hiiro/fuzzyfind"
 require_relative "hiiro/todo"
 require_relative "hiiro/tmux"
-require_relative "hiiro/tasks"
-require_relative "hiiro/queue"
 
 class String
   def underscore(camel_cased_word=self)
@@ -28,10 +27,7 @@ class String
 end
 
 class Hiiro
-  WORK_DIR = File.join(Dir.home, 'work')
-  REPO_PATH = File.join(WORK_DIR, '.bare')
-
-  def self.init(*oargs, plugins: [], logging: false, tasks: false, task_scope: nil, **values, &block)
+  def self.init(*oargs, plugins: [], logging: false, **values, &block)
     load_env
 
     if values[:args]
@@ -43,8 +39,8 @@ class Hiiro
 
     bin_name = values[:bin_name] || $0
 
-    new(bin_name, *args, logging: logging, tasks: tasks, task_scope: task_scope, **values).tap do |hiiro|
-      hiiro.load_plugins(plugins)
+    new(bin_name, *args, logging: logging, **values).tap do |hiiro|
+      hiiro.load_plugins(*plugins)
 
       hiiro.add_subcommand(:pry) { |*args|
         binding.pry
@@ -54,18 +50,6 @@ class Hiiro
         system(ENV['EDITOR'] || 'nvim', hiiro.bin)
       }
 
-      if hiiro.tasks_enabled?
-        hiiro.add_subcmd(:task) do |*args|
-          tm = TaskManager.new(hiiro, scope: :task)
-          Tasks.build_hiiro(hiiro, tm).run
-        end
-
-        hiiro.add_subcmd(:subtask) do |*args|
-          tm = TaskManager.new(hiiro, scope: :subtask)
-          Tasks.build_hiiro(hiiro, tm).run
-        end
-      end
-
       if block
         if block.arity == 1
           block.call(hiiro)
@@ -76,8 +60,8 @@ class Hiiro
     end
   end
 
-  def self.run(*args, plugins: [], logging: false, tasks: false, task_scope: nil, **values, &block)
-    hiiro = init(*args, plugins:, logging:, tasks:, task_scope:, **values, &block)
+  def self.run(*args, plugins: [], logging: false, **values, &block)
+    hiiro = init(*args, plugins:,logging:,**values, &block)
 
     hiiro.run
   end
@@ -95,17 +79,14 @@ class Hiiro
   attr_reader :loaded_plugins
   attr_reader :logging
   attr_reader :global_values
-  attr_reader :task_scope
 
-  def initialize(bin, *all_args, logging: false, tasks: false, task_scope: nil, **values)
+  def initialize(bin, *all_args, logging: false, **values)
     @bin = bin
     @bin_name = File.basename(bin)
     @all_args = all_args
     @subcmd, *@args = all_args # normally i would never do this
     @loaded_plugins = []
     @logging = logging
-    @tasks_enabled = tasks
-    @task_scope = task_scope
     @global_values = values
     @full_command = [
       bin_name,
@@ -113,50 +94,38 @@ class Hiiro
     ].map(&:shellescape).join(' ')
   end
 
-  def tasks_enabled?
-    @tasks_enabled
-  end
-
-  def environment
-    @environment ||= Environment.current
-  end
-  alias env environment
+  def editor
+    editors = Bins.glob(%w[nvim vim vi]).find(&File.method(:executable?))
 
-  def task_manager
-    return nil unless tasks_enabled?
-    @task_manager ||= TaskManager.new(self, scope: task_scope || :task)
+    ENV['EDITOR'] || editors.first
   end
-  alias tm task_manager
 
-  def tasks
-    task_manager&.tasks
+  def edit_files(*files)
+    if editor.match?(/vim/i)
+      system(editor, '-O', *files)
+    else
+      system(editor, *files)
+    end
   end
 
   def tmux_client
     @tmux_client ||= Tmux.client!(self)
   end
 
-  def start_tmux_session(name, **opts)
-    tmux_client.open_session(name, **opts)
+  def start_tmux_session(name)
+    tmux_client.open_session(name)
   end
 
-  def make_child(custom_subcmd=nil, custom_args=nil, **kwargs, &block)
-    child_subcmd = custom_subcmd || subcmd
-    child_args = custom_args || args
+  def make_child(subcmd, *args, **kwargs, &block)
+    bin_name = [bin, subcmd.to_s].join(?-)
 
-    child_bin_name = [bin, child_subcmd.to_s].join(?-)
-
-    Hiiro.init(bin_name: child_bin_name, args: child_args, **kwargs, &block)
+    Hiiro.init(bin_name:, args:, **kwargs, &block)
   end
 
   def todo_manager
     @todo_manager ||= TodoManager.new
   end
 
-  def queue
-    @queue ||= Queue.current
-  end
-
   def run
     result = runner.run(*args)