jtag 0.1.8 → 0.1.10

data/bin/jtag

@@ -93,10 +93,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'
@@ -119,7 +119,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 +127,87 @@ 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
+        exit_now! "No valid filename in arguments" if files.empty?
+        tags.push(arg)
+      end
+    end
+    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 the current tags for posts'
 arg_name 'filenames', :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 +220,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 +233,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
       else
         raise "File not found: #{file}"
@@ -177,10 +246,10 @@ end
 desc 'Sort the existing tags for posts'
 arg_name 'filenames', :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|
@@ -197,7 +266,7 @@ command :sort 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
@@ -207,10 +276,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 = []
@@ -239,7 +308,7 @@ command :merge do |c|
       end
       console_log
       console_log File.basename(file) + ":"
-      output_tags(new_tags,options[:format])
+      output_tags(new_tags,{ :format => options[:format] })
     }
   end
 end
@@ -265,10 +334,10 @@ end
 desc 'Add tags to post(s)'
 arg_name 'tags', :multiple
 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|
@@ -298,7 +367,7 @@ command :add do |c|
 
       console_log
       console_log File.basename(file) + ":"
-      output_tags(tags,options[:format])
+      output_tags(tags,{ :format => options[:format] })
     }
   end
 end
@@ -306,10 +375,10 @@ 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.action do |global_options,options,args|
     files = []
@@ -338,7 +407,7 @@ command :remove do |c|
 
       console_log
       console_log File.basename(file) + ":"
-      output_tags(tags,options[:format])
+      output_tags(tags,{ :format => options[:format] })
     }
   end
 end
@@ -346,10 +415,10 @@ end
 desc 'Generate a list of recommended tags, optionally updating the file'
 arg_name 'filename', :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
@@ -359,7 +428,7 @@ command :tag do |c|
           console_log
           console_log "STDIN:", {:err => true}
         end
-        output_tags(suggestions,options[:format])
+        output_tags(suggestions,{ :format => options[:format] })
       end
     end
     args.each {|file|
@@ -381,7 +450,7 @@ command :tag do |c|
             console_log
             console_log File.basename(file) + ":", {:err => true}
           end
-          output_tags(suggestions,options[:format])
+          output_tags(suggestions,{ :format => options[:format] })
         end
         suggestions = nil
       else
@@ -391,19 +460,36 @@ 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
+
   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
     console_log out.to_json
+  when 'plist'
+    out = {}
+    console_log tags.to_plist
   else
     out = {}
-    out['tags'] = tags
+    options[:grouping] ||= "tags"
+    out[options[:grouping]] = tags
     console_log out.to_yaml
   end
 end

data/lib/jtag.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'yaml'
 require 'csv'
 require 'json'
+require 'plist'
 require 'jtag/version.rb'
 require 'jtag/string.rb'
 require 'jtag/porter_stemming.rb'

data/lib/jtag/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jtag
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  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: 
 email: me@brettterpstra.com
 executables:
@@ -130,18 +146,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !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