jtag 0.1.21 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce6f0470ef8fd405ee64a347ff3248c12080d76b7d260f2767ea0df6a99754e
-  data.tar.gz: e6bbedc5133afafb194165e07a830feacab40d6409a11d2f76dc974e42df26f3
+  metadata.gz: d12022a720e811093534ee136708507580b0ac4457e9b8f4a15574c93a8885a1
+  data.tar.gz: 0c9ac5e09cba24a9f4d0328a41cb4c82d52fcf759dedab963eaf7fdfc82b558e
 SHA512:
-  metadata.gz: 2ae0e91ccbc3af0622c323fff774f0624927f16d9573a4170ba9f37ea08ebde9cf2cb92092f498bd4fbbd22179fa37e63d1ba01ad802995d8638b32567a95ab2
-  data.tar.gz: 355dd96ef61e1b14e1bd17e03ac39b6d39afb118d1733eb6fd7b0ca48fd1ed170b9668d009e8c8157e3fcd020be7d184cab04d1760914349722f6726a044d006
+  metadata.gz: 34aa8fc078a66ea62a371cb92f55e96211235a461d0da2130c2e0c3cf7b8e82a74519378f9bd4999388012d6192dd6705d9edafef3b0e5598b70aa2cbc23c252
+  data.tar.gz: a8d8eb9a5e60aaf84b0fba8d88295c9374bf1897ade5d6fa6f944932206ddfa4ec73eff446a8a8746f5065c5350de634e985b1a623288a1e93837064eded1743

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.1.25
+
+2026-11-04 10:03
+
+#### FIXED
+
+- Errors updating deprecated config location
+
 ### 0.1.19
 
 2024-09-16 13:15

data/Rakefile

@@ -16,19 +16,15 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 CUKE_RESULTS = 'results.html'
 CLEAN << CUKE_RESULTS
-desc 'Run features'
-Cucumber::Rake::Task.new(:features) do |t|
-  opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
-  opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
-  t.cucumber_opts =  opts
+Cucumber::Rake::Task.new(:features, 'Run features') do |t|
+  opts = ['features', '--format', 'html', '-o', CUKE_RESULTS, '--format', 'progress', '-x']
+  opts += ['--tags', ENV['TAGS']] if ENV['TAGS']
+  t.cucumber_opts = opts
   t.fork = false
 end
 
-desc 'Run features tagged as work-in-progress (@wip)'
-Cucumber::Rake::Task.new('features:wip') do |t|
-  tag_opts = ' --tags ~@pending'
-  tag_opts = ' --tags @wip'
-  t.cucumber_opts = "features --format html -o #{CUKE_RESULTS} --format pretty -x -s#{tag_opts}"
+Cucumber::Rake::Task.new('features:wip', 'Run features tagged as work-in-progress (@wip)') do |t|
+  t.cucumber_opts = ['features', '--format', 'html', '-o', CUKE_RESULTS, '--format', 'pretty', '-x', '-s', '--tags', '@wip']
   t.fork = false
 end
 
@@ -67,11 +63,12 @@ task :bump, :type do |t, args|
   version_file = "lib/#{spec.name}/version.rb"
   raise "File not found" unless File.exist? version_file
   content = IO.read(version_file)
