hiiro 0.1.93 → 0.1.94

data/bin/h-buffer

@@ -2,126 +2,141 @@
 
 require "hiiro"
 
-def buffer_names
-  `tmux list-buffers -F '\#{buffer_name}'`.strip.split("\n")
-end
-
-def show_buffer(name, *args)
-  `tmux show-buffer -b #{name.shellescape} #{args.shelljoin}`
-end
-
-def buffer_map
-  output = `tmux list-buffers -F '\#{buffer_name}: \#{buffer_sample}'`.strip
-
-  lines = output.split("\n").each_with_object({}) do |line, h|
-    buffer_name = line.split(': ', 2).first
-    h[line] = buffer_name
+Hiiro.run(*ARGV, plugins: [Pins]) do
+  tmux = tmux_client
+
+  select_buffer_proc = ->(partial = nil) {
+    buffers = tmux.buffers
+    return nil if buffers.empty?
+
+    if partial
+      buffers = buffers.matching(partial)
+    end
+
+    return nil if buffers.empty?
+    return buffers.first.name if buffers.size == 1
+
+    fuzzyfind_from_map(buffers.name_map)
+  }
+
+  add_subcmd(:ls) { |*args|
+    if args.empty?
+      tmux.buffers.each { |b| puts b.to_s }
+    else
+      system('tmux', 'list-buffers', *args)
+    end
+  }
+
+  add_subcmd(:show) { |name = nil, *args|
+    buffer_name = select_buffer_proc.call(name)
+
+    unless buffer_name
+      puts "No buffer selected or found"
+      next
+    end
+
+    if args.empty?
+      content = tmux.show_buffer(buffer_name)
+      print content if content
+    else
+      system('tmux', 'show-buffer', '-b', buffer_name, *args)
+    end
+  }
+
+  add_subcmd(:copy) { |name = nil|
+    buffer_name = select_buffer_proc.call(name)
+    unless buffer_name
+      puts "No buffer selected or found"
+      next
+    end
+
+    content = tmux.show_buffer(buffer_name)
+    if content
+      Hiiro::Shell.pipe(content, 'pbcopy')
+      puts "Copied buffer '#{buffer_name}' to clipboard"
+    end
+  }
+
+  add_subcmd(:save) { |path = nil, name = nil, *args|
+    if path.nil?
+      puts "Usage: h buffer save <path> [buffer_name]"
+      next
+    end
+
+    if name
+      tmux.save_buffer(path, name: name)
+    elsif args.empty?
+      buffer_name = select_buffer_proc.call(nil)
+      if buffer_name
+        tmux.save_buffer(path, name: buffer_name)
+      end
+    else
+      system('tmux', 'save-buffer', path, *args)
+    end
+  }
+
+  add_subcmd(:load) { |path = nil, *args|
+    if path.nil?
+      puts "Usage: h buffer load <path>"
+      next
+    end
+
+    if args.empty?
+      tmux.load_buffer(path)
+    else
+      system('tmux', 'load-buffer', path, *args)
+    end
+  }
+
+  add_subcmd(:set) { |*args|
+    system('tmux', 'set-buffer', *args)
+  }
+
+  add_subcmd(:paste) { |name = nil, *args|
+    if name && args.empty?
+      tmux.paste_buffer(name: name)
+    elsif args.any?
+      system('tmux', 'paste-buffer', *[name && "-b", name, *args].compact)
+    else
+      tmux.paste_buffer
+    end
+  }
+
+  add_subcmd(:delete) { |name = nil, *args|
+    if name.nil?
+      name = select_buffer_proc.call(nil)
+    end
+
+    if name && args.empty?
+      tmux.delete_buffer(name)
+    elsif name
+      system('tmux', 'delete-buffer', '-b', name, *args)
+    end
+  }
+
+  add_subcmd(:choose) { |*args|
+    if args.empty?
+      tmux.choose_buffer
+    else
+      system('tmux', 'choose-buffer', *args)
+    end
+  }
+
+  add_subcmd(:clear) {
+    buffers = tmux.buffers
+    count = buffers.size
+    buffers.clear_all
+    puts "Cleared #{count} buffers"
+  }
+
+  add_subcmd(:select) do
+    buffers = tmux.buffers
+    if buffers.empty?
+      STDERR.puts "No buffers found"
+      next
+    end
+
+    selected = fuzzyfind_from_map(buffers.name_map)
+    print selected if selected
   end
 end
