hiiro 0.1.219 → 0.1.220

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd3f8ae4acfb1fa951769555cd0503a9038070f2a5f630c455363e5ab7f4f08
-  data.tar.gz: '03231287cddeded344610db00c4b28e144ace9230d3463f5503231b93533d909'
+  metadata.gz: 28013aa2de1c98ae4ecd1a166635b4444f0c2753fe830aeb94d796cddd607b45
+  data.tar.gz: 17ad399a86996122313f9fb3a78aad3ea732bc8ab1a04fb735ba0b001486e3ab
 SHA512:
-  metadata.gz: c1a8c762c7d82202bc791eaddfa49bfcdf1cdef7d1ab938a1388f3fd0df6fd495a02d2ce96c7f773ed44b93adfec182aa95752235603374da0fe336453366d83
-  data.tar.gz: d8935dd8119922a2f714a173236e28a244dc84281e9b0f7ad0881a5e664fd17d60cbeb71a7a1ac3fb372f8ffb50ae7485edb684c3ce01f9f1992fa915fa76992
+  metadata.gz: 7e15908fda49530377d57b400f50439a2dd9a28b24820dc28a45e20e74df150011e981624308c271ea0dcff9f86249c68ad900c6909ed5ee61d5a6e8fe195352
+  data.tar.gz: c2ba6cb131f38b6aaa37655fc976e597e2fe1c1f0b605df431797ce4ffc2bd8f66ca086390d5691d0a1aafb2e9c4ea93ecb7a5ad581bda89f1388dfd57f8824a

data/lib/hiiro/tasks.rb

@@ -132,7 +132,7 @@ class Hiiro
       puts "Started task '#{task_name}' in worktree '#{subtree_name}'"
     end
 
-    def switch_to_task(task, app_name: nil)
+    def switch_to_task(task, app_name: nil, force: false)
       unless task
         puts "Task not found"
         return
@@ -145,6 +145,11 @@ class Hiiro
       session_exists = system('tmux', 'has-session', '-t', session_name, err: File::NULL)
 
       if session_exists
+        session = environment.find_session(session_name)
+        if session&.attached? && !force
+          puts "Session '#{session_name}' is already attached. Use -f to switch anyway."
+          exit 1
+        end
         hiiro.start_tmux_session(session_name)
       else
         base_dir = tree_path
@@ -656,18 +661,28 @@ class Hiiro
           tm.start_task(task_name, app_name: app_name, sparse_groups: opts.sparse)
         end
 
-        h.add_subcmd(:switch) do |task_name=nil, app_name=nil|
+        h.add_subcmd(:switch) do |*raw_args|
+          opts = Hiiro::Options.parse(raw_args) do
+            option(:force, short: :f, type: :flag, desc: 'Switch even if session is already attached')
+          end
+          task_name = opts.args[0]
+          app_name  = opts.args[1]
+
           if task_name.nil?
             selected = tm.select_task_interactive
             next unless selected
 
             case selected
             when Hiiro::Tmux::Session
+              if selected.attached? && !opts.force
+                puts "Session '#{selected.name}' is already attached. Use -f to switch anyway."
+                exit 1
+              end
               h.start_tmux_session(selected.name)
               puts "Switched to session '#{selected.name}'"
               next
             when Hiiro::Task
-              tm.switch_to_task(selected, app_name: app_name)
+              tm.switch_to_task(selected, app_name: app_name, force: opts.force)
               next
             end
           end
@@ -678,13 +693,17 @@ class Hiiro
           unless task
             session = tm.environment.find_session(task_name)
             if session
+              if session.attached? && !opts.force
+                puts "Session '#{session.name}' is already attached. Use -f to switch anyway."
+                exit 1
+              end
               h.start_tmux_session(session.name)
               puts "Switched to session '#{session.name}'"
               next
             end
           end
 
-          tm.switch_to_task(task, app_name: app_name)
+          tm.switch_to_task(task, app_name: app_name, force: opts.force)
         end
 
         h.add_subcmd(:app) do |app_name=nil|

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.219"
+  VERSION = "0.1.220"
 end

metadata

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