snibbets 2.0.7 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b5be01b0a7d1768bef21a63ffd7c1f1f176a77d6d3fa1be5ff84db7b0b27eb
-  data.tar.gz: 7c65f52ecb3dacbeea62c8225f9dc70db7d90d358a4c284050b7149a9b19fe75
+  metadata.gz: f07f0d4772b8d611c0e29da125b4e6915d3909479c4384348699eedc2e1baf90
+  data.tar.gz: e9abdf59d66f3c099c0c25f20a912efc53b690c7c45a5f4ada2b18355c3d473c
 SHA512:
-  metadata.gz: e4adffb0b196b8f891ac9363fdcb91a67dccfc579530568e336dd1ced2d7d8f6c7f4496fa1c4cbe992e24655a37a7808bd49c48e44d75623a2c1fa0fb1615bb9
-  data.tar.gz: 796ec5249c2c7332132ac2138d5281c05aab7259b75726319f247499543a15c4b839d6929e764850a8bbc907747a42a179d3b61625e4b4fff7ca90f698c24509
+  metadata.gz: ac873395a3735c827164f03b497f21f06e8af227b515e299c40eb8a4eeff26c907a5893077e1ee1a528200ef4ef9e6fe7c5ac1c9ddfecf7522ed0d772e6fd6eb
+  data.tar.gz: ca65c353589adda9fb4af59d390e98e277e5ba1523d746ab3f5cce19119cfa541b2db36045a90ecddd73be7224665dd96dd8642a2d7c010c438e6e9141a79d6a

data/CHANGELOG.md

@@ -1,6 +1,30 @@
-### 2.0.7
+### 2.0.9
 
-2023-04-15 12:02
+2023-04-15 15:44
+
+#### IMPROVED
+
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+
+#### FIXED
+
+- If a header section contains no code blocks, don't display it in menu
+- Remove leading and trailing newlines without affecting indentation
+
+### 2.0.8
+
+2023-04-15 15:41
+
+#### IMPROVED
+
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+
+#### FIXED
+
+- If a header section contains no code blocks, don't display it in menu
+- Remove leading and trailing newlines without affecting indentation
 
 ### 2.0.6
 

data/CHANGELOG.md.orig

@@ -0,0 +1,56 @@
+### 2.0.10
+
+2023-04-15 16:28
+
+#### FIXED
+
+- Update dependencies for security
+- Incorporate fixes from @robjwells addressing #3 and #4
+- Incorporate fixes from @robjwells addressing #3 and #4
+- Best menu CLI determination missing modules
+
+<<<<<<< HEAD
+### 2.0.7
+
+2023-04-15 12:02
+=======
+### 2.0.9
+
+2023-04-15 15:44
+
+#### IMPROVED
+
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+
+#### FIXED
+
+- If a header section contains no code blocks, don't display it in menu
+- Remove leading and trailing newlines without affecting indentation
+
+### 2.0.8
+
+2023-04-15 15:41
+
+#### IMPROVED
+
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+
+#### FIXED
+
+- If a header section contains no code blocks, don't display it in menu
+- Remove leading and trailing newlines without affecting indentation
+>>>>>>> release/2.0.9
+
+### 2.0.6
+
+2023-04-15 11:55
+
+#### IMPROVED
+
+- Refactor script as modules and classes
+
+## 2.0.2
+
+Initial release as a gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snibbets (2.0.3)
+    snibbets (2.0.10)
       tty-which (~> 0.5, >= 0.5.0)
 
 GEM
@@ -9,6 +9,7 @@ GEM
   specs:
     ansi (1.5.0)
     ast (2.4.2)
+    awesome_print (1.9.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
     gem-release (2.2.2)
@@ -25,7 +26,7 @@ GEM
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rdoc (4.3.0)
+    rdoc (6.3.3)
     regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.12.0)
@@ -76,21 +77,25 @@ GEM
     thor (1.2.1)
     tty-which (0.5.0)
     unicode-display_width (2.4.2)
+    yard (0.9.34)
 
 PLATFORMS
   arm64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
+  awesome_print (~> 1.9)
   bundler (~> 2.0)
   gem-release (~> 2.2)
   parse_gemspec-cli (~> 1.0)
   rake (~> 13.0)
