snibbets 2.0.11 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d69fb792808e08bf219cc435fda27458be565afb2b2d16dad8bcf40c4bc4386
-  data.tar.gz: b798ab66a6928be6d50e160ae8c9a1b6f30042a452ed06de798440f5e6e947c5
+  metadata.gz: 72d22da7e8723b49ee57a4b244c36dfc798f3f73eee8b936c0538eb09028f302
+  data.tar.gz: e0fa3c991a45448cdb6119583e34f631cc99e8028cb890c86fcc2a0a2bb8b2b5
 SHA512:
-  metadata.gz: 1b7b38a0b865c625feb8908a371b2ec76cc36765175abc68bf5956138ad4b60cb39b019aeec7775a4f89e51ce17c61c5b0df8d9b85c0752beb666c9153c9de0f
-  data.tar.gz: b5f7f8a20cb33d4828c012d35057b8af7adb0fe475d226b83af8b91cb5d2d9e18ef6fe5e3be42104ea7ded67cdf46d4e9f3ce679a1699053ca41467d32e9095a
+  metadata.gz: d15bffd5530b1d267c48f833d4a8f8711538eb8d4bcf48e21acdfe7247565f239dc46c0ce3938fa0e5b86727faf9afa4a86e3f32507ad9b590edeb968622c7c6
+  data.tar.gz: 5d910f25059137ade7c625dc1d8ecb207ac93cc199aa03385bc91f9c359a9233a5858481df5a598b4f3f80293e3807bdcf1b03f1cf838e4c6a03cfe807a08075

data/CHANGELOG.md.orig

@@ -1,3 +1,21 @@
+### 2.0.13
+
+2023-04-15 19:57
+
+#### NEW
+
+- Option to include blockquotes (>) in output
+
+### 2.0.12
+
+2023-04-15 19:28
+
+#### FIXED
+
+- Lowered minimum ruby version to allow Ruby 2.6
+- Failure to recognize snippet if title is on first line of file
+- Errantly discarding first snippet in file with multiple snippets
+
 ### 2.0.11
 
 2023-04-15 19:06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snibbets (2.0.11)
+    snibbets (2.0.13)
       tty-which (~> 0.5, >= 0.5.0)
 
 GEM
@@ -81,6 +81,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -1,19 +1,14 @@
-# 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)
-
-<!--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 +51,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 +81,7 @@ copy: false
 editor: 
 extension: md
 highlight: false
+include_blockquotes: false
 interactive: true
 launchbar: false
 menus: 
@@ -110,6 +106,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 +116,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.13
+
+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 +176,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/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,7 @@ module Snibbets
       editor: nil,
       extension: 'md',
       highlight: false,
+      include_blockquotes: false,
       interactive: true,
       launchbar: false,
       menus: nil,

data/lib/snibbets/string.rb

@@ -20,8 +20,8 @@ module Snibbets
       input = dup
       lines = input.split(/\n/)
       loop do
-        line = lines.shift
-        next if line =~ /^\s*[A-Z\s]+\w:\s*\S+/i || line =~ /^-{3,}\s*$/
+        line = lines[0]
+        lines.shift if line =~ /^\s*[A-Z\s]+\w:\s*\S+/i || line =~ /^-{3,}\s*$/
 
         break
       end
@@ -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"
@@ -133,7 +143,7 @@ module Snibbets
         parts = sans_blocks.gsub(/\n{2,}/, "\n\n").split(/^#+/)
       end
 
-      parts.shift if parts.count > 1
+      # parts.shift if parts.count > 1
 
       parts.each do |part|
         lines = part.split(/\n/).strip_empty

data/lib/snibbets/version.rb

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

data/lib/snibbets.rb

@@ -34,6 +34,10 @@ end
 
 module Snibbets
   class << self
+    def change_query(query)
+      @query = query
+    end
+
     # Search the snippets directory for query using find and grep
     def search(try: 0)
       folder = File.expand_path(Snibbets.options[:source])
@@ -270,7 +274,7 @@ module Snibbets
           else
             snippets.push({ 'title' => 'All snippets', 'code' => '' })
 
-            answer = Snibbets::Menu.menu(snippets, filename: File.basename(filepath, '.md'), title: 'Select snippet', query: @query)
+            answer = Menu.menu(snippets, filename: File.basename(filepath, '.md'), title: 'Select snippet', query: @query)
 
             if answer['title'] == 'All snippets'
               snippets.delete_if { |s| s['title'] == 'All snippets'}

data/snibbets.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "A plain text code snippet manager"
   spec.homepage = "https://github.com/ttscoff/snibbets"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: snibbets
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.13
 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'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: A plain text code snippet manager
 email: me@brettterpstra.com
 executables:
@@ -230,7 +230,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
@@ -245,15 +245,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Snibbets
 test_files: []