hiiro 0.1.152 → 0.1.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8a2bc3e8f629e23986cd1f75bdcca6fc2cd0aaabf85fbde2ae00e721077178
-  data.tar.gz: 1bfc80f8f3f0844bbc943c23f48258577f7d3b7cea66dd48319893e7f3289aa7
+  metadata.gz: a2fdf896084fbec37ad190f81188a0e470aaf30c491acb77df209e3b6d3da6cf
+  data.tar.gz: 3310a848c676685907bec54adba6b2eb76be56a811cf73f1dd56fb4a3953ddd7
 SHA512:
-  metadata.gz: 05dfbdf2fdef32ec3471b8f26efefc26f07b171b0886c6f9beb55ea7008218165cc126f762cd1ef5e391511815b42eb479aa0dcdff9cc5831b885a8c4ea15b52
-  data.tar.gz: b9645c6341b3cf753d209b7fcac576264788156a646042a5601d4e4f1269478fd87ab8d93024448ad2ce8eb410d01cd7cd410c26d20f0ebd71007967f6f6a028
+  metadata.gz: 85fe854d98a6ffa72e9df07b3816bd8a0e20ca044667afabefd8cd5918264804b8d92f85c464301aaf3275be71ba410399ab27499473ffb3b4b163e872040bff
+  data.tar.gz: 0ea45cfd61f388f051c50eca1fc6a7f1f46039cd56f6129dc03b12e5a93ad952298225d18ea0cb078aabea04f78fcf4e27ae6662d54abeb45bdaa9ffd0dba590

data/README.md

@@ -241,3 +241,118 @@ bundle exec rake test
 ## License
 
 MIT
+
+
+# COMPLEX SERVICES
+
+```sh
+
+❯ in this setup...can you configure a couple complex services that use variations, etc.  i need examples of how to configure it. and then can you show me how to run it for different variations
+
+⏺ Here's an example ~/.config/hiiro/services.yml:
+
+  # Individual services
+  api-rails:
+    base_dir: ~/work/api
+    host: localhost
+    port: 3000
+    init:
+      - bundle install
+    start:
+      - bin/rails s -p 3000
+    cleanup: []
+    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
+      REDIS_URL:
+        variations:
+          local: redis://localhost:6379
+          docker: redis://redis:6379
+
+  graphql:
+    base_dir: ~/work/graphql
+    host: localhost
+    port: 4000
+    init:
+      - npm install
+    start:
+      - npm run dev
+    env_file: .env.local
+    base_env: graphql.env
+    env_vars:
+      API_URL:
+        variations:
+          local: http://localhost:3000
+          staging: https://api.staging.example.com
+      AUTH_PROVIDER:
+        variations:
+          local: http://localhost:8080/auth
+          staging: https://auth.staging.example.com
+
+  frontend:
+    base_dir: ~/work/frontend
+    host: localhost
+    port: 8080
+    start:
+      - npm run dev
+    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
+
+  # Service groups
+  full-stack:
+    services:
+      - name: api-rails
+        use:
+          DATABASE_URL: local
+          REDIS_URL: local
+      - name: graphql
+        use:
+          API_URL: local
+          AUTH_PROVIDER: local
+      - name: frontend
+        use:
+          GRAPHQL_URL: local
+
+  staging-fe:
+    services:
+      - name: graphql
+        use:
+          API_URL: staging
+          AUTH_PROVIDER: staging
+      - name: frontend
+        use:
+          GRAPHQL_URL: local
+
+  Usage:
+
+  # Start a single service (defaults to "local" variations)
+  h service start api-rails
+
+  # Start with specific variations
+  h service start api-rails --use DATABASE_URL=docker --use REDIS_URL=docker
+
+  # Start the full local stack (one window, 3 split panes)
+  h service start full-stack
+
+  # Start frontend pointing at staging backends
+  h service start staging-fe
+
+  # No args — fuzzy select from all services + groups
+  h service start
+
+  The key ideas:
+  - local is the default variation — if you don't pass --use, each env var gets its local value
+  - Groups let you pre-bake variation combos — full-stack vs staging-fe are just different use: presets for the same services
+  - Base env templates live in ~/.config/hiiro/env_templates/ (e.g., api-rails.env) — they get copied to base_dir/env_file first, then variations are injected on top
+
+
+```

data/lib/hiiro/service_manager.rb

@@ -50,50 +50,15 @@ class Hiiro
       svc = find_service(svc_name)
       return unless svc
 
-      env_vars = svc[:env_vars]
-      return unless env_vars || svc[:base_env]
-
       base_dir = svc[:base_dir]
