hiiro 0.1.155 → 0.1.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbe44699de1ea172d5b4d18436f3aae2e7fec81e0350f66aef04646c452e259d
-  data.tar.gz: c91fba3e8f92db14f581af937b103ef3a87c52f993fe306a64a629b2420d0aee
+  metadata.gz: 6a1dfe8868ee27e926e81edb4d93f9dd75bab129a493985a00505a267088e32c
+  data.tar.gz: c5f7a4fb1aea909d05ebb8e00a737bc28bf7524a19e4f52f7af518aba508d5f0
 SHA512:
-  metadata.gz: 274b382097248a427e5300634e6928a92c2ce2135742fcd8ad9fea5c6f822f8e882445a82b3b6879c1062b5a86d19a86675b5c263d1e811fd7f3fede11b5af4f
-  data.tar.gz: 6cc068ece0ed1b5efcad1238ab14c42115364c33af8850781ef1e8dbca4bd5af751b53a33b421e8a95d12fa5d3bdcc6725a39682dade5356591cefb0c1ed1b50
+  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/examples/services.yml

@@ -1,6 +1,8 @@
 # Example services.yml
 # Place at ~/.config/hiiro/services.yml
 #
+# base_dir is always relative to the repo root (where init/start commands run)
+#
 # Base env templates referenced by base_env live in:
 #   ~/.config/hiiro/env_templates/
 
@@ -22,7 +24,7 @@ redis:
 # Rails API - multiple init steps, single env file with variations
 # =============================================================================
 api-rails:
-  base_dir: ~/work/api
+  base_dir: apps/api
   host: localhost
   port: 3000
   init:
@@ -67,7 +69,7 @@ api-rails:
 # GraphQL service - multiple env files
 # =============================================================================
 graphql:
-  base_dir: ~/work/graphql
+  base_dir: services/graphql
   host: localhost
   port: 4000
   init:
@@ -118,7 +120,7 @@ graphql:
 # Frontend - depends on graphql URL
 # =============================================================================
 frontend:
-  base_dir: ~/work/frontend
+  base_dir: apps/frontend
   host: localhost
   port: 8080
   start:
@@ -149,7 +151,7 @@ frontend:
 # Worker with custom stop command
 # =============================================================================
 sidekiq:
-  base_dir: ~/work/api
+  base_dir: apps/api
   host: localhost
   port: ""
   start:
@@ -172,7 +174,7 @@ sidekiq:
 # Multi-command start - seed data then launch
 # =============================================================================
 demo-server:
-  base_dir: ~/work/demo
+  base_dir: apps/demo
   host: localhost
   port: 5000
   init:

data/lib/hiiro/service_manager.rb

@@ -50,8 +50,7 @@ class Hiiro
       svc = find_service(svc_name)
       return unless svc
 
-      base_dir = svc[:base_dir]
-      return unless base_dir
+      base_dir = resolve_base_dir(svc[:base_dir])
 
       env_file_configs = build_env_file_configs(svc)
       return if env_file_configs.empty?
@@ -86,7 +85,7 @@ class Hiiro
       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
+      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)
@@ -99,7 +98,7 @@ class Hiiro
         svc = find_service(member_name)
         next unless svc
 
-        base_dir = svc[:base_dir] || Dir.pwd
+        base_dir = resolve_base_dir(svc[:base_dir])
 
         if idx == 0
           # First service uses the initial pane
@@ -182,40 +181,29 @@ class Hiiro
         return false
       end
 
-      # Run init commands
-      if svc[:init]
-        svc[:init].each do |cmd|
-          base_dir = svc[:base_dir]
-          if base_dir
-            system("cd #{base_dir} && #{cmd}")
-          else
-            system(cmd)
-          end
-        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)
-      base_dir = svc[:base_dir]
+      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 || Dir.pwd)
+        window_target = create_tmux_window(session, svc_name, base_dir)
         pane_id = capture_pane_id(window_target)
       elsif session && skip_window_creation
         # Pane already created by start_group
@@ -228,10 +216,8 @@ class Hiiro
 
       if pane_id
         system('tmux', 'send-keys', '-t', pane_id, script, 'Enter')
-      elsif base_dir
-        system("cd #{base_dir} && #{script} &")
       else
-        system("#{script} &")
+        system("cd #{base_dir} && #{script} &")
       end
 
       # Record state
@@ -761,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
@@ -817,5 +847,14 @@ class Hiiro
     def symbolize_keys(hash)
       hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
     end
+
+    def resolve_base_dir(base_dir)
+      return Dir.pwd if base_dir.nil? || base_dir.to_s.empty?
+
+      git_root = `git rev-parse --show-toplevel 2>/dev/null`.chomp
+      root = git_root.empty? ? Dir.pwd : git_root
+
+      File.join(root, base_dir)
+    end
   end
 end

data/lib/hiiro/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.155
+  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