searchlink 2.3.59 → 2.3.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afaa2c476c0dea9ca4af8d6049a6235c3aabf265fc512f61ec091343f0913cfa
-  data.tar.gz: 94d56d4f5af396e1fc71e564c35d25bbaee4540a039e73030f3623e32a03d9cf
+  metadata.gz: cff5bedf7ccbc233a648654e9f3c7bf41981a451c11ddfb6b1fd90741ae6ae2a
+  data.tar.gz: 41e05ed7af669c38d093eb5f109489a786e5bef29575caade95c8328332abf06
 SHA512:
-  metadata.gz: 70f776838f8735da2c152ead9d4178efa82d6c072ea2207bd0608bc116d84f30daa7170675412ec0e65611f5278bbd6eb8bec25324603a98fdaaae2941ab6894
-  data.tar.gz: f6d8d843f6e141caf38b1e1ac45fa7d244d19e01584d04f9fdee9f2b8dc9fe9ebf44a6a88bdbcc6403b9c5b8f09d6c526e8eb89780114e2f7a33de0515a981a5
+  metadata.gz: 1fcb8a00815275b8263805029d47d50d8fd5d934de2880dcfb32c41384652c5791a0c2415e5cead7b2649c348b5374f050d2a4f74b817b8399e25efd5bc72912
+  data.tar.gz: c65f32af3fdeca3ea36306b92babcaa09cfb4c1aee01c5569a1dcf8132821d9b94a05e9f186961a2e67990db6ec409b22562b12e73ef7ca4517036263a8bc642

data/bin/searchlink

@@ -31,13 +31,13 @@ if !ARGV.empty?
       puts
       sl.help_cli
       $stdout.puts 'See https://github.com/ttscoff/searchlink/wiki for help'
-      Process.exit
+      Process.exit 0
     when /^(--?)?v(er(s(ion)?)?)?$/
       print SL.version_check
-      Process.exit
+      Process.exit 0
     when /^--?(stdout)$/
       overwrite = false
-    when /^--?no[\-_]backup$/
+    when /^--?no[-_]backup$/
       backup = false
     else
       files.push(arg)
@@ -47,6 +47,7 @@ if !ARGV.empty?
   files.each do |file|
     if File.exist?(file) && `file -b "#{file}"|grep -c text`.to_i.positive?
       input = RUBY_VERSION.to_f > 1.9 ? IO.read(file).force_encoding('utf-8') : IO.read(file)
+      input.scrub!
 
       backup_file = "#{file}.bak"
       backup_file = "#{file}.bak 1" if File.exist?(backup_file)
@@ -72,7 +73,7 @@ if !ARGV.empty?
   end
 else
   input = RUBY_VERSION.to_f > 1.9 ? $stdin.read.force_encoding('utf-8').encode : $stdin.read
-
+  input.scrub!
   sl.parse(input)
   output = SL.output&.join('')
 

data/lib/searchlink/array.rb

@@ -1,7 +1,29 @@
 # Array helpers
 class ::Array
-  # Finds the longest element in a given array.
+  # Finds the longest element in an array of strings
+  #
+  # @return [String] first element among longest elements
   def longest_element
-    group_by(&:size).max.last[0]
+    longest_elements[0]
+  end
+  # Finds the longest elements and returns an Array
+  #
+  # @return [Array] array of longest elements
+  def longest_elements
+    group_by(&:size).max.last
+  end
+
+  # Finds the shortest element in an array of strings
+  #
+  # @return [String] first element among shortest elements
+  def shortest_element
+    shortest_elements[0]
+  end
+
+  # Finds the shortest elements in an array of strings
+  #
+  # @return [Array] array of shortest elements
+  def shortest_elements
+    group_by(&:size).min.last
   end
 end

data/lib/searchlink/config.rb

@@ -17,10 +17,19 @@ module SL
   class SearchLink
     # Values found in ~/.searchlink will override defaults in
     # this script
+    def config_file
+      old_style = File.expand_path('~/.searchlink')
+      new_style = File.expand_path('~/.config/searchlink/config.yaml')
+      if File.exist?(old_style)
+        return old_style
+      else
+        return new_style
+      end
+    end
 
     def initialize(opt = {})
       SL.printout = opt[:echo] || false
