snibbets 2.0.12 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 730cb0a9e548f9d590fb8eb8088bf279e5848dc7822fd2f7022e0c2c472f31e9
-  data.tar.gz: 544dbd0f8de24623ad0c4c4ef56be8ba77bb7b55a2aa6355c39ceaa51fae9519
+  metadata.gz: 98b13afd70724c3aa6daab71756c261aa79ad37346c649870061181ab8f99b60
+  data.tar.gz: b0e3a0c0ff67b4682ed8586ccde22c348d530064a631e4212f2ebd187f493180
 SHA512:
-  metadata.gz: 25175a8f43be5bf5793e1953d570314f558baaa2b2bdb6e7045f2f4e7ae4e081c86033b87f91d567c6f10c9a4ae9ea5e9ceb45117e4a6848a184a35d2e0bc4e9
-  data.tar.gz: fb643c8813e3fc6183a484395bc1326d44ebc994615d0b07f9cefc06b5099f40fdbc67b289e6108e54970c751e7f1fda603c3c228607862162d628f11bdd0c96
+  metadata.gz: 60d90cb35caa5c87b5155c6619321983ecc9499d0bd95977bab1247cd4ff45c3fffeb14ea2c1495c07ae7759f29e0e36e187891e78032c357499f87819856fcc
+  data.tar.gz: 8f5401783340973160e443699186b521b1f1b7c9d43f381c6b0c374aac9a1c60e5aef77df54780e2326f7e7fa06b2cc3afa8500103c421c1fefc5552d16150bd

data/CHANGELOG.md.orig

@@ -1,3 +1,23 @@
+### 2.0.14
+
+2023-04-15 21:21
+
+#### IMPROVED
+
+- Better default themes for highlighters
+
+#### FIXED
+
+- Error with lexers_db when using higlighting
+
+### 2.0.13
+
+2023-04-15 19:57
+
+#### NEW
+
+- Option to include blockquotes (>) in output
+
 ### 2.0.12
 
 2023-04-15 19:28

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snibbets (2.0.12)
+    snibbets (2.0.14)
       tty-which (~> 0.5, >= 0.5.0)
 
 GEM
