jtag 0.1.8 → 0.1.16

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: df37574933df4c54b9593793bb1f737b4446c8db712a8ea01ac7019b3ff22c05
+  data.tar.gz: 359c87ed6440b1423d69a251ff5f37e47806c6c9040e091b047cd2da48da41c2
+SHA512:
+  metadata.gz: 640c52f5097dd1df6b5e9deff22cf26ed23c36f15ecfb98f489a77039036256209a7975c3cc0d5296bececf665b8be6f0e1f7d6f74756bcd60d2d22970e59591
+  data.tar.gz: a96984e24677d8656b91b9dfdcc9d3f21ef49e4c76bb59fb1a55275329d724319aa6a314b7d836e5bc712ce1d4ac639c86538c64ee9baedb01d16666045e1fca

data/bin/jtag

@@ -22,19 +22,33 @@ end
 desc 'Debug level'
 default_value '0'
 arg_name 'debug_level'
-flag [:d,:debug]
+flag [:d,:debug], :must_match => /\d+/, :type => Integer, :default_value => 0
 
 desc 'Run silently'
-switch [:s,'silent']
+switch [:s,:silent]
 
-desc "Test (Dry run, don't update files)"
+desc 'Perform case-insensitive matches and searches'
+switch [:i,:case_insensitive]
+
+desc "Test (dry run, don't update files)"
 long_desc "Run all commands and show results on the command line, but don't overwrite/update any files"
 default_value false
-switch [:t,'test']
+switch [:t,:test]
 
 def console_log(msg="", options={})
-  return if @silent
   err = options[:err] || false
+  options[:log] ||= false
+
+  if options[:log]
+    if err
+      @log.warn(msg)
+    else
+      @log.info(msg)
+    end
+  end
+
+  return if @silent
+
   unless err
     $stdout.puts msg
   else
@@ -93,10 +107,10 @@ desc 'List tags, optionally filter for keywords/regular expressions (OR)'
 long_desc 'This command can be used to find the exact format for a given tag to keep spaces, underscores, capitalization and pluralization consistent'
 arg_name 'keyword', :multiple
 command :search do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
   c.arg_name 'output_format'
   c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/i, :type => String
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/i, :type => String
 
   c.desc 'Include tag counts'
   c.arg_name 'counts'
@@ -106,8 +120,8 @@ command :search do |c|
   c.action do |global_options,options,args|
     tags = @jt.get_tags({:counts => true})
     if args.length > 0
