hiiro 0.1.87 → 0.1.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce90e3d37e2dfb575b7a30f2070c605e377146073fe32f715768383b907290f4
-  data.tar.gz: a700aaee8c6b5c0eadfe6fe694df2a97291b38aa289c6c5dfce931e8ce1df39d
+  metadata.gz: b7cb7a6ce802264b5f0749fc119083f961e671dcf316dea88e0337c3f9ad6514
+  data.tar.gz: fd5f8e971430143cc0d3c5a69ef566b2b84cf91392371843ce45b1ccbf429683
 SHA512:
-  metadata.gz: 398be942e72ed10cd94becb6626d2c29bedd8554647e792b05cccea5098964085995a7eae2ebf0c15a3d5bacac73766884fcdb9ed8499d6546e3fb71ae48d59d
-  data.tar.gz: d6f3682431737967af381781a888d028b5b2fe13617d34eba984bebed53e5c4ffcbe41c9c79d72eba70aec3cfb8400f8185db5cf678953475896a5f96948922e
+  metadata.gz: 4e54192831986a7b1d5dead8db42775a2a758c020b0bd10c22879ee491256bad087dbdaa773a9d4e8ebd478916709dca8ff9027ac812be0e31f4b1aea45d3d7b
+  data.tar.gz: 5dd8c44cf7b57ef21296ebff7ed89883cf36a9105cffebd0d7de2df35f12bb0b0e3980539839af5a1f5543700298dccccdf3ade98b4e19f0a7ce3844556bc303

data/bin/h-buffer

@@ -6,6 +6,19 @@ def buffer_names
   `tmux list-buffers -F '\#{buffer_name}'`.strip.split("\n")
 end
 
+def show_buffer(name, *args)
+  `tmux show-buffer -b #{name.shellescape} #{args.shelljoin}`
+end
+
+def buffer_map
+  output = `tmux list-buffers -F '\#{buffer_name}: \#{buffer_sample}'`.strip
+
+  lines = output.split("\n").each_with_object({}) do |line, h|
+    buffer_name = line.split(': ', 2).first
+    h[line] = buffer_name
+  end
+end
+
 def find_buffer(partial)
   buffer_list = buffer_names
 
@@ -17,20 +30,17 @@ def find_buffer(partial)
 end
 
 def select_buffer(partial = nil)
-  names = buffer_names
-  return nil if names.empty?
+  buffers = buffer_map
+  return nil if buffers.empty?
 
   if partial
-    names = names.grep(Regexp.new(partial))
+    buffers = buffers.select{|k,v| ![k.to_s, v.to_s].grep(Regexp.new(partial)).empty? }
   end
 
-  return nil if names.empty?
-  return names.first if names.length == 1
+  return nil if buffers.empty?
+  return buffers.first if buffers.length == 1
 
-  selected, status = Hiiro::Fuzzyfind.select(names)
-  return nil unless status.success?
-
-  selected.strip.empty? ? nil : selected.strip
+  Hiiro::Fuzzyfind.map_select(buffers)
 end
 
 o = Hiiro.init(*ARGV, plugins: [Pins])
@@ -41,12 +51,13 @@ o.add_subcmd(:ls) { |*args|
 
 o.add_subcmd(:show) { |name = nil, *args|
   buffer = select_buffer(name)
+
   unless buffer
     puts "No buffer selected or found"
     next
   end
 
-  system('tmux', 'show-buffer', '-b', buffer, *args)
+  print show_buffer(buffer, *args)
 }
 
 o.add_subcmd(:copy) { |name = nil, *args|
@@ -56,13 +67,8 @@ o.add_subcmd(:copy) { |name = nil, *args|
     next
   end
 
-  require 'open3'
-  content = `tmux show-buffer -b #{buffer}`
-  Open3.popen3('pbcopy') do |stdin, stdout, stderr, wait_thr|
-    stdin.write(content)
-    stdin.close
-    wait_thr.value
-  end
+  content = show_buffer(buffer)
+  Hiiro::Shell.pipe(content, 'pbcopy')
   puts "Copied buffer '#{buffer}' to clipboard"
 }
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.87"
+  VERSION = "0.1.88"
 end

metadata

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