-
-def find_buffer(partial)
-  buffer_list = buffer_names
-
-  buffer, *other = buffer_list.grep(Regexp.new(partial))
-
-  return nil if other.any?
-
-  buffer
-end
-
-def select_buffer(partial = nil)
-  buffers = buffer_map
-  return nil if buffers.empty?
-
-  if partial
-    buffers = buffers.select{|k,v| ![k.to_s, v.to_s].grep(Regexp.new(partial)).empty? }
-  end
-
-  return nil if buffers.empty?
-  return buffers.first if buffers.length == 1
-
-  Hiiro::Fuzzyfind.map_select(buffers)
-end
-
-o = Hiiro.init(*ARGV, plugins: [Pins])
-
-o.add_subcmd(:ls) { |*args|
-  system('tmux', 'list-buffers', *args)
-}
-
-o.add_subcmd(:show) { |name = nil, *args|
-  buffer = select_buffer(name)
-
-  unless buffer
-    puts "No buffer selected or found"
-    next
-  end
-
-  print show_buffer(buffer, *args)
-}
-
-o.add_subcmd(:copy) { |name = nil, *args|
-  buffer = select_buffer(name)
-  unless buffer
-    puts "No buffer selected or found"
-    next
-  end
-
-  content = show_buffer(buffer)
-  Hiiro::Shell.pipe(content, 'pbcopy')
-  puts "Copied buffer '#{buffer}' to clipboard"
-}
-
-o.add_subcmd(:save) { |*args|
-  system('tmux', 'save-buffer', *args)
-}
-
-o.add_subcmd(:load) { |*args|
-  system('tmux', 'load-buffer', *args)
-}
-
-o.add_subcmd(:set) { |*args|
-  system('tmux', 'set-buffer', *args)
-}
-
-o.add_subcmd(:paste) { |*args|
-  system('tmux', 'paste-buffer', *args)
-}
-
-o.add_subcmd(:delete) { |*args|
-  system('tmux', 'delete-buffer', *args)
-}
-
-o.add_subcmd(:choose) { |*args|
-  system('tmux', 'choose-buffer', *args)
-}
-
-o.add_subcmd(:clear) { |*args|
-  # Delete all buffers
-  buffers = `tmux list-buffers -F '\#{buffer_name}'`.strip.split("\n")
-  buffers.each { |buf| system('tmux', 'delete-buffer', '-b', buf) }
-  puts "Cleared #{buffers.count} buffers"
-}
-
-o.add_subcmd(:select) do |*args|
-  # Get buffer list with content preview
-  output = `tmux list-buffers -F '\#{buffer_name}: \#{buffer_sample}'`.strip
-
-  if output.empty?
-    STDERR.puts "No buffers found"
-    next
-  end
-
-  lines = output.split("\n").each_with_object({}) do |line, h|
-    buffer_name = line.split(':').first
-    h[line] = buffer_name
-  end
-
-  selected = o.fuzzyfind_from_map(lines)
-
-  if selected
-    print selected
-  end
-end
-
-o.run

data/bin/h-commit

@@ -2,38 +2,36 @@
 
 require "hiiro"
 
