hiiro 0.1.57 → 0.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f55785ca9b54838e9b0e0eefe8e1e829f85ad1b1d9a1ed6b961305b847f1828
-  data.tar.gz: cda5ec5bdc86b4210e4870d88bca437c9cc7dbac3857ae3e264a66ba0b054675
+  metadata.gz: 48a2bf79d71ec28000cfde49b21206385dc42c12f4dc6a907d5b9488a9c4e6db
+  data.tar.gz: 9dfac1b2b9d320b7c336383ec101044180cd3220365df3537cdd418e753522f9
 SHA512:
-  metadata.gz: 8d8e719178da0355245154216264edb4c292fb5ccc62dc561e8529bf7b67f4a94d85a5db3516e1406f5cf7464f61454dc3c07f7dc26530a44a895577b7082c12
-  data.tar.gz: 28a570aba442cb90419feaf3edd4ef4135773fc2f971401df942bb09617f17c7466c3ba32dbfc2edd1849895d973cdada07f80b8edd2932685e8f21bc00f29d4
+  metadata.gz: '0487e36729f6d2d3d1269a89e2a76d59b959ea94f6166732439e07fe7eef363dd36741993852c9a95d6302bb6675ea8a8bc8c32517bec9e503e2a5610f88f47e'
+  data.tar.gz: d3a5ba6ab09f95f8fb46be7ff55428589d8a3129df025dcddf9b0d879246606679ef892df7bf0208052ddc72e620c1d1681cbe5218f338b37210429fb62261fe

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/lib/hiiro/prefix_matcher.rb

@@ -1,5 +1,112 @@
 class Hiiro
   class PrefixMatcher
+    class << self
+      def find(items, prefix, key: nil, &block)
+        new(items, key, &block).find(prefix)
+      end
+
+      def find_all(items, prefix, key: nil, &block)
+        new(items, key, &block).find_all(prefix)
+      end
+
+      def resolve(items, prefix, key: nil, &block)
+        new(items, key, &block).resolve(prefix)
+      end
+
+      def find_path(items, prefix, key: nil, &block)
+        new(items, key, &block).find_path(prefix)
+      end
+
+      def find_all_paths(items, prefix, key: nil, &block)
+        new(items, key, &block).find_all_paths(prefix)
+      end
+
+      def resolve_path(items, prefix, key: nil, &block)
+        new(items, key, &block).resolve_path(prefix)
+      end
+    end
+
+    attr_reader :original_items, :key, :block
+
+    def initialize(items, key = nil, &block)
+      @original_items = items
+      @key = key
+      @block = block
+    end
+
+    def all_items(key = nil, &block)
+      use_key = key.nil? && !block_given? ? @key : key
+      use_block = key.nil? && !block_given? ? @block : block
+
+      @all_items_cache ||= {}
+      cache_key = [use_key, use_block].hash
+
+      @all_items_cache[cache_key] ||= original_items.map { |item|
+        Item.new(
+          item: item,
+          extracted_item: extract(item, use_key, &use_block),
+          key: use_key,
+          block: use_block
+        )
+      }
+    end
+
+    def search(prefix, key = nil, &block)
+      Result.new(
+        matcher: self,
+        all_items: all_items(key, &block),
+        prefix: prefix,
+        key: key || @key,
+        block: block || @block
+      )
+    end
+
+    def find(prefix, key = nil, &block)
+      search(prefix, key, &block)
+    end
+
+    def find_all(prefix, key = nil, &block)
+      search(prefix, key, &block)
+    end
+
+    def resolve(prefix, key = nil, &block)
+      search(prefix, key, &block)
+    end
+
+    def find_path(prefix, key = nil, &block)
+      search_path(prefix, key, &block)
+    end
+
+    def find_all_paths(prefix, key = nil, &block)
+      search_path(prefix, key, &block)
+    end
+
+    def resolve_path(prefix, key = nil, &block)
+      search_path(prefix, key, &block)
+    end
+
+    def search_path(prefix, key = nil, &block)
+      PathResult.new(
+        matcher: self,
+        all_items: all_items(key, &block),
+        prefix: prefix,
+        key: key || @key,
+        block: block || @block
+      )
+    end
+
+    private
+
+    def matches?(item, prefix)
+      item.to_s.start_with?(prefix.to_s)
+    end
+
+    def extract(item, key = nil, &block)
+      return block.call(item) if block
+      return item.send(key) if key
+      item
+    end
+
     class Item
       attr_reader :item, :extracted_item, :key, :block
 
@@ -130,112 +237,5 @@ class Hiiro
         matches.first
       end
     end
-
-    class << self
-      def find(items, prefix, key: nil, &block)
-        new(items, key, &block).find(prefix)
-      end
-
-      def find_all(items, prefix, key: nil, &block)
-        new(items, key, &block).find_all(prefix)
-      end
-
-      def resolve(items, prefix, key: nil, &block)
-        new(items, key, &block).resolve(prefix)
-      end
-
-      def find_path(items, prefix, key: nil, &block)
-        new(items, key, &block).find_path(prefix)
-      end
-
-      def find_all_paths(items, prefix, key: nil, &block)
-        new(items, key, &block).find_all_paths(prefix)
-      end
-
-      def resolve_path(items, prefix, key: nil, &block)
-        new(items, key, &block).resolve_path(prefix)
-      end
-    end
-
-    attr_reader :original_items, :key, :block
-
-    def initialize(items, key = nil, &block)
-      @original_items = items
-      @key = key
-      @block = block
-    end
-
-    def all_items(key = nil, &block)
-      use_key = key.nil? && !block_given? ? @key : key
-      use_block = key.nil? && !block_given? ? @block : block
-
-      @all_items_cache ||= {}
-      cache_key = [use_key, use_block].hash
-
-      @all_items_cache[cache_key] ||= original_items.map { |item|
-        Item.new(
-          item: item,
-          extracted_item: extract(item, use_key, &use_block),
-          key: use_key,
-          block: use_block
-        )
-      }
-    end
-
-    def search(prefix, key = nil, &block)
-      Result.new(
-        matcher: self,
-        all_items: all_items(key, &block),
-        prefix: prefix,
-        key: key || @key,
-        block: block || @block
-      )
-    end
-
-    def find(prefix, key = nil, &block)
-      search(prefix, key, &block)
-    end
-
-    def find_all(prefix, key = nil, &block)
-      search(prefix, key, &block)
-    end
-
-    def resolve(prefix, key = nil, &block)
-      search(prefix, key, &block)
-    end
-
-    def find_path(prefix, key = nil, &block)
-      search_path(prefix, key, &block)
-    end
-
-    def find_all_paths(prefix, key = nil, &block)
-      search_path(prefix, key, &block)
-    end
-
-    def resolve_path(prefix, key = nil, &block)
-      search_path(prefix, key, &block)
-    end
-
-    def search_path(prefix, key = nil, &block)
-      PathResult.new(
-        matcher: self,
-        all_items: all_items(key, &block),
-        prefix: prefix,
-        key: key || @key,
-        block: block || @block
-      )
-    end
-
-    private
-
-    def matches?(item, prefix)
-      item.to_s.start_with?(prefix.to_s)
-    end
-
-    def extract(item, key = nil, &block)
-      return block.call(item) if block
-      return item.send(key) if key
-      item
-    end
   end
 end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.57"
+  VERSION = "0.1.59"
 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.57
+  version: 0.1.59
 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