-  content.sub!(/VERSION = '(\d+)\.(\d+)\.(\d+)(\.\S+)?'/) {|m|
-    major = $1.to_i
-    minor = $2.to_i
-    inc = $3.to_i
-    pre = $4
+  content.sub!(/VERSION = (['"])(\d+)\.(\d+)\.(\d+)(\.\S+)?\1/) {
+    quote = $1
+    major = $2.to_i
+    minor = $3.to_i
+    inc = $4.to_i
+    pre = $5
 
     case args[:type]
     when /^maj/
@@ -86,7 +83,7 @@ task :bump, :type do |t, args|
     end
 
     $stdout.puts "At version #{major}.#{minor}.#{inc}#{pre}"
-    "VERSION = '#{major}.#{minor}.#{inc}#{pre}'"
+    "VERSION = #{quote}#{major}.#{minor}.#{inc}#{pre}#{quote}"
   }
   File.open(version_file, 'w+') {|f|
     f.puts content

data/bin/jtag

@@ -797,8 +797,11 @@ end
 ## @return [void]
 ##
 def update_deprecated_config
+  @util = JekyllTag::Util.new
   if File.exist?(File.expand_path("~/.jtag"))
-    FileUtils.mv(File.expand_path("~/.jtag"), File.expand_path("~/.config/jtag"))
+    FileUtils.mkdir_p(File.expand_path("~/.config/jtag"))
+    FileUtils.cp_r(File.expand_path("~/.jtag"), File.expand_path("~/.config/jtag"), noop: true)
+    FileUtils.rm_rf(File.expand_path("~/.jtag"))
     @util.console_log "Moved ~/.jtag to ~/.config/jtag", level: :info, err: true, log: false
   end
 end
@@ -862,8 +865,10 @@ post do |global, command, options, args|
 end
 
 on_error do |exception|
+  @util ||= JekyllTag::Util.new
   if exception.is_a?(NoValidFile) || exception.is_a?(FileNotFound) || exception.is_a?(NoTagsFound)
-    @util.console_log "#{@jt.color(:red)}#{exception.message}", err: true, level: :error
+    prefix = @jt ? @jt.color(:red) : ""
+    @util.console_log "#{prefix}#{exception.message}", err: true, level: :error
     return false
   end
 

data/jtag.gemspec

@@ -6,6 +6,8 @@ spec = Gem::Specification.new do |s|
   s.author = "Brett Terpstra"
   s.email = "me@brettterpstra.com"
   s.homepage = "http://brettterpstra.com"
+  s.license = nil
+  s.required_ruby_version = ">= 3.3"
   s.platform = Gem::Platform::RUBY
   s.summary = "Auto-tagging and tagging tools for Jekyll"
   # Add your other files here if you make them
@@ -16,10 +18,10 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options << "--title" << "jtag" << "--main" << "README.rdoc"
   s.bindir = "bin"
   s.executables << "jtag"
-  s.add_development_dependency("rake")
-  s.add_development_dependency("rdoc")
-  s.add_development_dependency("aruba")
+  s.add_development_dependency("rake", "~> 13.0")
+  s.add_development_dependency("rdoc", "~> 6.6")
+  s.add_development_dependency("aruba", "~> 2.0")
   s.add_runtime_dependency("gli", "= 2.20.0")
-  s.add_runtime_dependency("plist")
-  s.add_runtime_dependency("csv")
+  s.add_runtime_dependency("plist", "~> 3.7")
+  s.add_runtime_dependency("csv", "~> 3.2")
 end

data/lib/jtag/jekylltag.rb

@@ -11,29 +11,31 @@ module JekyllTag
       config = config.symbolize_keys
       @support = support_dir
       @util = JekyllTag::Util.new
+      @min_matches = config[:min_matches] || 2
+      @post_extension = (config[:post_extension] || "md").to_s.sub(/^\./, "")
+      @tags_key = config[:tags_key] || "tags"
+      @default_post_location = normalize_post_location(config[:default_post_location], config[:post_extension])
       begin
         if options[:files]
           @tags_loc = :auto
           files = options[:files].map(&:File.expand_path)
         elsif config[:tags_location].to_s =~ /^(auto|posts?)$/
           @tags_loc = :auto
-          files = Dir.glob(File.expand_path(File.join(config[:default_post_location], "**", "*.#{config[:post_extension]}")))
+          files = Dir.glob(File.join(@default_post_location.to_s, "**", "*.#{@post_extension}"))
         else
-          @tags_loc = File.expand_path(config[:tags_location])
-          @tags_loc.sub!(/^https?:\/\//, "")
+          @tags_loc = config[:tags_location]
+          if File.exist?(File.expand_path(@tags_loc))
+            @tags_loc = File.expand_path(@tags_loc)
+          else
+            @tags_loc.sub!(/^https?:\/\//, "")
+          end
           files = nil
         end
       rescue StandardError => e
         raise InvalidTagsFile, "Error reading configured tags locatio (#{e})"
       end
-      @min_matches = config[:min_matches] || 2
-      @post_extension = config[:post_extension] || "md"
-      @post_extension.sub!(/^\./, "")
-      @tags_key = config[:tags_key] || "tags"
 
-      if config.has_key? :default_post_location
-        @default_post_location = File.expand_path(config[:default_post_location]) || false
-      else
+      unless config.has_key?(:default_post_location)
         str = ["#{color("yellow")}No #{color("boldyellow")}default_post_location#{color("yellow")} set.",
                "If you commonly work on the same posts you can add the path and extension",
                "to these key in ~/.jtag/config.yml. Then, if you don't specify files",
@@ -54,6 +56,24 @@ module JekyllTag
       }
     end
 
+    # Older configs stored a glob (…/_posts/*.md). Commands expect a directory
+    # plus post_extension, so peel the glob off and keep the extension.
+    def normalize_post_location(location, explicit_extension)
+      return false if location.nil? || location.to_s.strip.empty?
+
+      raw = location.to_s.strip
+      if raw.match?(/[*?\[{]/)
+        unless explicit_extension
+          ext = raw[/\*\.([A-Za-z0-9]+)\z/, 1]
+          @post_extension = ext if ext
+        end
+        dir = File.expand_path(File.dirname(raw))
+        return File.directory?(dir) ? dir : false
+      end
+
+      File.expand_path(raw)
+    end
+
     def tags(options = {})
       blacklisted = options[:blacklisted] || false
       counts = options[:counts] || false
@@ -140,7 +160,15 @@ module JekyllTag
       begin
         input = piped ? file.strip : IO.read(File.expand_path(file))
         yaml = YAML::load(input)
-        return yaml[@tags_key] || []
+        tags = yaml.is_a?(Hash) ? yaml[@tags_key] : nil
+        case tags
+        when Array
+          tags.compact.map(&:to_s)
+        when String
+          [tags]
+        else
+          []
+        end
       rescue
         return []
       end

data/lib/jtag/string.rb

@@ -22,7 +22,7 @@ module JekyllTag
     end
 
     ##
-    ## Convert a string to a format symbol (:csv, :complete, :json, :plist, :yaml)
+    ## Convert a string to a format symbol (:list, :csv, :complete, :json, :plist, :yaml)
     ##
     ## @return [Symbol] format symbol
     ##
@@ -38,6 +38,8 @@ module JekyllTag
         :csv
       when /^c/i
         :complete
+      when /^l/i
+        :list
       else
         raise ArgumentError, "Invalid format string: #{self}"
       end

data/lib/jtag/util.rb

@@ -17,6 +17,11 @@ module JekyllTag
 
     CONFIG_FILES = %w{blacklist.txt config.yml stopwords.txt synonyms.yml}
 
+    def initialize
+      @debug_level = 3
+      @silent = false
+    end
+
     ##
     ## Output tags in the specified format
     ##
@@ -33,7 +38,8 @@ module JekyllTag
     ##
     def output_tags(tags, options)
       # Determine the format for output, defaulting to "yaml" if not specified
-      format = options[:format]&.to_format || :yaml
+      format = options[:format].respond_to?(:to_format) ? options[:format].to_format : (options[:format] || :yaml)
+      format = format.to_sym
       # Determine if tags should be printed with a null delimiter
       print0 = options[:print0] || false
       # Determine the filename for output, if specified
@@ -45,7 +51,7 @@ module JekyllTag
       tags.uniq!
 
       case format
-      when "complete"
+      when :complete
         if filename || content
           content = filename ? IO.read(File.expand_path(filename)) : content
           parts = content.split(/---\s*\n/)
@@ -64,19 +70,19 @@ module JekyllTag
         else
           console_log tags.join("\n"), level: :error, err: false
         end
-      when "list"
+      when :list
         # Join tags with a null character delimiter
         console_log tags.map(&:strip).join(print0 ? "\x00" : "\n"), level: :error, err: false, file: filename
-      when "csv"
+      when :csv
         # Log the tags in CSV format
         console_log tags.to_csv
-      when "json"
+      when :json
         # Create a hash with tags and optional filename, then log as JSON
         out = {}
         out["tags"] = tags
         out["path"] = filename if filename
         console_log out.to_json
-      when "plist"
+      when :plist
         # Create a hash with optional filename, then log as plist
         out = {}
         out["path"] = filename if filename
@@ -139,7 +145,8 @@ module JekyllTag
       err = options[:err] || false
       options[:log] ||= false
 
-      return unless DEBUG_LEVELS[level.to_sym] < @debug_level
+      threshold = @debug_level || 0
+      return unless DEBUG_LEVELS.fetch(level.to_sym, 0) < threshold
 
       if options[:log]
         if err

data/lib/jtag/version.rb

@@ -1,3 +1,3 @@
 module Jtag
-  VERSION = "0.1.21"
+  VERSION = "0.1.25"
 end

metadata

@@ -1,56 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jtag
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.25
 platform: ruby
 authors:
 - Brett Terpstra
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2026-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -69,30 +70,31 @@ dependencies:
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
+description:
 email: me@brettterpstra.com
 executables:
 - jtag
@@ -129,8 +131,10 @@ files:
 - lib/jtag/version.rb
 - mise.toml
 homepage: http://brettterpstra.com
-licenses: []
+licenses:
+-
 metadata: {}
+post_install_message:
 rdoc_options:
 - "--title"
 - jtag
@@ -143,14 +147,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.4
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Auto-tagging and tagging tools for Jekyll
 test_files: []