snibbets 2.0.17 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e89ca24c47d946572565c20c19ab3c14c80b60d88874d871a74975478efd8a34
-  data.tar.gz: 66996bcf10f8f7d6bd0d879f150f94fe1c6b07b812f5aad27797a96ed9aa1cbd
+  metadata.gz: c0317bfeaf37247a0bcb128127a4b5f93022826c4a926684561585ff03b806b2
+  data.tar.gz: 76bf63ed29f6948539bc5ebface580fdbc2d4934e5a3e287746fe4f556e3cb7a
 SHA512:
-  metadata.gz: 676d63c79f5278dc7ca5edd8dcf68a0136b2ef26864c087b35c8fb595cf8b0150218691569a1d28b3d92ca4eecc581549cefb6c4b67d52fed00c164c1130c91b
-  data.tar.gz: dd83ac848efd7510c0aff692b802662610c6df5a8e245292478e8f39a2677ff8a11c747ac384f4a9c3a6544c6658b397207f5ef234dd470e58a095567a2eb7ee
+  metadata.gz: 250da1aaebe3ccf91dddf3c6d296c3d2864d77d9959b7cccd065cab58e2deeb27b05ed1bc018d6b42a01c9456f621b2f759368b2d7ec814aa4f7bc989255b8bc
+  data.tar.gz: ea0c220d5415ca2c0717e5602cda7602db28740c889013cfa2d00f70441ed98153d769bab74deced677da0b30b322951237d85dab5b65eac2b93bffd4d5d6afa

data/CHANGELOG.md.orig

@@ -1,3 +1,20 @@
+### 2.0.19
+
+2023-04-16 08:05
+
+#### FIXED
+
+- A fenced code block following a line containing only 4+ spaces or tabs would get parsed as an indented code block
+- Last fenced code block in a snippet might not be recognized
+
+### 2.0.18
+
+2023-04-16 06:57
+
+#### FIXED
+
+- If an invalid language (without a lexer) is supplied when using `--paste`, just use the input as the extension and tag
+
 ### 2.0.17
 
 2023-04-16 06:31

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snibbets (2.0.17)
+    snibbets (2.0.19)
       tty-which (~> 0.5, >= 0.5.0)
 
 GEM

data/README.md

@@ -155,7 +155,7 @@ Snibbet's implementation of Skylighting has limited but better-looking themes, a
 ### Usage
 
 ```
-Snibbets v2.0.17
+Snibbets v2.0.19
 
 Usage: snibbets [options] query
     -a, --all                        If a file contains multiple snippets, output all of them (no menu)

data/lib/snibbets/lexers.rb

@@ -29,12 +29,12 @@ module Snibbets
 
       def ext_to_lang(ext)
         matches = lexers.select { |lex| lex[:extensions].map(&:downcase).include?(ext.downcase) }
-        matches.map { |lex| lex[:lexer] }.first
+        matches.map { |lex| lex[:lexer] }.first || ext
       end
 
       def lang_to_ext(lexer)
         matches = lexers.select { |lex| lex[:lexer] == lexer || lex[:aliases].map(&:downcase).include?(lexer.downcase) }
-        matches.map { |lex| lex[:extensions].first }.first
+        matches.map { |lex| lex[:extensions].first }.first || lexer
       end
 
       def syntax_from_extension(filename)

data/lib/snibbets/string.rb

@@ -117,7 +117,7 @@ module Snibbets
         end
       end
 
-      sans_blocks = sans_blocks.gsub(/^(`{3,})(\s*\w+)?\s*\n(.*?)\n\1/m) do
+      sans_blocks = sans_blocks.gsub(/(?mi)^(`{3,})( *\w+)? *\n([\s\S]*?)\n\1 *(\n|\Z)/) do
         counter += 1
         lang = Regexp.last_match(2)
         lang = "<lang:#{lang.strip}>\n" if lang
@@ -125,12 +125,11 @@ module Snibbets
         "<block#{counter}>\n"
       end
 
-      sans_blocks = sans_blocks.gsub(/(?mi)^((?:\s{4,}|\t+)\S[\S\s]*?)(?=\n\S|\Z)/) do
+      sans_blocks = sans_blocks.gsub(/(?mi)^((?: {4,}|\t+)\S[\S\s]*?)(?=\n\S|\Z)/) do
         counter += 1
         code = Regexp.last_match(1).split(/\n/)
 
         code_blocks["block#{counter}"] = code.join("\n").outdent
-
         "<block#{counter}>\n"
       end
 

data/lib/snibbets/version.rb

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

data/lib/snibbets.rb

@@ -157,8 +157,10 @@ module Snibbets
       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| Lexers.lang_to_ext(lang) }
-      tags = langs.map { |lang| Lexers.ext_to_lang(lang) }.concat(langs).sort.uniq
+      exts = langs.map { |lang| Lexers.lang_to_ext(lang) }.delete_if(&:nil?)
+      tags = langs.map { |lang| Lexers.ext_to_lang(lang) }.concat(langs).delete_if(&:nil?).sort.uniq
+
+      exts = langs if exts.empty?
 
       filename = "#{title}.#{exts.join('.')}.#{Snibbets.options[:extension]}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snibbets
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.19
 platform: ruby
 authors:
 - Brett Terpstra