snibbets 2.0.33 → 2.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04adb0bcd4439b3cd445b65bbfb4dc8494237cccca55fb6cc1a42c696e45864
-  data.tar.gz: 25099f85f797910222a321dbebd3e0db84098071b964f6d93e0d6ba19ef456c5
+  metadata.gz: 4bfb107dedc2d689ec1ed371dcaf1ef7fb240218af43831856acb552789a0ce2
+  data.tar.gz: 482355a0c4a27d707d92633c47adeb2be0db027a37311412cb903f7d47cdb0b6
 SHA512:
-  metadata.gz: 7d06a635679db42ad3a53eb21b235e21d4057f189c77760edc373306909da795e306cb7c7992e564cc517831487620904485f2007f0631a6e55ba7c434606b95
-  data.tar.gz: 6b0f69d918b04ead612de23ba5d7c0b0044a137da79efc24b3037caa26f0f4d63055270499a6716c3c52e3a6bebbe3b12875db4dafbb7a7de8003559d58765ec
+  metadata.gz: 40afbc2d33dc562db0e5e21ec7fe40fc10872f279c1bc95b67deb6aac9cff90e663abc0100e49c2a08ea4500e0e2eb4f442bcf34259a54b0b901cf53c883c7ce
+  data.tar.gz: 072cccc7e2c90dc557f4af25b9338a7cec21b00c0545b5155b07f413d6560b7d964008a8919a638b0c0b67089ccd12d568951c314c75c29d896694a3de45e19e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 2.0.34
+
+2023-06-17 09:17
+
+#### IMPROVED
+
+- If a section of a snippet contains no code blocks, output the whole thing
+
+#### FIXED
+
+- Correct error if searching name only and no results are returned
+
 ### 2.0.33
 
 2023-04-26 10:23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snibbets (2.0.33)
+    snibbets (2.0.34)
       mdless (~> 1.0, >= 1.0.32)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-which (~> 0.5, >= 0.5.0)
@@ -17,47 +17,50 @@ GEM
     gem-release (2.2.2)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
-    mdless (1.0.32)
+    lint_roller (1.0.0)
+    mdless (1.0.33)
     multi_json (1.15.0)
-    parallel (1.22.1)
+    parallel (1.23.0)
     parse_gemspec (1.0.0)
     parse_gemspec-cli (1.0.0)
       multi_json
       parse_gemspec
       thor
-    parser (3.2.2.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rdoc (6.3.3)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.1)
     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-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       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)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       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)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.16.0)
+    rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
@@ -71,13 +74,20 @@ GEM
       terminal-table
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    standard (1.26.0)
+    standard (1.29.0)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (~> 1.48.1)
-      rubocop-performance (~> 1.16.0)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.52.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.1.0)
+    standard-custom (1.0.1)
+      lint_roller (~> 1.0)
+    standard-performance (1.1.0)
+      lint_roller (~> 1.0)
+      rubocop-performance (~> 1.18.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
+    thor (1.2.2)
     tty-cursor (0.7.1)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)

data/README.md

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

data/lib/snibbets/string.rb

@@ -169,7 +169,7 @@ module Snibbets
 
         next if lines.blocks.zero? && !notes
 
-        title = if lines.count > 1 && lines[0] !~ /<block\d+>/ && lines[0] =~ /^ +/
+        title = if lines.count > 1 && lines[0] !~ /<block\d+>/
                   lines.shift.strip.sub(/[.:]$/, '')
                 else
                   'Default snippet'
@@ -208,18 +208,27 @@ module Snibbets
       # becomes the title, code is gleaned from text between that and the
       # next ATX header (or end)
       sans_blocks, code_blocks = content.replace_blocks
-
-      parts = if Snibbets.options[:all_notes]
-                sans_blocks.split(/^#+/)
-              elsif sans_blocks =~ /<block\d+>/
-                sans_blocks.split(/\n/).each_with_object([]) do |line, arr|
-                  arr << line if line =~ /^#/ || line =~ /<block\d+>/
-                end.join("\n").split(/^#+/)
-              else
-                sans_blocks.gsub(/\n{2,}/, "\n\n").split(/^#+/)
-              end
-
-      # parts.shift if parts.count > 1
+      parts = sans_blocks.gsub(/\n{2,}/, "\n\n").split(/^#+/)
+
+      unless Snibbets.options[:all_notes]
+        parts.map! do |part|
+          if part =~ /<block\d+>/
+            lines = part.split(/\n/)
+            title = lines.shift
+            out = [title.gsub(/(^#+|#+$)/, '').strip]
+            out.concat(lines.each_with_object([]) do |line, arr|
+              arr << line.gsub(/(^#+|#+$)/, '').strip if line =~ /^#/ || line =~ /<block\d+>/
+            end)
+            out.join("\n")
+          else
+            lines = part.split(/\n/)
+            title = lines.shift
+            out = title.nil? ? [] : [title.gsub(/(^#+|#+$)/, '').strip]
+            out.concat(lines)
+            out.join("\n")
+          end
+        end
+      end
 
       restore_blocks(parts, code_blocks)
     end

data/lib/snibbets/version.rb

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

data/lib/snibbets.rb

@@ -61,9 +61,7 @@ module Snibbets
               ag = TTY::Which.which('ag')
               ack = TTY::Which.which('ack')
               grep = TTY::Which.which('grep')
-              if Snibbets.options[:name_only]
-                nil
-              elsif !rg.empty?
+              if !rg.empty?
                 %(#{rg} -li --color=never --glob='*.#{ext}' '#{@query.rx}' "#{folder}")
               elsif !ag.empty?
                 %(#{ag} -li --nocolor -G '.*.#{ext}' '#{@query.rx}' "#{folder}")
@@ -84,9 +82,14 @@ module Snibbets
               end
             end
 
-      if try == 2 && cmd.nil?
-        puts "{br}No search method available on this system. Please install ripgrep, silver surfer, ack, or grep.".x
-        Process.exit 1
+      if try == 2
+        if Snibbets.options[:name_only]
+          puts '{br}No name matches found'.x
+          Process.exit 1
+        elsif cmd.nil?
+          puts '{br}No search method available on this system. Please install ripgrep, silver surfer, ack, or grep.'.x
+          Process.exit 1
+        end
       end
 
       res = cmd.nil? ? '' : `#{cmd}`.strip

metadata

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