hiiro 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1976453cdeb8c87f0abb85e7fc0061f7809ea40dfd23f5737838c9ef2352128d
-  data.tar.gz: 98521457732fceb0b2b33d816c5f53ecceac9f250a235e5c16d8d43f780466f7
+  metadata.gz: 30801e00dc876dec391ff411a4f20a500ca411e7d2ebf77318790ace5fc603bc
+  data.tar.gz: e6bae4d3c68e5edf720f1eeb0b282f9c15ca1c662ff460eb2bae25b38dd30904
 SHA512:
-  metadata.gz: 97f152f96b8a4af4f0b956f21dd5a6d9232f5bf3f3aa3093cdaef897914b9379b9e5e754a87cb1a274ab27ecc7bd6cd2a03843b547ffc6a96ea6acaffbfbff35
-  data.tar.gz: 6668446ba8ec596bd7ad163d7519ab90181c1af5632b335090b79bc438787153b43ebbf419324890c6e9caa6bdedc0e63cbddc59b687ef829f61605d9e79054f
+  metadata.gz: 74879d93880ef6c1ed72777ca0fbabe19273d22d2acc7f42ddcbb12a80db439ae0a0a09b7b4970483235b591c69e71e6dbb1015cac3d10364bff2e794fd0a7e9
+  data.tar.gz: 35c0a0a4f90e2fb22bd3129131ad8904c12ba3d528a7e6a0d2568656767c97620235c7e4d6180d968a5ab3926fdb104cff5a9230416ef94a79ed76e598276a73

data/bin/h-link

@@ -39,9 +39,15 @@ def hash_matches?(links, *args)
   end
 end
 
-def link_matches?(link, *args)
+def search_links(links, *args)
   terms = args.map(&:downcase)
 