-      env_file = svc[:env_file]
-      base_env = svc[:base_env]
-
-      # Copy base env template if configured
-      if base_env && env_file && base_dir
-        src = File.join(ENV_TEMPLATES_DIR, base_env)
-        dest = File.join(base_dir, env_file)
-        if File.exist?(src)
-          FileUtils.mkdir_p(File.dirname(dest))
-          FileUtils.cp(src, dest)
-        end
-      end
-
-      # Inject variation values into env file
-      return unless env_vars && env_file && base_dir
+      return unless base_dir
 
-      dest = File.join(base_dir, env_file)
-      lines = File.exist?(dest) ? File.readlines(dest) : []
-
-      env_vars.each do |var_name, var_config|
-        next unless var_config.is_a?(Hash) && var_config['variations']
-
-        variation = (variation_overrides[var_name] || variation_overrides[var_name.to_sym] || 'local').to_s
-        value = var_config['variations'][variation]
-        next unless value
+      env_file_configs = build_env_file_configs(svc)
+      return if env_file_configs.empty?
 
-        # Replace existing line or append
-        replaced = false
-        lines.map! do |line|
-          if line.match?(/\A#{Regexp.escape(var_name)}=/)
-            replaced = true
-            "#{var_name}=#{value}\n"
-          else
-            line
-          end
-        end
-        lines << "#{var_name}=#{value}\n" unless replaced
+      env_file_configs.each do |efc|
+        prepare_single_env(base_dir, efc, variation_overrides)
       end
-
-      File.write(dest, lines.join)
     end
 
     def start_group(name, tmux_info: {}, task_info: {})
@@ -131,8 +96,6 @@ class Hiiro
         member_name = member['name'] || member[:name]
         use_overrides = member['use'] || member[:use] || {}
 
-        prepare_env(member_name, variation_overrides: use_overrides)
-
         svc = find_service(member_name)
         next unless svc
 
@@ -152,7 +115,7 @@ class Hiiro
           pane: pane_id,
         )
 
-        start(member_name, tmux_info: member_tmux_info, task_info: task_info, skip_env: true, skip_window_creation: true)
+        start(member_name, tmux_info: member_tmux_info, task_info: task_info, variation_overrides: use_overrides, skip_window_creation: true)
       end
       true
     end
@@ -219,11 +182,6 @@ class Hiiro
         return false
       end
 
-      # Prepare env file unless already handled by start_group
-      unless skip_env
-        prepare_env(svc_name, variation_overrides: variation_overrides)
-      end
-
       # Run init commands
       if svc[:init]
         svc[:init].each do |cmd|
@@ -236,6 +194,11 @@ class Hiiro
         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
@@ -248,7 +211,7 @@ class Hiiro
       session = tmux_info[:session] || current_tmux_session
 
       # Write start commands to an executable tempfile
-      script = write_start_script(svc_name, start_cmds, base_dir)
+      script = write_start_script(svc_name, start_cmds)
 
       if session && !skip_window_creation
         # Create a new tmux window for this service
@@ -265,6 +228,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} &")
       end
@@ -469,8 +434,13 @@ class Hiiro
 
         h.add_subcmd(:start) do |svc_name=nil, *extra_args|
           unless svc_name
-            puts "Usage: service start <name> [--use VAR=variation ...]"
-            next
+            all = sm.services.keys
+            if all.empty?
+              puts "No services configured"
+              next
+            end
+            svc_name = h.fuzzyfind(all)
+            next unless svc_name
           end
 
           # Parse --use flags from extra_args
@@ -513,8 +483,13 @@ class Hiiro
 
         h.add_subcmd(:stop) do |svc_name=nil|
           unless svc_name
-            puts "Usage: service stop <name>"
-            next
+            running = sm.running_services.keys
+            if running.empty?
+              puts "No running services"
+              next
+            end
+            svc_name = h.fuzzyfind(running)
+            next unless svc_name
           end
 
           sm.stop(svc_name)
@@ -522,8 +497,13 @@ class Hiiro
 
         h.add_subcmd(:reset) do |svc_name=nil|
           unless svc_name
-            puts "Usage: service reset <name>"
-            next
+            running = sm.running_services.keys
+            if running.empty?
+              puts "No running services"
+              next
+            end
+            svc_name = h.fuzzyfind(running)
+            next unless svc_name
           end
 
           sm.reset(svc_name)
@@ -535,8 +515,13 @@ class Hiiro
 
         h.add_subcmd(:attach) do |svc_name=nil|
           unless svc_name
