snibbets 2.0.9 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e721debb0d3122f59722537839a728cc81e532c8039edeca696b46f19c91d920
-  data.tar.gz: ab7261e014473773db55aa1e56f392ba11dc2b423c2d281216d18b57bf51378e
+  metadata.gz: 5d69fb792808e08bf219cc435fda27458be565afb2b2d16dad8bcf40c4bc4386
+  data.tar.gz: b798ab66a6928be6d50e160ae8c9a1b6f30042a452ed06de798440f5e6e947c5
 SHA512:
-  metadata.gz: 9f991baaab2bbe857bb1f2f0edb924ebc241faa58ffb20dec1084283a54d5e7c0163e1aac0368cb051b6b8bc3fe90d7db18517ff48176956e98b6889d7c918bb
-  data.tar.gz: 01175aaaa465ae16bafff11a8a1d891b188c288042073f667f34a597e28bce105fd3e73e2a56683ed3780c12f7520d525694a1075af728f609e8a28803aad614
+  metadata.gz: 1b7b38a0b865c625feb8908a371b2ec76cc36765175abc68bf5956138ad4b60cb39b019aeec7775a4f89e51ce17c61c5b0df8d9b85c0752beb666c9153c9de0f
+  data.tar.gz: b5f7f8a20cb33d4828c012d35057b8af7adb0fe475d226b83af8b91cb5d2d9e18ef6fe5e3be42104ea7ded67cdf46d4e9f3ce679a1699053ca41467d32e9095a

data/CHANGELOG.md.orig

@@ -0,0 +1,65 @@
+### 2.0.11
+
+2023-04-15 19:06
+
+#### FIXED
+
+- Overactive stripping of newlines within code blocks
+- Syntax definition determination when adding new snippets
+
+### 2.0.10
+
+2023-04-15 16:28
+
+#### FIXED
+
+- Update dependencies for security
+- Incorporate fixes from @robjwells addressing #3 and #4
+- Incorporate fixes from @robjwells addressing #3 and #4
+- Best menu CLI determination missing modules
+
+<<<<<<< HEAD
+### 2.0.7
+
+2023-04-15 12:02
+=======
+### 2.0.9
+
+2023-04-15 15:44
+
+#### IMPROVED
+
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+
+#### FIXED
+
+- If a header section contains no code blocks, don't display it in menu
+- Remove leading and trailing newlines without affecting indentation
+
+### 2.0.8
+
+2023-04-15 15:41
+
+#### IMPROVED
+
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+- Allow setting `menus` config key to force Snibbets to use fzf, gum, or console menus
+
+#### FIXED
+
+- If a header section contains no code blocks, don't display it in menu
+- Remove leading and trailing newlines without affecting indentation
+>>>>>>> release/2.0.9
+
+### 2.0.6
+
+2023-04-15 11:55
+
+#### IMPROVED
+
+- Refactor script as modules and classes
+
+## 2.0.2
+
+Initial release as a gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    snibbets (2.0.7)
+    snibbets (2.0.11)
       tty-which (~> 0.5, >= 0.5.0)
 
 GEM
@@ -26,7 +26,7 @@ GEM
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rdoc (4.3.0)
+    rdoc (6.3.3)
     regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.12.0)
@@ -77,12 +77,11 @@ GEM
     thor (1.2.1)
     tty-which (0.5.0)
     unicode-display_width (2.4.2)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
 
 PLATFORMS
   arm64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   awesome_print (~> 1.9)
@@ -90,7 +89,7 @@ DEPENDENCIES
   gem-release (~> 2.2)
   parse_gemspec-cli (~> 1.0)
   rake (~> 13.0)
-  rdoc (~> 4.3)
+  rdoc (~> 6.3.1)
   rspec (~> 3.0)
   simplecov (~> 0.21)
   simplecov-console (~> 0.9)

data/Gemfile.lock.orig