-hiiro = Hiiro.init(*ARGV, plugins: [Pins])
-
-hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
-
-hiiro.add_subcmd(:select, :sk) { |*args|
-  # Pass all args to git log, with sensible defaults
-  git_args = ['git', 'log', '--oneline', '--decorate', '-n', '50']
-  git_args.concat(args) if args.any?
-
-  commits = `#{git_args.shelljoin}`.lines.map(&:chomp)
-
-  if commits.empty?
-    puts "No commits found"
-    next
-  end
-
-  require 'open3'
-  selected, status = Open3.capture2('sk', '--no-sort', stdin_data: commits.join("\n"))
-
-  if status.success? && !selected.strip.empty?
-    # Extract just the SHA from the selected line
-    sha = selected.strip.split.first
-    puts sha
-  end
-}
-
-hiiro.add_default {
-  puts "Usage: h commit <subcommand> [args]"
-  puts
-  puts "Subcommands:"
-  puts "  select, sk  Select a commit using sk and print its SHA"
-  puts "              Additional args are passed to git log"
-}
-
-hiiro.run
+Hiiro.run(*ARGV, plugins: [Pins]) do
+  add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
+
+  add_subcmd(:select, :sk) { |*select_args|
+    # Pass all args to git log, with sensible defaults
+    git_args = ['git', 'log', '--oneline', '--decorate', '-n', '50']
+    git_args.concat(select_args) if select_args.any?
+
+    commits = `#{git_args.shelljoin}`.lines.map(&:chomp)
+
+    if commits.empty?
+      puts "No commits found"
+      next
+    end
+
+    require 'open3'
+    selected, status = Open3.capture2('sk', '--no-sort', stdin_data: commits.join("\n"))
+
+    if status.success? && !selected.strip.empty?
+      # Extract just the SHA from the selected line
+      sha = selected.strip.split.first
+      puts sha
+    end
+  }
+
+  add_default {
+    puts "Usage: h commit <subcommand> [args]"
+    puts
+    puts "Subcommands:"
+    puts "  select, sk  Select a commit using sk and print its SHA"
+    puts "              Additional args are passed to git log"
+  }
+end

data/bin/h-link

@@ -193,213 +193,207 @@ class LinkManager
 end
 
 lm = LinkManager.new
-o = Hiiro.init(*ARGV, plugins: [Tmux, Pins], links_file: lm.links_file)
 
-o.add_subcmd(:add) do |*args|
-  links = lm.load_links
+Hiiro.run(*ARGV, plugins: [Tmux, Pins], links_file: lm.links_file) do
+  add_subcmd(:add) do |*add_args|
+    links = lm.load_links
 
-  if args.empty?
-    new_links = lm.edit_links
+    if add_args.empty?
+      new_links = lm.edit_links
 
-    links.concat(new_links)
-    lm.save_links(links)
+      links.concat(new_links)
+      lm.save_links(links)
 
-    if new_links.length == 1
-      puts "Saved link ##{links.length}: #{new_links.first.url}"
-    else
-      puts "Saved #{new_links.length} links (#{links.length - new_links.length + 1}-#{links.length})"
+      if new_links.length == 1
+        puts "Saved link ##{links.length}: #{new_links.first.url}"
+      else
+        puts "Saved #{new_links.length} links (#{links.length - new_links.length + 1}-#{links.length})"
+      end
+      exit 0
     end
-    exit 0
-  end
 
-  url = args.shift
-  description = args.join(' ')
+    url = add_args.shift
+    description = add_args.join(' ')
 
-  new_link = LinkManager::Link.new(
-    url: url,
-    description: description,
-    shorthand: nil,
-    created_at: Time.now.iso8601
-  )
+    new_link = LinkManager::Link.new(
+      url: url,
+      description: description,
+      shorthand: nil,
+      created_at: Time.now.iso8601
+    )
 
-  links << new_link
-  lm.save_links(links)
+    links << new_link
+    lm.save_links(links)
 
-  puts "Saved link ##{links.length}: #{url}"
-end
+    puts "Saved link ##{links.length}: #{url}"
+  end
 
-o.add_subcmd(:ls) do |*args|
-  links = lm.load_links
-  if links.empty?
-    puts "No links saved."
-  else
-    links.each_with_index do |link, idx|
-      puts link.display_string(idx)
+  add_subcmd(:ls) do |*ls_args|
+    links = lm.load_links
+    if links.empty?
+      puts "No links saved."
+    else
+      links.each_with_index do |link, idx|
+        puts link.display_string(idx)
+      end
     end
   end
