hiiro 0.1.156 → 0.1.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc18a91776e0f111e0263e6dcf4c48129a14097f9b58cb0a75f3d7917c8281a2
-  data.tar.gz: 02f058b4148463f1685476f7c963931a74f2a1970cd8c8fddcf1fe1605f66721
+  metadata.gz: 6a1dfe8868ee27e926e81edb4d93f9dd75bab129a493985a00505a267088e32c
+  data.tar.gz: c5f7a4fb1aea909d05ebb8e00a737bc28bf7524a19e4f52f7af518aba508d5f0
 SHA512:
-  metadata.gz: d2bad5c61c106dc01c45e62e40a3c49fc247b96cbd2c7d2138d5bb8c7df2fe995ad85e48563cf9250333e4bfe62f4307efdc27ca3103086f4e2e9c0e16681958
-  data.tar.gz: 23bb98706770163a575aa25ee40368cd5d94856c0ed4214e2aaaa4433afa92ec691738332d973dc44e02d0fec4b6f2ceaf724eb96a29c47c126b6e26bfeef8ef
+  metadata.gz: 9dc4b695cbb678fa4ec76e940baba3356c67f6eeb551bcef4dd7f42de63c247fe42b9b98403a08ff7b0af406de0ce109d7bdbac9eda37dee71938b432566f114
+  data.tar.gz: f16b50413fd3c6e01b206bc385f08157fa504466470ad1dbb84dd9513c0253961f2c5a81f928fff0334241d40ac7fb1d64dd1a3e3e62da835e0ca4ea5b952cc8

data/examples/services.sleepers.yml

@@ -0,0 +1,41 @@
+---
+s1:
+  base_dir: lib
+  host: localhost
+  port: '1111'
+  init:
+  - 'echo pwd: $PWD'
+  - pwd
+  - echo
+  - echo sleeper 1
+  start:
+  - sleep 1d
+  cleanup:
+  - ls -lA
+  env_files:
+  - env_file: ".env"
+    base_env: ''
+    env_vars:
+      hello: world
+s2:
+  base_dir: lib
+  host: localhost
+  port: '2222'
+  init:
+  - 'echo pwd: $PWD'
+  - pwd
+  - echo
+  - echo sleeper 2
+  start:
+  - sleep 2d
+  cleanup:
+  - ls -lA
+  env_files:
+  - env_file: ".env"
+    base_env: ''
+    env_vars:
+      bye: world
+ss:
+  services:
+  - name: s1
+  - name: s2

data/lib/hiiro/service_manager.rb

@@ -181,33 +181,26 @@ class Hiiro
         return false
       end
 
-      # Run init commands
-      if svc[:init]
-        base_dir = resolve_base_dir(svc[:base_dir])
-        svc[:init].each do |cmd|
-          system("cd #{base_dir} && #{cmd}")
-        end
-      end
-
-      # Prepare env files after init (e.g., init may install deps that generate .env templates)
-      unless skip_env
-        prepare_env(svc_name, variation_overrides: variation_overrides)
-      end
-
-      # Start the service
       start_cmd = svc[:start]
       unless start_cmd
         puts "No start command configured for '#{svc_name}'"
         return false
       end
 
+      # Build separate init/env/start scripts + a launcher that runs them in order
+      init_cmds = Array(svc[:init] || [])
       start_cmds = Array(start_cmd)
+      script = write_launcher_script(
+        svc_name,
+        init_cmds: init_cmds,
+        start_cmds: start_cmds,
+        env_prep: !skip_env,
+        variation_overrides: variation_overrides,
+      )
+
       base_dir = resolve_base_dir(svc[:base_dir])
       session = tmux_info[:session] || current_tmux_session
 
-      # Write start commands to an executable tempfile
-      script = write_start_script(svc_name, start_cmds)
-
       if session && !skip_window_creation
         # Create a new tmux window for this service
         window_target = create_tmux_window(session, svc_name, base_dir)
@@ -754,19 +747,63 @@ class Hiiro
       !system('tmux', 'has-session', '-t', pane_id, [:out, :err] => '/dev/null')
     end
 
-    def write_start_script(svc_name, cmds)
+    def scripts_dir
       dir = File.join(STATE_DIR, 'scripts')
       FileUtils.mkdir_p(dir)
-      path = File.join(dir, "#{svc_name}.sh")
+      dir
+    end
 
+    def write_shell_script(path, cmds)
       lines = ["#!/usr/bin/env bash", "set -e"]
       lines.concat(cmds)
-
       File.write(path, lines.join("\n") + "\n")
       File.chmod(0755, path)
       path
     end
 
+    def write_env_prep_script(svc_name, variation_overrides)
+      path = File.join(scripts_dir, "#{svc_name}-env.rb")
+      overrides_literal = variation_overrides.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(", ")
+
+      code = <<~RUBY
+        #!/usr/bin/env ruby
+        require 'hiiro'
+        sm = Hiiro::ServiceManager.new
+        sm.prepare_env(#{svc_name.inspect}, variation_overrides: { #{overrides_literal} })
+      RUBY
+
+      File.write(path, code)
+      File.chmod(0755, path)
+      path
+    end
+
+    def write_launcher_script(svc_name, init_cmds:, start_cmds:, env_prep: true, variation_overrides: {})
+      dir = scripts_dir
+
+      # Write init script (may be empty)
+      init_path = File.join(dir, "#{svc_name}-init.sh")
+      write_shell_script(init_path, init_cmds)
+
+      # Write start script
+      start_path = File.join(dir, "#{svc_name}-start.sh")
+      write_shell_script(start_path, start_cmds)
+
+      # Write env prep script
+      env_path = nil
+      if env_prep
+        env_path = write_env_prep_script(svc_name, variation_overrides)
+      end
+
+      # Write launcher that orchestrates: init -> env -> start
+      launcher_path = File.join(dir, "#{svc_name}.sh")
+      steps = []
+      steps << init_path unless init_cmds.empty?
+      steps << env_path if env_path
+      steps << "exec #{start_path}"
+
+      write_shell_script(launcher_path, steps)
+    end
+
     def current_tmux_session
       return nil unless ENV['TMUX']
       `tmux display-message -p '#S'`.chomp

data/lib/hiiro/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.156
+  version: 0.1.157
 platform: ruby
 authors:
 - Joshua Toyota
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-05 00:00:00.000000000 Z
+date: 2026-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -113,6 +113,7 @@ files:
 - docs/h-session.md
 - docs/h-window.md
 - editboth
+- examples/services.sleepers.yml
 - examples/services.yml
 - exe/h
 - exe/hiiro