jtag 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db1f81c4454558bb43b86b14534a46106fffd94a
-  data.tar.gz: bbdbb8861c0be80a8199f019e586ddad637a3500
+SHA256:
+  metadata.gz: f68f1e95a41e56ce886f6b77f116f7617918d99374b0a8bc093d06f55ec63fa1
+  data.tar.gz: b1e2d8fe246baba7cc17b2fe86e867e91f0beed1c631021b6b02512ef8ed2641
 SHA512:
-  metadata.gz: e9a3aa5f5d9123c3d94a3a63d972781f3289267badac6ea367d3ac7b5242bc7d0a240af242985b7b42a1944dde1655582ab1d8daf17c099e3df7636c2aac9af7
-  data.tar.gz: a3bb2004a8e9e6760abb2c28ab5edec017eba25a4c213a4509efc59bd663132f1f43b9a7a4f311b52bb3ba78ba4deac88e1197bf2732ecde80eb6a3203b27152
+  metadata.gz: 767f4d931006ff59a30fb32d0f156703026f34b5c12c86fbdc02ebb56b0f3580618a411cfda9666fb299793dd88d34dec6b4dcf0804932f4f46df6dfd86b864f
+  data.tar.gz: f9c405479a2bb93999598387815fe37d626e84391fce3f650c308bc1b4c4f1ac48a6dbb6a1e7927dedb03cd41c32c847c2a0c612d423b9105e912c085976cc0b

data/bin/jtag

@@ -11,10 +11,11 @@ version Jtag::VERSION
 
 @config_files = %w{blacklist.txt config.yml stopwords.txt synonyms.yml}
 @config_target = File.expand_path("~/.jtag")
+@piped_content = nil
 
 def config_files_complete?
   @config_files.each do |file|
-    return false unless File.exists?(File.join(@config_target,file))
+    return false unless File.exists?(File.join(@config_target, file))
   end
   true
 end
@@ -22,18 +23,18 @@ end
 desc 'Debug level'
 default_value '0'
 arg_name 'debug_level'
-flag [:d,:debug], :must_match => /\d+/, :type => Integer, :default_value => 0
+flag %i[d debug], :must_match => /\d+/, :type => Integer, :default_value => 0
 
 desc 'Run silently'
-switch [:s,:silent]
+switch %i[s silent]
 
 desc 'Perform case-insensitive matches and searches'
-switch [:i,:case_insensitive]
+switch %i[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 %i[t test]
 
 def console_log(msg="", options={})
   err = options[:err] || false
@@ -52,7 +53,7 @@ def console_log(msg="", options={})
   unless err
     $stdout.puts msg
   else
-    $stderr.puts msg
+    warn msg
   end
 end
 
@@ -110,12 +111,12 @@ command :search 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)$/i, :type => String
+  c.flag %i[f format], :must_match => /^(csv|list|yaml|json|plist)$/i, :type => String
 
   c.desc 'Include tag counts'
   c.arg_name 'counts'
   c.default_value false
-  c.switch [:c,:counts]
+  c.switch %i[c counts]
 
   c.action do |global_options,options,args|
     tags = @jt.get_tags({:counts => true})
