hiiro 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d5d0cdd946b7aecc0994b6a5bb970b3857f9e0049a6f2bb2908dc7713dc325
-  data.tar.gz: 9238058ff310eef9ebe8595fca12c872aaf9668299d29990750a18f54d9e2f1a
+  metadata.gz: 120a159138b041e06749ec822d31251a980ff168177a23e62d118ce64a9aa7a3
+  data.tar.gz: 6e4fbc826a0fc648bc1dd53da2165daf15b081875bce912ff6d8933ca56f5662
 SHA512:
-  metadata.gz: 39531bfa736dd54743fef4b2a5286137ceb6d4cc9ff14b77b0c8d6217e12e1b623953f78da41acc08d56aff3b622986a326455805d0096969c315f36d69dbed5
-  data.tar.gz: 969631679249c0f5d8f0fc0f377536a0aafa000e0e4a3d6ce7d34e9b03ec88282f3121a725aaccbf47d3bcc1ab10cff2e43e1e022bd3de237382a57f9f8f91de
+  metadata.gz: 0b943ab68f08a7db203c94c5d1f1b096e0ef0bcc3bdb30ba7556e49bd86cd5b398b87cf6181d676bf609870c11df3aaa124f74035fbc636566f3a21fcfe3a107
+  data.tar.gz: 4c13f38ad2c94c3fd20c537f6bed9e2bdd865ff09bc03603bf47142387fc340d5a54b5fde18eabfbd0e3a78b8b38bbab78c715f94b9073c185f903371b8e28de

data/bin/h-link

@@ -25,6 +25,32 @@ def ensure_links_file
   File.write(LINKS_FILE, [].to_yaml) unless File.exist?(LINKS_FILE)
 end
 
+def hash_matches?(links, *args)
+  terms = args.map(&:downcase)
+
+  links.select do |line, link|
+    searchable = [
+      link['url'],
+      link['description'],
+      link['shorthand']
+    ].compact.join(' ').downcase
+
+    terms.all? { |term| searchable.include?(term) }
+  end
+end
+
+def link_matches?(link, *args)
+  terms = args.map(&:downcase)
+
+  searchable = [
+    link['url'],
+    link['description'],
+    link['shorthand']
+  ].compact.join(' ').downcase
+
+  terms.all? { |term| searchable.include?(term) }
+end
+
 def load_links
   ensure_links_file
   YAML.load_file(LINKS_FILE) || []
@@ -141,14 +167,18 @@ o.add_subcmd(:select) do |*args|
     exit 1
   end
 
-  lines = links.each_with_index.map do |link, idx|
+  lines = links.each_with_index.each_with_object({}) do |(link, idx), h|
     num = (idx + 1).to_s.rjust(3)
     desc = link['description'].to_s.empty? ? "" : " - #{link['description']}"
-    "#{num}. #{link['url']}#{desc}"
+    h["#{num}. #{link['url']}#{desc}"] = link
+  end
+
+  if args.any?
+    lines = hash_matches?(lines, *args)
   end
 
   require 'open3'
-  selected, status = Open3.capture2('sk', stdin_data: lines.join("\n"))
+  selected, status = Open3.capture2('sk', stdin_data: lines.keys.join("\n"))
 
   if status.success? && !selected.strip.empty?
     if selected =~ /^\s*(\d+)\.\s+(\S+)/
@@ -157,6 +187,18 @@ o.add_subcmd(:select) do |*args|
   end
 end
 
+o.add_subcmd(:editall) do |*args|
+  links_before = load_links
+  system(ENV['EDITOR'] || 'vim', LINKS_FILE)
+
+  begin
+    links_after = load_links
+  rescue => e
+    puts "ERROR: Unable to read updated file...reverting."
+    save_links(links_before)
+  end
+end
+
 o.add_subcmd(:edit) do |*args|
   if args.empty?
     puts "Usage: h link edit <number|shorthand>"

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

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