-end
 
-o.add_subcmd(:list) do |*args|
-  o.run_subcmd(:ls, *args)
-end
-
-o.add_subcmd(:search) do |*args|
-  if args.empty?
-    puts "Usage: h link search <term> [term...]"
-    exit 1
+  add_subcmd(:list) do |*list_args|
+    run_subcmd(:ls, *list_args)
   end
 
-  links = lm.load_links
-  matches = links.each_with_index.select { |link, idx| link.matches?(*args) }
+  add_subcmd(:search) do |*search_args|
+    if search_args.empty?
+      puts "Usage: h link search <term> [term...]"
+      exit 1
+    end
 
-  if matches.empty?
-    puts "No links found matching: #{args.join(' ')}"
-  else
-    matches.each do |link, idx|
-      puts link.display_string(idx)
+    links = lm.load_links
+    matches = links.each_with_index.select { |link, idx| link.matches?(*search_args) }
+
+    if matches.empty?
+      puts "No links found matching: #{search_args.join(' ')}"
+    else
+      matches.each do |link, idx|
+        puts link.display_string(idx)
+      end
     end
   end
-end
 
-o.add_subcmd(:select) do |*args|
-  links = lm.load_links
+  add_subcmd(:select) do |*select_args|
+    links = lm.load_links
 
-  if links.empty?
-    STDERR.puts "No links saved."
-    exit 1
-  end
+    if links.empty?
+      STDERR.puts "No links saved."
+      exit 1
+    end
 
-  lines = lm.load_link_hash(links)
+    lines = lm.load_link_hash(links)
 
-  if args.any?
-    lines = lm.hash_matches?(lines, *args)
-  end
+    if select_args.any?
+      lines = lm.hash_matches?(lines, *select_args)
+    end
 
-  selected, status = o.fuzzyfind(lines.keys)
+    selected, status = fuzzyfind(lines.keys)
 
-  if status.success? && !selected.strip.empty?
-    link = lines[selected.strip]
-    if link
-      url = link.url
+    if status.success? && !selected.strip.empty?
+      link = lines[selected.strip]
+      if link
+        url = link.url
 
-      if lm.has_placeholders?(url)
-        values = lm.prompt_for_placeholder_values(url, link)
-        url = lm.substitute_placeholders(url, values)
-      end
+        if lm.has_placeholders?(url)
+          values = lm.prompt_for_placeholder_values(url, link)
+          url = lm.substitute_placeholders(url, values)
+        end
 
-      puts url
+        puts url
+      end
     end
   end
-end
 
-o.add_subcmd(:editall) do |*args|
-  links_before = lm.load_links
-  system(ENV['EDITOR'] || 'vim', lm.links_file)
+  add_subcmd(:editall) do |*editall_args|
+    links_before = lm.load_links
+    system(ENV['EDITOR'] || 'vim', lm.links_file)
 
-  begin
-    links_after = lm.load_links
-  rescue => e
-    puts "ERROR: Unable to read updated file...reverting."
-    lm.save_links(links_before)
+    begin
+      links_after = lm.load_links
+    rescue => e
+      puts "ERROR: Unable to read updated file...reverting."
+      lm.save_links(links_before)
+    end
   end
-end
 
-o.add_subcmd(:edit) do |*args|
-  if args.empty?
-    puts "Usage: h link edit <number|shorthand>"
-    exit 1
-  end
+  add_subcmd(:edit) do |*edit_args|
+    if edit_args.empty?
+      puts "Usage: h link edit <number|shorthand>"
+      exit 1
+    end
 
-  links = lm.load_links
-  idx, link = lm.find_link_by_ref(args.first, links)
+    links = lm.load_links
+    idx, link = lm.find_link_by_ref(edit_args.first, links)
 
