jtag 0.1.6 → 0.1.7

data/README.rdoc

@@ -1,6 +1,6 @@
 = jtag
 
-jTag is a simple command line application for manipulating Jekyll tags in the YAML headers. It can perform mass operations such as tag addition, removal, merging and sorting. It can also suggest relevant tags based on the content of the post matched against your existing tagset (requires a plugin/template in your jekyll install).
+jTag is a command line application for manipulating Jekyll tags in the YAML headers. It can perform mass operations such as tag addition, removal, merging and sorting. It can also suggest relevant tags based on the content of the post matched against your existing tagset (requires a plugin/template in your jekyll install).
 
 Configuration includes a persistent blacklist and synonym definitions. Tags manually added to posts are automatically whitelisted for the auto-tagger. The autotagger can update your posts directly, or be used to provide suggestions that you can manually insert in the post.
 

data/bin/jtag

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 require 'gli'
 require 'jtag'
 
@@ -140,17 +141,34 @@ command :tags do |c|
   c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
 
   c.action do |global_options,options,args|
-    args.each{|file|
-      tags = @jt.post_tags(file)
+
+    if @piped_content
+      tags = @jt.post_tags(@piped_content,true)
       if args.length > 1
         console_log
-        console_log File.basename(file) + ":"
+        console_log "STDIN:"
       end
       if tags.empty? || tags.nil?
         console_log "No tags in post", {:err => true}
       else
         output_tags(tags,options[:format])
       end
+    end
+    args.each{|file|
+      if File.exists?(file)
+        tags = @jt.post_tags(file)
+        if args.length > 1
+          console_log
+          console_log File.basename(file) + ":"
+        end
+        if tags.empty? || tags.nil?
+          console_log "No tags in post", {:err => true}
+        else
+          output_tags(tags,options[:format])
+        end
+      else
+        raise "File not found: #{file}"
+      end
     }
   end
 end
@@ -334,11 +352,21 @@ command :tag do |c|
   c.flag [:f,:format], :must_match => /^(csv|list|yaml|json)$/, :type => String
 
   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,options[:format])
+      end
+    end
     args.each {|file|
       if File.exists?(File.expand_path(file))
         input = IO.read(File.expand_path(file))
         suggestions = @jt.suggest(input)
+
         unless global_options[:t]
           if @jt.update_file_tags(file, suggestions)
             console_log
@@ -408,6 +436,13 @@ 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
+
   @jt = JTag.new(global[:support], global[:config])
 
   true

data/lib/jtag/config_files/config.yml

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

data/lib/jtag/jekylltag.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class JTag
 
   def initialize(support_dir, config)
@@ -60,21 +61,24 @@ class JTag
   def split_post(file)
     input = IO.read(file)
     # Check to see if it's a full post with YAML headers
-    post_parts = input.split(/^---\s*$/)
-    raise "File has improper YAML header" unless post_parts.length == 3
-    after = post_parts[2].strip
-    yaml = YAML::load(input)
+    post_parts = input.split(/^[\.\-]{3}\s*$/)
+    if post_parts.length >= 3
+      after = post_parts[2].strip
+      yaml = YAML::load(input)
+    else
+      after = input
+      yaml = YAML::load("--- title: #{File.basename(file)}")
+    end
     [yaml, after]
   end
 
-  def post_tags(file)
-    if File.exists?(file)
-      input = IO.read(file)
-      yaml = YAML::load(input) || false
-      exit_now! "Invalid post header" unless yaml
+  def post_tags(file,piped=false)
+    begin
+      input = piped ? file : IO.read(file)
+      yaml = YAML::load(input)
       return yaml["tags"] || []
-    else
-      raise "File #{file} does not exist"
+    rescue
+      return []
     end
   end
 
@@ -95,15 +99,26 @@ class JTag
 
 
   def suggest(input)
-    yaml = YAML::load(input) || false
-    exit_now! "Invalid post header" unless yaml
-    current_tags = yaml["tags"] || []
-    title = yaml["title"] || ""
-    @content = (title + after).strip_all.strip_urls rescue input.strip_all.strip_urls
+    parts = input.split(/^[\.\-]{3}\s*$/)
+    if parts.length >= 2
+      begin
+        yaml = YAML::load(parts[1])
+        current_tags = yaml["tags"] || []
+        title = yaml["title"] || ""
+      rescue
+        current_tags = []
+        title = ""
+      end
+    else
+      current_tags = []
+      title = ""
+    end
+    @content = (title + parts[2..-1].join(" ")).strip_all.strip_urls rescue input.strip_all.strip_urls
     @words = split_words
     @auto_tags = []
     populate_auto_tags
-    @auto_tags.concat(current_tags).uniq!
+
+    @auto_tags.concat(current_tags).uniq
   end
 
   def split_words
@@ -121,7 +136,7 @@ class JTag
     @words.each { |word| freqs[word] += 1 }
     freqs.delete_if {|k,v| v < @min_matches }
 
-    exit_with_message "No high frequency words", 1 if freqs.empty?
+    return [] if freqs.empty?
 
     freqs.sort_by {|k,v| [v * -1, k] }.each {|word|
       index = @tags.keys.index(word[0])

data/lib/jtag/string.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class String
   # convert "WikiLink" to "Wiki link"
   def break_camel

data/lib/jtag/version.rb

@@ -1,3 +1,3 @@
 module Jtag
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jtag
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,12 +130,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -591621506323502236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -591621506323502236
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25