hiiro 0.1.64 → 0.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26230a22dcc41666062bbd486f5c5f0f289f1c0f901890ff8eded9184fff6d1d
-  data.tar.gz: 49a1d56f36ba069d0738533f1ac26b649534e7dc999822d6d44cc5bb7a9ce626
+  metadata.gz: faccc5bdf44ff09a979a082a288539bba108912bde19b854cdc88a7c64484323
+  data.tar.gz: 7ecd4b4b79589a042e37188d6fa2355c755e066830a2e7b2250f925d3bc8a13c
 SHA512:
-  metadata.gz: 7bf0a65e90a7e97d940eae54c2734f496161294b9d4518cca53e652594244cd5a1f7c4c36e27dfa45dc8ce1fe0e6f1db2fe01431c262a7e7647197d0675fdaca
-  data.tar.gz: 1551df9b3fb4b018a085b2deffcd774f7677fbc9337fef7e050024162c6b8cfa402d04b1cbc32baed2304e3adb22272e09332c72698c9341fd59ba43073def78
+  metadata.gz: 434536b4f52e7a87e4e6f9ec9d02f67c216dc0055cf5027c86b57ae40d33cc1bd018aa83f0a72c97497d9d69124f40d985b072b71447172a7e29dd9fe540864f
+  data.tar.gz: 36290dcf8e5a58047bf79abe6701ba4e522254ed9da923f6cdd87ee48fa9e2e75bd08d92c3022a0541331688a33762671c36974757e090639841f5ba419ae963

data/editboth

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+home_map = {
+  'plugins' => File.join(Dir.home, '.config', 'hiiro', 'plugins'),
+  'bin' => File.join(Dir.home, 'bin'),
+  'exe' => File.join(Dir.home, 'bin'),
+  'lib' => File.dirname(`gem which hiiro`),
+}
+
+files = ARGV.flat_map do |fname|
+  key, *_ = fname.split(?/)
+
+  [fname, fname.sub(key, home_map[key])]
+end
+
+editor = ENV['EDITOR'] || 'safe_nvim' || 'nvim'
+
+system(editor, '-O2', *files)
+

data/lib/hiiro/sk.rb

@@ -13,5 +13,13 @@ class Hiiro
 
       result
     end
+
+    def self.map_select(mapping)
+      keys = mapping.keys
+
+      key = select(keys)
+
+      mapping[key.to_s.chomp]
+    end
   end
 end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.64"
+  VERSION = "0.1.66"
 end

data/lib/hiiro.rb

@@ -163,6 +163,10 @@ class Hiiro
     @git ||= Git.new(self, Dir.pwd)
   end
 
+  def attach_method(name, &block)
+    define_singleton_method(name.to_sym, &block)
+  end
+
   def load_plugins(*plugins)
     plugins.flatten.each { |plugin| load_plugin(plugin) }
   end

data/plugins/tasks.rb

@@ -517,9 +517,10 @@ class TaskManager
     branch_name = nil
 
     if task_name.nil?
-      selected_task = select_branch_interactive
-      return unless selected_task
-      task_name, branch_name = selected_task.split(/\s\s*[|]\s\s*/)
+      branch = select_branch_interactive
+      return unless branch
+      print branch
+      return
     end
  
     task = task_by_name(task_name)
@@ -630,14 +631,14 @@ class TaskManager
   end
 
   def select_branch_interactive(prompt = nil)
-    names = if scope == :subtask
-      tasks.map { |t| format('%-25s  | %s', t.short_name, t.branch) }
+    name_map = if scope == :subtask
+      tasks.sort_by(&:short_name).each_with_object({}) { |t,h| h[format('%-25s  | %s', t.short_name, t.branch)] = t.branch }
     else
-      environment.all_tasks.map { |t| format('%-25s  | %s', t.name, t.branch) }
+      environment.all_tasks.sort_by(&:name).each_with_object({}) { |t,h| h[format('%-25s  | %s', t.name, t.branch)] = t.branch }
     end
-    return nil if names.empty?
+    return nil if name_map.empty?
 
-    sk_select(names.sort)
+    Hiiro::Sk.map_select(name_map)
   end
 
   # --- Private helpers ---
@@ -809,33 +810,36 @@ module Tasks
     add_subcommands(hiiro)
   end
 
-  def self.attach_methods(hiiro)
-    hiiro.instance_eval do
-      def environment
-        @environment ||= Environment.current
-      end
-    end
+  def self.attach_methods(hiiro, task_manager=nil)
+    environment = Environment.current
+
+    hiiro.attach_method(:environment) { environment }
+    hiiro.attach_method(:env) { environment }
+    hiiro.attach_method(:task_manager) { task_manager }
+    hiiro.attach_method(:tm) { task_manager }
+
+    hiiro
   end
 
   def self.add_subcommands(hiiro)
     hiiro.add_subcmd(:task) do |*args|
-      mgr = TaskManager.new(hiiro, scope: :task)
-      task_hiiro = Tasks.build_hiiro(hiiro, mgr)
-      task_hiiro.run
+      tm = TaskManager.new(hiiro, scope: :task)
+      build_hiiro(hiiro, tm).run
     end
 
     hiiro.add_subcmd(:subtask) do |*args|
-      mgr = TaskManager.new(hiiro, scope: :subtask)
-      task_hiiro = Tasks.build_hiiro(hiiro, mgr)
-      task_hiiro.run
+      tm = TaskManager.new(hiiro, scope: :subtask)
+      build_hiiro(hiiro, tm).run
     end
   end
 
-  def self.build_hiiro(parent_hiiro, mgr)
+  def self.build_hiiro(parent_hiiro, tm)
     bin_name = [parent_hiiro.bin, parent_hiiro.subcmd || ''].join('-')
 
-    Hiiro.init(bin_name:, args: parent_hiiro.args, task_manager: mgr) do |h|
-      tm = mgr
+    task_hiiro = Hiiro.init(
+      bin_name:,
+      args: parent_hiiro.args,
+    ) do |h|
       h.add_subcmd(:list) { tm.list }
       h.add_subcmd(:ls) { tm.list }
 
@@ -893,5 +897,7 @@ module Tasks
         system(ENV['EDITOR'] || 'nvim', __FILE__)
       end
     end
+
+    attach_methods task_hiiro, tm
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.64
+  version: 0.1.66
 platform: ruby
 authors:
 - Joshua Toyota
@@ -95,6 +95,7 @@ files:
 - docs/h-session.md
 - docs/h-video.md
 - docs/h-window.md
+- editboth
 - exe/h
 - hiiro.gemspec
 - lib/hiiro.rb