hiiro 0.1.150 → 0.1.152

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10f2a86eb2689dd8fa57d4f90c5dbb4cad8cdfff2607a0b382eb26a941a31775
-  data.tar.gz: ac6de045418d116c85f336c2926bd8c959b6b52cd9d6493f30c29bcea59a90d8
+  metadata.gz: ca8a2bc3e8f629e23986cd1f75bdcca6fc2cd0aaabf85fbde2ae00e721077178
+  data.tar.gz: 1bfc80f8f3f0844bbc943c23f48258577f7d3b7cea66dd48319893e7f3289aa7
 SHA512:
-  metadata.gz: eaf5e0269292073af2e4b2ea9015ed9ebb13376aa2756513d6a1eb14a84ea9706bf600159bbd38d72436f29ebcbdfb2b51e0994457949e3a7a921c704459e109
-  data.tar.gz: 757f05788e7fa28a6a998a218cfaa8e672461a296e646f4919611138fc1d20054171eed3e054ae1bb5693ffb0e65f2b000be3c5f9523ad555f195fe1767f61f0
+  metadata.gz: 05dfbdf2fdef32ec3471b8f26efefc26f07b171b0886c6f9beb55ea7008218165cc126f762cd1ef5e391511815b42eb479aa0dcdff9cc5831b885a8c4ea15b52
+  data.tar.gz: b9645c6341b3cf753d209b7fcac576264788156a646042a5601d4e4f1269478fd87ab8d93024448ad2ce8eb410d01cd7cd410c26d20f0ebd71007967f6f6a028

data/lib/hiiro/service_manager.rb

@@ -109,13 +109,50 @@ class Hiiro
         return false
       end
 
+      session = tmux_info[:session] || current_tmux_session
+      unless session
+        puts "tmux is required to start a service group"
+        return false
+      end
+
       puts "Starting group '#{group[:name]}'..."
-      members.each do |member|
+
+      # 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 = first_svc&.[](:base_dir) || Dir.pwd
+
+      # 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)
+
+      members.each_with_index do |member, idx|
         member_name = member['name'] || member[:name]
         use_overrides = member['use'] || member[:use] || {}
 
         prepare_env(member_name, variation_overrides: use_overrides)
-        start(member_name, tmux_info: tmux_info, task_info: task_info, skip_env: true)
+
+        svc = find_service(member_name)
+        next unless svc
+
+        base_dir = svc[:base_dir] || Dir.pwd
+
+        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)
+        end
+
+        member_tmux_info = tmux_info.merge(
+          session: session,
+          window: window_target,
+          pane: pane_id,
+        )
+
+        start(member_name, tmux_info: member_tmux_info, task_info: task_info, skip_env: true, skip_window_creation: true)
       end
       true
     end
@@ -129,7 +166,45 @@ class Hiiro
       load_state
     end
 
-    def start(name, tmux_info: {}, task_info: {}, variation_overrides: {}, skip_env: false)
+    def reset(name)
+      svc = find_service(name)
+      unless svc
+        puts "Service '#{name}' not found"
+        return false
+      end
+
+      svc_name = svc[:name]
+      state = load_state
+      unless state.key?(svc_name)
+        puts "Service '#{svc_name}' is not in running state"
+        return false
+      end
+
+      state.delete(svc_name)
+      save_state(state)
+      puts "Reset service '#{svc_name}' (cleared from running state)"
+      true
+    end
+
+    def clean
+      state = load_state
+      return puts("No running services to clean") if state.empty?
+
+      stale = state.select { |_, info| stale_pane?(info['tmux_pane']) }
+      if stale.empty?
+        puts "All running services have live panes"
+        return false
+      end
+
+      stale.each do |svc_name, _|
+        state.delete(svc_name)
+        puts "Cleaned stale service '#{svc_name}'"
+      end
+      save_state(state)
+      true
+    end
+
+    def start(name, tmux_info: {}, task_info: {}, variation_overrides: {}, skip_env: false, skip_window_creation: false)
       svc = find_service(name)
       unless svc
         puts "Service '#{name}' not found"
@@ -168,29 +243,38 @@ class Hiiro
         return false
       end
 
+      start_cmds = Array(start_cmd)
       base_dir = svc[:base_dir]