@@ -0,0 +1,107 @@
+PATH
+  remote: .
+  specs:
+    snibbets (2.0.10)
+      tty-which (~> 0.5, >= 0.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    ast (2.4.2)
+    awesome_print (1.9.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    gem-release (2.2.2)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    multi_json (1.15.0)
+    parallel (1.22.1)
+    parse_gemspec (1.0.0)
+    parse_gemspec-cli (1.0.0)
+      multi_json
+      parse_gemspec
+      thor
+    parser (3.2.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+<<<<<<< HEAD
+    rdoc (6.3.1)
+=======
+    rdoc (6.3.3)
+>>>>>>> af6f234 (Update rdoc)
+    regexp_parser (2.7.0)
+    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-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
+      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)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      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)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.16.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-console (0.9.1)
+      ansi
+      simplecov
+      terminal-table
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    standard (1.26.0)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (~> 1.48.1)
+      rubocop-performance (~> 1.16.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    thor (1.2.1)
+    tty-which (0.5.0)
+    unicode-display_width (2.4.2)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+
+PLATFORMS
+  arm64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  awesome_print (~> 1.9)
+  bundler (~> 2.0)
+  gem-release (~> 2.2)
+  parse_gemspec-cli (~> 1.0)
+  rake (~> 13.0)
+  rdoc (~> 6.3.1)
+  rspec (~> 3.0)
+  simplecov (~> 0.21)
+  simplecov-console (~> 0.9)
+  snibbets!
+  standard (~> 1.3)
+  yard (~> 0.9, >= 0.9.26)
+
+BUNDLED WITH
+   2.2.29

data/buildnotes.md

@@ -20,7 +20,6 @@ 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

data/lib/snibbets/array.rb

@@ -15,25 +15,21 @@ module Snibbets
     def remove_leading_empty_elements
       output = []
 
+      in_leader = true
       each do |line|
-        next if line =~ /^\s*$/ || line.empty?
-
-        output << line
+        if (line =~ /^\s*$/ || line.empty?) && in_leader
+          next
+        else
+          in_leader = false
+          output << line
+        end
       end
 
       output
     end
 
     def remove_trailing_empty_elements
-      output = []
-
-      reverse.each do |line|
-        next if line =~ /^\s*$/ || line.empty?
-
-        output << line
-      end
-
-      output.reverse
+      reverse.remove_leading_empty_elements.reverse
     end
   end
 end

data/lib/snibbets/config.rb

@@ -2,7 +2,7 @@
 
 module Snibbets
   class Config
-    attr_accessor :options
+    attr_accessor :options, :test_editor, :config_dir, :config_file
 
     DEFAULT_OPTIONS = {
       all: false,
@@ -19,61 +19,58 @@ module Snibbets
     }.freeze
 
     def initialize
+      @config_dir = File.expand_path('~/.config/snibbets')
+      @config_file = File.join(@config_dir, 'snibbets.yml')
       custom_config = read_config
       @options = DEFAULT_OPTIONS.merge(custom_config)
       @options[:editor] ||= best_editor
       @options[:menus] ||= best_menu
+      @test_editor = nil
 
       write_config unless @options.equal?(custom_config)
     end
 
     def best_menu
-      return 'fzf' if Which.exist?('fzf')
-      return 'gum' if Which.exist?('gum')
+      return 'fzf' if TTY::Which.exist?('fzf') && @test_editor == 'fzf'
+
+      return 'gum' if TTY::Which.exist?('gum') && @test_editor == 'gum'
+
       'console'
     end
 
     def best_editor
-      if ENV['EDITOR']
+      if ENV['EDITOR'] && @test_editor == 'EDITOR'
         ENV['EDITOR']
-      elsif ENV['GIT_EDITOR']
+      elsif ENV['GIT_EDITOR'] && @test_editor == 'GIT_EDITOR'
         ENV['GIT_EDITOR']
       else
-        return TTY::Which.which('code') if TTY::Which.exist?('code')
+        return TTY::Which.which('code') if TTY::Which.exist?('code') && @test_editor == 'code'
 
-        return TTY::Which.which('subl') if TTY::Which.exist?('subl')
+        return TTY::Which.which('subl') if TTY::Which.exist?('subl') && @test_editor == 'subl'
 
-        return TTY::Which.which('bbedit') if TTY::Which.exist?('bbedit')
+        return TTY::Which.which('nano') if TTY::Which.exist?('nano') && @test_editor == 'nano'
 
-        return TTY::Which.which('nano') if TTY::Which.exist?('nano')
-
-        return TTY::Which.which('vim') if TTY::Which.exist?('vim')
+        return TTY::Which.which('vim') if TTY::Which.exist?('vim') && @test_editor == 'vim'
 
         'TextEdit'
       end
     end
 
-    def config_dir
-      File.expand_path('~/.config/snibbets')
-    end
-
-    def config_file
-      File.join(config_dir, 'snibbets.yml')
-    end
-
     def read_config
-      if File.exist?(config_file)
-        YAML.safe_load(IO.read(config_file)).symbolize_keys
+      if File.exist?(@config_file)
+        YAML.safe_load(IO.read(@config_file)).symbolize_keys
       else
         {}
       end
     end
 
     def write_config
-      raise 'Error creating config directory, file exists' if File.exist?(config_dir) && !File.directory?(config_dir)
+      raise 'Error creating config directory, file exists' if File.exist?(@config_dir) && !File.directory?(@config_dir)
+
+      FileUtils.mkdir_p(@config_dir) unless File.directory?(@config_dir)
+      File.open(@config_file, 'w') { |f| f.puts(YAML.dump(@options.stringify_keys)) }
 
-      FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
-      File.open(config_file, 'w') { |f| f.puts(YAML.dump(@options.stringify_keys)) }
+      true
     end
   end
 end

data/lib/snibbets/lexers.rb

@@ -1,34 +1,44 @@
+# frozen_string_literal: true
+
 module Snibbets
-  class Lexers
-    attr_accessor :lexers
+  # Lexer definitions
+  module Lexers
+    class << self
+      def lexers
+        @lexers ||= build_lexers
+      end
+
+      def build_lexers
+        lex = []
+        IO.read('lib/snibbets/lexers_db.txt').split(/\n/).each do |line|
+          key = line.match(/(?mi)^((, )?[^,]+?)+?(?=\[)/)[0]
+          keys = key.split(/,/).map(&:strip)
+          value = line.match(/\[(.*?)\]/)[1]
+          values = value.split(/,/).map(&:strip)
 
-    def build_lexers
-      IO.read('lexers_db.txt').split(/\n/).each do |line|
-        key = line.match(/(?mi)^((, )?[^,]+?)+?(?=\[)/)[0]
-        keys = key.split(/,/).map(&:strip)
-        value = line.match(/\[(.*?)\]/)[1]
-        values = value.split(/,/).map(&:strip)
+          lex << {
+            lexer: keys.shift,
+            aliases: keys,
+            extensions: values
+          }
+        end
 
-        @lexers << {
-          lexer: keys.shift,
-          aliases: keys,
-          extensions: values
-        }
+        lex
       end
-    end
 
-    def ext_to_lang(ext)
-      matches = @lexers.select { |lex| lex[:extensions].map(&:downcase).include?(ext.downcase) }
-      matches.map { |lex| lex[:lexer] }.first
-    end
+      def ext_to_lang(ext)
+        matches = lexers.select { |lex| lex[:extensions].map(&:downcase).include?(ext.downcase) }
+        matches.map { |lex| lex[:lexer] }.first
+      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
-    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
+      end
 
-    def syntax_from_extension(filename)
-      ext_to_lang(filename.split(/\./)[1])
+      def syntax_from_extension(filename)
+        ext_to_lang(filename.split(/\./)[1])
+      end
     end
   end
 end

data/lib/snibbets/menu.rb

@@ -113,7 +113,7 @@ module Snibbets
             return res[line - 1] if line.positive? && line <= res.length
 
             warn 'Out of range'
-            console_menu(res, title)
+            return console_menu(res, title, filename, query: query)
           end
         rescue Interrupt
           system('stty', stty_save)

data/lib/snibbets/version.rb

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

data/lib/snibbets/which.rb

@@ -16,8 +16,8 @@ module TTY
     end
     module_function :app_bundle
 
-    def bundle_id?(cmd)
-      cmd =~ /^\w+(\.\w+){2,}/
+    def bundle_id?(id)
+      id =~ /^\w+(\.\w+){2,}/ ? true : false
     end
     module_function :bundle_id?
 

data/lib/snibbets.rb

@@ -36,14 +36,14 @@ module Snibbets
   class << self
     # Search the snippets directory for query using find and grep
     def search(try: 0)
-      folder = Snibbets.options[:source]
+      folder = File.expand_path(Snibbets.options[:source])
       # start by doing a spotlight search, if that fails, start trying:
       # First try only search by filenames
       # Second try search with grep
       ext = Snibbets.options[:extension] || 'md'
       cmd = case try
             when 1
-              %(find "#{folder}" -iregex '#{@query.rx}' -name '*.#{ext}')
+              %(find "#{folder}" -iregex '^#{Regexp.escape(folder)}/#{@query.rx}' -name '*.#{ext}')
             when 2
               rg = TTY::Which.which('rg')
               ag = TTY::Which.which('ag')
@@ -139,8 +139,6 @@ module Snibbets
         exit!
       end
 
-      build_lexers
-
       pb = OS.paste.outdent
 
       printf 'What does this snippet do? '
@@ -150,12 +148,12 @@ 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| Snibbets::Lexers.lang_to_ext(lang) }
-      tags = langs.map { |lang| Snibbets::Lexers.ext_to_lang(lang) }.concat(langs).sort.uniq
+      exts = langs.map { |lang| Lexers.lang_to_ext(lang) }
+      tags = langs.map { |lang| Lexers.ext_to_lang(lang) }.concat(langs).sort.uniq
 
-      filename ="#{title}.#{exts.join('.')}.#{Snibbets.options[:extension]}"
+      filename = "#{title}.#{exts.join('.')}.#{Snibbets.options[:extension]}"
 
-      File.open(File.join(Snibbets.options[:source], filename), 'w') do |f|
+      File.open(File.join(File.expand_path(Snibbets.options[:source]), filename), 'w') do |f|
         f.puts "tags: #{tags.join(', ')}
 
     ```

data/snibbets.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "gem-release", "~> 2.2"
   spec.add_development_dependency "parse_gemspec-cli", "~> 1.0"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency 'rdoc', '~> 4.3'
+  spec.add_development_dependency 'rdoc', '~> 6.3.1'
   spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.26'
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.21"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snibbets
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.0.11
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-15 00:00:00.000000000 Z
+date: 2023-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 6.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 6.3.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -199,8 +199,10 @@ extra_rdoc_files:
 - README.md
 files:
 - CHANGELOG.md
+- CHANGELOG.md.orig
 - Gemfile
 - Gemfile.lock
+- Gemfile.lock.orig
 - LICENSE.txt
 - README.md
 - README.rdoc