hiiro 0.1.206 → 0.1.208

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43afc62e3bf52a55f7f155090abc9c326e5ce273f3c90cb6db629ff65535f8cd
-  data.tar.gz: cde95c8c0eb5cff21939427af608d1cdfd9f9bd67b0c02d9ac3841e5a0c6768d
+  metadata.gz: 481e1331821875953629a6cac3c704b9867047f8d33cbc0d84c21037ec34ddc0
+  data.tar.gz: 9bb8ef3c6c1e1614a9c144e3ff299f824e0c3dc9804ca3c24b616dad35877f76
 SHA512:
-  metadata.gz: 0651e3b77c8601162b5f7d29866f095db404c16380d28f397c3a3c088238b77814eadd002d7ef48615531535c89c53370f509b8c749119eac435128adb860fe7
-  data.tar.gz: b30056a4f4b75bc89decbc98ff5a117664aa0d6026251399a8035c92acc3c1f712dcd440d062586418fa38d0085c1c821f63f4861218110cff443b07d74b5e4f
+  metadata.gz: dc6339585ffc0a60610e279b0745dc3a9c74b5bb19df18025c20c92c2e1061aee36b9deac84fb4dba69b718b8eab0f9d036419baed3221d3fa45b4634315ee2d
+  data.tar.gz: '09ded021e3375c1a0414d75ca181d8f8310539f536dae6ab844941c4f0418bed522dff163768a10afa6c0e957ddfac55252d6f355f0e2e928a3487a2bf65b547'

data/lib/hiiro/config.rb

@@ -0,0 +1,33 @@
+class Hiiro
+  class Config
+    BASE_DIR = File.join(Dir.home, '.config/hiiro')
+
+    class << self
+      def path(relpath='')
+        File.join(BASE_DIR, relpath)
+      end
+
+      def plugin_files
+        user_files = Dir.glob(File.join(plugin_dir, '*.rb'))
+        user_basenames = user_files.map { |f| File.basename(f) }
+
+        gem_plugin_dir = File.join(File.expand_path('../..', __FILE__), 'plugins')
+        gem_files = Dir.exist?(gem_plugin_dir) ? Dir.glob(File.join(gem_plugin_dir, '*.rb')) : []
+
+        fallback_files = gem_files.reject { |f| user_basenames.include?(File.basename(f)) }
+
+        user_files + fallback_files
+      end
+
+      def plugin_dir
+        config_dir('plugins')
+      end
+
+      def config_dir(subdir=nil)
+        File.join(Dir.home, '.config/hiiro', *[subdir].compact).tap do |config_path|
+          FileUtils.mkdir_p(config_path) unless Dir.exist?(config_path)
+        end
+      end
+    end
+  end
+end

data/lib/hiiro/queue.rb

@@ -146,6 +146,7 @@ class Hiiro
           working_dir = tree.path if tree
         elsif prompt_obj.session
           target_session = prompt_obj.session.name
+          working_dir = prompt_obj.session.path || working_dir
         end
 
         if prompt_obj.tree
@@ -668,12 +669,7 @@ class Hiiro
       end
 
       def tree_name
-        doc.front_matter['tree_name'].tap do |tname|
-          puts tree_name: tname
-          puts task_tree: task&.tree
-          puts task_tree_name: task&.tree_name
-          puts task_tree_path: task&.tree&.path
-        end
+        doc.front_matter['tree_name']
       end
 
       def session_name

data/lib/hiiro/tasks.rb

@@ -185,7 +185,7 @@ class Hiiro
       puts "#{label}:"
       puts
 
-      client_map = TmuxSession.client_map
+      client_map = Hiiro::Tmux::Session.client_map
 
       # Collect rows as {prefix, name, tree, branch, session} so we can
       # compute max column widths before rendering.
@@ -876,43 +876,6 @@ class Hiiro
     end
   end
 
-  class TmuxSession
-    attr_reader :name
-
-    def self.current
-      name = Hiiro::Tmux::Session.current&.name
-      return nil unless name
-      new(name)
-    end
-
-    def self.all
-      output = `tmux list-sessions -F '#S' 2>/dev/null`
-      output.lines(chomp: true).map { |name| new(name) }
-    end
-
-    # Returns { session_name => "ttysXXX" } for sessions with attached clients.
-    # The tty identifies which terminal tab (e.g. Ghostty tab) the client is in.
-    def self.client_map
-      output = `tmux list-clients -F '\#{client_tty}|\#{session_name}' 2>/dev/null`
-      output.lines(chomp: true).each_with_object({}) do |line, map|
-        tty, session = line.split('|', 2)
-        map[session] ||= tty.delete_prefix('/dev/')
-      end
-    end
-
-    def initialize(name)
-      @name = name
-    end
-
-    def ==(other)
-      other.is_a?(TmuxSession) && name == other.name
-    end
-
-    def to_s
-      name
-    end
-  end
-
   class Tree
     attr_reader :path, :head, :branch
 