-      pane_id = tmux_info[:pane] || ENV['TMUX_PANE']
+      session = tmux_info[:session] || current_tmux_session
+
+      # Write start commands to an executable tempfile
+      script = write_start_script(svc_name, start_cmds, base_dir)
+
+      if session && !skip_window_creation
+        # Create a new tmux window for this service
+        window_target = create_tmux_window(session, svc_name, base_dir || Dir.pwd)
+        pane_id = capture_pane_id(window_target)
+      elsif session && skip_window_creation
+        # Pane already created by start_group
+        pane_id = tmux_info[:pane]
+        window_target = tmux_info[:window]
+      else
+        pane_id = nil
+        window_target = nil
+      end
 
       if pane_id
-        if base_dir
-          system('tmux', 'send-keys', '-t', pane_id, "cd #{base_dir} && #{start_cmd}", 'Enter')
-        else
-          system('tmux', 'send-keys', '-t', pane_id, start_cmd, 'Enter')
-        end
+        system('tmux', 'send-keys', '-t', pane_id, script, 'Enter')
       else
-        if base_dir
-          system("cd #{base_dir} && #{start_cmd} &")
-        else
-          system("#{start_cmd} &")
-        end
+        system("#{script} &")
       end
 
       # Record state
       state = load_state
       state[svc_name] = {
         'pid' => nil,
-        'tmux_session' => tmux_info[:session],
-        'tmux_window' => tmux_info[:window],
+        'tmux_session' => session || tmux_info[:session],
+        'tmux_window' => window_target || tmux_info[:window],
         'tmux_pane' => pane_id,
         'task' => task_info[:task_name],
         'tree' => task_info[:tree],
@@ -220,7 +304,7 @@ class Hiiro
       info = running_services[svc_name]
       pane_id = info['tmux_pane']
 
-      if svc[:stop]
+      if svc[:stop] && !svc[:stop].to_s.strip.empty?
         stop_cmd = svc[:stop]
         if info['pid']
           stop_cmd = stop_cmd.gsub('$PID', info['pid'].to_s)
@@ -260,11 +344,16 @@ class Hiiro
       info = running_services[svc_name]
       pane_id = info['tmux_pane']
       session = info['tmux_session']
+      window = info['tmux_window']
 
       if session
         system('tmux', 'switch-client', '-t', session)
       end
 
+      if window
+        system('tmux', 'select-window', '-t', window)
+      end
+
       if pane_id
         system('tmux', 'select-pane', '-t', pane_id)
       end
@@ -398,8 +487,6 @@ class Hiiro
 
           tmux_info = {
             session: ENV['TMUX'] ? `tmux display-message -p '#S'`.chomp : nil,
-            window: ENV['TMUX'] ? `tmux display-message -p '#I'`.chomp : nil,
-            pane: ENV['TMUX_PANE'],
           }
 
           task_info = {}
@@ -433,6 +520,19 @@ class Hiiro
           sm.stop(svc_name)
         end
 
+        h.add_subcmd(:reset) do |svc_name=nil|
+          unless svc_name
+            puts "Usage: service reset <name>"
+            next
+          end
+
+          sm.reset(svc_name)
+        end
+
+        h.add_subcmd(:clean) do
+          sm.clean
+        end
+
         h.add_subcmd(:attach) do |svc_name=nil|
           unless svc_name
             puts "Usage: service attach <name>"
@@ -499,8 +599,7 @@ class Hiiro
             'host' => 'localhost',
             'port' => '',
             'init' => [],
-            'start' => '',
-            'stop' => '',
+            'start' => [''],
             'cleanup' => [],
           }
 
@@ -606,6 +705,45 @@ class Hiiro
 
     private
 
+    def stale_pane?(pane_id)
+      return true unless pane_id
+      !system('tmux', 'has-session', '-t', pane_id, [:out, :err] => '/dev/null')
+    end
+
+    def write_start_script(svc_name, cmds, base_dir)
+      dir = File.join(STATE_DIR, 'scripts')
+      FileUtils.mkdir_p(dir)
+      path = File.join(dir, "#{svc_name}.sh")
+
+      lines = ["#!/usr/bin/env bash", "set -e"]
+      lines << "cd #{base_dir}" if base_dir
+      lines.concat(cmds)
+
+      File.write(path, lines.join("\n") + "\n")
+      File.chmod(0755, path)
+      path
+    end
+
+    def current_tmux_session
+      return nil unless ENV['TMUX']
+      `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}"
+    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, 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
+    end
+
     def load_config
       return {} unless File.exist?(config_file)
       YAML.safe_load_file(config_file, permitted_classes: [Symbol]) || {}

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.150"
+  VERSION = "0.1.152"
 end

metadata

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