@@ -82,6 +82,9 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  ruby
+  x64-mingw32
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -1,19 +1,18 @@
-# Snibbets
+
 
 [![RubyGems.org](https://img.shields.io/gem/v/snibbets)](https://rubygems.org/gems/snibbets)
-[![GitHub Actions](https://github.com/ttscoff/snibbets/actions/workflows/check.yml/badge.svg)](https://github.com/ttscoff/snibbets/actions/workflows/check.yml)
+<!-- [![GitHub Actions](https://github.com/ttscoff/snibbets/actions/workflows/check.yml/badge.svg)](https://github.com/ttscoff/snibbets/actions/workflows/check.yml) -->
 
-<!--README-->
 A tool for accessing code snippets contained in a folder of plain text Markdown files.
 
 Snibbets allows me to keep code snippets in raw files, not relying on a dedicated code snippet app. I can collect and edit my snippets using a text editor, nvALT (nvUltra), or simply by saving snippets from my clipboard to a text file using *NIX redirection on the command line. I can add descriptive names and extended descriptions/notes to code snippets using standard Markdown.
 
 What Snibbets does is simply allow a quick search for a specific snippet that I can either output to the terminal, pipe to my clipboard, or access via LaunchBar (via the included LaunchBar Action). It's basically a wrapper for `find` and `grep` with the ability to separate code blocks from other text in my Markdown files.
 
-<!--GITHUB-->
+
 ![Snibbets in action](https://cdn3.brettterpstra.com/uploads/2023/04/snibbets2.gif)
-<!--END GITHUB-->
-<!--JEKYLL{% gif /uploads/2023/04/snibbets2.gif %}-->
+
+
 
 ## Collecting Snippets
 
@@ -56,12 +55,12 @@ Snibbets requires Ruby 3.0+. On recent versions of macOS, this is not included b
 
 If available, menus are generated by [fzf] or [gum]. If neither are available, a basic Readline menu system will be displayed, so neither are required, just nice to have as they provide fuzzy filtering, scrolling, and type-ahead completion.
 
-[homebrew]: https://brew.sh/ "Homebrew—The Missing Package Manager for macOS (or Linux)"
+[homebrew]: https://brew.sh/ "Homebrew???The Missing Package Manager for macOS (or Linux)"
 [rbenv]: https://github.com/rbenv/rbenv "rbenv/rbenv:Manage your app's Ruby environment"
 [rvm]: https://rvm.io/ "Ruby Version Manager"
 [asdf]: https://asdf-vm.com/ "ASDF environment manager"
 [fzf]: https://github.com/junegunn/fzf "junegunn/fzf:A command-line fuzzy finder"
-[gum]: https://github.com/charmbracelet/gum "charmbracelet/gum:A tool for glamorous shell scripts 🎀"
+[gum]: https://github.com/charmbracelet/gum "charmbracelet/gum:A tool for glamorous shell scripts ????"
 
 ### Installation
 
@@ -86,6 +85,7 @@ copy: false
 editor: 
 extension: md
 highlight: false
+include_blockquotes: false
 interactive: true
 launchbar: false
 menus: 
@@ -110,6 +110,8 @@ The `editor` setting is used to open the config file, and to open snippets for e
 
 The `highlight` key turns on syntax highlighting. This requires that either `pygmentize` or `skyligting` is available on your system (both available via package managers like Homebrew). This feature is still in development and results may be mixed.
 
+The `include_blockquotes` setting determines whether blockquotes are included in the output. By default, Snibbets removes everything other than code blocks (indented or fenced) from the output it displays. But if you want to include a note that you'll see on the command line, you can put it in a block quote by preceding each line you want to preserve with a right angle bracket (`>`).
+
 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.
@@ -118,20 +120,25 @@ The `name_only` key will permanently set Snibbets to only search for snippets by
 
 ### Usage
 
-    Usage: snibbets [options] query
-        -a, --all                        If a file contains multiple snippets, output all of them (no menu)
-        -c, --[no-]copy                  Copy the output to the clibpoard (also displays on STDOUT)
-        -e, --edit                       Open the selected snippet in your configured editor
-        -n, --[no-]name-only             Only search file names, not content
-        -o, --output FORMAT              Output format (json|launchbar|*raw)
-        -p, --paste                      Interactively create a new snippet from clipboard contents (Mac only)
-        -q, --quiet                      Skip menus and display first match
-        -s, --source FOLDER              Snippets folder to search
-            --configure                  Open the configuration file in your default editor
-            --highlight                  Use pygments or skylighting to syntax highlight (if installed)
-            --save                       Save the current command line options to the YAML configuration
-        -h, --help                       Display this screen
-        -v, --version                    Display version information
+```
+Snibbets v2.0.14
+
+Usage: snibbets [options] query
+    -a, --all                        If a file contains multiple snippets, output all of them (no menu)
+    -c, --[no-]copy                  Copy the output to the clibpoard (also displays on STDOUT)
+    -e, --edit                       Open the selected snippet in your configured editor
+    -n, --[no-]name-only             Only search file names, not content
+    -o, --output FORMAT              Output format (json|launchbar|*raw)
+    -p, --paste, --new               Interactively create a new snippet from clipboard contents (Mac only)
+    -q, --quiet                      Skip menus and display first match
+    -s, --source FOLDER              Snippets folder to search
+        --configure                  Open the configuration file in your default editor
+        --[no-]blockquotes           Include block quotes in output
+        --highlight                  Use pygments or skylighting to syntax highlight (if installed)
+        --save                       Save the current command line options to the YAML configuration
+    -h, --help                       Display this screen
+    -v, --version                    Display version information
+```
 
 If your Snippets folder is set in the config, simply running `snibbets [search query]` will perform the search and output the code blocks, presenting a menu if more than one match is found or the target file contains more than one snippet. Selected contents are output raw to STDOUT.
 
@@ -173,4 +180,3 @@ Once installed, run the action (type `snib` and hit return on the result) to sel
 ### Usage
 
 Type `snib` to bring the Action up, then hit Space to enter your query text. Matching files will be presented. If the selected file contains more than one snippet, a list of snippets (based on ATX headers in the file) will be presented as a child menu. Selecting a snippet and hitting return will copy the associated code block to the clipboard.
-<!--END README-->

data/README.md.orig

@@ -0,0 +1,186 @@
+
+
+[![RubyGems.org](https://img.shields.io/gem/v/snibbets)](https://rubygems.org/gems/snibbets)
+<<<<<<< HEAD
+[![GitHub Actions](https://github.com/ttscoff/snibbets/actions/workflows/check.yml/badge.svg)](https://github.com/ttscoff/snibbets/actions/workflows/check.yml)
+=======
+<!-- [![GitHub Actions](https://github.com/ttscoff/snibbets/actions/workflows/check.yml/badge.svg)](https://github.com/ttscoff/snibbets/actions/workflows/check.yml) -->
+>>>>>>> develop
+
+A tool for accessing code snippets contained in a folder of plain text Markdown files.
+
+Snibbets allows me to keep code snippets in raw files, not relying on a dedicated code snippet app. I can collect and edit my snippets using a text editor, nvALT (nvUltra), or simply by saving snippets from my clipboard to a text file using *NIX redirection on the command line. I can add descriptive names and extended descriptions/notes to code snippets using standard Markdown.
+
+What Snibbets does is simply allow a quick search for a specific snippet that I can either output to the terminal, pipe to my clipboard, or access via LaunchBar (via the included LaunchBar Action). It's basically a wrapper for `find` and `grep` with the ability to separate code blocks from other text in my Markdown files.
+
+
+![Snibbets in action](https://cdn3.brettterpstra.com/uploads/2023/04/snibbets2.gif)
+
+
+
+## Collecting Snippets
+
+Snibbets is designed to work with a folder containing Markdown files. Each Markdown file can have somewhat flexible formatting, as long as there's at least one code block (either indented by 4 spaces/1 tab or fenced with backticks).
+
+I recommend using filenames with multiple extensions (ending with your markdown extension), primarily to define the syntax for a snippet. For example, a css snippet would be `*.css.md`, a ruby snippet would be `*.rb.md`. This can aid in searching and makes it easy to script things like adding language tags automatically.
+
+The name of the file should be the description of the snippet, at least in the case where there's only one snippet in the document. Call it 'javascript url parser.js.md' or similar. If I got the snippet from StackOverflow, I give it a name based on the question I searched to find it. Be descriptive.
+
+You can combine multiple snippets in a file, though. For example, I have a file called 'Ruby hash snippets.rb.md'. That file contains an array of useful snippets, and each one has a descriptive title in an h3 header above it. Those (ATX) headers are used to split the file, and when you search from the command line, you'll get a menu of all of the snippets in the selected file. (And if you have [fzf](https://github.com/junegunn/fzf) or [gum](https://github.com/charmbracelet/gum) installed, you can quickly filter through with fuzzy searching and find exactly what you need.)
+
+If a file contains multiple snippets, they should be separated by ATX-style headers (one or more `#`) describing the snippets. Additional  descriptions can be included outside of the code block. For example:
+
+A file titled `unix find.bash.md`:
+
+    title: Unix find commands
+    tags: bash, shell, unix
+
+    ### Find by name and execute command
+
+        find . -name "rc.conf" -exec chmod o r '{}' \;
+
+    ### Find by name and grep contents
+
+        find . -name "*.php" -exec grep -H googleapis '{}' \;
+
+    ### Find by age range to CSV
+
+    Finds files older than 18months and newer than 24 months, cats the output to a CSV in the format `/some/path/somewhere, size in bytes, Access Time, Modified Time`
+
+        find /dir/dir -type f -mtime +540 -mtime -720 -printf \"%p\",\"%s\",\"%AD\",|"%TD\"\\n > /dir/dir/output.csv
+
+You can include MultiMarkdown metadata in your snippets, either in a YAML block or just at the top of the file with raw key/value pairs. I mostly use this for adding tags, which are then synced to macOS tags when I save. It makes it easy to search for snippets in [nvUltra](https://nvultra.com/), and also allows you to do searches like `snibbets tag:javascript url parser` in Snibbets.
+
+## CLI
+
+### Dependencies
+
+Snibbets requires Ruby 3.0+. On recent versions of macOS, this is not included by default. You can install it via the Command Line Tools from Apple. On macOS and most other systems, you can use something like [Homebrew], [rbenv], [rvm], or [asdf] to install Ruby 3.
+
+If available, menus are generated by [fzf] or [gum]. If neither are available, a basic Readline menu system will be displayed, so neither are required, just nice to have as they provide fuzzy filtering, scrolling, and type-ahead completion.
+
+[homebrew]: https://brew.sh/ "Homebrew???The Missing Package Manager for macOS (or Linux)"
+[rbenv]: https://github.com/rbenv/rbenv "rbenv/rbenv:Manage your app's Ruby environment"
+[rvm]: https://rvm.io/ "Ruby Version Manager"
+[asdf]: https://asdf-vm.com/ "ASDF environment manager"
+[fzf]: https://github.com/junegunn/fzf "junegunn/fzf:A command-line fuzzy finder"
+[gum]: https://github.com/charmbracelet/gum "charmbracelet/gum:A tool for glamorous shell scripts ????"
+
+### Installation
+
+To install Snibbets:
+
+    gem install snibbets
+
+If you're using the system Ruby, you may need to use `sudo gem install snibbets`.
+
+### Configuration
+
+When you run it the first time, Snibbets will write a configuration file to `~/.config/snibbets/snibbets.yml`. You can edit that file to set things like your snippets directory, your preferred file extension, and a few other options. Options specified in the config file can always be overriden on the command line with flags.
+
+Once an editor is defined, you can use `snibbets --configure` to open it automatically. Running that commmand before configuring an editor will use whatever app/utility your system defaults to for YAML files.
+
+Default config:
+
+```yaml
+---
+all: false
+copy: false
+editor: 
+extension: md
+highlight: false
+include_blockquotes: false
+interactive: true
+launchbar: false
+menus: 
+name_only: false
+output: raw
+source: "~/Dropbox/Snippets"
+```
+
+#### Snippet Location
+
+Set the `source` key to the folder where you keep your Markdown snippets. Optionally adjust the `extension` setting if you use an extension other than `md` (e.g. `markdown` or `txt`).
+
+#### Other Options
+
+The `all` setting determines how Snibbets handles files containing multiple snippets. If `all` is true, then it will always display every snippet in the selected file. If false, it will offer a menu and let you choose which snippet to display. You can use `--all` on the command line to just enable this once.
+
+The `copy` setting determines whether the output is copied to the clipboard in addition to being displayed on STDOUT. This is the equivalent of running `snibbets QUERY | pbcopy` (macOS) or `snibbets QUERY | xclip` (Linux). This can be enabled for just one run with `--copy` on the command line. Setting it to true in the config will copy to the clipboard every time a snippet is displayed. On Mac this will work automatically, on Windows/Linux you may need to [install `xclip` or `xsel`][xclip].
+
+[xclip]: https://ostechnix.com/access-clipboard-contents-using-xclip-and-xsel-in-linux/
+
+The `editor` setting is used to open the config file, and to open snippets for editing when using the `--edit` flag. This setting can be any command line utility (`code`, `subl`, `vim`, `nano`, etc.), or on macOS it can be an application name (`BBEdit`, `VS Code`, etc.) or a bundle identifier (`com.sublimetext.4`, `com.microsoft.VSCode`, etc.). If no editor is set, then the file will be opened by whatever the system default is (using `open` on macOS, `start` on Windows, or `xdg-open`on Linux).
+
+The `highlight` key turns on syntax highlighting. This requires that either `pygmentize` or `skyligting` is available on your system (both available via package managers like Homebrew). This feature is still in development and results may be mixed.
+
+The `include_blockquotes` setting determines whether blockquotes are included in the output. By default, Snibbets removes everything other than code blocks (indented or fenced) from the output it displays. But if you want to include a note that you'll see on the command line, you can put it in a block quote by preceding each line you want to preserve with a right angle bracket (`>`).
+
+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
+
+```
+Snibbets v2.0.14
+
+Usage: snibbets [options] query
+    -a, --all                        If a file contains multiple snippets, output all of them (no menu)
+    -c, --[no-]copy                  Copy the output to the clibpoard (also displays on STDOUT)
+    -e, --edit                       Open the selected snippet in your configured editor
+    -n, --[no-]name-only             Only search file names, not content
+    -o, --output FORMAT              Output format (json|launchbar|*raw)
+    -p, --paste, --new               Interactively create a new snippet from clipboard contents (Mac only)
+    -q, --quiet                      Skip menus and display first match
+    -s, --source FOLDER              Snippets folder to search
+        --configure                  Open the configuration file in your default editor
+        --[no-]blockquotes           Include block quotes in output
+        --highlight                  Use pygments or skylighting to syntax highlight (if installed)
+        --save                       Save the current command line options to the YAML configuration
+    -h, --help                       Display this screen
+    -v, --version                    Display version information
+```
+
+If your Snippets folder is set in the config, simply running `snibbets [search query]` will perform the search and output the code blocks, presenting a menu if more than one match is found or the target file contains more than one snippet. Selected contents are output raw to STDOUT.
+
+> If you have fzf or gum installed, snibbets will use those for menus, providing fuzzy filtering of options.
+
+#### JSON output
+
+An undocumented output option is `-o json`, which will output all of the matches and their code blocks as a JSON string that can be incorporated into other scripts. It's similar to the `-o launchbar` option, but doesn't contain the extra keys required for the LaunchBar action.
+
+#### Open snippets in your editor
+
+Use the `--edit` flag on any search to open the found snippet file in your editor. Configure your default editor in the config file. `snibbets configure` will open that, but if you don't have an editor set, it might have strange results. To edit manually, open `~/.config/snibbets/snibbets.yml` in your text editor of choice.
+
+#### Creating new snippets
+
+I do most of my snippet editing in [nvUltra], but sometimes I have a function in my clipboard that just needs quick saving and there are so few moving parts to creating a snippet that it just feels like they could be automated/simplified. That's why I added the `--paste` flag. If you have a code snippet in your clipboard, you can just run `snibbets --paste` (or just `-p`) and you'll get a prompt asking you to describe the snippet (used for filename) and one asking what language(s) are represented.
+
+You can input the languages as names, e.g. `rust`, `typescript`, or `scala`, or you can just add file extensions that represent the language. If I say `ts` to that prompt, it will generate an extension of `.ts.md` and then add a metadata tag of `typescript` to the file. The code from the clipboard goes into a fenced code block in the document. You can always go add notes to it later, but it's a great way to save snippets as you come across them (or solutions you figure out after a week of banging your head).
+
+This command requires that a clipboard utility be available. On macOS, you have `pbpaste` by default and don't need to do anything. On Windows and Linux, you'll need to [install either `xclip` or `xsel`][xclip].
+
+[nvUltra]: https://nvultra.com "nvUltra for Mac"
+
+
+#### Saving Settings When Running
+
+Any time you specify things like a source folder with the `--source` flag, or turn on highlighting or name-only search, you can add the flag `--save` to write those to your config and make them the default options.
+
+## LaunchBar Action
+
+_I'm currently reworking the LaunchBar action, and it doesn't function very well at this time. I'll update when I have a chance._
+
+### Installation
+
+The LaunchBar action can be installed simply by double clicking the `.lbaction` file in Finder. The CLI is not required for the LaunchBar action to function. 
+
+Once installed, run the action (type `snib` and hit return on the result) to select your Snippets folder.
+
+### Usage
+
+Type `snib` to bring the Action up, then hit Space to enter your query text. Matching files will be presented. If the selected file contains more than one snippet, a list of snippets (based on ATX headers in the file) will be presented as a child menu. Selecting a snippet and hitting return will copy the associated code block to the clipboard.

data/bin/snibbets

@@ -64,6 +64,10 @@ module Snibbets
           @arguments[:edit_config] = true
         end
 
+        opts.on('--[no-]blockquotes', 'Include block quotes in output') do |v|
+          options[:include_blockquotes] = v
+        end
+
         opts.on('--highlight', 'Use pygments or skylighting to syntax highlight (if installed)') do
           options[:highlight] = true
         end

data/buildnotes.md

@@ -1,6 +1,6 @@
 template: gem, git, gli, project
 executable: na
-readme: README.md
+readme: src/README.md
 changelog: CHANGELOG.md
 project: snibbets
 
@@ -20,6 +20,7 @@ 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
@@ -29,6 +30,8 @@ git push
 @include(project:Update Blog Project) Update Blog Project
 @run(rake bump[patch]) Bump Version
 
+@run(git commit -am 'Version bump')
+
 @after
 Don't forget to publish the website!
 @end

data/lib/snibbets/config.rb

@@ -10,6 +10,8 @@ module Snibbets
       editor: nil,
       extension: 'md',
       highlight: false,
+      highlighter: nil,
+      include_blockquotes: false,
       interactive: true,
       launchbar: false,
       menus: nil,

data/lib/snibbets/highlight.rb

@@ -1,26 +1,37 @@
 module Snibbets
-  class Highlight
-    def highlight_pygments(executable, code, syntax, theme)
-      syntax = syntax.empty? ? '-g' : "-l #{syntax}"
-      `echo #{Shellwords.escape(code)} | #{executable} #{syntax}`
-    end
+  module Highlight
+    class << self
+      def highlight_pygments(executable, code, syntax, theme)
+        syntax = syntax.empty? ? '-g' : "-l #{syntax}"
+        `echo #{Shellwords.escape(code)} | #{executable} -O full,style=#{theme} #{syntax}`
+      end
 
-    def highlight_skylight(executable, code, syntax, theme)
-      return code if syntax.empty?
+      def highlight_skylight(executable, code, syntax, theme)
+        return code if syntax.empty?
 
-      `echo #{Shellwords.escape(code)} | #{executable} --syntax #{syntax}`
-    end
+        `echo #{Shellwords.escape(code)} | #{executable} -t lib/breeze-dark.theme --syntax #{syntax}`
+      end
 
-    def highlight(code, filename, theme = 'monokai')
-      syntax = syntax_from_extension(filename)
+      def highlight(code, filename, theme = 'monokai')
+        syntax = Lexers.syntax_from_extension(filename)
 
-      skylight = TTY::Which.which('skylighting')
-      return highlight_skylight(skylight, code, syntax, theme) unless skylight.empty?
+        skylight = TTY::Which.which('skylighting')
+        pygments = TTY::Which.which('pygmentize')
 
-      pygments = TTY::Which.which('pygmentize')
-      return highlight_pygments(pygments, code, syntax, theme) unless pygments.empty?
+        if Snibbets.options[:highlighter] =~ /^s/ && skylight
+          return highlight_skylight(skylight, code, syntax, theme)
+        elsif Snibbets.options[:highlighter] =~ /^p/ && !pygments.empty?
+          return highlight_pygments(pygments, code, syntax, theme)
+        else
+          if !skylight.empty?
+            return highlight_skylight(skylight, code, syntax, theme)
+          elsif !pygments.empty?
+            return highlight_pygments(pygments, code, syntax, theme)
+          end
+        end
 
-      code
+        code
+      end
     end
   end
 end

data/lib/snibbets/lexers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require_relative 'lexers_db'
 
 module Snibbets
   # Lexer definitions
@@ -10,7 +11,7 @@ module Snibbets
 
       def build_lexers
         lex = []
-        IO.read('lib/snibbets/lexers_db.txt').split(/\n/).each do |line|
+        LEXERS_DB.split(/\n/).each do |line|
           key = line.match(/(?mi)^((, )?[^,]+?)+?(?=\[)/)[0]
           keys = key.split(/,/).map(&:strip)
           value = line.match(/\[(.*?)\]/)[1]

data/lib/snibbets/lexers_db.rb

@@ -0,0 +1,379 @@
+LEXERS_DB =<<EOLEXERS
+abap [abap, ABAP]
+abnf [abnf]
+actionscript, as [as]
+ada [adb, ads, ada]
+adl [adl, adls, adlf, adlx]
+agda [agda]
+aheui [aheui]
+alloy [als]
+ambienttalk [at]
+amdgpu [isa]
+ampl [run]
+ansys [ans]
+apache [.htaccess, apache.conf, apache2.conf]
+apl [apl, aplf, aplo, apln, aplc, apli, dyalog]
+applescript [applescript]
+arduino [ino]
+arrow [arw]
+asc [asc]
+pem [pem, id_dsa, id_ecdsa, id_ecdsa_sk, id_ed25519, id_ed25519_sk, id_rsa]
+aspectj [aj]
+aspx-vb [aspx, asax, ascx, ashx, asmx, axd]
+asymptote, asy [asy]
+augeas [aug]
+autohotkey, ahk [ahk, ahkl]
+autoit [au3]
+awk [awk]
+bare [bare]
+shell [sh, ksh, bash, zsh]
+batch [bat, cmd]
+bbcbasic [bbc]
+bc [bc]
+befunge [befunge]
+bibtex [bib]
+blitzbasic [bb, decls]
+blitzmax [bmx]
+bnf [bnf]
+boa [boa]
+boo [boo]
+boogie [bpl]
+brainfuck, bf [bf, b]
+bst [bst]
+c-objdump [c-objdump]
+c [c, h, idc]
+ca65 [s]
+cadl [cadl]
+cddl [cddl]
+ceylon [ceylon]
+cfc [cfc]
+cf3 [cf]
+cfm [cfm, cfml]
+chaiscript, chai [chai]
+chapel, chpl [chpl]
+charmci [ci]
+cheetah, spitfire [tmpl, spt]
+cirru [cirru]
+clay [clay]
+clean [icl, dcl]
+clojure, clj [clj]
+clojurescript, cljs [cljs]
+cmake [cmake, CMakeLists.txt]
+cobol [cob, cpy]
+cobolfree [cbl]
+coffeescript, coffee-script, coffee [coffee]
+common-lisp, cl [cl]
+lisp [lisp]
+componentpascal, cp [cp, cps]
+coq [v]
+cpp, c++ [cpp, hpp, c++, h++, cc, hh, cxx, hxx, C, H, cp, CPP]
+cpp-objdump, c++-objdumb, cxx-objdump [cpp-objdump, c++-objdump, cxx-objdump]
+cpsa [cpsa]
+cr, crystal [cr]
+crmsh, pcmk [crmsh, pcmk]
+croc [croc]
+cryptol, cry [cry]
+csharp, c# [cs]
+csound, csound-orc [orc, udo]
+csound-document, csound-csd [csd]
+csound-score, csound-sco [sco]
+css [css]
+cuda, cu [cu, cuh]
+cypher [cyp, cypher]
+cython, pyx, pyrex [pyx, pxd, pxi]
+d [d, di]
+dart [dart]
+dasm16 [dasm16, dasm]
+delphi, pas, pascal, objectpascal [pas, dpr]
+devicetree, dts [dts, dtsi]
+dg [dg]
+diff, udiff [diff, patch]
+docker, dockerfile [Dockerfile, docker]
+dpatch [dpatch, darcspatch]
+dtd [dtd]
+jbst [duel, jbst]
+dylan-console, dylan-repl [dylan-console]
+dylan-lid, lid [lid, hdp]
+dylan [dylan, dyl, intr]
+earl-grey, earlgrey, eg [eg]
+easytrieve [ezt, mac]
+ebnf [ebnf]
+ec [ec, eh]
+ecl [ecl]
+eiffel [e]
+elixir, ex, exs [ex, eex, exs, leex]
+elm [elm]
+emacs-lisp, elisp, emacs [el]
+email, eml [eml]
+erb [erb]
+erl [erl-sh]
+erlang [erl, hrl, es, escript]
+evoque [evoque]
+execline [exec]
+extempore [xtm]
+ezhil [n]
+factor [factor]
+fan [fan]
+fancy, fy [fy, fancypack]
+felix, flx [flx, flxh]
+fennel, fnl [fnl]
+fish, fishshell [fish, load]
+floscript, flo [flo]
+forth [frt, fs]
+fortran [f03, f90, F03, F90]
+fortranfixed [f, F]
+foxpro, vfp, clipper, xbase [PRG, prg]
+freefem [edp]
+fsharp, f# [fs, fsi]
+fstar [fst, fsti]
+futhark [fut]
+gap [g, gd, gi, gap]
+gas, asm [s, S]
+gcode [gcode]
+gdscript, gd [gd]
+genshi, kid, xml+genshi, xml+kid [kid]
+gherkin, cucumber [feature]
+glsl [vert, frag, geo]
+gnuplot [plot, plt]
+go, golang [go]
+golo [golo]
+gooddata-cl [gdc]
+gosu [gs, gsx, gsp, vark]
+graphviz, dot [gv, dot]
+groff, nroff, man [man]
+groovy [groovy, gradle]
+gsql [gsql]
+gst [gst]
+haml [haml]
+haskell, hs [hs]
+haxe, hxsl, hx [hx, hxsl]
+haxeml, hxml [hxml]
+hlsl [hlsl, hlsli]
+hsail, hsa [hsail]
+handlebars [handlebars, hbs]
+html+ng2 [ng2]
+html+php [phtml]
+html+twig [twig]
+html [html, htm, xhtml, xslt]
+hybris, hy [hy, hyb]
+hylang [hy]
+i6t [i6t]
+idl [pro]
+idris, idr [idr]
+igor, igorpro [ipf]
+inform6, i6 [inf]
+inform7, i7 [ni, i7x]
+ini, cfg, dosini [ini, cfg, inf, service, socket, device, mount, automount, swap, target, path, timer, slice, scope]
+io [io]
+ioke, ik [ik]
+isabelle [thy]
+j [ijs]
+jags [jag, bug]
+jasmin, jasminxt [j]
+java [java]
+javascript, js [js, jsm, mjs, cjs]
+jcl [jcl]
+jsgf [jsgf]
+jslt [jslt]
+json, json-object [json]
+jsonld, json-ld [jsonld]
+jsp [jsp]
+julia, jl [jl]
+juttle [juttle]
+kal [kal]
+kmsg, dmesg [kmsg, dmesg]
+koka [kk, kki]
+kotlin [kt, kts]
+kuin [kn]
+lasso, lassoscript [lasso]
+lean [lean]
+less [less]
+limbo [b]
+liquid [liquid]
+literate-agda, lagda [lagda]
+literate-cryptol, lcryptol, lcry [lcry]
+literate-haskell, lhaskell, lhs [lhs]
+literate-idris, lidris, lidr [lidr]
+livescript, live-script [ls]
+llvm-mir [mir]
+llvm [ll]
+logos [x, xi, xm, xmi]
+logtalk [lgt, logtalk]
+lsl [lsl]
+lua [lua, wlua]
+make, makefile, mf, bsdmake [mak, mk, Makefile, makefile, Makefile. GNUmakefile]
+mako [mao]
+maql [maql]
+markdown, md [md, markdown, mmd]
+mask [mask]
+mason [m, mhtml, mc, mi, autohandler, dhandler]
+mathematica, mma, nb [nb, cdf, nbp, ma]
+miniscript, ms [ms]
+modelica [mo]
+modula2, m2 [def, mod]
+monkey [monkey]
+monte [mt]
+moocode, moo [moo]
+moonscript, moon [moon]
+mosel [mos]
+mscgen, msc [msc]
+mupad [mu]
+mxml [mxml]
+myghty [myt, autodelegate]
+ncl [ncl]
+nemerle [n]
+nesc [nc]
+nestedtext, nt [nt]
+newlisp [lsp, nl, kif]
+newspeak [ns2]
+nimrod, nim [nim, nimrod]
+nit [nit]
+nixos, nix [nix]
+nsis, nsi, nsh [nsi, nsh]
+nusmv [smv]
+objdump [objdump]
+objective-c++, objectivec++, obj-c++, objc++ [mm, hh]
+objective-c, objectivec, obj-c, objc [m, h]
+objective-j, objectivej, obj-j, objj [j]
+ocaml [ml, mli, mll, mly]
+odin [odin]
+omg-idl [idl, pidl]
+ooc [ooc]
+opa [opa]
+openedge, abl, progress [p, cls]
+pacmanconf [pacman.conf]
+pan [pan]
+parasail [psi, psl]
+pawn [p, pwn, inc]
+peg [peg]
+perl, pl [pl, pm, t, perl]
+php [php, inc]
+pig [pig]
+pike [pike, pmod]
+pkgconfig [pc]
+pointless [ptls]
+pony [pony]
+postscript, postscr [ps, eps]
+pot, po [pot, po]
+pov [pov, inc]
+powershell, pwsh, posh, ps1, psm1 [ps1, psm1]
+praat [praat, proc, psc]
+prolog [ecl, prolog, pro, pl]
+promql [promql]
+properties, jproperties [properties]
+protobuf, proto [proto]
+pug [pug]
+jade [jade]
+puppet [pp]
+py2tb [py2tb]
+pypylog, pypy [pypylog]
+pytb, py3tb [pytb, py3tb]
+python, py, sage [py, pyw, jy, sage, sc, bzl, tac]
+qbasic, basic [BAS, bas]
+qml, qbs [qml, qbs]
+qvto, qvt [qvto]
+racket, rkt [rkt, rktd, rktl]
+reasonml, reason [re, rei]
+rebol [r, r3, reb]
+red [red, reds]
+redcode [cw]
+registry [reg]
+restructuredtext, rst, rest [rst, rest]
+rexx, arexx [rexx, rex, rx, arexx]
+rhtml [rhtml]
+ride [ride]
+rng-compact, rnc [rnc]
+roboconf-graph [graph]
+roboconf-instances [instances]
+robotframework [robot]
+rql [rql]
+rsl [rsl]
+ruby, rb [rb, rbw, rake, gemspec, rbx, duby]
+rust, rs [rs, rs.in]
+sarl [sarl]
+sas [SAS, sas]
+sass [sass, scss]
+scala [scala]
+scaml [scaml]
+scdoc, scd [scd, scdoc]
+scheme, scm [scm, ss]
+scilab [sci, sce, tst]
+sgf [sgf]
+shen [shen]
+shexc, shex [shex]
+sieve [siv, sieve]
+silver [sil, vpr]
+slash [sla]
+slim [slim]
+slurm, sbatch [sl]
+smali [smali]
+smalltalk, squeak, st [st]
+smarty [tpl]
+smithy [smithy]
+sml [sml, sig, fun]
+snobol [snobol]
+snowball [sbl]
+solidity [sol]
+sp [sp]
+sparql [rq, sparql]
+spec [spec]
+r [R]
+sql [sql]
+ssp [ssp]
+stan [stan]
+stata, do [do, ado]
+supercollider, sc [sc, scd]
+swift [swift]
+swig [swg, i]
+systemverilog, sv [sv, svh]
+tads3 [t]
+tap [tap]
+tasm [tasm]
+tcl [tcl, rvt]
+tcsh, csh [tcsh, csh]
+tea [tea]
+teal [teal]
+teratermmacro, teraterm, ttl [ttl]
+termcap [termcap, termcap.src]
+terminfo [terminfo, terminfo.src]
+terraform, tf [tf]
+tex, latex [tex, aux, toc]
+text [txt]
+thrift [thrift]
+ti, thingsdb [ti]
+tid [tid]
+tnt [tnt]
+trafficscript, rts [rts]
+treetop [treetop, tt]
+turtle [ttl]
+typescript, ts [ts]
+typoscript [typoscript]
+ucode [u, u1, u2]
+urbiscript [u]
+usd, usda [usd, usda]
+vala, vapi [vala, vapi]
+vb.net, vbnet [vb, bas]
+vbscript [vbs, VBS]
+vcl [vcl]
+velocity [vm, fhtml]
+verilog, v [v]
+vgl [rpf]
+vhdl [vhdl, vhd]
+vim [vim, .vimrc, .exrc, .gvimrc, _vimrc, _exrc, _gvimrc, vimrc, gvimrc]
+wast, wat [wat, wast]
+wdiff [wdiff]
+webidl [webidl]
+whiley [whiley]
+x10, xten [x10]
+xml [xml, xsl, rss, xslt, xsd, wsdl, wsf]
+xquery, xqy, xq, xql, xqm [xqy, xquery, xq, xql, xqm]
+xslt [xsl, xslt, xpl]
+xtend [xtend]
+yaml+jinja, salt, sls [sls]
+yaml [yaml, yml]
+yang [yang]
+zeek [zeek]
+bro [bro]
+zephir [zep]
+zig [zig]
+EOLEXERS

data/lib/snibbets/string.rb

@@ -107,7 +107,17 @@ module Snibbets
       counter = 0
       code_blocks = {}
 
-      sans_blocks = content.gsub(/^(`{3,})(\w+)?\s*\n(.*?)\n\1/m) do
+      sans_blocks = content.dup
+
+      if Snibbets.options[:include_blockquotes]
+        sans_blocks = sans_blocks.gsub(/(?mi)(^(>.*?)(\n|$))+/) do
+          counter += 1
+          code_blocks["block#{counter}"] = Regexp.last_match(0).gsub(/^> *(?=\S)/, '# ')
+          "<block#{counter}>\n"
+        end
+      end
+
+      sans_blocks = sans_blocks.gsub(/^(`{3,})(\w+)?\s*\n(.*?)\n\1/m) do
         counter += 1
         code_blocks["block#{counter}"] = Regexp.last_match(3)
         "<block#{counter}>\n"

data/lib/snibbets/version.rb

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

data/lib/snibbets.rb

@@ -253,7 +253,7 @@ module Snibbets
               warn header
               warn '-' * header.length
               code = snip['code']
-              code = highlight(code, filepath) if Snibbets.options[:highlight]
+              code = Highlight.highlight(code, filepath) if Snibbets.options[:highlight]
               print(code)
             end
           end
@@ -300,7 +300,7 @@ module Snibbets
               warn header
               warn '-' * header.length
               code = answer['code']
-              code = highlight(code, filepath) if Snibbets.options[:highlight]
+              code = Highlight.highlight(code, filepath) if Snibbets.options[:highlight]
               print(code)
             end
           end

data/snibbets.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables << 'snibbets'
 
   spec.files = Dir["lib/**/*.rb"].reject { |f| f.end_with?("_spec.rb") }
+  spec.files += Dir["lib/lexers/lexers_db.txt"]
   spec.files += Dir["[A-Z]*"]
 
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: snibbets
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.14
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2023-04-16 00:00:00.000000000 Z
@@ -174,22 +174,22 @@ dependencies:
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: A plain text code snippet manager
 email: me@brettterpstra.com
 executables:
@@ -205,6 +205,7 @@ files:
 - Gemfile.lock.orig
 - LICENSE.txt
 - README.md
+- README.md.orig
 - README.rdoc
 - Rakefile
 - bin/snibbets
@@ -215,6 +216,7 @@ files:
 - lib/snibbets/hash.rb
 - lib/snibbets/highlight.rb
 - lib/snibbets/lexers.rb
+- lib/snibbets/lexers_db.rb
 - lib/snibbets/menu.rb
 - lib/snibbets/os.rb
 - lib/snibbets/string.rb
@@ -230,7 +232,7 @@ metadata:
   bug_tracker_uri: https://github.com/ttscoff/snibbets/issues
   changelog_uri: https://github.com/ttscoff/snibbets/blob/main/CHANGELOG.md
   github_repo: git@github.com:ttscoff/snibbets.git
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - na
@@ -252,8 +254,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: Snibbets
 test_files: []