-  if link.nil?
-    puts "Link not found: #{args.first}"
-    exit 1
-  end
+    if link.nil?
+      puts "Link not found: #{edit_args.first}"
+      exit 1
+    end
 
-  updated_links = lm.edit_links(link)
+    updated_links = lm.edit_links(link)
 
-  # Replace the original link with the first updated link
-  # If multiple links were added, insert them all
-  links[idx] = updated_links.first
-  if updated_links.length > 1
-    links.insert(idx + 1, *updated_links[1..-1])
-  end
+    # Replace the original link with the first updated link
+    # If multiple links were added, insert them all
+    links[idx] = updated_links.first
+    if updated_links.length > 1
+      links.insert(idx + 1, *updated_links[1..-1])
+    end
 
-  lm.save_links(links)
+    lm.save_links(links)
 
-  if updated_links.length == 1
-    puts "Updated link ##{idx + 1}"
-  else
-    puts "Updated link ##{idx + 1} and added #{updated_links.length - 1} more"
+    if updated_links.length == 1
+      puts "Updated link ##{idx + 1}"
+    else
+      puts "Updated link ##{idx + 1} and added #{updated_links.length - 1} more"
+    end
   end
-end
 
-o.add_subcmd(:open) do |*args|
-  links = lm.load_links
+  add_subcmd(:open) do |*open_args|
+    links = lm.load_links
 
-  if args.empty?
-    lines = lm.load_link_hash(links)
+    if open_args.empty?
+      lines = lm.load_link_hash(links)
 
-    exit_code = 1
+      exit_code = 1
 
-    if args.any?
-      lines = lm.hash_matches?(lines, *args)
-    end
+      if open_args.any?
+        lines = lm.hash_matches?(lines, *open_args)
+      end
 
-    selected, status = o.fuzzyfind(lines.keys)
+      selected, status = fuzzyfind(lines.keys)
 
-    if status.success? && !selected.strip.empty?
-      link = lines[selected.strip]
-      if link
-        url = link.url
+      if status.success? && !selected.strip.empty?
+        link = lines[selected.strip]
+        if link
+          url = link.url
 
-        if lm.has_placeholders?(url)
-          values = lm.prompt_for_placeholder_values(url, link)
-          url = lm.substitute_placeholders(url, values)
-        end
+          if lm.has_placeholders?(url)
+            values = lm.prompt_for_placeholder_values(url, link)
+            url = lm.substitute_placeholders(url, values)
+          end
 
-        system('open', url)
-        exit_code = 0
+          system('open', url)
+          exit_code = 0
+        end
       end
+
+      exit exit_code
     end
 
-    exit exit_code
-  end
+    idx, link = lm.find_link_by_ref(open_args.first, links)
 
-  idx, link = lm.find_link_by_ref(args.first, links)
+    if link.nil?
+      matches = lm.search_links(links, *open_args)
 
-  if link.nil?
-    matches = lm.search_links(links, *args)
+      if matches.count == 1
+        link = matches.first
+      end
+    end
 
-    if matches.count == 1
-      link = matches.first
+    if link.nil?
+      puts "Link not found: #{open_args.first}"
+      exit 1
     end
-  end
 
-  if link.nil?
-    puts "Link not found: #{args.first}"
-    exit 1
-  end
+    url = link.url
 
-  url = link.url
+    if lm.has_placeholders?(url)
+      values = lm.prompt_for_placeholder_values(url, link)
+      url = lm.substitute_placeholders(url, values)
+    end
 
-  if lm.has_placeholders?(url)
-    values = lm.prompt_for_placeholder_values(url, link)
-    url = lm.substitute_placeholders(url, values)
+    system('open', url)
   end
 
-  system('open', url)
-end
-
-o.add_subcmd(:path) do |*args|
-  print lm.links_file
-end
-
-begin
-  o.run
-rescue => e
-  require 'pry'
-  binding.pry
+  add_subcmd(:path) do |*path_args|
+    print lm.links_file
+  end
 end