hiiro 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c231fe73a649821cd62ad3bfafaf3a1176891fb6b37fa8a95d7e3a50499553ab
-  data.tar.gz: cc0759a2304557485168249934b108199dce624e972bd5dc4a8663cec283a60c
+  metadata.gz: 80d5d0cdd946b7aecc0994b6a5bb970b3857f9e0049a6f2bb2908dc7713dc325
+  data.tar.gz: 9238058ff310eef9ebe8595fca12c872aaf9668299d29990750a18f54d9e2f1a
 SHA512:
-  metadata.gz: db1cb32fc6c26d31268a845569400fb833509a5289c30b481fcc6a1e6ad0857a98eb837cbb1f1e9c957f45c8132703553d5ea593f60d93ac8bb88a53256205bb
-  data.tar.gz: 32a64ec1dc0acdbd91d2e823c20b65ebb56749b8988531e76efa7d5cd90de0e9ca918f5d1c68377b8632780f6beacf086472e13394c2b106a7f08d1a60080367
+  metadata.gz: 39531bfa736dd54743fef4b2a5286137ceb6d4cc9ff14b77b0c8d6217e12e1b623953f78da41acc08d56aff3b622986a326455805d0096969c315f36d69dbed5
+  data.tar.gz: 969631679249c0f5d8f0fc0f377536a0aafa000e0e4a3d6ce7d34e9b03ec88282f3121a725aaccbf47d3bcc1ab10cff2e43e1e022bd3de237382a57f9f8f91de

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)
 
@@ -21,6 +30,19 @@ def load_links
   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 +60,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 +119,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?
@@ -126,7 +152,7 @@ o.add_subcmd(:select) do |*args|
 
   if status.success? && !selected.strip.empty?
     if selected =~ /^\s*(\d+)\.\s+(\S+)/
-      print $2
+      puts $2
     end
   end
 end
@@ -145,15 +171,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.11"
+  VERSION = "0.1.13"
 end

metadata

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