+  links.select do |link|
+    link_matches?(link, *terms)
+  end
+end
+
+def link_matches?(link, *terms)
   searchable = [
     link['url'],
     link['description'],
@@ -234,6 +240,8 @@ o.add_subcmd(:open) do |*args|
   if args.empty?
     lines = load_link_hash(links)
 
+    exit_code = 1
+
     if args.any?
       lines = hash_matches?(lines, *args)
     end
@@ -244,12 +252,23 @@ o.add_subcmd(:open) do |*args|
     if status.success? && !selected.strip.empty?
       if selected =~ /^\s*(\d+)\.\s+(\S+)/
         system('open', $2)
+        exit_code = 0
       end
     end
+
+    exit exit_code
   end
 
   idx, link = find_link_by_ref(args.first, links)
 
+  if link.nil? 
+    matches = search_links(links, *args)
+
+    if matches.count == 1
+      link = matches.first
+    end
+  end
+
   if link.nil?
     puts "Link not found: #{args.first}"
     exit 1

data/lib/hiiro/history.rb

@@ -0,0 +1,268 @@
+require 'yaml'
+require 'time'
+require 'fileutils'
+
+class Hiiro
+  class History
+    HISTORY_FILE = File.join(Dir.home, '.config/hiiro/history.yml')
+
+    class Entry
+      attr_reader :id, :timestamp, :source, :cmd, :description
+      attr_reader :tmux_session, :tmux_window, :tmux_pane
+      attr_reader :git_branch, :git_worktree
+      attr_reader :task, :subtask
+
+      def initialize(data)
+        @id = data['id']
+        @timestamp = data['timestamp']
+        @source = data['source']
+        @cmd = data['cmd']
+        @description = data['description']
+        @tmux_session = data['tmux_session']
+        @tmux_window = data['tmux_window']
+        @tmux_pane = data['tmux_pane']
+        @git_branch = data['git_branch']
+        @git_worktree = data['git_worktree']
+        @task = data['task']
+        @subtask = data['subtask']
+      end
+
+      def to_h
+        {
+          'id' => id,
+          'timestamp' => timestamp,
+          'source' => source,
+          'cmd' => cmd,
+          'description' => description,
+          'tmux_session' => tmux_session,
+          'tmux_window' => tmux_window,
+          'tmux_pane' => tmux_pane,
+          'git_branch' => git_branch,
+          'git_worktree' => git_worktree,
+          'task' => task,
+          'subtask' => subtask,
+        }.compact
+      end
+
+      def short_line(index)
+        time_str = Time.parse(timestamp).strftime('%Y-%m-%d %H:%M')
+        desc = description || cmd || '(no description)'
+        desc = desc[0..60] + '...' if desc.length > 63
+        format('%3d  %s  %s', index, time_str, desc)
+      end
+
+      def full_display
+        lines = []
+        lines << "ID:          #{id}"
+        lines << "Timestamp:   #{timestamp}"
+        lines << "Description: #{description}" if description
+        lines << "Command:     #{cmd}" if cmd
+        lines << "Source:      #{source}" if source
+        lines << ""
+        lines << "Tmux:"
+        lines << "  Session:   #{tmux_session}" if tmux_session
+        lines << "  Window:    #{tmux_window}" if tmux_window
+        lines << "  Pane:      #{tmux_pane}" if tmux_pane
+        lines << ""
+        lines << "Git:"
+        lines << "  Branch:    #{git_branch}" if git_branch
+        lines << "  Worktree:  #{git_worktree}" if git_worktree
+        lines << ""
+        lines << "Task:"
+        lines << "  Task:      #{task}" if task
+        lines << "  Subtask:   #{subtask}" if subtask
+        lines.join("\n")
+      end
+    end
+
+    class << self
+      def load(hiiro)
+        history = new
+
+        hiiro.add_subcmd(:history) do |*args|
+          subcmd, *rest = args
+          case subcmd
+          when 'ls', 'list', nil
+            history.list
+          when 'show'
+            history.show(rest.first)
+          when 'goto'
+            history.goto(rest.first)
+          when 'add'
+            history.add_manual(rest.join(' '), hiiro: hiiro)
+          else
+            puts "Unknown history subcommand: #{subcmd}"
+            puts "Available: ls, show <id>, goto <id>, add <description>"
+            false
+          end
+        end
+      end
+
+      def log(description: nil, pwd: Dir.pwd, cmd: nil, source: nil, task: nil, subtask: nil)
+        new.add(
+          description: description,
+          cmd: cmd,
+          pwd: pwd,
+          source: source,
+          task: task,
+          subtask: subtask
+        )
+      end
+    end
+
+    def initialize
+      ensure_history_file
+    end
+
+    def entries
+      @entries ||= load_entries
+    end
+
+    def reload
+      @entries = nil
+      entries
+    end
+
+    def list
+      if entries.empty?
+        puts "No history entries."
+        return true
+      end
+
+      entries.each_with_index do |entry, idx|
+        puts entry.short_line(idx + 1)
+      end
+      true
+    end
+
+    def show(ref)
+      entry = find_entry(ref)
+      unless entry
+        puts "Entry not found: #{ref}"
+        return false
+      end
+
+      puts entry.full_display
+      true
+    end
+
+    def goto(ref)
+      entry = find_entry(ref)
+      unless entry
+        puts "Entry not found: #{ref}"
+        return false
+      end
+
+      unless entry.tmux_session
+        puts "No tmux session recorded for this entry"
+        return false
+      end
+
+      target = entry.tmux_session
+      target += ":#{entry.tmux_window}" if entry.tmux_window
+      target += ".#{entry.tmux_pane}" if entry.tmux_pane
+
+      system('tmux', 'switch-client', '-t', target)
+    end
+
+    def add_manual(description, hiiro: nil)
+      add(description: description, source: 'manual')
+      puts "Added history entry: #{description}"
+      true
+    end
+
+    def add(description: nil, cmd: nil, source: nil, task: nil, subtask: nil, pwd: Dir.pwd)
+      cmd ||= 
+      entry_data = {
+        'id' => generate_id,
+        'timestamp' => Time.now.iso8601,
+        'description' => description,
+        'cmd' => cmd,
+        'pwd' => pwd,
+        'source' => source,
+        'tmux_session' => current_tmux_session,
+        'tmux_window' => current_tmux_window,
+        'tmux_pane' => current_tmux_pane,
+        'git_branch' => current_git_branch,
+        'git_worktree' => current_git_worktree,
+        'task' => task,
+        'subtask' => subtask,
+      }.compact
+
+      all = load_raw_entries
+      all << entry_data
+      save_entries(all)
+
+      Entry.new(entry_data)
+    end
+
+    private
+
+    def find_entry(ref)
+      return nil unless ref
+
+      if ref.to_s.match?(/^\d+$/)
+        idx = ref.to_i - 1
+        return entries[idx] if idx >= 0 && idx < entries.length
+      end
+
+      entries.find { |e| e.id == ref.to_s }
+    end
+
+    def generate_id
+      Time.now.strftime('%Y%m%d%H%M%S') + '-' + rand(10000).to_s.rjust(4, '0')
+    end
+
+    def ensure_history_file
+      dir = File.dirname(HISTORY_FILE)
+      FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
+
+      unless File.exist?(HISTORY_FILE)
+        File.write(HISTORY_FILE, [].to_yaml)
+      end
+    end
+
+    def load_raw_entries
+      YAML.load_file(HISTORY_FILE) || []
+    rescue => e
+      []
+    end
+
+    def load_entries
+      load_raw_entries.map { |data| Entry.new(data) }
+    end
+
+    def save_entries(entries_data)
+      File.write(HISTORY_FILE, entries_data.to_yaml)
+    end
+
+    def current_tmux_session
+      return nil unless ENV['TMUX']
+      `tmux display-message -p '#S'`.strip rescue nil
+    end
+
+    def current_tmux_window
+      return nil unless ENV['TMUX']
+      `tmux display-message -p '#I'`.strip rescue nil
+    end
+
+    def current_tmux_pane
+      return nil unless ENV['TMUX']
+      `tmux display-message -p '#P'`.strip rescue nil
+    end
+
+    def current_git_branch
+      branch = `git branch --show-current 2>/dev/null`.strip
+      branch.empty? ? nil : branch
+    rescue
+      nil
+    end
+
+    def current_git_worktree
+      worktree = `git rev-parse --show-toplevel 2>/dev/null`.strip
+      worktree.empty? ? nil : worktree
+    rescue
+      nil
+    end
+  end
+end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.15"
+  VERSION = "0.1.17"
 end

data/lib/hiiro.rb

@@ -1,7 +1,9 @@
 require "fileutils"
 require "yaml"
+require "shellwords"
 
 require_relative "hiiro/version"
+require_relative "hiiro/history"
 
 class Hiiro
   def self.init(*args, plugins: [], logging: false, **values, &block)
@@ -9,6 +11,7 @@ class Hiiro
     args = ARGV if args.empty?
 
     new($0, *args, logging: logging, **values).tap do |hiiro|
+      History.load(hiiro)
       hiiro.load_plugins(*plugins)
 
       hiiro.add_subcmd(:edit, **values) { |*args|
@@ -33,23 +36,32 @@ class Hiiro
     self
   end
 
-  attr_reader :bin, :bin_name, :all_args
+  attr_reader :bin, :bin_name, :all_args, :full_command
   attr_reader :subcmd, :args
   attr_reader :loaded_plugins
   attr_reader :logging
   attr_reader :global_values
 
-  def initialize(bin, *args, logging: false, **values)
+  def initialize(bin, *all_args, logging: false, **values)
     @bin = bin
     @bin_name = File.basename(bin)
-    @all_args = args
-    @subcmd, *@args = args # normally i would never do this
+    @all_args = all_args
+    @subcmd, *@args = all_args # normally i would never do this
     @loaded_plugins = []
     @logging = logging
     @global_values = values
+    @full_command = [
+      bin,
+      all_args,
+    ].map(&:shellescape).join(' ')
+  end
+
+  def history
+    @history ||= History.new
   end
 
   def run
+    log(description: 'hiiro: ran command')
     result = runner.run(*args)
 
     handle_result(result)
@@ -61,6 +73,15 @@ class Hiiro
     exit 1
   end
 
+  def log(**opts)
+    history.add(
+      description: 'command ran',
+      cmd: full_command,
+      source: 'hiiro',
+      **opts,
+    )
+  end
+
   def handle_result(result)
     exit 0 if result.nil? || result
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Joshua Toyota
@@ -61,6 +61,7 @@ files:
 - exe/h
 - hiiro.gemspec
 - lib/hiiro.rb
+- lib/hiiro/history.rb
 - lib/hiiro/version.rb
 - links.backup.yml
 - plugins/notify.rb