forematter 0.1.0 → 0.1.1

data/lib/forematter.rb

@@ -25,6 +25,9 @@ module Forematter
   class UsageException < Exception
   end
 
+  class UnexpectedValue < Exception
+  end
+
   class << self
     attr_reader   :root_command
     # attr_accessor :verbose

data/lib/forematter/command_runner.rb

@@ -4,16 +4,25 @@ module Forematter
   class CommandRunner < ::Cri::CommandRunner
     def call
       run
+      exit 1 if @has_error
     rescue UsageException
-      path = [command.supercommand]
-      path.unshift(path[0].supercommand) until path[0].nil?
-      super_usage = path[1..-1].map { |c| c.name + ' ' }.join
       $stderr.puts "usage: #{super_usage}#{command.usage}"
       exit 1
     end
 
     protected
 
+    def log_skip(file, msg)
+      $stderr.puts "#{super_usage}#{command.name}: #{file.filename}: #{msg}"
+      @has_error = 1
+    end
+
+    def super_usage
+      path = [command.supercommand]
+      path.unshift(path[0].supercommand) until path[0].nil?
+      path[1..-1].map { |c| c.name + ' ' }.join
+    end
+
     def field
       partition
       fail UsageException, 'Missing field name' unless @field

data/lib/forematter/commands/add.rb

@@ -18,8 +18,8 @@ module Forematter::Commands
   class Add < Forematter::CommandRunner
     def run
       files.each do |file|
-        old = file[field].to_ruby || []
-        fail "#{field} is not an array" unless old.is_a?(Array)
+        old = file.key?(field) ? file[field].to_ruby : []
+        log_skip(file, "#{field} is not an array, unable to add") && next unless old.is_a?(Array)
         add = options[:'allow-dupes'] ? values : values.select { |v| !old.include?(v) }
         next if add.empty?
         add.each { |v| old << v }

data/lib/forematter/commands/classify.rb

@@ -29,8 +29,14 @@ module Forematter::Commands
       load_classifier
 
       puts 'Getting categories'
-      categories_for(files_with(field)).each do |cat|
-        bayes.add_category(cat.to_sym)
+      categories_for(files_with(field)).each { |cat| bayes.add_category(cat) }
+
+      if bayes.categories.empty?
+        $stderr.puts "No categories found in #{field}, unable to classify"
+        exit 1
+      else
+        found = bayes.categories.length
+        puts "#{found} #{found == 1 ? 'category' : 'categories'} found"
       end
 
       puts 'Training classifier'
@@ -54,7 +60,11 @@ module Forematter::Commands
     end
 
     def categories_for(files)
-      files.map { |file| file[field].to_ruby }.reject(&:nil?).uniq
+      files
+        .map { |file| file[field].to_ruby }
+        .select { |f| f.is_a?(String) }
+        .uniq
+        .map(&:to_sym)
     end
 
     def files_to_classify
@@ -65,7 +75,10 @@ module Forematter::Commands
 
     def train(file)
       val = file[field].to_ruby
-      fail 'Unable to classify by non-string fields' unless val.is_a?(String)
+      unless val.is_a?(String)
+        skip file, "unable to train, #{field} is not a string"
+        return
+      end
       bayes.train(val.to_sym, file.content)
     end
 

data/lib/forematter/commands/cleanup.rb

@@ -25,7 +25,11 @@ module Forematter::Commands
 
       files_with(field).each do |file|
         old = file[field].to_ruby
-        val = cleanup(old)
+        begin
+          val = cleanup(old)
+        rescue Forematter::UnexpectedValue => e
+          log_skip(file, e.message) && next
+        end
         unless val == old
           file[field] = val
           file.write
@@ -47,7 +51,7 @@ module Forematter::Commands
     def cleanup(val)
       val = val.dup
       return cleanup_array(val) if val.is_a?(Array)
-      fail 'Unable to sort non-array values' if options[:sort]
+      fail Forematter::UnexpectedValue, "#{field} is not an array" if options[:sort]
       options.keys.each do |option|
         val = val.method(CLEANUP_MAP[option]).call if CLEANUP_MAP.key?(option) && options[option]
       end

data/lib/forematter/commands/list.rb

@@ -10,7 +10,7 @@ EOS
 module Forematter::Commands
   class List < Forematter::CommandRunner
     def run
-      puts tags.uniq.sort_by(&:downcase).join("\n")
+      puts tags.uniq.compact.map(&:to_s).sort_by(&:downcase).join("\n")
     end
 
     protected

data/lib/forematter/commands/merge.rb

@@ -17,7 +17,7 @@ module Forematter::Commands
 
       files_with(field).each do |file|
         old = file[field].to_ruby
-        fail "#{field} is not an array" unless old.is_a?(Array)
+        log_skip(file, "#{field} is not an array") && next unless old.is_a?(Array)
 
         # Continue unless unless field had one of the values to remove
         next if (old & dups).empty?

data/lib/forematter/commands/remove.rb

@@ -15,7 +15,7 @@ module Forematter::Commands
     def run
       files_with(field).each do |file|
         old = file[field].to_ruby
-        fail "#{field} is not an array" unless old.is_a?(Array)
+        log_skip(file, "#{field} is not an array") && next unless old.is_a?(Array)
 
         # Continue unless old contains elements of values
         next if (old & values).empty?

data/lib/forematter/file_wrapper.rb

@@ -5,7 +5,7 @@ module Forematter
     extend Forwardable
 
     def initialize(filename)
-      fail "File not found: #{filename}" unless File.exist?(filename)
+      fail Forematter::UnexpectedValue, "File not found: #{filename}" unless File.file?(filename)
       @filename = filename
     end
 

data/lib/forematter/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Forematter
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forematter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -139,18 +139,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2379320938142761946
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2379320938142761946
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23