snibbets 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f07f0d4772b8d611c0e29da125b4e6915d3909479c4384348699eedc2e1baf90
-  data.tar.gz: e9abdf59d66f3c099c0c25f20a912efc53b690c7c45a5f4ada2b18355c3d473c
+  metadata.gz: 5d69fb792808e08bf219cc435fda27458be565afb2b2d16dad8bcf40c4bc4386
+  data.tar.gz: b798ab66a6928be6d50e160ae8c9a1b6f30042a452ed06de798440f5e6e947c5
 SHA512:
-  metadata.gz: ac873395a3735c827164f03b497f21f06e8af227b515e299c40eb8a4eeff26c907a5893077e1ee1a528200ef4ef9e6fe7c5ac1c9ddfecf7522ed0d772e6fd6eb
-  data.tar.gz: ca65c353589adda9fb4af59d390e98e277e5ba1523d746ab3f5cce19119cfa541b2db36045a90ecddd73be7224665dd96dd8642a2d7c010c438e6e9141a79d6a
+  metadata.gz: 1b7b38a0b865c625feb8908a371b2ec76cc36765175abc68bf5956138ad4b60cb39b019aeec7775a4f89e51ce17c61c5b0df8d9b85c0752beb666c9153c9de0f
+  data.tar.gz: b5f7f8a20cb33d4828c012d35057b8af7adb0fe475d226b83af8b91cb5d2d9e18ef6fe5e3be42104ea7ded67cdf46d4e9f3ce679a1699053ca41467d32e9095a

data/CHANGELOG.md.orig

@@ -1,3 +1,12 @@
+### 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

data/Gemfile.lock

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

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 TTY::Which.exist?('fzf')
-      return 'gum' if TTY::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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Snibbets
-  VERSION = '2.0.10'
+  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

@@ -139,8 +139,6 @@ module Snibbets
         exit!
       end
 
-      build_lexers
-
       pb = OS.paste.outdent
 
       printf 'What does this snippet do? '
@@ -150,10 +148,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| 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(File.expand_path(Snibbets.options[:source]), filename), 'w') do |f|
         f.puts "tags: #{tags.join(', ')}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snibbets
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  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