hiiro 0.1.152 → 0.1.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8a2bc3e8f629e23986cd1f75bdcca6fc2cd0aaabf85fbde2ae00e721077178
-  data.tar.gz: 1bfc80f8f3f0844bbc943c23f48258577f7d3b7cea66dd48319893e7f3289aa7
+  metadata.gz: b270bade909acb9e7805983022b54951c14048c9964f758a011448400cc8e492
+  data.tar.gz: 5045f0d977f5113886e6c35d8288a5eb9ca697a24f529a097ff9f61ceda70e62
 SHA512:
-  metadata.gz: 05dfbdf2fdef32ec3471b8f26efefc26f07b171b0886c6f9beb55ea7008218165cc126f762cd1ef5e391511815b42eb479aa0dcdff9cc5831b885a8c4ea15b52
-  data.tar.gz: b9645c6341b3cf753d209b7fcac576264788156a646042a5601d4e4f1269478fd87ab8d93024448ad2ce8eb410d01cd7cd410c26d20f0ebd71007967f6f6a028
+  metadata.gz: 9ea8d52d648ab2cf4d79d7a35a1877a53e7bff26fab0ece31d0d4b3b46172b04aeadef115395bd154f60bfc418acdfd8b0b7bdca20cb6affc499751ba8bb8687
+  data.tar.gz: 2ff7f43419014b05dab1e12c15200eb612c81966bc9611b47b88f6127aad8ceafd423514a70f1f876600d590be41646ca675fc15e8d78a8c70a43e2c92498112

data/lib/hiiro/service_manager.rb

@@ -248,7 +248,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 +265,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 +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
@@ -513,8 +520,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 +534,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 +552,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 +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)
@@ -710,13 +737,12 @@ class Hiiro
       !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.153"
 end

metadata

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