@@ -152,12 +153,12 @@ 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.flag %i[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.flag %i[f format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.desc 'If output format is list, print without newlines.'
   c.switch [:print0]
@@ -225,22 +226,22 @@ 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.flag %i[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.flag %i[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.switch %i[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.flag %i[e edit], :default_value => false, :type => String
 
   c.action do |global_options,options,args|
     max = options[:m].to_i
@@ -310,7 +311,7 @@ command :loners do |c|
           }
         }
         unless global_options[:t]
-          @jt.update_file_tags(file,tags)
+          @jt.update_file_tags(file, tags)
           console_log "Updated tags for #{file}", :log => true
         end
 
@@ -333,15 +334,15 @@ command :tags 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.flag %i[f format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.action do |global_options,options,args|
 
     if @piped_content
-      tags = @jt.post_tags(@piped_content,true)
+      tags = @jt.post_tags(@piped_content, true)
       if args.length > 1
         console_log
-        console_log "STDIN:"
+        console_log 'STDIN:'
       end
       if tags.empty? || tags.nil?
         console_log "No tags in post", {:err => true}
@@ -375,7 +376,7 @@ command :sort 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.flag %i[f format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.action do |global_options,options,args|
     args.each{|file|
@@ -404,7 +405,7 @@ command :merge 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.flag %i[f format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
   c.action do |global_options, options, args|
     files = []
@@ -469,7 +470,7 @@ command :add 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.flag %i[f format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
 
 
   c.action do |global_options,options,args|
@@ -497,7 +498,7 @@ command :add do |c|
       tags.uniq!
       tags.sort!
       unless global_options[:t]
-        @jt.update_file_tags(file,tags)
+        @jt.update_file_tags(file, tags)
         console_log "Updated tags for #{file}", :log => true
       end
 
@@ -514,12 +515,12 @@ command :remove 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.flag %i[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.flag %i[p path], :type => String
 
   c.action do |global_options,options,args|
     files = []
@@ -565,7 +566,7 @@ command :remove do |c|
         }
       }
       unless global_options[:t]
-        @jt.update_file_tags(file,tags)
+        @jt.update_file_tags(file, tags)
         console_log "Updated tags for #{file}", :log => true
       end
 
@@ -579,20 +580,21 @@ end
 desc 'Generate a list of recommended tags, optionally updating the file'
 arg_name 'file_pattern', :multiple
 command :tag do |c|
-  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Defaults to yaml.'
+  c.desc 'Format to use when outputting tags to console: list, json, plist, csv or yaml. Use "complete" to output full text when input is STDIN.'
   c.arg_name 'output_format'
-  c.default_value 'yaml'
-  c.flag [:f,:format], :must_match => /^(csv|list|yaml|json|plist)$/, :type => String
+  c.flag %i[f format], :must_match => /^(csv|list|yaml|json|plist|complete)$/, :type => String, :default_value => 'yaml'
 
-  c.action do |global_options,options,args|
+  c.action do |global_options, options, args|
     if @piped_content
       suggestions = @jt.suggest(@piped_content)
-      if !global_options[:s] || global_options[:t]
-        if args.length > 1
-          console_log
-          console_log "STDIN:", :err => true
-        end
-        output_tags(suggestions, :format => options[:format], :filename => file )
+      if args.length > 0
+        console_log
+        console_log 'STDIN:', :err => true
+      end
+      if options[:format] == 'complete'
+        @jt.update_file_tags(@piped_content, suggestions, true)
+      else
+        output_tags(suggestions, :format => options[:format], :filename => nil)
       end
     end
     args.each {|file|
@@ -670,7 +672,7 @@ end
 #   end
 # end
 
-pre do |global,command,options,args|
+pre do |global, command, options, args|
   # Use skips_pre before a command to skip this block
   # on that command only
   @silent = global[:silent]
@@ -690,11 +692,7 @@ pre do |global,command,options,args|
   global[:config] = YAML::load(File.open(configfile,"r"))
   global[:support] = File.expand_path("~/.jtag")
 
-  if STDIN.stat.size > 0
-    @piped_content = STDIN.read
-  else
-    @piped_content = false
-  end
+  @piped_content = STDIN.stat.size > 0 ? STDIN.read : nil
 
   @jt = JTag.new(global[:support], global[:config])
 

data/lib/jtag/jekylltag.rb

@@ -40,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
@@ -77,8 +78,8 @@ class JTag
     compiled
   end
 
-  def split_post(file)
-    input = IO.read(file)
+  def split_post(file, piped = false)
+    input = piped ? file : IO.read(file)
     # Check to see if it's a full post with YAML headers
     post_parts = input.split(/^[\.\-]{3}\s*$/)
     if post_parts.length >= 3
@@ -93,7 +94,7 @@ class JTag
 
   def post_tags(file, piped=false)
     begin
-      input = piped ? file : IO.read(file)
+      input = piped ? file.strip : IO.read(file)
       yaml = YAML::load(input)
       return yaml[@tags_key] || []
     rescue
@@ -190,15 +191,21 @@ class JTag
     end
   end
 
-  def update_file_tags(file, tags)
+  def update_file_tags(file, tags, piped = false)
     begin
-      if File.exists?(file)
-        yaml, after = split_post(file)
+      if File.exists?(file) || piped
+        yaml, after = split_post(file, piped)
         yaml[@tags_key] = tags
-        File.open(file,'w+') do |f|
-          f.puts yaml.to_yaml
-          f.puts "---"
-          f.puts after
+        if piped
+          puts yaml.to_yaml
+          puts "---"
+          puts after
+        else
+          File.open(file,'w+') do |f|
+            f.puts yaml.to_yaml
+            f.puts "---"
+            f.puts after
+          end
         end
       else
         raise "File does not exist: #{file}"

data/lib/jtag/version.rb

@@ -1,3 +1,3 @@
 module Jtag
-  VERSION = '0.1.12'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jtag
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,28 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 2.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.17.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: me@brettterpstra.com
 executables:
 - jtag
@@ -118,13 +104,12 @@ files:
 homepage: http://brettterpstra.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - jtag
 - "--main"
 - README.rdoc
-- "-ri"
 require_paths:
 - lib
 - lib
@@ -139,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: Auto-tagging and tagging tools for Jekyll
 test_files: []