hiiro 0.1.148 → 0.1.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6853495ad221de1f2f059def5cb33cab82c6e7466197d2a8bcc2ae9553b8b21f
-  data.tar.gz: '08a332bb67dc2b0593d5673bb88470ac15b5ebe89fdfa278b176efe6ad3d95eb'
+  metadata.gz: f67c9b0a2688514af184098d8c69497f0fe09adb4a91a4e41b17596a4069e352
+  data.tar.gz: c6f3ef4544274739bdbdde419a25101948d5af2119d0da2b6015a580864d80ec
 SHA512:
-  metadata.gz: afb939d7ac0dd3a8cabdbed74468962df605d3af66cdb485ff6d503cb46bed0e9fe0d23b854eef3a8b711fde269087fa3bc816ad60ca151d7d6e242a65621161
-  data.tar.gz: 0db711deda38e8a804c0bcc9315329c3e944fc63872f4d319dfaa2ff2fd6f211eef1873202cd41219bb2906448f696945af518ad095012f98363a6bbf18e27d7
+  metadata.gz: 00e92bb9a9186cea72209f320df3b43c3e3f1537596ddecd78d740d0c87ba42b7f9ccd1c250b36e6fa331371875fdf15b2f0d8baf2d7b115b76ec64183aeb9aa
+  data.tar.gz: 16e4b2d2af8857cd4d1bd7739add2d919466d58b2c0c9806371079344d8c094a66c75c32f49766efc36eda4dde6a5113c3bfde1710719919912745709d210429

data/lib/hiiro/service_manager.rb

@@ -7,6 +7,7 @@ class Hiiro
     CONFIG_FILE = File.join(Dir.home, '.config', 'hiiro', 'services.yml')
     STATE_DIR = File.join(Dir.home, '.config', 'hiiro', 'services')
     STATE_FILE = File.join(STATE_DIR, 'running.yml')
+    ENV_TEMPLATES_DIR = File.join(Dir.home, '.config', 'hiiro', 'env_templates')
 
     attr_reader :config_file, :state_file
 
@@ -30,6 +31,94 @@ class Hiiro
       { name: svc_name, **symbolize_keys(configs[svc_name]) }
     end
 
+    def find_group(name)
+      configs = services
+      names = configs.keys.select { |k| configs[k].is_a?(Hash) && configs[k].key?('services') }
+      return nil if names.empty?
+
+      structs = names.map { |k| OpenStruct.new(name: k) }
+      result = Hiiro::Matcher.new(structs, :name).by_prefix(name)
+      match = result.resolved || result.first
+      return nil unless match
+
+      group_name = match.item.name
+      { name: group_name, **symbolize_keys(configs[group_name]) }
+    end
+
+    def prepare_env(svc_name, variation_overrides: {})
+      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
+
+      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
+
+        # 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
+      end
+
+      File.write(dest, lines.join)
+    end
+
+    def start_group(name, tmux_info: {}, task_info: {})
+      group = find_group(name)
+      unless group
+        puts "Group '#{name}' not found"
+        return false
+      end
+
+      members = group[:services]
+      unless members && !members.empty?
+        puts "Group '#{group[:name]}' has no services"
+        return false
+      end
+
+      puts "Starting group '#{group[:name]}'..."
+      members.each do |member|
+        member_name = member['name'] || member[:name]
+        use_overrides = member['use'] || member[:use] || {}
+
+        prepare_env(member_name, variation_overrides: use_overrides)
+        start(member_name, tmux_info: tmux_info, task_info: task_info, skip_env: true)
+      end
+      true
+    end
+
     def running?(name)
       state = load_state
       state.key?(name)
@@ -39,7 +128,7 @@ class Hiiro
       load_state
     end
 
-    def start(name, tmux_info: {}, task_info: {})
+    def start(name, tmux_info: {}, task_info: {}, variation_overrides: {}, skip_env: false)
       svc = find_service(name)
       unless svc
         puts "Service '#{name}' not found"
@@ -54,6 +143,11 @@ 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|
@@ -283,12 +377,24 @@ class Hiiro
           h.run_subcmd(:ls)
         end
 
-        h.add_subcmd(:start) do |svc_name=nil|
+        h.add_subcmd(:start) do |svc_name=nil, *extra_args|
           unless svc_name
-            puts "Usage: service start <name>"
+            puts "Usage: service start <name> [--use VAR=variation ...]"
             next
           end
 
+          # Parse --use flags from extra_args
+          variation_overrides = {}
+          extra_args.each_with_index do |arg, i|
+            if arg == '--use' && extra_args[i + 1]
+              key, val = extra_args[i + 1].split('=', 2)
+              variation_overrides[key] = val if key && val
+            elsif arg.start_with?('--use=')
+              key, val = arg.sub('--use=', '').split('=', 2)
+              variation_overrides[key] = val if key && val
+            end
+          end
+
           tmux_info = {
             session: ENV['TMUX'] ? `tmux display-message -p '#S'`.chomp : nil,
             window: ENV['TMUX'] ? `tmux display-message -p '#I'`.chomp : nil,
@@ -308,7 +414,13 @@ class Hiiro
             end
           end
 
-          sm.start(svc_name, tmux_info: tmux_info, task_info: task_info)
+          # Check if it's a group or individual service
+          group = sm.find_group(svc_name)
+          if group
+            sm.start_group(svc_name, tmux_info: tmux_info, task_info: task_info)
+          else
+            sm.start(svc_name, tmux_info: tmux_info, task_info: task_info, variation_overrides: variation_overrides)
+          end
         end
 
         h.add_subcmd(:stop) do |svc_name=nil|
@@ -433,6 +545,61 @@ class Hiiro
           editor = ENV['EDITOR'] || 'nvim'
           system(editor, sm.config_file)
         end
+
+        h.add_subcmd(:groups) do
+          configs = sm.services
+          groups = configs.select { |_, v| v.is_a?(Hash) && v.key?('services') }
+
+          if groups.empty?
+            puts "No service groups configured."
+            next
+          end
+
+          puts "Service groups:"
+          puts
+          groups.each do |name, cfg|
+            members = (cfg['services'] || []).map { |m| m['name'] || m[:name] }.compact
+            puts format("  %-20s  %s", name, members.join(', '))
+          end
+        end
+
+        h.add_subcmd(:env) do |svc_name=nil|
+          unless svc_name
+            puts "Usage: service env <name>"
+            next
+          end
+
+          svc = sm.find_service(svc_name)
+          unless svc
+            puts "Service '#{svc_name}' not found"
+            next
+          end
+
+          env_vars = svc[:env_vars]
+          unless env_vars
+            puts "No env_vars 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 "  #{var_name}:"
+            var_config['variations'].each do |variation, value|
+              puts "    #{variation}: #{value}"
+            end
+          end
+
+          if svc[:base_env]
+            puts
+            puts "Base env template: #{svc[:base_env]}"
+          end
+          if svc[:env_file]
+            puts "Env file: #{svc[:env_file]}"
+          end
+        end
       end
     end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.148"
+  VERSION = "0.1.149"
 end

metadata

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