hiiro 0.1.157 → 0.1.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a1dfe8868ee27e926e81edb4d93f9dd75bab129a493985a00505a267088e32c
-  data.tar.gz: c5f7a4fb1aea909d05ebb8e00a737bc28bf7524a19e4f52f7af518aba508d5f0
+  metadata.gz: 394980810fd90dc9fdd82383a671502fd78669690479d6b3e6ba0fb4ed6510fc
+  data.tar.gz: 189dffc8b1e175751572114424b7ce0078e6eae386aa3c3993ae0d0689c37733
 SHA512:
-  metadata.gz: 9dc4b695cbb678fa4ec76e940baba3356c67f6eeb551bcef4dd7f42de63c247fe42b9b98403a08ff7b0af406de0ce109d7bdbac9eda37dee71938b432566f114
-  data.tar.gz: f16b50413fd3c6e01b206bc385f08157fa504466470ad1dbb84dd9513c0253961f2c5a81f928fff0334241d40ac7fb1d64dd1a3e3e62da835e0ca4ea5b952cc8
+  metadata.gz: 6cef595bf8648318ade523cd214a43d76960398543168803fe9a2cb2948dbe4d065e259a5de3aa5ebc60a2e703fa3de21e049b5c9c6295a3c3602c8a5f6524fd
+  data.tar.gz: '009cf0ef87a09777f322bba3868bd06197d1b8207f94e580fe7e63ed1437f2a5c965c35b66b7479f3fb819a0cf90dd64d9327f38fc76926053371c7a6b984b7f'

data/lib/hiiro/service_manager.rb

@@ -82,14 +82,8 @@ class Hiiro
       puts "Starting group '#{group[:name]}'..."
 
       # Create one window for the group, split panes for each service
-      first_member = members.first
-      first_name = first_member['name'] || first_member[:name]
-      first_svc = find_service(first_name)
-      first_base_dir = resolve_base_dir(first_svc&.[](:base_dir))
-
-      # Create a new window for the group
-      window_target = create_tmux_window(session, group[:name], first_base_dir)
-      first_pane_id = capture_pane_id(window_target)
+      window_target, first_pane_id = create_tmux_window(session, group[:name])
+      last_pane_id = first_pane_id
 
       members.each_with_index do |member, idx|
         member_name = member['name'] || member[:name]
@@ -98,14 +92,12 @@ class Hiiro
         svc = find_service(member_name)
         next unless svc
 
-        base_dir = resolve_base_dir(svc[:base_dir])
-
         if idx == 0
-          # First service uses the initial pane
           pane_id = first_pane_id
         else
-          # Subsequent services get split panes
-          pane_id = split_tmux_pane(window_target, base_dir)
+          # Split from the last pane so each new pane is distinct
+          pane_id = split_tmux_pane(window_target, last_pane_id)
+          last_pane_id = pane_id
         end
 
         member_tmux_info = tmux_info.merge(
@@ -203,8 +195,7 @@ class Hiiro
 
       if session && !skip_window_creation
         # Create a new tmux window for this service
-        window_target = create_tmux_window(session, svc_name, base_dir)
-        pane_id = capture_pane_id(window_target)
+        window_target, pane_id = create_tmux_window(session, svc_name)
       elsif session && skip_window_creation
         # Pane already created by start_group
         pane_id = tmux_info[:pane]
@@ -215,7 +206,7 @@ class Hiiro
       end
 
       if pane_id
-        system('tmux', 'send-keys', '-t', pane_id, script, 'Enter')
+        send_to_pane(pane_id, base_dir, script)
       else
         system("cd #{base_dir} && #{script} &")
       end
@@ -754,7 +745,7 @@ class Hiiro
     end
 
     def write_shell_script(path, cmds)
-      lines = ["#!/usr/bin/env bash", "set -e"]
+      lines = ["#!/usr/bin/env bash"]
       lines.concat(cmds)
       File.write(path, lines.join("\n") + "\n")
       File.chmod(0755, path)
@@ -809,19 +800,20 @@ class Hiiro
       `tmux display-message -p '#S'`.chomp
     end
 
-    def create_tmux_window(session, name, start_dir)
-      system('tmux', 'new-window', '-d', '-t', session, '-n', name, '-c', start_dir)
-      "#{session}:#{name}"
+    def create_tmux_window(session, name)
+      pane_id = `tmux new-window -d -t #{session} -n #{name} -P -F '\#{pane_id}'`.chomp
+      window_target = "#{session}:#{name}"
+      [window_target, pane_id]
     end
 
-    def capture_pane_id(window_target)
-      `tmux list-panes -t #{window_target} -F '\#{pane_id}'`.chomp.split("\n").last
+    def split_tmux_pane(window_target, target_pane_id)
+      pane_id = `tmux split-window -d -t #{target_pane_id} -P -F '\#{pane_id}'`.chomp
+      system('tmux', 'select-layout', '-t', window_target, 'even-vertical')
+      pane_id
     end
 
-    def split_tmux_pane(window_target, start_dir)
-      system('tmux', 'split-window', '-d', '-t', window_target, '-c', start_dir)
-      system('tmux', 'select-layout', '-t', window_target, 'even-vertical')
-      `tmux list-panes -t #{window_target} -F '\#{pane_id}'`.chomp.split("\n").last
+    def send_to_pane(pane_id, base_dir, script)
+      system('tmux', 'send-keys', '-t', pane_id, "cd #{base_dir} && #{script}", 'Enter')
     end
 
     def load_config

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.157"
+  VERSION = "0.1.159"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.157
+  version: 0.1.159
 platform: ruby
 authors:
 - Joshua Toyota