snibbets 2.0.26 → 2.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8268903f7b48cbc4e12e42e09fc99c5062f6b5f1bf49e6e7a0033d1c759a2069
-  data.tar.gz: d880b58db9f6f7b849de94157816a4c48774dadbadc977ea109839201194e56d
+  metadata.gz: 6f9f01ad7e1ae9656d572bbd502f4b0dc1fa7d344509a6a93f07b765d515ddca
+  data.tar.gz: 0bc11012e818d56256550af0b3df3fe952307d2f86b8e7da9d91a8a80dfbafee
 SHA512:
-  metadata.gz: a06043d9c6684b6a3fd1d1ec6f813d1a4e1148d99534278561b6359a63083b5766c83c3ff5910b2ba424cef31fc2024f23d147ee20b24ef204c15312f67f601a
-  data.tar.gz: db1de38bd67085f64e9d1c85ff68ed7f03e29ec335f2cd988925fb4b93d49f4ba0b69612831ddfba1414c7e3cad1750c4ddcd8f7f25184935c3b1e69d70656cd
+  metadata.gz: a8926027efe84785a45414761eab33b66474a819ed394e52e1f638c95e5ae7a3aad857df95728640f3ccf68ad0d471b93039b694bfa0d72886b682afad13c3c5
+  data.tar.gz: bfc6c99b3178fb1f7cb8dc3b7aad350cca53e6f560ab19357924291346e6bc74583c9755a945363122105840ef66abee960a8aa9ca75547f23b239be088761b1

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+### 2.0.28
+
+2023-04-18 09:18
+
+#### NEW
+
+- `--nvultra` will open the selected snippet in nvUltra
+
+#### IMPROVED
+
+- Use Readline for entering info with `--paste`, allows for better editing experience
+- Allow `--edit` with `--paste` to open the new snippet in your editor immediately
+
+#### FIXED
+
+- Code indentation with `--paste`
+- Nil error when highlighting without extension
+- When detecting indented code blocks, require a blank line (or start of file) before them, to avoid picking up lines within indented lists
+
+### 2.0.27
+
+2023-04-17 15:54
+
+#### NEW
+
+- `--nvultra` will open the selected snippet in nvUltra
+
+#### IMPROVED
+
+- Use Readline for entering info with `--paste`, allows for better editing experience
+- Allow `--edit` with `--paste` to open the new snippet in your editor immediately
+
+#### FIXED
+
+- Code indentation with `--paste`
+- Nil error when highlighting without extension
+
 ### 2.0.26
 
 2023-04-16 11:18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snibbets (2.0.26)
+    snibbets (2.0.28)
       mdless (~> 1.0, >= 1.0.32)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-which (~> 0.5, >= 0.5.0)

data/README.md

@@ -118,11 +118,13 @@ The `name_only` key will permanently set Snibbets to only search for snippets by
 
 #### Syntax Highlighting
 
-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. You can also set `highlighter` to `pygments` or `skylight` to force using one highlighter over the other. 
+The `highlight` key turns on syntax highlighting. This requires that either `pygmentize` or `skylighting` is available on your system (both available via package managers like Homebrew). This feature is still in development and results may be mixed. You can also set `highlighter` to `pygments` or `skylight` to force using one highlighter over the other. 
 
-Highlighting using Skylighting requires that your snippets be named with extra extensions defining the lexer to use. The last extension before `.md` (or whatever your snippet extension is set to) should be the one that the highlighter will recognize as a valid lexer, e.g. `my code.jquery.js.md`.
+Highlighting using Skylighting requires that your snippets be named with extra extensions defining the lexer to use. The last extension before `.md` (or whatever your snippet extension is set to) should be the one that the highlighter will recognize as a valid lexer, e.g. `my code.jquery.js.md`. 
 