@@ -1060,7 +1023,7 @@ class Hiiro
     end
 
     def all_sessions
-      @all_sessions ||= TmuxSession.all
+      @all_sessions ||= Hiiro::Tmux::Session.all
     end
 
     def all_trees
@@ -1099,7 +1062,7 @@ class Hiiro
     end
 
     def session
-      @session ||= TmuxSession.current
+      @session ||= Hiiro::Tmux::Session.current
     end
 
     def tree

data/lib/hiiro/tmux/session.rb

@@ -1,17 +1,17 @@
 class Hiiro
   class Tmux
     class Session
-      FORMAT = '#{session_id}|#{session_name}|#{session_windows}|#{session_attached}|#{session_created}|#{session_last_attached}'
+      FORMAT = '#{session_id}|#{session_name}|#{session_windows}|#{session_attached}|#{session_created}|#{session_last_attached}|#{session_path}'
 
-      attr_reader :id, :name, :windows, :created, :last_attached
+      attr_reader :id, :name, :windows, :created, :last_attached, :path
 
       def self.from_format_line(line)
         return nil if line.nil? || line.strip.empty?
 
-        parts = line.strip.split('|', 6)
+        parts = line.strip.split('|', 7)
         return nil if parts.size < 4
 
-        id, name, windows, attached, created, last_attached = parts
+        id, name, windows, attached, created, last_attached, path = parts
 
         new(
           id: id,
@@ -19,7 +19,8 @@ class Hiiro
           windows: windows.to_i,
           attached: attached == '1',
           created: created.to_i,
-          last_attached: last_attached.to_i
+          last_attached: last_attached.to_i,
+          path: path
         )
       end
 
@@ -30,13 +31,33 @@ class Hiiro
         from_format_line(output)
       end
 
-      def initialize(id:, name:, windows: 0, attached: false, created: 0, last_attached: 0)
+      def self.all
+        output = `tmux list-sessions -F '#{FORMAT}' 2>/dev/null`
+        return [] if output.nil? || output.empty?
+
+        output.each_line.map { |line| from_format_line(line) }.compact
+      end
+
+      def self.client_map
+        output = `tmux list-clients -F '\#{client_tty}|\#{session_name}' 2>/dev/null`
+        output.lines(chomp: true).each_with_object({}) do |line, map|
+          tty, session_name = line.split('|', 2)
+          map[session_name] ||= tty.delete_prefix('/dev/')
+        end
+      end
+
+      def initialize(id:, name:, windows: 0, attached: false, created: 0, last_attached: 0, path: nil)
         @id = id
         @name = name
         @windows = windows
         @attached = attached
         @created = created
         @last_attached = last_attached
+        @path = path
+      end
+
+      def ==(other)
+        other.is_a?(Session) && name == other.name
       end
 
       def attached?
@@ -74,7 +95,8 @@ class Hiiro
           windows: windows,
           attached: attached?,
           created: created,
-          last_attached: last_attached
+          last_attached: last_attached,
+          path: path
         }.compact
       end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.206"
+  VERSION = "0.1.208"
 end

data/lib/hiiro.rb

@@ -5,6 +5,7 @@ require "pry"
 require "ostruct"
 
 require_relative "hiiro/version"
+require_relative "hiiro/config"
 require_relative "hiiro/bins"
 require_relative "hiiro/fuzzyfind"
 require_relative "hiiro/git"
@@ -405,32 +406,6 @@ class Hiiro
     runner&.values&.[](name)
   end
 
-  class Config
-    class << self
-      def plugin_files
-        user_files = Dir.glob(File.join(plugin_dir, '*.rb'))
-        user_basenames = user_files.map { |f| File.basename(f) }
-
-        gem_plugin_dir = File.join(File.expand_path('../..', __FILE__), 'plugins')
-        gem_files = Dir.exist?(gem_plugin_dir) ? Dir.glob(File.join(gem_plugin_dir, '*.rb')) : []
-
-        fallback_files = gem_files.reject { |f| user_basenames.include?(File.basename(f)) }
-
-        user_files + fallback_files
-      end
-
-      def plugin_dir
-        config_dir('plugins')
-      end
-
-      def config_dir(subdir=nil)
-        File.join(Dir.home, '.config/hiiro', *[subdir].compact).tap do |config_path|
-          FileUtils.mkdir_p(config_path) unless Dir.exist?(config_path)
-        end
-      end
-    end
-  end
-
   def default_subcommand
     Runners::Subcommand.new(
       bin_name,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.206
+  version: 0.1.208
 platform: ruby
 authors:
 - Joshua Toyota
@@ -136,6 +136,7 @@ files:
 - lib/hiiro.rb
 - lib/hiiro/app_files.rb
 - lib/hiiro/bins.rb
+- lib/hiiro/config.rb
 - lib/hiiro/fuzzyfind.rb
 - lib/hiiro/git.rb
 - lib/hiiro/git/branch.rb