snibbets 2.0.27 → 2.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f787f19a0ad33d36951029f1d367cb0c8d1b1f4e4b0af0725a678b8b6c55fe5
-  data.tar.gz: 31ae62df88fbae803a93d3a50a8f3125ed9c6c58e0f3ae2f08c511d1673d6c29
+  metadata.gz: c514df1f69038d43d34563cc23735ccb8c3912f407a533d90aeacc5e924c81a5
+  data.tar.gz: bce3c77b30ee7369040fcc3af38801ad0b21a53c5f5ce7d991c4f95ec14a249e
 SHA512:
-  metadata.gz: 76afe13255327745446d6367b2b64f1266692df02ae039442d01437af42ce87488c86c87d0e65d327552a992c1a3eb570f5e071fc5427191a880f04f34039954
-  data.tar.gz: 3656f676bacce960fe21dfa5e0773d90e3c90059181c80e5836d36ec59709e286bd3dba914162d9b3a30a0afb35bf3e0c7036c73a724e8c609b9113d66acca68
+  metadata.gz: a41ac5237f863911b9950670073fb6922ebf341e1ad06650e475de18f724028edcb1589b5ffcd50c47ef8f144161ecde58c50761967e6f7a60b66586ac1c2a15
+  data.tar.gz: a8d3281abaa277a56e85d4e5275a68cf825fe3bb13eb5714bc43d186bd1a5ec681cf44fdea35290539fb1005c15d8dde308fe44a47295e3f46a5e4e4541f03be

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+### 2.0.29
+
+2023-04-18 10:45
+
+#### 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
+- Better removal of extra leading/trailing newlines
+
+#### 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
+- Selecting 'All snippets' could return blank results in some cases
+
+### 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

data/Gemfile.lock

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

data/README.md

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

data/lib/snibbets/string.rb

@@ -16,6 +16,10 @@ module Snibbets
       replace remove_spotlight_tags
     end
 
+    def strip_empty
+      split(/\n/).strip_empty.join("\n")
+    end
+
     def remove_meta
       input = dup
       lines = input.split(/\n/)
@@ -93,22 +97,11 @@ module Snibbets
       end
     end
 
-    # Returns an array of snippets. Single snippets are returned without a
-    # title, multiple snippets get titles from header lines
-    def snippets
-      content = dup.remove_meta
-      # If there's only one snippet, just clean it and return
-      # return [{ 'title' => '', 'code' => content.clean_code.strip }] unless multiple?
-
-      # Split content by ATX headers. Everything on the line after the #
-      # becomes the title, code is gleaned from text between that and the
-      # next ATX header (or end)
-      sections = []
+    def replace_blocks
+      sans_blocks = dup
       counter = 0
       code_blocks = {}
 
-      sans_blocks = content.dup
-
       if Snibbets.options[:include_blockquotes]
         sans_blocks = sans_blocks.gsub(/(?mi)(^(>.*?)(\n|$))+/) do
           counter += 1
@@ -125,7 +118,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/)
 
@@ -133,6 +126,23 @@ module Snibbets
         "<block#{counter}>\n"
       end
 
+      [sans_blocks, code_blocks]
+    end
+
+    # Returns an array of snippets. Single snippets are returned without a
+    # title, multiple snippets get titles from header lines
+    def snippets
+      content = dup.remove_meta
+      # If there's only one snippet, just clean it and return
+      # return [{ 'title' => '', 'code' => content.clean_code.strip }] unless multiple?
+
+      # Split content by ATX headers. Everything on the line after the #
+      # becomes the title, code is gleaned from text between that and the
+      # next ATX header (or end)
+      sections = []
+
+      sans_blocks, code_blocks = content.replace_blocks
+
       content = []
       if sans_blocks =~ /<block\d+>/
         sans_blocks.each_line do |line|
@@ -148,10 +158,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
@@ -166,7 +175,7 @@ module Snibbets
 
         sections << {
           'title' => title,
-          'code' => code,
+          'code' => code.strip_empty,
           'language' => lang
         }
       end

data/lib/snibbets/version.rb

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

data/lib/snibbets.rb

@@ -282,6 +282,7 @@ module Snibbets
               header = File.basename(filepath, '.md')
               warn header
               warn '-' * header.length
+              warn ''
               code = snip['code']
               lang = snip['language']
               print(code, filepath, lang)
@@ -289,52 +290,54 @@ module Snibbets
           end
         elsif snippets.length > 1
           if Snibbets.options[:all]
-            if Snibbets.options[:output] == 'json'
-              print(snippets.to_json, filepath)
-            else
-
-              snippets.each do |snippet|
-                lang = snippet['language']
-                warn "### #{snippet['title']} ###"
-                # warn "# #{'-' * snippet['title'].length}"
-                print(snippet['code'], filepath, lang)
-                puts
-              end
-            end
+            print_all(snippets, filepath)
           else
-            snippets.push({ 'title' => 'All snippets', 'code' => '' })
+            select_snippet(snippets, filepath)
+          end
+        end
+      end
+    end
 
-            answer = Menu.menu(snippets, filename: File.basename(filepath, '.md'), title: 'Select snippet', query: @query)
+    def select_snippet(snippets, filepath)
+      snippets.push({ 'title' => 'All snippets', 'code' => '' })
+      answer = Menu.menu(snippets.dup, 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, filepath)
-              else
-                header = File.basename(filepath, '.md')
-                warn header
-                warn '=' * header.length
-
-                snippets.each do |snippet|
-                  lang = snippet['language']
-                  warn "### #{snippet['title']} ###"
-                  # warn "# #{'-' * snippet['title'].length}"
-                  print(snippet['code'], filepath, lang)
-                  puts
-                end
+      if answer['title'] == 'All snippets'
+        snippets.delete_if { |s| s['title'] == 'All snippets' }
+        if Snibbets.options[:output] == 'json'
+          print(snippets.to_json, filepath)
+        else
+          header = File.basename(filepath, '.md')
+          warn header
+          warn '=' * header.length
+          warn ''
+          print_all(snippets, filepath)
+        end
+      elsif Snibbets.options[:output] == 'json'
+        print(answer.to_json, filepath)
+      else
+        header = "#{File.basename(filepath, '.md')}: #{answer['title']}"
+        warn header
+        warn '-' * header.length
+        warn ''
+        code = answer['code']
+        lang = answer['language']
+        print(code, filepath, lang)
+      end
+    end
 
-              end
-            elsif Snibbets.options[:output] == 'json'
-              print(answer.to_json, filepath)
-            else
-              header = "#{File.basename(filepath, '.md')}: #{answer['title']}"
-              warn header
-              warn '-' * header.length
-              code = answer['code']
-              lang = answer['language']
-              print(code, filepath, lang)
-            end
-          end
+    def print_all(snippets, filepath)
+      if Snibbets.options[:output] == 'json'
+        print(snippets.to_json, filepath)
+      else
+
+        snippets.each do |snippet|
+          lang = snippet['language']
+          warn "### #{snippet['title']} ###"
+          warn ''
+          # warn "# #{'-' * snippet['title'].length}"
+          print(snippet['code'], filepath, lang)
+          puts
         end
       end
     end

metadata

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