hiiro 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e36b4e41c8423664f340bf38dc96796bb459a9edb161b4c2e937837504bb23
-  data.tar.gz: c4374d147f3ddb4620349697d14701e0c50c0e3ea74034aa0f9cad6eeae162c9
+  metadata.gz: 120a159138b041e06749ec822d31251a980ff168177a23e62d118ce64a9aa7a3
+  data.tar.gz: 6e4fbc826a0fc648bc1dd53da2165daf15b081875bce912ff6d8933ca56f5662
 SHA512:
-  metadata.gz: 820400fc28e1137fce98dc50687c1aeb4543c9b072bca58419c9de5c133c057601e0a9c8b56ff8f6225c36c3e0531d3039cb0011a7bcb8b1bc64e604f0c2f256
-  data.tar.gz: 0abdd6cde316418cbf24ea129cd9988f59561fd25c14e15ee7e4227f7d6a82be3a098e295a7ccde5a899580124af4e92e0a8bed3531f99c89c521c7c9976cc5c
+  metadata.gz: 0b943ab68f08a7db203c94c5d1f1b096e0ef0bcc3bdb30ba7556e49bd86cd5b398b87cf6181d676bf609870c11df3aaa124f74035fbc636566f3a21fcfe3a107
+  data.tar.gz: 4c13f38ad2c94c3fd20c537f6bed9e2bdd865ff09bc03603bf47142387fc340d5a54b5fde18eabfbd0e3a78b8b38bbab78c715f94b9073c185f903371b8e28de

data/bin/h-link

@@ -3,10 +3,19 @@
 require 'yaml'
 require 'fileutils'
 require 'time'
-
+require 'pry'
+require 'tempfile'
 require "hiiro"
 
 LINKS_FILE = File.join(Dir.home, '.config/hiiro/links.yml')
+LINK_TEMPLATE = {
+  'url' => 'http://EXAMPLE',
+  'description' => '',
+  'shorthand' => nil,
+  'created_at' => Time.now.iso8601,
+}
+
+
 
 o = Hiiro.init(*ARGV, plugins: [Tmux, Pins], links_file: LINKS_FILE)
 
@@ -16,11 +25,50 @@ 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) || []
 end
 
+def edit_link(link=LINK_TEMPLATE)
+  tmpfile = Tempfile.new(['link-edit-', '.yml'])
+  tmpfile.write(link.to_yaml)
+  tmpfile.close
+
+  system(ENV['EDITOR'] || 'vim', tmpfile.path)
+
+  updated = YAML.load_file(tmpfile.path)
+  tmpfile.unlink
+
+  updated
+end
+
 def save_links(links)
   ensure_links_file
   File.write(LINKS_FILE, links.to_yaml)
@@ -38,16 +86,20 @@ def find_link_by_ref(ref, links)
   [nil, nil]
 end
 
-o.add_subcmd(:save) do |*args|
+o.add_subcmd(:add) do |*args|
+  links = load_links
+
   if args.empty?
-    puts "Usage: h link save <url> [description...]"
-    exit 1
+    updated = edit_link
+
+    links << updated
+    save_links(links)
+    exit 0
   end
 
   url = args.shift
   description = args.join(' ')
 
-  links = load_links
   links << {
     'url' => url,
     'description' => description,
@@ -93,7 +145,7 @@ o.add_subcmd(:search) do |*args|
       link['shorthand']
     ].compact.join(' ').downcase
 
-    terms.any? { |term| searchable.include?(term) }
+    terms.all? { |term| searchable.include?(term) }
   end
 
   if matches.empty?
@@ -115,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+)/
@@ -131,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>"
@@ -145,15 +213,7 @@ o.add_subcmd(:edit) do |*args|
     exit 1
   end
 
-  require 'tempfile'
-  tmpfile = Tempfile.new(['link-edit-', '.yml'])
-  tmpfile.write(link.to_yaml)
-  tmpfile.close
-
-  system(ENV['EDITOR'] || 'vim', tmpfile.path)
-
-  updated = YAML.load_file(tmpfile.path)
-  tmpfile.unlink
+  updated = edit_link(link)
 
   links[idx] = updated
   save_links(links)

data/lib/hiiro/version.rb

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

metadata

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