-  rdoc (~> 4.3)
+  rdoc (~> 6.3.1)
   rspec (~> 3.0)
   simplecov (~> 0.21)
   simplecov-console (~> 0.9)
   snibbets!
   standard (~> 1.3)
+  yard (~> 0.9, >= 0.9.26)
 
 BUNDLED WITH
    2.2.29

data/Gemfile.lock.orig

@@ -0,0 +1,107 @@
+PATH
+  remote: .
+  specs:
+    snibbets (2.0.10)
+      tty-which (~> 0.5, >= 0.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    ast (2.4.2)
+    awesome_print (1.9.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    gem-release (2.2.2)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    multi_json (1.15.0)
+    parallel (1.22.1)
+    parse_gemspec (1.0.0)
+    parse_gemspec-cli (1.0.0)
+      multi_json
+      parse_gemspec
+      thor
+    parser (3.2.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+<<<<<<< HEAD
+    rdoc (6.3.1)
+=======
+    rdoc (6.3.3)
+>>>>>>> af6f234 (Update rdoc)
+    regexp_parser (2.7.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.48.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.16.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-console (0.9.1)
+      ansi
+      simplecov
+      terminal-table
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    standard (1.26.0)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (~> 1.48.1)
+      rubocop-performance (~> 1.16.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    tty-which (0.5.0)
+    unicode-display_width (2.4.2)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+
+PLATFORMS
+  arm64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  awesome_print (~> 1.9)
+  bundler (~> 2.0)
+  gem-release (~> 2.2)
+  parse_gemspec-cli (~> 1.0)
+  rake (~> 13.0)
+  rdoc (~> 6.3.1)
+  rspec (~> 3.0)
+  simplecov (~> 0.21)
+  simplecov-console (~> 0.9)
+  snibbets!
+  standard (~> 1.3)
+  yard (~> 0.9, >= 0.9.26)
+
+BUNDLED WITH
+   2.2.29

data/README.md

@@ -88,6 +88,7 @@ extension: md
 highlight: false
 interactive: true
 launchbar: false
+menus: 
 name_only: false
 output: raw
 source: "~/Dropbox/Snippets"
@@ -111,6 +112,8 @@ The `highlight` key turns on syntax highlighting. This requires that either `pyg
 
 The `interactive` setting determines whether menus will be displayed. This should generally be true, but if you want silent operation that just displays the best match automatically, set it to false. 
 
+The `menus` setting will determine what method is used for displaying interactive menus. If this is not set, it will be automatically determined in the order of `fzf`, `gum`, and `console`. You can manually choose to use one of these options over another by making it the `menus` setting.
+
 The `name_only` key will permanently set Snibbets to only search for snippets by their filename rather than examining their contents. You can enable this at runtime using `--name-only` in the command.
 
 ### Usage

data/bin/snibbets

@@ -4,290 +4,6 @@
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 require 'snibbets'
 
-module Snibbets
-  class << self
-    # Search the snippets directory for query using find and grep
-    def search(try: 0)
-      folder = Snibbets.options[:source]
-      # start by doing a spotlight search, if that fails, start trying:
-      # First try only search by filenames
-      # Second try search with grep
-      ext = Snibbets.options[:extension] || 'md'
-      cmd = case try
-            when 1
-              %(find "#{folder}" -iregex '#{@query.rx}' -name '*.#{ext}')
-            when 2
-              rg = TTY::Which.which('rg')
-              ag = TTY::Which.which('ag')
-              ack = TTY::Which.which('ack')
-              grep = TTY::Which.which('grep')
-              if Snibbets.options[:name_only]
-                nil
-              elsif !rg.empty?
-                %(#{rg} -li --color=never --glob='*.#{ext}' '#{@query.rx}' "#{folder}")
-              elsif !ag.empty?
-                %(#{ag} -li --nocolor -G '.*.#{ext}' '#{@query.rx}' "#{folder}")
-              elsif !ack.empty?
-                %(#{ack} -li --nocolor --markdown '#{@query.rx}' "#{folder}")
-              elsif !grep.empty?
-                %(#{grep} -iEl '#{@query.rx}' "#{folder}"/**/*.#{ext})
-              else
-                nil
-              end
-            else
-              mdfind = TTY::Which.which('mdfind')
-              if mdfind.empty?
-                nil
-              else
-                name_only = Snibbets.options[:name_only] ? '-name ' : ''
-                %(mdfind -onlyin #{folder} #{name_only}'#{@query} filename:.#{ext}' 2>/dev/null)
-              end
-            end
-
-      if try == 2 && cmd.nil?
-        puts "No search method available on this system. Please install ripgrep, silver surfer, ack, or grep."
-        Process.exit 1
-      end
-
-      res = cmd.nil? ? '' : `#{cmd}`.strip
-
-      matches = []
-
-      unless res.empty?
-        lines = res.split(/\n/)
-        lines.each do |l|
-          matches << {
-            'title' => File.basename(l, '.*'),
-            'path' => l
-          }
-        end
-
-        matches.sort_by! { |a| a['title'] }.uniq!
-
-        return matches unless matches.empty?
-      end
-
-      return matches if try == 2
-
-      # if no results on the first try, try again searching all text
-      search(try: try + 1) if matches.empty?
-    end
-
-    def open_snippet_in_editor(filepath)
-      editor = Snibbets.options[:editor] || Snibbets::Config.best_editor
-
-      os = RbConfig::CONFIG['target_os']
-
-      if editor.nil?
-        OS.open(filepath)
-      else
-        if os =~ /darwin.*/i
-          if editor =~ /^TextEdit/
-            `open -a TextEdit "#{filepath}"`
-          elsif TTY::Which.bundle_id?(editor)
-            `open -b "#{editor}" "#{filepath}"`
-          elsif TTY::Which.app?(editor)
-            `open -a "#{editor}" "#{filepath}"`
-          elsif TTY::Which.exist?(editor)
-            editor = TTY::Which.which(editor)
-            system %(#{editor} "#{filepath}") if editor
-          else
-            puts "No editor configured, or editor is missing"
-            Process.exit 1
-          end
-        elsif TTY::Which.exist?(editor)
-          editor = TTY::Which.which(editor)
-          system %(#{editor} "#{filepath}") if editor
-        else
-          puts "No editor configured, or editor is missing"
-          Process.exit 1
-        end
-      end
-    end
-
-    def new_snippet_from_clipboard
-      trap('SIGINT') do
-        Howzit.console.info "\nCancelled"
-        exit!
-      end
-
-      build_lexers
-
-      pb = OS.paste.outdent
-
-      printf 'What does this snippet do? '
-      input = $stdin.gets.chomp
-      title = input unless input.empty?
-
-      printf 'What language(s) does it use (separate with spaces, full names or file extensions will work)? '
-      input = $stdin.gets.chomp
-      langs = input.split(/ +/).map(&:strip) unless input.empty?
-      exts = langs.map { |lang| Snibbets::Lexers.lang_to_ext(lang) }
-      tags = langs.map { |lang| Snibbets::Lexers.ext_to_lang(lang) }.concat(langs).sort.uniq
-
-      filename ="#{title}.#{exts.join('.')}.#{Snibbets.options[:extension]}"
-
-      File.open(File.join(Snibbets.options[:source], filename), 'w') do |f|
-        f.puts "tags: #{tags.join(', ')}
-
-    ```
-    #{pb}
-    ```"
-      end
-
-      puts "New snippet written to #{filename}."
-    end
-
-    def handle_launchbar(results)
-      output = []
-
-      if results.empty?
-        out = {
-          'title' => 'No matching snippets found'
-        }.to_json
-        puts out
-        Process.exit
-      end
-
-      results.each do |result|
-        input = IO.read(result['path'])
-        snippets = input.snippets
-        next if snippets.empty?
-
-        children = []
-
-        if snippets.length == 1
-          output << {
-            'title' => result['title'],
-            'path' => result['path'],
-            'action' => 'copyIt',
-            'actionArgument' => snippets[0]['code'],
-            'label' => 'Copy'
-          }
-          next
-        end
-
-        snippets.each { |s|
-          children << {
-            'title' => s['title'],
-            'path' => result['path'],
-            'action' => 'copyIt',
-            'actionArgument' => s['code'],
-            'label' => 'Copy'
-          }
-        }
-
-        output << {
-          'title' => result['title'],
-          'path' => result['path'],
-          'children' => children
-        }
-      end
-
-      puts output.to_json
-    end
-
-    def handle_results(results)
-      if Snibbets.options[:launchbar]
-        handle_launchbar(results)
-      else
-        filepath = nil
-        if results.empty?
-          warn 'No results'
-          Process.exit 0
-        elsif results.length == 1 || !Snibbets.options[:interactive]
-          filepath = results[0]['path']
-          input = IO.read(filepath)
-        else
-          answer = Snibbets::Menu.menu(results, title: 'Select a file')
-          filepath = answer['path']
-          input = IO.read(filepath)
-        end
-
-        if @arguments[:edit_snippet]
-          open_snippet_in_editor(filepath)
-          Process.exit 0
-        end
-
-        snippets = input.snippets
-
-        if snippets.empty?
-          warn 'No snippets found'
-          Process.exit 0
-        elsif snippets.length == 1 || !Snibbets.options[:interactive]
-          if Snibbets.options[:output] == 'json'
-            print(snippets.to_json)
-          else
-            snippets.each do |snip|
-              header = File.basename(filepath, '.md')
-              warn header
-              warn '-' * header.length
-              code = snip['code']
-              code = highlight(code, filepath) if Snibbets.options[:highlight]
-              print(code)
-            end
-          end
-        elsif snippets.length > 1
-          if Snibbets.options[:all]
-            if Snibbets.options[:output] == 'json'
-              print(snippets.to_json)
-            else
-              output = []
-              snippets.each do |snippet|
-                output << snippet['title']
-                output << '-' * snippet['title'].length
-                output << snippet['code']
-                output << "\n"
-              end
-              print(output.join("\n"))
-            end
-          else
-            snippets.push({ 'title' => 'All snippets', 'code' => '' })
-
-            answer = Snibbets::Menu.menu(snippets, filename: File.basename(filepath, '.md'), title: 'Select snippet', query: @query)
-
-            if answer['title'] == 'All snippets'
-              snippets.delete_if { |s| s['title'] == 'All snippets'}
-              if Snibbets.options[:output] == 'json'
-                print(snippets.to_json)
-              else
-                header = File.basename(filepath, '.md')
-                warn header
-                warn '=' * header.length
-                output = []
-                snippets.each do |snippet|
-                  output << snippet['title']
-                  output << '-' * snippet['title'].length
-                  output << snippet['code']
-                  output << "\n"
-                end
-                print(output.join("\n"))
-              end
-            elsif Snibbets.options[:output] == 'json'
-              print(answer.to_json)
-            else
-              header = "#{File.basename(filepath, '.md')}: #{answer['title']}"
-              warn header
-              warn '-' * header.length
-              code = answer['code']
-              code = highlight(code, filepath) if Snibbets.options[:highlight]
-              print(code)
-            end
-          end
-        end
-      end
-    end
-
-    def print(output)
-      $stdout.puts(output)
-      if Snibbets.options[:copy]
-        OS.copy(output)
-        $stderr.puts "Copied to clipboard"
-      end
-    end
-  end
-end
-
 module Snibbets
   class << self
     attr_reader :arguments, :query

data/buildnotes.md

@@ -20,7 +20,6 @@ You no longer need to manually bump the version, it will be incremented when thi
 #!/bin/bash
 
 changelog -u
-# scripts/fixreadme.rb
 changelog | git commit -a -F -
 git pull
 git push

data/lib/snibbets/array.rb

@@ -0,0 +1,39 @@
+module Snibbets
+  class ::Array
+    def blocks
+      select { |el| el =~ /^<block\d+>$/ }.count
+    end
+
+    def strip_empty
+      remove_leading_empty_elements.remove_trailing_empty_elements
+    end
+
+    def strip_empty!
+      replace strip_empty
+    end
+
+    def remove_leading_empty_elements
+      output = []
+
+      each do |line|
+        next if line =~ /^\s*$/ || line.empty?
+
+        output << line
+      end
+
+      output
+    end
+
+    def remove_trailing_empty_elements
+      output = []
+
+      reverse.each do |line|
+        next if line =~ /^\s*$/ || line.empty?
+
+        output << line
+      end
+
+      output.reverse
+    end
+  end
+end

data/lib/snibbets/config.rb

@@ -12,6 +12,7 @@ module Snibbets
       highlight: false,
       interactive: true,
       launchbar: false,
+      menus: nil,
       name_only: false,
       output: 'raw',
       source: File.expand_path('~/Dropbox/Snippets')
@@ -21,9 +22,17 @@ module Snibbets
       custom_config = read_config
       @options = DEFAULT_OPTIONS.merge(custom_config)
       @options[:editor] ||= best_editor
+      @options[:menus] ||= best_menu
+
       write_config unless @options.equal?(custom_config)
     end
 
+    def best_menu
+      return 'fzf' if TTY::Which.exist?('fzf')
+      return 'gum' if TTY::Which.exist?('gum')
+      'console'
+    end
+
     def best_editor
       if ENV['EDITOR']
         ENV['EDITOR']

data/lib/snibbets/menu.rb

@@ -113,7 +113,7 @@ module Snibbets
             return res[line - 1] if line.positive? && line <= res.length
 
             warn 'Out of range'
-            console_menu(res, title)
+            return console_menu(res, title, filename, query: query)
           end
         rescue Interrupt
           system('stty', stty_save)
@@ -122,11 +122,23 @@ module Snibbets
       end
 
       def menu(res, filename: nil, title: 'Select one', query: nil)
+        menu_opt = Snibbets.options[:menus]
         query&.remove_spotlight_tags!
+
         fzf = TTY::Which.which('fzf')
+        gum = TTY::Which.which('gum')
+
+        case menu_opt
+        when /fzf/
+          return fzf_menu(fzf, res, title, query, filename) unless fzf.empty?
+        when /gum/
+          return gum_menu(gum, res, title, query, filename) unless gum.empty?
+        when /console/
+          return console_menu(res, title, filename, query: query)
+        end
+
         return fzf_menu(fzf, res, title, query, filename) unless fzf.empty?
 
-        gum = TTY::Which.which('gum')
         return gum_menu(gum, res, title, query, filename) unless gum.empty?
 
         console_menu(res, title, filename, query: query)

data/lib/snibbets/string.rb

@@ -28,6 +28,10 @@ module Snibbets
       lines.join("\n")
     end
 
+    def strip_newlines
+      split(/\n/).strip_empty.join("\n")
+    end
+
     # Are there multiple snippets (indicated by ATX headers)
     def multiple?
       gsub(/(`{3,}).*?\n\1/m, '').scan(/^#+/).length > 1
@@ -131,8 +135,10 @@ module Snibbets
 
       parts.shift if parts.count > 1
 
-      parts.each do |p|
-        lines = p.split(/\n/)
+      parts.each do |part|
+        lines = part.split(/\n/).strip_empty
+
+        next if lines.blocks == 0
 
         title = lines.count > 1 ? lines.shift.strip.sub(/[.:]$/, '') : 'Default snippet'
         block = lines.join("\n").gsub(/<(block\d+)>/) { code_blocks[Regexp.last_match(1)] }

data/lib/snibbets/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Snibbets
-  VERSION = '2.0.7'
+  VERSION = '2.0.10'
 end

data/lib/snibbets.rb

@@ -13,6 +13,7 @@ require_relative 'snibbets/config'
 require_relative 'snibbets/which'
 require_relative 'snibbets/string'
 require_relative 'snibbets/hash'
+require_relative 'snibbets/array'
 require_relative 'snibbets/menu'
 require_relative 'snibbets/os'
 require_relative 'snibbets/highlight'
@@ -30,3 +31,287 @@ module Snibbets
     end
   end
 end
+
+module Snibbets
+  class << self
+    # Search the snippets directory for query using find and grep
+    def search(try: 0)
+      folder = File.expand_path(Snibbets.options[:source])
+      # start by doing a spotlight search, if that fails, start trying:
+      # First try only search by filenames
+      # Second try search with grep
+      ext = Snibbets.options[:extension] || 'md'
+      cmd = case try
+            when 1
+              %(find "#{folder}" -iregex '^#{Regexp.escape(folder)}/#{@query.rx}' -name '*.#{ext}')
+            when 2
+              rg = TTY::Which.which('rg')
+              ag = TTY::Which.which('ag')
+              ack = TTY::Which.which('ack')
+              grep = TTY::Which.which('grep')
+              if Snibbets.options[:name_only]
+                nil
+              elsif !rg.empty?
+                %(#{rg} -li --color=never --glob='*.#{ext}' '#{@query.rx}' "#{folder}")
+              elsif !ag.empty?
+                %(#{ag} -li --nocolor -G '.*.#{ext}' '#{@query.rx}' "#{folder}")
+              elsif !ack.empty?
+                %(#{ack} -li --nocolor --markdown '#{@query.rx}' "#{folder}")
+              elsif !grep.empty?
+                %(#{grep} -iEl '#{@query.rx}' "#{folder}"/**/*.#{ext})
+              else
+                nil
+              end
+            else
+              mdfind = TTY::Which.which('mdfind')
+              if mdfind.empty?
+                nil
+              else
+                name_only = Snibbets.options[:name_only] ? '-name ' : ''
+                %(mdfind -onlyin #{folder} #{name_only}'#{@query} filename:.#{ext}' 2>/dev/null)
+              end
+            end
+
+      if try == 2 && cmd.nil?
+        puts "No search method available on this system. Please install ripgrep, silver surfer, ack, or grep."
+        Process.exit 1
+      end
+
+      res = cmd.nil? ? '' : `#{cmd}`.strip
+
+      matches = []
+
+      unless res.empty?
+        lines = res.split(/\n/)
+        lines.each do |l|
+          matches << {
+            'title' => File.basename(l, '.*'),
+            'path' => l
+          }
+        end
+
+        matches.sort_by! { |a| a['title'] }.uniq!
+
+        return matches unless matches.empty?
+      end
+
+      return matches if try == 2
+
+      # if no results on the first try, try again searching all text
+      search(try: try + 1) if matches.empty?
+    end
+
+    def open_snippet_in_editor(filepath)
+      editor = Snibbets.options[:editor] || Snibbets::Config.best_editor
+
+      os = RbConfig::CONFIG['target_os']
+
+      if editor.nil?
+        OS.open(filepath)
+      else
+        if os =~ /darwin.*/i
+          if editor =~ /^TextEdit/
+            `open -a TextEdit "#{filepath}"`
+          elsif TTY::Which.bundle_id?(editor)
+            `open -b "#{editor}" "#{filepath}"`
+          elsif TTY::Which.app?(editor)
+            `open -a "#{editor}" "#{filepath}"`
+          elsif TTY::Which.exist?(editor)
+            editor = TTY::Which.which(editor)
+            system %(#{editor} "#{filepath}") if editor
+          else
+            puts "No editor configured, or editor is missing"
+            Process.exit 1
+          end
+        elsif TTY::Which.exist?(editor)
+          editor = TTY::Which.which(editor)
+          system %(#{editor} "#{filepath}") if editor
+        else
+          puts "No editor configured, or editor is missing"
+          Process.exit 1
+        end
+      end
+    end
+
+    def new_snippet_from_clipboard
+      trap('SIGINT') do
+        Howzit.console.info "\nCancelled"
+        exit!
+      end
+
+      build_lexers
+
+      pb = OS.paste.outdent
+
+      printf 'What does this snippet do? '
+      input = $stdin.gets.chomp
+      title = input unless input.empty?
+
+      printf 'What language(s) does it use (separate with spaces, full names or file extensions will work)? '
+      input = $stdin.gets.chomp
+      langs = input.split(/ +/).map(&:strip) unless input.empty?
+      exts = langs.map { |lang| Snibbets::Lexers.lang_to_ext(lang) }
+      tags = langs.map { |lang| Snibbets::Lexers.ext_to_lang(lang) }.concat(langs).sort.uniq
+
+      filename ="#{title}.#{exts.join('.')}.#{Snibbets.options[:extension]}"
+
+      File.open(File.join(File.expand_path(Snibbets.options[:source]), filename), 'w') do |f|
+        f.puts "tags: #{tags.join(', ')}
+
+    ```
+    #{pb}
+    ```"
+      end
+
+      puts "New snippet written to #{filename}."
+    end
+
+    def handle_launchbar(results)
+      output = []
+
+      if results.empty?
+        out = {
+          'title' => 'No matching snippets found'
+        }.to_json
+        puts out
+        Process.exit
+      end
+
+      results.each do |result|
+        input = IO.read(result['path'])
+        snippets = input.snippets
+        next if snippets.empty?
+
+        children = []
+
+        if snippets.length == 1
+          output << {
+            'title' => result['title'],
+            'path' => result['path'],
+            'action' => 'copyIt',
+            'actionArgument' => snippets[0]['code'],
+            'label' => 'Copy'
+          }
+          next
+        end
+
+        snippets.each { |s|
+          children << {
+            'title' => s['title'],
+            'path' => result['path'],
+            'action' => 'copyIt',
+            'actionArgument' => s['code'],
+            'label' => 'Copy'
+          }
+        }
+
+        output << {
+          'title' => result['title'],
+          'path' => result['path'],
+          'children' => children
+        }
+      end
+
+      puts output.to_json
+    end
+
+    def handle_results(results)
+      if Snibbets.options[:launchbar]
+        handle_launchbar(results)
+      else
+        filepath = nil
+        if results.empty?
+          warn 'No results'
+          Process.exit 0
+        elsif results.length == 1 || !Snibbets.options[:interactive]
+          filepath = results[0]['path']
+          input = IO.read(filepath)
+        else
+          answer = Snibbets::Menu.menu(results, title: 'Select a file')
+          filepath = answer['path']
+          input = IO.read(filepath)
+        end
+
+        if @arguments[:edit_snippet]
+          open_snippet_in_editor(filepath)
+          Process.exit 0
+        end
+
+        snippets = input.snippets
+
+        if snippets.empty?
+          warn 'No snippets found'
+          Process.exit 0
+        elsif snippets.length == 1 || !Snibbets.options[:interactive]
+          if Snibbets.options[:output] == 'json'
+            print(snippets.to_json)
+          else
+            snippets.each do |snip|
+              header = File.basename(filepath, '.md')
+              warn header
+              warn '-' * header.length
+              code = snip['code']
+              code = highlight(code, filepath) if Snibbets.options[:highlight]
+              print(code)
+            end
+          end
+        elsif snippets.length > 1
+          if Snibbets.options[:all]
+            if Snibbets.options[:output] == 'json'
+              print(snippets.to_json)
+            else
+              output = []
+              snippets.each do |snippet|
+                output << snippet['title']
+                output << '-' * snippet['title'].length
+                output << snippet['code']
+                output << "\n"
+              end
+              print(output.join("\n"))
+            end
+          else
+            snippets.push({ 'title' => 'All snippets', 'code' => '' })
+
+            answer = Snibbets::Menu.menu(snippets, filename: File.basename(filepath, '.md'), title: 'Select snippet', query: @query)
+
+            if answer['title'] == 'All snippets'
+              snippets.delete_if { |s| s['title'] == 'All snippets'}
+              if Snibbets.options[:output] == 'json'
+                print(snippets.to_json)
+              else
+                header = File.basename(filepath, '.md')
+                warn header
+                warn '=' * header.length
+                output = []
+                snippets.each do |snippet|
+                  output << snippet['title']
+                  output << '-' * snippet['title'].length
+                  output << snippet['code']
+                  output << "\n"
+                end
+                print(output.join("\n"))
+              end
+            elsif Snibbets.options[:output] == 'json'
+              print(answer.to_json)
+            else
+              header = "#{File.basename(filepath, '.md')}: #{answer['title']}"
+              warn header
+              warn '-' * header.length
+              code = answer['code']
+              code = highlight(code, filepath) if Snibbets.options[:highlight]
+              print(code)
+            end
+          end
+        end
+      end
+    end
+
+    def print(output)
+      $stdout.puts(output)
+      if Snibbets.options[:copy]
+        OS.copy(output)
+        $stderr.puts "Copied to clipboard"
+      end
+    end
+  end
+end

data/snibbets.gemspec

@@ -31,10 +31,11 @@ Gem::Specification.new do |spec|
   spec.files += Dir["[A-Z]*"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "awesome_print", "~> 1.9"
   spec.add_development_dependency "gem-release", "~> 2.2"
   spec.add_development_dependency "parse_gemspec-cli", "~> 1.0"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency 'rdoc', '~> 4.3'
+  spec.add_development_dependency 'rdoc', '~> 6.3.1'
   spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.26'
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.21"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snibbets
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.10
 platform: ruby
 authors:
 - Brett Terpstra
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -185,8 +199,10 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG.md
+- CHANGELOG.md.orig
 - Gemfile
 - Gemfile.lock
+- Gemfile.lock.orig
 - LICENSE.txt
 - README.md
 - README.rdoc
@@ -194,6 +210,7 @@ files:
 - bin/snibbets
 - buildnotes.md
 - lib/snibbets.rb
+- lib/snibbets/array.rb
 - lib/snibbets/config.rb
 - lib/snibbets/hash.rb
 - lib/snibbets/highlight.rb