hiiro 0.1.58 → 0.1.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f183baf860848362b475e46afc9f6519e244e341cc2c63e07a5917dee51603a
-  data.tar.gz: de0fde039502136565942f159e499f0bb99eb76cb6a4bc25990174131b0b8779
+  metadata.gz: 63be1fe21ba988716a8a6ab1d687d70cb9bda81d2e3cd705393cea963e40d8fd
+  data.tar.gz: a76b65dbdf66d0c7faecfef65a4b00d870eb279b90ed4dbfd37d239dfa05dfa8
 SHA512:
-  metadata.gz: 8871dc00189d5e8a640ac91b0b7ac28759ead113adf8675e848fffa79282524547140b93f2ad51a9b2b7ecea69a6dd78b290306288440303129bdb8ae03817f9
-  data.tar.gz: 3b2a9793aea6c1d54d52141c98549f7fc01d017d4e11c5fecca424383430f917252b62b8aa62545cd4aced9771c3429d306fdbf6c7a4b1c1e590b829f9285736
+  metadata.gz: 531ecc32843bc301ac68f4e23a18e94a6d2a89634187f90147908a356d6eb13dbb309b640c5c0795959f118bd2994265c7c777de8b806f631fadc01ebe8212ce
+  data.tar.gz: 5e866fed148138c9ea5a1537d5851c9ef97431831d554754dc8c9c2b301b9aa47dfa61bd8073bed421f83ccce048c5759bf8f5da4265226075916beb8ac06352

data/bin/h-branch

@@ -225,6 +225,150 @@ hiiro.add_subcmd(:select) do |*args|
   end
 end
 
+hiiro.add_subcmd(:checkout, :co) { |branch = nil, *args|
+  unless branch
+    # Use sk to select a branch
+    branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
+    require 'open3'
+    selected, status = Open3.capture2('sk', '--no-sort', '--tac', stdin_data: branches.join("\n"))
+    unless status.success? && !selected.strip.empty?
+      puts "No branch selected"
+      next
+    end
+    branch = selected.strip
+  end
+
+  system('git', 'checkout', branch, *args)
+}
+
+hiiro.add_subcmd(:rm, :remove) { |branch = nil, *args|
+  unless branch
+    # Use sk to select a branch
+    branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
+    require 'open3'
+    selected, status = Open3.capture2('sk', '--no-sort', '--tac', stdin_data: branches.join("\n"))
+    unless status.success? && !selected.strip.empty?
+      puts "No branch selected"
+      next
+    end
+    branch = selected.strip
+  end
+
+  system('git', 'branch', '-d', branch, *args)
+}
+
+hiiro.add_subcmd(:duplicate) { |new_name = nil, source = nil|
+  unless new_name
+    puts "Usage: h branch duplicate <new_name> [source_branch]"
+    puts "  Creates a copy of source_branch (or current branch) as new_name"
+    next
+  end
+
+  source ||= hiiro.git.branch
+  system('git', 'branch', new_name, source)
+  puts "Created branch '#{new_name}' from '#{source}'"
+}
+
+hiiro.add_subcmd(:push) { |*args|
+  opts = Hiiro::Options.new(args) do
+    option :remote, short: 'r', default: 'origin', desc: 'Remote name'
+    option :from, short: 'f', desc: 'Local branch or commit to push'
+    option :to, short: 't', desc: 'Remote branch name'
+    flag :force, short: 'F', desc: 'Force push'
+    flag :set_upstream, short: 'u', desc: 'Set upstream tracking'
+  end.parse!
+
+  local_ref = opts[:from] || hiiro.git.branch
+  remote_branch = opts[:to] || local_ref
+
+  git_args = ['git', 'push']
+  git_args << '--force' if opts[:force]
+  git_args << '-u' if opts[:set_upstream]
+  git_args << opts[:remote]
+  git_args << "#{local_ref}:#{remote_branch}"
+
+  puts "Pushing #{local_ref} to #{opts[:remote]}/#{remote_branch}..."
+  system(*git_args)
+}
+
+hiiro.add_subcmd(:diff) { |*args|
+  case args.length
+  when 0
+    # Compare current branch to main/master
+    base = %w[main master].find { |b| system("git rev-parse --verify #{b} >/dev/null 2>&1") } || 'HEAD~1'
+    range = "#{base}..HEAD"
+  when 1
+    # Compare current branch to specified ref
+    range = "#{args[0]}..HEAD"
+  else
+    # Compare two refs (from..to or from...to based on args)
+    from, to = args[0..1]
+    range = "#{from}..#{to}"
+  end
+
+  system('git', 'log', '--oneline', '--decorate', range)
+}
+
+hiiro.add_subcmd(:ahead) { |*args|
+  case args.length
+  when 0
+    base = %w[main master].find { |b| system("git rev-parse --verify #{b} >/dev/null 2>&1") } || 'HEAD~1'
+    ahead_of = base
+    branch = 'HEAD'
+  when 1
+    ahead_of = args[0]
+    branch = 'HEAD'
+  else
+    ahead_of, branch = args[0..1]
+  end
+
+  count = `git rev-list --count #{ahead_of}..#{branch}`.strip.to_i
+  puts "#{branch} is #{count} commit(s) ahead of #{ahead_of}"
+}
+
+hiiro.add_subcmd(:behind) { |*args|
+  case args.length
+  when 0
+    base = %w[main master].find { |b| system("git rev-parse --verify #{b} >/dev/null 2>&1") } || 'HEAD~1'
+    behind_of = base
+    branch = 'HEAD'
+  when 1
+    behind_of = args[0]
+    branch = 'HEAD'
+  else
+    behind_of, branch = args[0..1]
+  end
+
+  count = `git rev-list --count #{branch}..#{behind_of}`.strip.to_i
+  puts "#{branch} is #{count} commit(s) behind #{behind_of}"
+}
+
+hiiro.add_subcmd(:ancestor) { |*args|
+  case args.length
+  when 0
+    # Check if main/master is ancestor of HEAD
+    base = %w[main master].find { |b| system("git rev-parse --verify #{b} >/dev/null 2>&1") }
+    unless base
+      puts "Cannot find main or master branch"
+      next
+    end
+    ancestor = base
+    descendant = 'HEAD'
+  when 1
+    # Check if arg is ancestor of HEAD
+    ancestor = args[0]
+    descendant = 'HEAD'
+  else
+    ancestor, descendant = args[0..1]
+  end
+
+  if system("git merge-base --is-ancestor #{ancestor} #{descendant}")
+    puts "Yes, #{ancestor} is an ancestor of #{descendant}"
+  else
+    puts "No, #{ancestor} is NOT an ancestor of #{descendant}"
+  end
+}
+
 hiiro.add_default { manager.help }
 
 hiiro.run

