hiiro 0.1.204 → 0.1.206

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dbd4e31ff3df97138538c11a18bba336f839479ec862f21cd6f3fba42053373
-  data.tar.gz: 03ac722ea8387a2a1c35ecefd38bf64b963e51f1e3b8403cfc69647e6c550727
+  metadata.gz: 43afc62e3bf52a55f7f155090abc9c326e5ce273f3c90cb6db629ff65535f8cd
+  data.tar.gz: cde95c8c0eb5cff21939427af608d1cdfd9f9bd67b0c02d9ac3841e5a0c6768d
 SHA512:
-  metadata.gz: 81e354d4de2540dc21fa51b1fb294e8838b8b48005f2de3a93178f6b29db406a8ed2109043dbdd9a363d984e2607c2fa715496499b2a3dcd441207994ccf675f
-  data.tar.gz: 0a737674dda65146b987937f82ca9211d0f5349735496e4702a5273706e29c3490ed29f595106aac789bbe3faeda4e1720b3a8e1f01d251c96e8a80a71c26b3b
+  metadata.gz: 0651e3b77c8601162b5f7d29866f095db404c16380d28f397c3a3c088238b77814eadd002d7ef48615531535c89c53370f509b8c749119eac435128adb860fe7
+  data.tar.gz: b30056a4f4b75bc89decbc98ff5a117664aa0d6026251399a8035c92acc3c1f712dcd440d062586418fa38d0085c1c821f63f4861218110cff443b07d74b5e4f

data/bin/h-app