-      unless File.exist? File.expand_path('~/.searchlink')
+      unless File.exist? config_file
         default_config = <<~ENDCONFIG
           # set to true to have an HTML comment included detailing any errors
           # Can be disabled per search with `--d`, or enabled with `++d`.
@@ -146,12 +155,12 @@ module SL
 
         ENDCONFIG
 
-        File.open(File.expand_path('~/.searchlink'), 'w') do |f|
+        File.open(config_file, 'w') do |f|
           f.puts default_config
         end
       end
 
-      config = YAML.load_file(File.expand_path('~/.searchlink'))
+      config = YAML.load_file(config_file)
 
       # set to true to have an HTML comment inserted showing any errors
       config['debug'] ||= false

data/lib/searchlink/searches.rb

@@ -24,9 +24,9 @@ module SL
       def description_for_search(search_type)
         description = "#{search_type} search"
         plugins[:search].each do |_, plugin|
-          s = plugin[:searches].select { |s| s[0] == search_type }
-          unless s.empty?
-            description = s[0][1]
+          search = plugin[:searches].select { |s| s[0].is_a?(Array) ? s[0].include?(search_type) : s[0] == search_type }
+          unless search.empty?
+            description = search[0][1]
             break
           end
         end
@@ -42,11 +42,14 @@ module SL
         searches = plugins[:search]
                    .flat_map { |_, plugin| plugin[:searches] }
                    .reject { |s| s[1].nil? }
-                   .sort_by { |s| s[0] }
+                   .sort_by { |s| s[0].is_a?(Array) ? s[0][0] : s[0] }
         out = ['<table id="searches">',
                '<thead><td>Shortcut</td><td>Search Type</td></thead>',
                '<tbody>']
-        searches.each { |s| out << "<tr><td><code>!#{s[0]}</code></td><td>#{s[1]}</td></tr>" }
+
+        searches.each do |s|
+          out << "<tr><td><code>!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..].join(',')})" : s[0]}</code></td><td>#{s[1]}</td></tr>"
+        end
         out.concat(['</tbody>', '</table>']).join("\n")
       end
 
@@ -58,9 +61,11 @@ module SL
       def available_searches
         searches = []
         plugins[:search].each { |_, plugin| searches.concat(plugin[:searches].delete_if { |s| s[1].nil? }) }
-        out = ''
-        searches.each { |s| out += "!#{s[0]}#{s[0].spacer}#{s[1]}\n" }
-        out
+        out = []
+        searches.each do |s|
+          out += "!#{s[0].is_a?(Array) ? "#{s[0][0]} (#{s[0][1..].join(',')})" : s[0]}#{s[0].spacer}#{s[1]}"
+        end
+        out.join("\n")
       end
 
       def best_search_match(term)
@@ -110,7 +115,12 @@ module SL
 
       def load_custom
         plugins_folder = File.expand_path('~/.local/searchlink/plugins')
-        return unless File.directory?(plugins_folder)
+
+        Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
+          require plugin
+        end
+
+        plugins_folder = File.expand_path('~/.config/searchlink/plugins')
 
         Dir.glob(File.join(plugins_folder, '**/*.rb')).sort.each do |plugin|
           require plugin

data/lib/searchlink/string.rb

@@ -1,5 +1,15 @@
 # String helpers
 class ::String
+  # Scrub invalid characters from string
+  def scrub
+    encode('utf-16', invalid: :replace).encode('utf-8')
+  end
+
+  # @see #scrub
+  def scrub!
+    replace scrub
+  end
+
   # URL Encode string
   #
   # @return     [String] url encoded string

data/lib/searchlink/util.rb

@@ -78,7 +78,7 @@ module SL
       ## @return     [String] path to new cache file
       ##
       def cache_file_for(filename)
-        cache_folder = File.expand_path('~/.local/share/searchlink/cache')
+        cache_folder = File.expand_path('~/.config/searchlink/cache')
         FileUtils.mkdir_p(cache_folder) unless File.directory?(cache_folder)
         File.join(cache_folder, filename.sub(/(\.cache)?$/, '.cache'))
       end

data/lib/searchlink/version.rb

@@ -1,5 +1,5 @@
 module SL
-  VERSION = '2.3.59'
+  VERSION = '2.3.61'
 end
 
 module SL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.59
+  version: 2.3.61
 platform: ruby
 authors:
 - Brett Terpstra