hiiro 0.1.158 → 0.1.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d61f29ccdc547d37007e61e81488c54e366a574d8f5d95efef42eaeb234c2d
-  data.tar.gz: cc2b2fa6c52956a5d780b07820d86350c1a585f6df05166378a420a22e391f8e
+  metadata.gz: 394980810fd90dc9fdd82383a671502fd78669690479d6b3e6ba0fb4ed6510fc
+  data.tar.gz: 189dffc8b1e175751572114424b7ce0078e6eae386aa3c3993ae0d0689c37733
 SHA512:
-  metadata.gz: 1cdcd252caf0b31bd14eb765b66e92ff8ad892eb2d0613d7bb3e0f853d322a72797052cc25a7b2a543a0e3e1d90e525655ad9f91b2b40c865640b3c58fb0763a
-  data.tar.gz: 162a5028c7e6e8ff3e24c91a9a5d6e442d7488440bc70d2f1021f0001ebfef287f0cb9ead32d5cc35e4884059fef0ccc7945b3330a269e78407d158ae892fed3
+  metadata.gz: 6cef595bf8648318ade523cd214a43d76960398543168803fe9a2cb2948dbe4d065e259a5de3aa5ebc60a2e703fa3de21e049b5c9c6295a3c3602c8a5f6524fd
+  data.tar.gz: '009cf0ef87a09777f322bba3868bd06197d1b8207f94e580fe7e63ed1437f2a5c965c35b66b7479f3fb819a0cf90dd64d9327f38fc76926053371c7a6b984b7f'

data/lib/hiiro/service_manager.rb

@@ -82,8 +82,8 @@ class Hiiro
       puts "Starting group '#{group[:name]}'..."
 
       # Create one window for the group, split panes for each service
-      window_target = create_tmux_window(session, group[:name])
-      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]
@@ -95,7 +95,9 @@ class Hiiro
         if idx == 0
           pane_id = first_pane_id
         else
-          pane_id = split_tmux_pane(window_target)
+          # 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(
@@ -193,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)
-        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]
@@ -800,18 +801,15 @@ class Hiiro
     end
 
     def create_tmux_window(session, name)
-      system('tmux', 'new-window', '-d', '-t', session, '-n', name)
-      "#{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
-    end
-
-    def split_tmux_pane(window_target)
-      system('tmux', 'split-window', '-d', '-t', window_target)
+    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')
-      `tmux list-panes -t #{window_target} -F '\#{pane_id}'`.chomp.split("\n").last
+      pane_id
     end
 
     def send_to_pane(pane_id, base_dir, script)

data/lib/hiiro/version.rb

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

metadata

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