-            puts "Usage: service attach <name>"
-            next
+            running = sm.running_services.keys
+            if running.empty?
+              puts "No running services"
+              next
+            end
+            svc_name = h.fuzzyfind(running)
+            next unless svc_name
           end
 
           sm.attach(svc_name)
@@ -586,8 +571,13 @@ class Hiiro
 
         h.add_subcmd(:status) do |svc_name=nil|
           unless svc_name
-            puts "Usage: service status <name>"
-            next
+            running = sm.running_services.keys
+            if running.empty?
+              puts "No running services"
+              next
+            end
+            svc_name = h.fuzzyfind(running)
+            next unless svc_name
           end
 
           sm.status(svc_name)
@@ -601,6 +591,9 @@ class Hiiro
             'init' => [],
             'start' => [''],
             'cleanup' => [],
+            'env_files' => [
+              { 'env_file' => '.env', 'base_env' => '', 'env_vars' => {} },
+            ],
           }
 
           require 'tempfile'
@@ -675,29 +668,30 @@ class Hiiro
             next
           end
 
-          env_vars = svc[:env_vars]
-          unless env_vars
-            puts "No env_vars configured for '#{svc[:name]}'"
+          configs = sm.send(:build_env_file_configs, svc)
+          if configs.empty?
+            puts "No env files configured for '#{svc[:name]}'"
             next
           end
 
-          puts "Env vars for '#{svc[:name]}':"
-          puts
-          env_vars.each do |var_name, var_config|
-            next unless var_config.is_a?(Hash) && var_config['variations']
+          puts "Env files for '#{svc[:name]}':"
+          configs.each do |efc|
+            puts
+            puts "  #{efc[:env_file] || '(no dest)'}"
+            puts "    template: #{efc[:base_env]}" if efc[:base_env]
 
-            puts "  #{var_name}:"
-            var_config['variations'].each do |variation, value|
-              puts "    #{variation}: #{value}"
-            end
-          end
+            env_vars = efc[:env_vars]
+            next unless env_vars
 
-          if svc[:base_env]
-            puts
-            puts "Base env template: #{svc[:base_env]}"
-          end
-          if svc[:env_file]
-            puts "Env file: #{svc[:env_file]}"
+            env_vars.each do |var_name, var_config|
+              variations = var_config.is_a?(Hash) && (var_config['variations'] || var_config[:variations])
+              next unless variations
+
+              puts "    #{var_name}:"
+              variations.each do |variation, value|
+                puts "      #{variation}: #{value}"
+              end
+            end
           end
         end
       end
@@ -705,18 +699,74 @@ class Hiiro
 
     private
 
+    # Normalize env file config into an array of hashes,
+    # supporting both old single-env format and new env_files array
+    def build_env_file_configs(svc)
+      if svc[:env_files]
+        Array(svc[:env_files]).map { |ef| symbolize_keys(ef.is_a?(Hash) ? ef : {}) }
+      elsif svc[:env_file] || svc[:base_env] || svc[:env_vars]
+        [{ env_file: svc[:env_file], base_env: svc[:base_env], env_vars: svc[:env_vars] }]
+      else
+        []
+      end
+    end
+
+    def prepare_single_env(base_dir, efc, variation_overrides)
+      env_file = efc[:env_file]
+      base_env = efc[:base_env]
+      env_vars = efc[:env_vars]
+
+      # Copy base env template if configured
+      if base_env && env_file
+        src = File.join(ENV_TEMPLATES_DIR, base_env)
+        dest = File.join(base_dir, env_file)
+        if File.exist?(src)
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.cp(src, dest)
+        end
+      end
+
+      # Inject variation values into env file
+      return unless env_vars && env_file
+
+      dest = File.join(base_dir, env_file)
+      lines = File.exist?(dest) ? File.readlines(dest) : []
+
+      env_vars.each do |var_name, var_config|
+        var_config = symbolize_keys(var_config) if var_config.is_a?(Hash)
+        variations = var_config.is_a?(Hash) && (var_config[:variations] || var_config['variations'])
+        next unless variations
+
+        variation = (variation_overrides[var_name] || variation_overrides[var_name.to_sym] || 'local').to_s
+        value = variations[variation]
+        next unless value
+
+        replaced = false
+        lines.map! do |line|
+          if line.match?(/\A#{Regexp.escape(var_name.to_s)}=/)
+            replaced = true
+            "#{var_name}=#{value}\n"
+          else
+            line
+          end
+        end
+        lines << "#{var_name}=#{value}\n" unless replaced
+      end
+
+      File.write(dest, lines.join)
+    end
+
     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)
+    def write_start_script(svc_name, cmds)
       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")

data/lib/hiiro/version.rb

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

metadata

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