hiiro 0.1.65 → 0.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0c1414031bed7ec09923ecd3c88bd20b72a5a64bce2bdf31234dbe03b2c2d1
-  data.tar.gz: 3b88d057d457e74f3a796874203e6c863b27325a9238b004f88b6aedec57cf22
+  metadata.gz: faccc5bdf44ff09a979a082a288539bba108912bde19b854cdc88a7c64484323
+  data.tar.gz: 7ecd4b4b79589a042e37188d6fa2355c755e066830a2e7b2250f925d3bc8a13c
 SHA512:
-  metadata.gz: a4d11de5d29582076d40150b510b09bf8219f0713c26d59a3205f2f6704b05bffbb84205077d6340cd33c7870a5e4d6c3c83723fd273966c63c1e3ae2badcb29
-  data.tar.gz: 5dc971e9c3070edaa1cbf1ae92105929350fa6b4c3eced60183f46215322288ad9df975af6f307724a44cbbae6c16ac5b148e321da7a010501fe7f5be31a5539
+  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.65"
+  VERSION = "0.1.66"
 end

data/lib/hiiro.rb

@@ -164,7 +164,7 @@ class Hiiro
   end
 
   def attach_method(name, &block)
-    define_method(name.to_sym, &block)
+    define_singleton_method(name.to_sym, &block)
   end
 
   def load_plugins(*plugins)

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 ---
@@ -832,7 +833,7 @@ module Tasks
     end
   end
 
-  def self.build_hiiro(parent_hiiro, task_manager)
+  def self.build_hiiro(parent_hiiro, tm)
     bin_name = [parent_hiiro.bin, parent_hiiro.subcmd || ''].join('-')
 
     task_hiiro = Hiiro.init(
@@ -897,6 +898,6 @@ module Tasks
       end
     end
 
-    attach_methods task_hiiro, task_manager
+    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.65
+  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