data/bin/h-buffer

@@ -2,8 +2,12 @@
 
 require "hiiro"
 
+def buffer_names
+  `tmux list-buffers -F '\#{buffer_name}'`.strip.split("\n")
+end
+
 def find_buffer(partial)
-  buffer_list = `tmux list-buffers`.lines.map{|line| line.split(/:/, 2).first }
+  buffer_list = buffer_names
 
   buffer, *other = buffer_list.grep(Regexp.new(partial))
 
@@ -12,18 +16,57 @@ def find_buffer(partial)
   buffer
 end
 
+def select_buffer(partial = nil)
+  names = buffer_names
+  return nil if names.empty?
+
+  if partial
+    names = names.grep(Regexp.new(partial))
+  end
+
+  return nil if names.empty?
+  return names.first if names.length == 1
+
+  require 'open3'
+  selected, status = Open3.capture2('sk', '--no-sort', stdin_data: names.join("\n"))
+  return nil unless status.success?
+
+  selected.strip.empty? ? nil : selected.strip
+end
+
 o = Hiiro.init(*ARGV, plugins: [Pins])
 
 o.add_subcmd(:ls) { |*args|
   system('tmux', 'list-buffers', *args)
 }
 
-o.add_subcmd(:show) { |name, *args|
-  buffer = find_buffer(name)
+o.add_subcmd(:show) { |name = nil, *args|
+  buffer = select_buffer(name)
+  unless buffer
+    puts "No buffer selected or found"
+    next
+  end
 
   system('tmux', 'show-buffer', '-b', buffer, *args)
 }
 
+o.add_subcmd(:copy) { |name = nil, *args|
+  buffer = select_buffer(name)
+  unless buffer
+    puts "No buffer selected or found"
+    next
+  end
+
+  require 'open3'
+  content = `tmux show-buffer -b #{buffer}`
+  Open3.popen3('pbcopy') do |stdin, stdout, stderr, wait_thr|
+    stdin.write(content)
+    stdin.close
+    wait_thr.value
+  end
+  puts "Copied buffer '#{buffer}' to clipboard"
+}
+
 o.add_subcmd(:save) { |*args|
   system('tmux', 'save-buffer', *args)
 }

data/bin/h-commit

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+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

data/bin/h-config

@@ -16,6 +16,19 @@ Hiiro.run(*ARGV) {
     open_config(dir: dir, file: file)
   }
 
+  add_subcmd(:git) {
+    make_child(subcmd, *args) {
+      add_subcmd(:global) {
+        open_config(dir: '~', file: '.gitconfig')
+      }
+
+      add_subcmd(:local) {
+        root = `git rev-parse --show-toplevel`.chomp 
+        open_config(dir: root, file: '.git/config')
+      }
+    }
+  }
+
   add_subcmd(:tmux) {
     open_config(dir: '~', file: '.tmux.conf')
   }

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.58"
+  VERSION = "0.1.60"
 end

data/lib/hiiro.rb

@@ -87,6 +87,12 @@ class Hiiro
     ].map(&:shellescape).join(' ')
   end
 
+  def make_child(subcmd, *args, **kwargs, &block)
+    bin_name = [bin, subcmd.to_s].join(?-)
+
+    Hiiro.init(bin_name:, args:, **kwargs, &block)
+  end
+
   def history
     @history ||= History.new
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.58
+  version: 0.1.60
 platform: ruby
 authors:
 - Joshua Toyota
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-08 00:00:00.000000000 Z
+date: 2026-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -71,6 +71,7 @@ files:
 - bin/h-app
 - bin/h-branch
 - bin/h-buffer
+- bin/h-commit
 - bin/h-config
 - bin/h-home
 - bin/h-html