+      re = args.join("|")
       tags.delete_if {|tag|
-        re = args.join("|")
         if tag && tag['name'] =~ /(#{re})/i
           false
         else
@@ -119,7 +133,7 @@ command :search do |c|
       else
         tags.map! {|tag| tag['name'] }
       end
-      output_tags(tags,options[:format])
+      output_tags(tags,{ :format => options[:format] })
     else
       tags.delete_if {|tag| !tag }
       if options[:c]
@@ -127,18 +141,199 @@ command :search do |c|
       else
         tags.map! {|tag| tag['name'] }
       end
-      output_tags(tags,options[:format])
+      output_tags(tags,{ :format => options[:format] })
     end
   end
 end
 
+desc 'List posts with tag(s)'
+arg_name 'tags', :multiple
+command :posts_tagged do |c|
+  c.desc 'Boolean operator for multiple tags (AND/OR/NOT)'
+  c.arg_name 'bool'
+  c.default_value 'OR'
+  c.flag [:b,:bool], :must_match => /(AND|OR|NOT)/i, :type => String
+
+  c.desc 'Format to use when outputting file list: list, json, plist, csv or yaml. Defaults to list.'
+  c.arg_name 'output_format'
+  c.default_value 'list'
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
+
+  c.desc 'If output format is list, print without newlines.'
+  c.switch [:print0]
+
+  c.action do |global_options,options,args|
+    bool = options[:bool].upcase
+    files = []
+    tags = []
+    matches = []
+    args.length.times do
+      arg = args.pop
+      if File.exists?(arg)
+        files.push(arg)
+      else
+        tags.push(arg)
+      end
+    end
+    if files.empty?
+      if @jt.default_post_location && File.exists?(File.dirname(@jt.default_post_location))
+        files = Dir.glob(@jt.default_post_location)
+      end
+    end
+    exit_now! "No valid filename in arguments" if files.empty?
+    files.each {|file|
+      if File.exists?(file)
+        post_tags = @jt.post_tags(file)
+
+        if bool == "AND"
+          matched = 0
+          tags.each {|tag|
+            matched += 1 if post_tags.include?(tag)
+          }
+          matches.push(file) if matched == tags.length
+        elsif bool == "NOT"
+          matched = false
+          tags.each {|tag|
+            matched = true if post_tags.include?(tag)
+          }
+          matches.push(file) unless matched
+        else
+          tags.each {|tag|
+            if post_tags.include?(tag)
+              matches.push(file) unless matches.include?(file)
+            end
+          }
+        end
+      else
+        raise "File not found: #{file}"
+      end
+    }
+
+    search_string = tags.join(" #{bool} ")
+    if matches.empty?
+      console_log "No matching files found for #{search_string}"
+    else
+      console_log "(#{search_string})", {:err => true}
+      output_tags(matches, { :format => options[:format], :print0 => options[:print0], :grouping => "files" })
+    end
+  end
+end
+
+desc 'Show tags with fewer than X posts attached to them, optionally removing them from specified posts'
+arg_name 'file_pattern', :multiple
+command :loners do |c|
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
+  c.arg_name 'output_format'
+  c.default_value 'yaml'
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
+
+  c.desc 'Upper limit for how many posts a tag can be attached to and still be a loner'
+  c.arg_name 'max'
+  c.default_value '2'
+  c.flag [:m,:max], :default_value => 2, :must_match => /^\d+$/
+
+  c.desc "Remove tags with fewer than X posts attached"
+  c.switch [:r,:remove], :default_value => false
+
+  c.desc "Display output without attached occurence counts"
+  c.switch [:no_counts], :default_value => false
+
+  c.desc 'Output a file list of tags that can be edited and passed back in for removing'
+  c.arg_name 'filename'
+  c.flag [:e,:edit], :default_value => false, :type => String
+
+  c.action do |global_options,options,args|
+    max = options[:m].to_i
+    loner_tags = @jt.get_tags({:counts => true})
+    loner_tags.delete_if { |tag|
+      tag.class == FalseClass || tag['count'] > max
+    }
+    loner_tags.sort_by! {|tag| tag['count']}
+
+    exit_now! "No tags matched the criteria" if loner_tags.empty? || loner_tags.nil?
+
+    if options[:e]
+      path = File.expand_path(options[:e])
+      while File.exists?(path)
+        if path =~ /(\d+)(\.[^\.]+?)?$/
+          path.sub!(/(\d+)(\.[^\.]+?)?$/) do |m|
+            $1.next! + $2
+          end
+        else
+          path.sub!(/(\.[^\.]+?)?$/,'01\1')
+        end
+      end
+      File.open(path, 'w+') do |f|
+        f.puts "# Edit this file to remove tags you want to keep,"
+        f.puts "# then run `jtag remove -p '#{path}' [/path/to/posts/*.md]`"
+        f.puts "# to remove any tags left in the file."
+        f.puts "#"
+        f.puts "# The post counts are included for your convenience, and will"
+        f.puts "# be automatically ignored when reading the list back in."
+        f.puts "#"
+        f.puts "# Lines beginning with a # are comments (ignored), but you probably figured that out."
+        loner_tags.each{ |t|
+          f.printf "% 3d |\t%s\n", t['count'], t['name']
+        }
+      end
+
+      console_log "A list of results and instructions for use have been written to #{path}."
+      if ENV['EDITOR']
+        console_log
+        print "Would you like to open the file in #{ENV['EDITOR']} now? (y/N) "
+        input = STDIN.gets
+        if input =~ /^y/i
+          system "#{ENV['EDITOR']} '#{path}'"
+        end
+      end
+    elsif options[:r]
+      files = []
+      args.length.times do
+        arg = args.pop
+        files.push(arg) if File.exists?(arg)
+      end
+      if files.empty?
+        if @jt.default_post_location && File.exists?(File.dirname(@jt.default_post_location))
+          files = Dir.glob(@jt.default_post_location)
+        end
+      end
+      exit_now! "No valid filename in arguments" if files.empty?
+      files.each {|file|
+        tags = @jt.post_tags(file)
+        loner_tags.each { |d|
+          tags.delete_if { |tag|
+            if global_options[:i]
+              tag.downcase == d.downcase
+            else
+              tag == d
+            end
+          }
+        }
+        unless global_options[:t]
+          @jt.update_file_tags(file,tags)
+          console_log "Updated tags for #{file}", :log => true
+        end
+
+        console_log
+        console_log File.basename(file) + ":"
+        output_tags(tags, :format => options[:format], :filename => file )
+      }
+    else
+      output_tags(loner_tags.map{|tag|
+        count = options[:no_counts] ? "" : " (#{tag['count']})"
+        "#{tag['name']}#{count}"}, :format => options[:format] )
+    end
+  end
+end
+
+
 desc 'Show the current tags for posts'
-arg_name 'filenames', :multiple
+arg_name 'file_pattern', :multiple
 command :tags do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
   c.arg_name 'output_format'
   c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.action do |global_options,options,args|
 
@@ -151,7 +346,7 @@ command :tags do |c|
       if tags.empty? || tags.nil?
         console_log "No tags in post", {:err => true}
       else
-        output_tags(tags,options[:format])
+        output_tags(tags,{ :format => options[:format] })
       end
     end
     args.each{|file|
@@ -164,7 +359,7 @@ command :tags do |c|
         if tags.empty? || tags.nil?
           console_log "No tags in post", {:err => true}
         else
-          output_tags(tags,options[:format])
+          output_tags(tags,{ :format => options[:format], :filename => file })
         end
       else
         raise "File not found: #{file}"
@@ -175,12 +370,12 @@ end
 
 
 desc 'Sort the existing tags for posts'
-arg_name 'filenames', :multiple
+arg_name 'file_pattern', :multiple
 command :sort do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
   c.arg_name 'output_format'
   c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.action do |global_options,options,args|
     args.each{|file|
@@ -190,14 +385,13 @@ command :sort do |c|
       unless global_options[:t]
         @jt.update_file_tags(file, tags)
       end
-      if args.length > 1
-        console_log
-        console_log File.basename(file) + ":"
-      end
+      console_log
+      console_log File.basename(file) + ":"
+
       if tags.empty? || tags.nil?
         console_log "No tags in post", {:err => true}
       else
-        output_tags(tags,options[:format])
+        output_tags(tags,{ :format => options[:format], :filename => file })
       end
     }
   end
@@ -207,10 +401,10 @@ desc 'Merge multiple tags into one'
 long_desc 'Scans the specified posts for any of the tags, merging any found into the last one in the list'
 arg_name 'tags to merge merge_tag'
 command :merge do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
   c.arg_name 'output_format'
   c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.action do |global_options, options, args|
     files = []
@@ -220,11 +414,15 @@ command :merge do |c|
       if File.exists?(arg)
         files.push(arg)
       else
-        exit_now! "No valid filename in arguments" if files.empty?
         tags.push(arg)
       end
     end
-
+    if files.empty?
+      if @jt.default_post_location && File.exists?(File.dirname(@jt.default_post_location))
+        files = Dir.glob(@jt.default_post_location)
+      end
+    end
+    exit_now! "No valid filename in arguments" if files.empty?
     exit_now! "Needs at least two tag inputs, one or more to merge, one to merge to" if tags.length < 2
     tags.reverse!
     merge_tag = tags.pop
@@ -235,11 +433,13 @@ command :merge do |c|
       unless global_options[:t]
         @jt.update_file_tags(file, new_tags)
         console_log
-        console_log "Updated tags for #{file}"
+        console_log "Updated tags for #{file}", :log => true
       end
+
       console_log
       console_log File.basename(file) + ":"
-      output_tags(new_tags,options[:format])
+      output_tags(new_tags,{ :format => options[:format], :filename => file })
+
     }
   end
 end
@@ -264,11 +464,12 @@ end
 
 desc 'Add tags to post(s)'
 arg_name 'tags', :multiple
+arg_name 'file_pattern'
 command :add do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
   c.arg_name 'output_format'
   c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
 
   c.action do |global_options,options,args|
@@ -279,11 +480,15 @@ command :add do |c|
       if File.exists?(arg)
         files.push(arg)
       else
-        exit_now! "No valid filename in arguments" if files.empty?
         new_tags.push(arg)
       end
     end
-
+    if files.empty?
+      if @jt.default_post_location && File.exists?(File.dirname(@jt.default_post_location))
+        files = Dir.glob(@jt.default_post_location)
+      end
+    end
+    exit_now! "No valid filename in arguments" if files.empty?
     exit_now! "No tags found in arguments" if new_tags.empty?
 
     files.each {|file|
@@ -293,12 +498,12 @@ command :add do |c|
       tags.sort!
       unless global_options[:t]
         @jt.update_file_tags(file,tags)
-        console_log "Updated tags for #{file}"
+        console_log "Updated tags for #{file}", :log => true
       end
 
       console_log
       console_log File.basename(file) + ":"
-      output_tags(tags,options[:format])
+      output_tags(tags, :format => options[:format], :filename => file)
     }
   end
 end
@@ -306,10 +511,15 @@ end
 desc 'Remove tags from post(s)'
 arg_name 'tags', :multiple
 command :remove do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
   c.arg_name 'output_format'
   c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
+
+  c.desc 'A filepath to a list of tags to be removed'
+  c.long_desc 'One tag per line, and leading numbers and pipes (|) will be ignored. This file format is generated automatically by the `loners` command, but any text file will do the trick.'
+  c.arg_name 'input_file'
+  c.flag [:p,:path], :type => String
 
   c.action do |global_options,options,args|
     files = []
@@ -319,37 +529,60 @@ command :remove do |c|
       if File.exists?(arg)
         files.push(arg)
       else
-        exit_now! "No valid filename in arguments" if files.empty?
-        remove_tags.push(arg)
+        remove_tags.push(arg) unless options[:p]
       end
     end
+    if files.empty?
+      if @jt.default_post_location && File.exists?(File.dirname(@jt.default_post_location))
+        files = Dir.glob(@jt.default_post_location)
+      end
+    end
+    exit_now! "No valid filename in arguments" if files.empty?
+
+    if options[:p]
+      path = File.expand_path(options[:p])
+      exit_now! "Input file does not appear to be where you think it is." unless File.exists?(path)
+      IO.read(path).each_line {|l|
+        next if l =~ /^\s*#/
+        if l =~ /^(?:[\s\d])*(?:\|\s*)?(\S.*?)$/
+          remove_tags.push($1.strip)
+        end
+      }
+      console_log "Found #{remove_tags.length} tags in #{File.basename(path)}..."
+    end
 
-    exit_now! "No tags found in arguments" if remove_tags.empty?
+    exit_now! "No tags found in input, my work here is done" if remove_tags.empty?
 
     files.each {|file|
       tags = @jt.post_tags(file)
       remove_tags.each { |d|
-        tags.delete_if { |tag| tag == d }
+        tags.delete_if { |tag|
+          if global_options[:i]
+            tag.downcase == d.downcase
+          else
+            tag == d
+          end
+        }
       }
       unless global_options[:t]
         @jt.update_file_tags(file,tags)
-        console_log "Updated tags for #{file}"
+        console_log "Updated tags for #{file}", :log => true
       end
 
       console_log
       console_log File.basename(file) + ":"
-      output_tags(tags,options[:format])
+      output_tags(tags,{ :format => options[:format], :filename => file })
     }
   end
 end
 
 desc 'Generate a list of recommended tags, optionally updating the file'
-arg_name 'filename', :multiple
+arg_name 'file_pattern', :multiple
 command :tag do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
   c.arg_name 'output_format'
   c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
+  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.action do |global_options,options,args|
     if @piped_content
@@ -357,9 +590,9 @@ command :tag do |c|
       if !global_options[:s] || global_options[:t]
         if args.length > 1
           console_log
-          console_log "STDIN:", {:err => true}
+          console_log "STDIN:", :err => true
         end
-        output_tags(suggestions,options[:format])
+        output_tags(suggestions, :format => options[:format], :filename => file )
       end
     end
     args.each {|file|
@@ -370,18 +603,18 @@ command :tag do |c|
         unless global_options[:t]
           if @jt.update_file_tags(file, suggestions)
             console_log
-            console_log "Updated file #{file} with:"
+            console_log "Updated file #{file} with:", :log => true
           else
             console_log
-            console_log "Failed to update #{file} with:"
+            console_log "Failed to update #{file} with:", :log => true
           end
         end
         if !global_options[:s] || global_options[:t]
           if args.length > 1
             console_log
-            console_log File.basename(file) + ":", {:err => true}
+            console_log File.basename(file) + ":", :err => true, :log => true
           end
-          output_tags(suggestions,options[:format])
+          output_tags(suggestions, :format => options[:format], :filename => file )
         end
         suggestions = nil
       else
@@ -391,19 +624,38 @@ command :tag do |c|
   end
 end
 
-def output_tags(tags,format='yaml')
+def output_tags(tags,options)
+  format = options[:format] || 'yaml'
+  print0 = options[:print0] || false
+  filename = options[:filename] || false
   case format
   when 'list'
-    console_log tags.join("\n")
+    unless print0
+      console_log tags.join("\n")
+    else
+      console_log tags.map {|tag|
+        if tag.strip =~ /\b\s\b/
+          %Q{"#{tag.strip}"}
+        else
+          tag.strip
+        end
+      }.join(" ")
+    end
   when 'csv'
     console_log tags.to_csv
   when 'json'
     out = {}
     out['tags'] = tags
+    out['path'] = filename if filename
     console_log out.to_json
-  else
+  when 'plist'
     out = {}
-    out['tags'] = tags
+    out['path'] = filename if filename
+    console_log tags.to_plist
+  else
+     out = {}
+    options[:grouping] ||= "tags"
+    out[options[:grouping]] = tags
     console_log out.to_yaml
   end
 end
@@ -419,16 +671,17 @@ end
 # end
 
 pre do |global,command,options,args|
-  # Pre logic here
-  # Return true to proceed; false to abort and not call the
-  # chosen command
   # Use skips_pre before a command to skip this block
   # on that command only
   @silent = global[:silent]
 
+  @logfile = File.open(File.join(Dir.tmpdir, "jtag_actions.log"), 'a')
+
+  @log = Logger.new(@logfile, shift_age = 7, shift_size = 1048576)
+
   unless config_files_complete?
     write_config
-    console_log "Missing config files written to #{@config_target}. Please check your configuration."
+    console_log "Missing config files written to #{@config_target}. Please check your configuration.", {:err => true}
     return false
   end
 

data/lib/jtag.rb

@@ -4,10 +4,10 @@ require 'fileutils'
 require 'yaml'
 require 'csv'
 require 'json'
+require 'plist'
 require 'jtag/version.rb'
 require 'jtag/string.rb'
 require 'jtag/porter_stemming.rb'
 require 'jtag/jekylltag.rb'
-
-# Add requires for other files you add to your project here, so
-# you just need to require this one file in your bin file
+require 'tmpdir'
+require 'logger'

data/lib/jtag/config_files/config.yml

@@ -1,3 +1,5 @@
 ---
 tags_location: localhost/data/tags.json
 min_matches: 2
+default_post_location:
+tags_key: tags

data/lib/jtag/jekylltag.rb

@@ -1,13 +1,32 @@
 # encoding: utf-8
+
 class JTag
+  attr_reader :default_post_location
+  attr_accessor :tags_key
 
   def initialize(support_dir, config)
     @support = support_dir
-    @min_matches = config["min_matches"] || 2
-    @tags_loc = config["tags_location"]
-    @blacklistfile = File.join(@support,"blacklist.txt")
+    begin
+      @tags_loc = config['tags_location']
+      @tags_loc.sub!(/^https?:\/\//,'')
+    rescue
+      raise "No tags location in configuration."
+    end
+    @min_matches = config['min_matches'] || 2
+    @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
+      console_log "#{color('yellow')}No #{color('boldyellow')}default_post_location#{color('yellow')} set.", :err => true
+      console_log "If you commonly work on the same posts you can add the path and *.ext", :err => true
+      console_log "to this key in ~/.jtag/config.yml. Then, if you don't specify files", :err => true
+      console_log "to act on in a command, it will fall back to those. Nice!#{color('default')}", :err => true
+      @default_post_location = false
+    end
+    @blacklistfile = File.join(@support,'blacklist.txt')
     @blacklist = IO.read(@blacklistfile).split("\n") || []
-    @skipwords = IO.read(File.join(support_dir,"stopwords.txt")).split("\n") || []
+    @skipwords = IO.read(File.join(support_dir,'stopwords.txt')).split("\n") || []
     remote_tags = get_tags
     @tags = {}
     remote_tags.each {|tag| @tags[Text::PorterStemming.stem(tag).downcase] = tag if tag}
@@ -21,13 +40,14 @@ class JTag
     counts = options[:counts] || false
     host, path = @tags_loc.match(/^([^\/]+)(\/.*)/)[1,2]
     tags = ""
-    http = Net::HTTP.new(host, 80)
-    http.start do |http|
-      request = Net::HTTP::Get.new(path)
-      response = http.request(request)
-      response.value
-      tags = response.body
-    end
+    # http = Net::HTTP.new(host, 80)
+    # http.start do |http|
+    #   request = Net::HTTP::Get.new(path)
+    #   response = http.request(request)
+    #   response.value
+    #   tags = response.body
+    # end
+    tags = `curl -sSL "#{@tags_loc}"`
     tags = JSON.parse(tags)
     if tags && tags.key?("tags")
       if counts
@@ -72,11 +92,11 @@ class JTag
     [yaml, after]
   end
 
-  def post_tags(file,piped=false)
+  def post_tags(file, piped=false)
     begin
       input = piped ? file : IO.read(file)
       yaml = YAML::load(input)
-      return yaml["tags"] || []
+      return yaml[@tags_key] || []
     rescue
       return []
     end
@@ -103,7 +123,7 @@ class JTag
     if parts.length >= 2
       begin
         yaml = YAML::load(parts[1])
-        current_tags = yaml["tags"] || []
+        current_tags = yaml[@tags_key] || []
         title = yaml["title"] || ""
       rescue
         current_tags = []
@@ -175,7 +195,7 @@ class JTag
     begin
       if File.exists?(file)
         yaml, after = split_post(file)
-        yaml["tags"] = tags
+        yaml[@tags_key] = tags
         File.open(file,'w+') do |f|
           f.puts yaml.to_yaml
           f.puts "---"
@@ -190,5 +210,52 @@ class JTag
       return false
     end
   end
-end
 
+  private
+
+  def color(name)
+      color = {}
+      color['black'] = "\033[0;30m"
+      color['red'] = "\033[0;31m"
+      color['green'] = "\033[0;32m"
+      color['yellow'] = "\033[0;33m"
+      color['blue'] = "\033[0;34m"
+      color['magenta'] = "\033[0;35m"
+      color['cyan'] = "\033[0;36m"
+      color['white'] = "\033[0;37m"
+      color['bgblack'] = "\033[0;40m"
+      color['bgred'] = "\033[0;41m"
+      color['bggreen'] = "\033[0;42m"
+      color['bgyellow'] = "\033[0;43m"
+      color['bgblue'] = "\033[0;44m"
+      color['bgmagenta'] = "\033[0;45m"
+      color['bgcyan'] = "\033[0;46m"
+      color['bgwhite'] = "\033[0;47m"
+      color['boldblack'] = "\033[1;30m"
+      color['boldred'] = "\033[1;31m"
+      color['boldgreen'] = "\033[1;32m"
+      color['boldyellow'] = "\033[1;33m"
+      color['boldblue'] = "\033[1;34m"
+      color['boldmagenta'] = "\033[1;35m"
+      color['boldcyan'] = "\033[1;36m"
+      color['boldwhite'] = "\033[1;37m"
+      color['boldbgblack'] = "\033[1;40m"
+      color['boldbgred'] = "\033[1;41m"
+      color['boldbggreen'] = "\033[1;42m"
+      color['boldbgyellow'] = "\033[1;43m"
+      color['boldbgblue'] = "\033[1;44m"
+      color['boldbgmagenta'] = "\033[1;45m"
+      color['boldbgcyan'] = "\033[1;46m"
+      color['boldbgwhite'] = "\033[1;47m"
+      color['default'] = "\033[0;39m"
+      color['warning'] = color['yellow']
+      color['warningb'] = color['boldyellow']
+      color['success'] = color['green']
+      color['successb'] = color['boldgreen']
+      color['neutral'] = color['white']
+      color['neutralb'] = color['boldwhite']
+      color['info'] = color['cyan']
+      color['infob'] = color['boldcyan']
+      color[name]
+  end
+end

data/lib/jtag/version.rb

@@ -1,3 +1,3 @@
 module Jtag
-  VERSION = '0.1.8'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,97 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: jtag
 version: !ruby/object:Gem::Version
-  version: 0.1.8
-  prerelease: 
+  version: 0.1.16
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: plist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: me@brettterpstra.com
 executables:
 - jtag
@@ -100,52 +89,43 @@ extra_rdoc_files:
 - README.rdoc
 - jtag.rdoc
 files:
+- README.rdoc
 - bin/jtag
-- lib/jtag/version.rb
+- jtag.rdoc
+- lib/jtag.rb
 - lib/jtag/config_files/blacklist.txt
 - lib/jtag/config_files/config.yml
 - lib/jtag/config_files/stopwords.txt
 - lib/jtag/config_files/synonyms.yml
-- lib/jtag/porter_stemming.rb
 - lib/jtag/jekylltag.rb
+- lib/jtag/porter_stemming.rb
 - lib/jtag/string.rb
-- lib/jtag.rb
-- README.rdoc
-- jtag.rdoc
+- lib/jtag/version.rb
 homepage: http://brettterpstra.com
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options:
-- --title
+- "--title"
 - jtag
-- --main
+- "--main"
 - README.rdoc
-- -ri
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2297591427914032875
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2297591427914032875
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.16
+signing_key:
+specification_version: 4
 summary: Auto-tagging and tagging tools for Jekyll
 test_files: []