hiiro 0.1.151 → 0.1.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98bf6f648f72277fb219044bd6f5a5e0c1320c21d122e8478cc4e6d6f7000a4b
-  data.tar.gz: 6308aa3432b0cf8e9f2fc3ca4fc66fb9075902fb3c421fad4d2dbd03f2105418
+  metadata.gz: b270bade909acb9e7805983022b54951c14048c9964f758a011448400cc8e492
+  data.tar.gz: 5045f0d977f5113886e6c35d8288a5eb9ca697a24f529a097ff9f61ceda70e62
 SHA512:
-  metadata.gz: 268febf76230f6cb10ac9b492bc7c37fb34d48764b43d912dc430ae66f9b29cae1190c58109fa93d2935b4145a1e75685f6a8a1f4345e0ff53a40e70326301bc
-  data.tar.gz: dbf74be661003f9b67e878c9284d2b4a6ef4d20712226e6021023b5e2e7d8352bb671c8a86e184367fb0bad38301a4c589a6254c8d2ba2660d972a178d715feb
+  metadata.gz: 9ea8d52d648ab2cf4d79d7a35a1877a53e7bff26fab0ece31d0d4b3b46172b04aeadef115395bd154f60bfc418acdfd8b0b7bdca20cb6affc499751ba8bb8687
+  data.tar.gz: 2ff7f43419014b05dab1e12c15200eb612c81966bc9611b47b88f6127aad8ceafd423514a70f1f876600d590be41646ca675fc15e8d78a8c70a43e2c92498112

data/lib/hiiro/service_manager.rb

@@ -166,6 +166,44 @@ class Hiiro
       load_state
     end
 
+    def reset(name)
+      svc = find_service(name)
+      unless svc
+        puts "Service '#{name}' not found"
+        return false
+      end
+
+      svc_name = svc[:name]
+      state = load_state
+      unless state.key?(svc_name)
+        puts "Service '#{svc_name}' is not in running state"
+        return false
+      end
+
+      state.delete(svc_name)
+      save_state(state)
+      puts "Reset service '#{svc_name}' (cleared from running state)"
+      true
+    end
+
+    def clean
+      state = load_state
+      return puts("No running services to clean") if state.empty?
+
+      stale = state.select { |_, info| stale_pane?(info['tmux_pane']) }
+      if stale.empty?
+        puts "All running services have live panes"
+        return false
+      end
+
+      stale.each do |svc_name, _|
+        state.delete(svc_name)
+        puts "Cleaned stale service '#{svc_name}'"
+      end
+      save_state(state)
+      true
+    end
+
     def start(name, tmux_info: {}, task_info: {}, variation_overrides: {}, skip_env: false, skip_window_creation: false)
       svc = find_service(name)
       unless svc
@@ -205,12 +243,13 @@ class Hiiro
         return false
       end
 
-      # Coerce start command to array
       start_cmds = Array(start_cmd)
-
       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)
@@ -225,16 +264,11 @@ class Hiiro
       end
 
       if pane_id
-        # Send each start command to the pane
-        combined_cmd = start_cmds.join(' && ')
-        system('tmux', 'send-keys', '-t', pane_id, combined_cmd, 'Enter')
+        system('tmux', 'send-keys', '-t', pane_id, script, 'Enter')
+      elsif base_dir
+        system("cd #{base_dir} && #{script} &")
       else
-        combined_cmd = start_cmds.join(' && ')
-        if base_dir
-          system("cd #{base_dir} && #{combined_cmd} &")
-        else
-          system("#{combined_cmd} &")
-        end
+        system("#{script} &")
       end
 
       # Record state
@@ -437,8 +471,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
@@ -481,17 +520,45 @@ 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)
         end
 
+        h.add_subcmd(:reset) do |svc_name=nil|
+          unless svc_name
+            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)
+        end
+
+        h.add_subcmd(:clean) do
+          sm.clean
+        end
+
         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)
@@ -541,8 +608,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)
@@ -660,6 +732,24 @@ class Hiiro
 
     private
 
+    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)
+      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.concat(cmds)
+
+      File.write(path, lines.join("\n") + "\n")
+      File.chmod(0755, path)
+      path
+    end
+
     def current_tmux_session
       return nil unless ENV['TMUX']
       `tmux display-message -p '#S'`.chomp

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.151"
+  VERSION = "0.1.153"
 end

metadata

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