hiiro 0.1.155 → 0.1.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbe44699de1ea172d5b4d18436f3aae2e7fec81e0350f66aef04646c452e259d
-  data.tar.gz: c91fba3e8f92db14f581af937b103ef3a87c52f993fe306a64a629b2420d0aee
+  metadata.gz: cc18a91776e0f111e0263e6dcf4c48129a14097f9b58cb0a75f3d7917c8281a2
+  data.tar.gz: 02f058b4148463f1685476f7c963931a74f2a1970cd8c8fddcf1fe1605f66721
 SHA512:
-  metadata.gz: 274b382097248a427e5300634e6928a92c2ce2135742fcd8ad9fea5c6f822f8e882445a82b3b6879c1062b5a86d19a86675b5c263d1e811fd7f3fede11b5af4f
-  data.tar.gz: 6cc068ece0ed1b5efcad1238ab14c42115364c33af8850781ef1e8dbca4bd5af751b53a33b421e8a95d12fa5d3bdcc6725a39682dade5356591cefb0c1ed1b50
+  metadata.gz: d2bad5c61c106dc01c45e62e40a3c49fc247b96cbd2c7d2138d5bb8c7df2fe995ad85e48563cf9250333e4bfe62f4307efdc27ca3103086f4e2e9c0e16681958
+  data.tar.gz: 23bb98706770163a575aa25ee40368cd5d94856c0ed4214e2aaaa4433afa92ec691738332d973dc44e02d0fec4b6f2ceaf724eb96a29c47c126b6e26bfeef8ef

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
@@ -184,13 +183,9 @@ class Hiiro
 
       # Run init commands
       if svc[:init]
+        base_dir = resolve_base_dir(svc[:base_dir])
         svc[:init].each do |cmd|
-          base_dir = svc[:base_dir]
-          if base_dir
-            system("cd #{base_dir} && #{cmd}")
-          else
-            system(cmd)
-          end
+          system("cd #{base_dir} && #{cmd}")
         end
       end
 
@@ -207,7 +202,7 @@ class Hiiro
       end
 
       start_cmds = Array(start_cmd)
-      base_dir = svc[:base_dir]
+      base_dir = resolve_base_dir(svc[:base_dir])
       session = tmux_info[:session] || current_tmux_session
 
       # Write start commands to an executable tempfile
@@ -215,7 +210,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 || 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 +223,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
@@ -817,5 +810,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.156"
 end

metadata

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