@@ -45,8 +45,7 @@ end
 
 Hiiro.run(*ARGV) {
   add_subcmd(:config) {
-    editor = ENV['EDITOR'] || 'nvim'
-    system(editor, APPS_FILE)
+    edit_files(APPS_FILE)
   }
 
   add_subcmd(:cd) { |app_name=nil|

data/bin/h-branch

@@ -119,7 +119,7 @@ end
 Hiiro.run(*ARGV) do
   manager = BranchManager.new(self)
 
-  add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
+  add_subcmd(:edit) { edit_files(__FILE__) }
   add_subcmd(:save) { manager.save }
   add_subcmd(:current) { print `git branch --show-current` }
   add_subcmd(:info) { manager.current }

data/bin/h-claude

@@ -66,8 +66,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) {
     else
       tmpfile = Tempfile.new(['claude-inline-', '.md'])
       tmpfile.close
-      editor = ENV['EDITOR'] || 'vim'
-      system(editor, tmpfile.path)
+      edit_files(tmpfile.path)
       prompt = File.read(tmpfile.path).strip
       tmpfile.unlink
       if prompt.empty?
@@ -80,7 +79,6 @@ Hiiro.run(*ARGV, plugins: [Pins]) {
   }
 
   add_subcmd(:loop) { |*args|
-    editor = ENV['EDITOR'] || 'vim'
     separator = "-" * 72
     history = []
 
@@ -104,7 +102,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) {
       end
 
       tmpfile.close
-      system(editor, tmpfile.path)
+      edit_files(tmpfile.path)
       content = File.read(tmpfile.path).strip
       tmpfile.unlink
 

data/bin/h-commit

@@ -3,7 +3,7 @@
 require "hiiro"
 
 Hiiro.run(*ARGV, plugins: [Pins]) do
-  add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
+  add_subcmd(:edit) { edit_files(__FILE__) }
 
   add_subcmd(:select, :sk) { |*select_args|
     # Pass all args to git log, with sensible defaults

data/bin/h-config

@@ -2,50 +2,48 @@
 
 require 'hiiro'
 
-def open_config(dir:, file:)
-  editor = ENV['EDITOR'] || 'nvim'
-  full_path = File.expand_path(File.join(dir, file))
-  Dir.chdir(File.expand_path(dir))
-  system(editor, full_path)
-end
-
 Hiiro.run(*ARGV) {
+  open_config = ->(dir:, file:) {
+    full_path = File.expand_path(File.join(dir, file))
+    Dir.chdir(File.expand_path(dir))
+    edit_files(full_path)
+  }
   add_subcmd(:vim) {
     dir = '~/.config/nvim'
     file = File.exist?(File.expand_path('~/.config/nvim/init.lua')) ? 'init.lua' : 'init.vim'
-    open_config(dir: dir, file: file)
+    open_config.(dir: dir, file: file)
   }
 
   add_subcmd(:git) {
     make_child(subcmd, *args) {
       add_subcmd(:global) {
-        open_config(dir: '~', file: '.gitconfig')
+        open_config.(dir: '~', file: '.gitconfig')
       }
 
       add_subcmd(:local) {
         root = `git rev-parse --show-toplevel`.chomp 
-        open_config(dir: root, file: '.git/config')
+        open_config.(dir: root, file: '.git/config')
       }
     }.run
   }
 
   add_subcmd(:tmux) {
-    open_config(dir: '~', file: '.tmux.conf')
+    open_config.(dir: '~', file: '.tmux.conf')
   }
 
   add_subcmd(:zsh) {
-    open_config(dir: '~', file: '.zshrc')
+    open_config.(dir: '~', file: '.zshrc')
   }
 
   add_subcmd(:profile) {
-    open_config(dir: '~', file: '.zprofile')
+    open_config.(dir: '~', file: '.zprofile')
   }
 
   add_subcmd(:starship) {
-    open_config(dir: '~/.config/starship', file: 'starship.toml')
+    open_config.(dir: '~/.config/starship', file: 'starship.toml')
   }
 
   add_subcmd(:claude) {
-    open_config(dir: '~/.claude', file: 'settings.json')
+    open_config.(dir: '~/.claude', file: 'settings.json')
   }
 }

data/bin/h-link

@@ -332,7 +332,7 @@ Hiiro.run(*ARGV, plugins: [Pins], links_file: lm.links_file) do
 
   add_subcmd(:editall) do |*editall_args|
     links_before = lm.load_links
-    system(ENV['EDITOR'] || 'vim', lm.links_file)
+    edit_files(lm.links_file)
 
     begin
       links_after = lm.load_links

data/bin/h-plugin

@@ -21,7 +21,7 @@ Hiiro.run(*ARGV, plugins: [Pins], dir: BASE_DIR) do
 
   add_subcmd(:edit) { |*edit_args|
     if edit_args.none?
-      system(ENV['EDITOR'] || 'safe_nvim', __FILE__)
+      edit_files(__FILE__)
     else
       pm = Hiiro::Matcher.new(plugin_files) { |f| File.basename(f) }
       plugins = edit_args.flat_map { |arg| pm.by_prefix(arg).matches.map(&:item) }.uniq
@@ -29,7 +29,7 @@ Hiiro.run(*ARGV, plugins: [Pins], dir: BASE_DIR) do
       if plugins.none?
         puts "No matching plugins found for: #{edit_args.map(&:inspect).join(' ')}"
       else
-        system(ENV['EDITOR'] || 'safe_nvim', *plugins)
+        edit_files(*plugins)
       end
     end
   }

data/bin/h-pr

@@ -723,7 +723,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
   }
 
-  add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
+  add_subcmd(:edit) { edit_files(__FILE__) }
   add_subcmd(:save) { |pr_number=nil| manager.save(pr_number) }
   add_subcmd(:current) { manager.current }
   add_subcmd(:open) { |pr_number=nil|
@@ -1132,7 +1132,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     tmpfile.write(lines.join("\n"))
     tmpfile.close
 
-    system(ENV['EDITOR'] || 'nvim', tmpfile.path)
+    edit_files(tmpfile.path)
 
     to_add = YAML.safe_load_file(tmpfile.path) || []
     tmpfile.unlink

data/bin/h-project

@@ -117,8 +117,6 @@ Hiiro.run(*ARGV) do
   # === EDIT CONFIG FILE ===
   add_subcmd(:edit) { |*edit_args|
     projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
-    editor = ENV['EDITOR'] || 'vim'
-
     # Create config dir if needed
     config_dir = File.dirname(projects_file)
     Dir.mkdir(config_dir) unless Dir.exist?(config_dir)
@@ -128,7 +126,7 @@ Hiiro.run(*ARGV) do
       File.write(projects_file, "# Project aliases\n# project_name: /path/to/project\n")
     end
 
-    exec(editor, projects_file)
+    edit_files(projects_file)
   }
 
   # === SELECT PROJECT ===

data/bin/h-session

@@ -157,7 +157,7 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
     tmpfile.write(orphan_names.to_yaml)
     tmpfile.close
 
-    system(ENV['EDITOR'] || 'nvim', tmpfile.path)
+    edit_files(tmpfile.path)
 
     to_kill = YAML.safe_load_file(tmpfile.path) || []
     tmpfile.unlink

data/bin/h-todo

@@ -227,8 +227,7 @@ Hiiro.run(*ARGV, todo_file: tm.todo_file) do
   end
 
   add_subcmd(:editall) do |*args|
-    editor = ENV['EDITOR'] || 'safe_nvim' || 'nvim'
-    system(editor, tm.todo_file)
+    edit_files(tm.todo_file)
   end
 
   add_subcmd(:help) do |*args|

data/lib/hiiro/app_files.rb

@@ -123,12 +123,7 @@ class Hiiro
             end
           end
 
-          editor = ENV['EDITOR'] || 'nvim'
-          if editor.match?(/vim/i)
-            system(editor, '-O', *resolved)
-          else
-            system(editor, *resolved)
-          end
+          h.edit_files(*resolved)
         end
       end
     end

data/lib/hiiro/queue.rb

@@ -447,6 +447,7 @@ class Hiiro
           opts = Hiiro::Options.parse(args) do
             option(:task, short: :t, desc: 'Task name')
             flag(:choose, short: :T, desc: 'Choose task interactively')
+            flag(:session, short: :s, desc: 'Use current tmux session')
           end
 
           if opts.help?
@@ -457,6 +458,11 @@ class Hiiro
           args = opts.args
           ti = q.resolve_task_info(opts, h, task_info)
 
+          if opts.session
+            session_name = h.tmux_client.current_session&.name
+            ti = (ti || {}).merge(session_name: session_name) if session_name
+          end
+
           tmpfile = Tempfile.new(['hq-', '.md'])
           prompt_file = tmpfile.path
           if args.empty? && !$stdin.tty?
@@ -476,10 +482,11 @@ class Hiiro
             end
 
             tmpfile.close
-            editor = ENV['EDITOR'] || 'vim'
-            editor_args = [editor]
-            editor_args << '+$' if editor.include?('vim')
-            system(*editor_args, tmpfile.path)
+            if h.vim?
+              system(h.editor, '+$', tmpfile.path)
+            else
+              system(h.editor, tmpfile.path)
+            end
             content = File.read(tmpfile.path).strip
             tmpfile.unlink
             if content.empty?
@@ -498,13 +505,19 @@ class Hiiro
 
         h.add_subcmd(:wip) { |*args|
           q.queue_dirs
-          editor = ENV['EDITOR'] || 'vim'
           opts = Hiiro::Options.parse(args) do
             option(:task, short: :t, desc: 'Task name')
             flag(:choose, short: :T, desc: 'Choose task interactively')
+            flag(:session, short: :s, desc: 'Use current tmux session')
           end
           args = opts.args
           ti = q.resolve_task_info(opts, h, task_info)
+
+          if opts.session
+            session_name = h.tmux_client.current_session&.name
+            ti = (ti || {}).merge(session_name: session_name) if session_name
+          end
+
           name = args.first
 
           if name.nil?
@@ -534,9 +547,7 @@ class Hiiro
             end
           end
 
-          editor_args = [editor]
-          editor_args << '+$' if editor.include?('vim')
-          system(*editor_args, path)
+          h.edit_files(path)
         }
 
         h.add_subcmd(:ready) { |name = nil|

data/lib/hiiro/runner_tool.rb

@@ -122,11 +122,6 @@ class Hiiro
       true
     end
 
-    def edit_config
-      editor = ENV['EDITOR'] || 'nvim'
-      system(editor, config_file)
-    end
-
     def self.build_hiiro(parent_hiiro, rt, git: nil)
       parent_hiiro.make_child(:run) do |h|
         h.add_default do |*run_args|
@@ -204,8 +199,7 @@ class Hiiro
           tmpfile.write(YAML.dump({ 'new_tool' => template }))
           tmpfile.close
 
-          editor = ENV['EDITOR'] || 'nvim'
-          system(editor, tmpfile.path)
+          h.edit_files(tmpfile.path)
 
           begin
             data = YAML.safe_load_file(tmpfile.path, permitted_classes: [Symbol]) || {}
@@ -229,7 +223,7 @@ class Hiiro
         end
 
         h.add_subcmd(:config) do
-          rt.edit_config
+          h.edit_files(rt.config_file)
         end
       end
     end

data/lib/hiiro/service_manager.rb

@@ -489,7 +489,7 @@ class Hiiro
           end
 
           tmux_info = {
-            session: ENV['TMUX'] ? `tmux display-message -p '#S'`.chomp : nil,
+            session: h.tmux_client.current_session&.name,
           }
 
           task_info = {}
@@ -646,8 +646,7 @@ class Hiiro
           tmpfile.write(YAML.dump({ 'new_service' => template }))
           tmpfile.close
 
-          editor = ENV['EDITOR'] || 'nvim'
-          system(editor, tmpfile.path)
+          h.edit_files(tmpfile.path)
 
           begin
             data = YAML.safe_load_file(tmpfile.path, permitted_classes: [Symbol]) || {}
@@ -680,8 +679,7 @@ class Hiiro
         end
 
         h.add_subcmd(:config) do
-          editor = ENV['EDITOR'] || 'nvim'
-          system(editor, sm.config_file)
+          h.edit_files(sm.config_file)
         end
 
         h.add_subcmd(:groups) do
@@ -866,8 +864,7 @@ class Hiiro
     end
 
     def current_tmux_session
-      return nil unless ENV['TMUX']
-      `tmux display-message -p '#S'`.chomp
+      Hiiro::Tmux::Session.current&.name
     end
 
     def create_tmux_window(session, name)

data/lib/hiiro/tasks.rb

@@ -722,7 +722,7 @@ class Hiiro
         end
 
         h.add_subcmd(:edit) do
-          system(ENV['EDITOR'] || 'nvim', __FILE__)
+          h.edit_files(__FILE__)
         end
 
         h.add_subcmd(:todo) do |*todo_args|
@@ -880,9 +880,8 @@ class Hiiro
     attr_reader :name
 
     def self.current
-      return nil unless ENV['TMUX']
-
-      name = `tmux display-message -p '#S'`.chomp
+      name = Hiiro::Tmux::Session.current&.name
+      return nil unless name
       new(name)
     end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.204"
+  VERSION = "0.1.206"
 end

data/lib/hiiro.rb

@@ -58,7 +58,7 @@ class Hiiro
       }
 
       hiiro.add_subcmd(:edit, **values) { |*args|
-        system(ENV['EDITOR'] || 'nvim', hiiro.bin)
+        hiiro.edit_files(hiiro.bin)
       }
 
       if hiiro.tasks_enabled?
@@ -154,9 +154,17 @@ class Hiiro
     ENV['EDITOR'] || editors.first
   end
 
-  def edit_files(*files)
+  def vim?
+    editor.to_s.match?(/vim/i)
+  end
+
+  def edit_files(*files, max_splits: 3)
     if editor.match?(/vim/i)
-      system(editor, '-O', *files)
+      if files.count > max_splits.to_i
+        system(editor, '-O' + max_splits.to_i.to_s, *files)
+      else
+        system(editor, '-O', *files)
+      end
     else
       system(editor, *files)
     end

metadata

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