-You can also define languages in your fenced code blocks by putting the lexer name right after the opening fence. This is used with Skylighting, but Pygments will always use it's own lexer detection. When defining multiple snippets in one file that are of different languages, this method will ensure that each one is properly highlighted. 
+You can also define languages in your fenced code blocks by putting the lexer name right after the opening fence. When defining multiple snippets in one file that are of different languages, this method will ensure that each one is properly highlighted. 
+
+If you don't use either extensions or fenced code labels with Skylighting, code won't get highlighted.
 
 To define a snippet as python code, for example:
 
@@ -145,7 +147,7 @@ You can turn highlighting on or off for a single run using `--highlight` or `--n
 
 Snibbet's implementation of Skylighting has limited but better-looking themes, and has some lexers that Pygments lacks. However, Pygments has _more_ lexers and a wider array of themes. It also can determine the target syntax automatically better than Skylighting (which requires the syntax to be specified -- it's pulled from the extensions of your snippets), which is why Pygments is the default if it's installed and you don't configure it otherwise.
 
-- Install [Skylighting] with [Homebrew] (`brew install pygmentize`) or [apt-get].
+- Install [Skylighting] with [Homebrew] (`brew install skylighting`) or [apt-get].
 - Install [Pygments] using [Homebrew] (`brew install pygments`) or `pip install pygments`.
 
 [Skylighting]: https://github.com/jgm/skylighting
@@ -155,7 +157,7 @@ Snibbet's implementation of Skylighting has limited but better-looking themes, a
 ### Usage
 
 ```
-Snibbets v2.0.26
+Snibbets v2.0.28
 
 Usage: snibbets [options] query
     -a, --all                        If a file contains multiple snippets, output all of them (no menu)

data/buildnotes.md

@@ -1,6 +1,6 @@
 template: gem, git, gli, project
 executable: na
-readme: src/README.md
+readme: src/_README.md
 changelog: CHANGELOG.md
 project: snibbets
 
@@ -20,11 +20,17 @@ A plain text snippet manager
 
 You no longer need to manually bump the version, it will be incremented when this task runs.
 
-```run Update Changelog and README
+```run Update Changelog
 #!/bin/bash
 
 changelog -u
-scripts/fixreadme.rb
+```
+
+@include(project:Update GitHub README)
+
+```run Update README
+#!/bin/bash
+
 changelog | git commit -a -F -
 git pull
 git push

data/lib/snibbets/string.rb

@@ -125,7 +125,7 @@ module Snibbets
         "<block#{counter}>\n"
       end
 
-      sans_blocks = sans_blocks.gsub(/(?mi)^((?: {4,}|\t+)\S[\S\s]*?)(?=\n\S|\Z)/) do
+      sans_blocks = sans_blocks.gsub(/(?mi)(?<=\n\n|\A)\n?((?: {4,}|\t+)\S[\S\s]*?)(?=\n\S|\Z)/) do
         counter += 1
         code = Regexp.last_match(1).split(/\n/)
 
@@ -148,10 +148,9 @@ module Snibbets
 
       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'
+        title = lines.count > 1 && lines[0] !~ /<block\d+>/ ? lines.shift.strip.sub(/[.:]$/, '') : 'Default snippet'
         block = lines.join("\n").gsub(/<(block\d+)>/) { code_blocks[Regexp.last_match(1)] }
 
         lang = nil

data/lib/snibbets/version.rb

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

data/snibbets.taskpaper

@@ -1,6 +1,7 @@
 Inbox:
 	- handle multiple code blocks within a section separately for highlighting @maybe @na
 		If a header contains multiple snippets, create an array with a language specifier for each snippet, and then pass the array to the print function to handle individually highlighting each code block. Have a special language specifier for blockquote notes to avoid highlighting them at all.
+		Could possibly just highlight each block as its found, and save an original copy in memory for uncolored output, or just write a decoloring method. Skip highlighting if it's not enabled, but decolor ouput sent to non-tty or --copy.
 snibbets:
 	Feature Requests:
 	Ideas:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snibbets
 version: !ruby/object:Gem::Version
-  version: 2.0.26
+  version: 2.0.28
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-16 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler