hiiro 0.1.154 → 0.1.156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2fdf896084fbec37ad190f81188a0e470aaf30c491acb77df209e3b6d3da6cf
-  data.tar.gz: 3310a848c676685907bec54adba6b2eb76be56a811cf73f1dd56fb4a3953ddd7
+  metadata.gz: cc18a91776e0f111e0263e6dcf4c48129a14097f9b58cb0a75f3d7917c8281a2
+  data.tar.gz: 02f058b4148463f1685476f7c963931a74f2a1970cd8c8fddcf1fe1605f66721
 SHA512:
-  metadata.gz: 85fe854d98a6ffa72e9df07b3816bd8a0e20ca044667afabefd8cd5918264804b8d92f85c464301aaf3275be71ba410399ab27499473ffb3b4b163e872040bff
-  data.tar.gz: 0ea45cfd61f388f051c50eca1fc6a7f1f46039cd56f6129dc03b12e5a93ad952298225d18ea0cb078aabea04f78fcf4e27ae6662d54abeb45bdaa9ffd0dba590
+  metadata.gz: d2bad5c61c106dc01c45e62e40a3c49fc247b96cbd2c7d2138d5bb8c7df2fe995ad85e48563cf9250333e4bfe62f4307efdc27ca3103086f4e2e9c0e16681958
+  data.tar.gz: 23bb98706770163a575aa25ee40368cd5d94856c0ed4214e2aaaa4433afa92ec691738332d973dc44e02d0fec4b6f2ceaf724eb96a29c47c126b6e26bfeef8ef

data/examples/services.yml

@@ -0,0 +1,291 @@
+# 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/
+
+# =============================================================================
+# Simple service - single start command, no env files
+# =============================================================================
+redis:
+  base_dir: ""
+  host: localhost
+  port: 6379
+  start:
+    - redis-server
+
+# Usage:
+#   h service start redis
+#   h service stop redis          # sends C-c
+
+# =============================================================================
+# Rails API - multiple init steps, single env file with variations
+# =============================================================================
+api-rails:
+  base_dir: apps/api
+  host: localhost
+  port: 3000
+  init:
+    - bundle install
+    - bin/rails db:migrate
+  start:
+    - bundle exec rails s -p 3000
+  cleanup:
+    - rm -f tmp/pids/server.pid
+  env_files:
+    - env_file: .env.development
+      base_env: api-rails.env
+      env_vars:
+        DATABASE_URL:
+          variations:
+            local: postgres://localhost:5432/api_dev
+            docker: postgres://db:5432/api_dev
+            staging: postgres://readonly:pass@staging-db.internal:5432/api
+        REDIS_URL:
+          variations:
+            local: redis://localhost:6379
+            docker: redis://redis:6379
+        LOG_LEVEL:
+          variations:
+            local: debug
+            quiet: warn
+
+# Usage:
+#   h service start api-rails
+#     -> uses "local" for all variations (DATABASE_URL=postgres://localhost..., REDIS_URL=redis://localhost..., LOG_LEVEL=debug)
+#
+#   h service start api-rails --use DATABASE_URL=docker --use REDIS_URL=docker
+#     -> uses docker DB and redis, LOG_LEVEL defaults to "local" (debug)
+#
+#   h service start api-rails --use DATABASE_URL=staging --use LOG_LEVEL=quiet
+#     -> connects to staging DB (readonly), quiet logging, REDIS_URL defaults to local
+#
+#   h service start api-rails --use LOG_LEVEL=quiet
+#     -> everything local except warn-level logging
+
+# =============================================================================
+# GraphQL service - multiple env files
+# =============================================================================
+graphql:
+  base_dir: services/graphql
+  host: localhost
+  port: 4000
+  init:
+    - npm install
+  start:
+    - npm run dev
+  env_files:
+    - env_file: .env.local
+      base_env: graphql.env
+      env_vars:
+        API_URL:
+          variations:
+            local: http://localhost:3000
+            staging: https://api.staging.example.com
+            production: https://api.example.com
+        AUTH_PROVIDER:
+          variations:
+            local: http://localhost:8080/auth
+            staging: https://auth.staging.example.com
+            production: https://auth.example.com
+    - env_file: .env.test
+      base_env: graphql-test.env
+      env_vars:
+        API_URL:
+          variations:
+            local: http://localhost:3001
+            mock: http://localhost:9999
+
+# Usage:
+#   h service start graphql
+#     -> writes BOTH env files:
+#        .env.local   gets API_URL=http://localhost:3000, AUTH_PROVIDER=http://localhost:8080/auth
+#        .env.test    gets API_URL=http://localhost:3001
+#
+#   h service start graphql --use API_URL=staging --use AUTH_PROVIDER=staging
+#     -> .env.local   gets API_URL=https://api.staging.example.com, AUTH_PROVIDER=https://auth.staging.example.com
+#        .env.test    gets API_URL=http://localhost:3001 (no "staging" variation defined for .env.test, falls back to "local")
+#
+#   h service start graphql --use API_URL=mock
+#     -> .env.local   gets API_URL=http://localhost:3000 (no "mock" variation in .env.local, falls back to "local")
+#        .env.test    gets API_URL=http://localhost:9999 (uses "mock" variation)
+#
+#   h service start graphql --use API_URL=production --use AUTH_PROVIDER=production
+#     -> .env.local   gets API_URL=https://api.example.com, AUTH_PROVIDER=https://auth.example.com
+#        .env.test    gets API_URL=http://localhost:3001 (no "production" defined, falls back to "local")
+
+# =============================================================================
+# Frontend - depends on graphql URL
+# =============================================================================
+frontend:
+  base_dir: apps/frontend
+  host: localhost
+  port: 8080
+  start:
+    - npm run dev
+  env_files:
+    - env_file: .env.local
+      base_env: frontend.env
+      env_vars:
+        GRAPHQL_URL:
+          variations:
+            local: http://localhost:4000/graphql
+            staging: https://graphql.staging.example.com/graphql
+            production: https://graphql.example.com/graphql
+        FEATURE_FLAGS:
+          variations:
+            local: all
+            staging: released
+            production: released
+
+# Usage:
+#   h service start frontend
+#     -> GRAPHQL_URL=http://localhost:4000/graphql, FEATURE_FLAGS=all
+#
+#   h service start frontend --use GRAPHQL_URL=staging --use FEATURE_FLAGS=staging
+#     -> GRAPHQL_URL=https://graphql.staging.example.com/graphql, FEATURE_FLAGS=released
+
+# =============================================================================
+# Worker with custom stop command
+# =============================================================================
+sidekiq:
+  base_dir: apps/api
+  host: localhost
+  port: ""
+  start:
+    - bundle exec sidekiq -C config/sidekiq.yml
+  stop: "pkill -f sidekiq"
+  env_files:
+    - env_file: .env.development
+      base_env: api-rails.env
+      env_vars:
+        REDIS_URL:
+          variations:
+            local: redis://localhost:6379
+            docker: redis://redis:6379
+
+# Usage:
+#   h service start sidekiq
+#   h service stop sidekiq    # runs "pkill -f sidekiq" instead of C-c
+
+# =============================================================================
+# Multi-command start - seed data then launch
+# =============================================================================
+demo-server:
+  base_dir: apps/demo
+  host: localhost
+  port: 5000
+  init:
+    - npm install
+  start:
+    - npm run db:seed
+    - npm run build:assets
+    - npm start
+  env_files:
+    - env_file: .env
+      base_env: demo.env
+      env_vars:
+        DEMO_MODE:
+          variations:
+            local: full
+            lite: minimal
+
+# Usage:
+#   h service start demo-server
+#     -> creates a script that runs: db:seed && build:assets && start
+#     -> DEMO_MODE=full
+#
+#   h service start demo-server --use DEMO_MODE=lite
+#     -> same commands, DEMO_MODE=minimal
+
+# =============================================================================
+# SERVICE GROUPS
+# =============================================================================
+
+# Full local stack - everything pointing at localhost
+full-stack:
+  services:
+    - name: redis
+    - name: api-rails
+      use:
+        DATABASE_URL: local
+        REDIS_URL: local
+        LOG_LEVEL: local
+    - name: graphql
+      use:
+        API_URL: local
+        AUTH_PROVIDER: local
+    - name: frontend
+      use:
+        GRAPHQL_URL: local
+        FEATURE_FLAGS: local
+
+# Usage:
+#   h service start full-stack
+#     -> creates ONE tmux window with 4 split panes (redis, api-rails, graphql, frontend)
+#     -> all services use "local" variations
+
+# Frontend + GraphQL against staging API (no local rails needed)
+staging-fe:
+  services:
+    - name: graphql
+      use:
+        API_URL: staging
+        AUTH_PROVIDER: staging
+    - name: frontend
+      use:
+        GRAPHQL_URL: local
+        FEATURE_FLAGS: staging
+
+# Usage:
+#   h service start staging-fe
+#     -> ONE tmux window, 2 split panes
+#     -> graphql points at staging API/auth
+#     -> frontend points at local graphql (which proxies to staging)
+
+# Backend only - rails + sidekiq + redis, docker DB
+backend-docker:
+  services:
+    - name: redis
+    - name: api-rails
+      use:
+        DATABASE_URL: docker
+        REDIS_URL: docker
+        LOG_LEVEL: local
+    - name: sidekiq
+      use:
+        REDIS_URL: docker
+
+# Usage:
+#   h service start backend-docker
+#     -> 3 split panes: redis, api-rails, sidekiq
+#     -> all using docker postgres and redis URLs
+
+# =============================================================================
+# QUICK REFERENCE - all start commands
+# =============================================================================
+#
+# Start with defaults (all "local" variations):
+#   h service start <name>
+#
+# Start with specific variations:
+#   h service start <name> --use VAR=variation
+#   h service start <name> --use VAR1=v1 --use VAR2=v2
+#
+# Start a group (pre-configured variation combos):
+#   h service start <group-name>
+#
+# Interactive selection (no name):
+#   h service start
+#
+# Other commands:
+#   h service stop [name]       # C-c (or custom stop cmd), fuzzy select if no name
+#   h service attach [name]     # switch to service's tmux pane
+#   h service status [name]     # show service details
+#   h service reset [name]      # clear stale running state
+#   h service clean             # auto-prune dead panes from state
+#   h service ls                # list all services + status
+#   h service env <name>        # show env file config and variations
+#   h service groups            # list all groups and members

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.154"
+  VERSION = "0.1.156"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.154
+  version: 0.1.156
 platform: ruby
 authors:
 - Joshua Toyota
@@ -113,6 +113,7 @@ files:
 - docs/h-session.md
 - docs/h-window.md
 - editboth
+- examples/services.yml
 - exe/h
 - exe/hiiro
 - h-tmux-plugins.tmux