macaw 0.0.40 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06dfef52346c5bafb0f0fc2ee6ffa2f95298cd1a
-  data.tar.gz: 1f11bf5f437fb1c5665385cad0d91541613716e9
+  metadata.gz: 3d5a9f79f978035965ae9ed533cbd5148d927684
+  data.tar.gz: 165d7dcd5d67b483d95ad5b086bd7f4b7e31bb02
 SHA512:
-  metadata.gz: 6861e834380c57a5a354178c533ebfe9cdc084d765a5d063f5ac73c0c7e82c5476aae0e85f0788f1165f015ad72cb7c0d12527e0053ef3355762680d96a7a0a0
-  data.tar.gz: dd05f1a8f17e67eb2f2506010e5fce59688597fc63683c2d5d2589c8e21ab8c1d070f450fe1b04aa3178724b26bb1226cca6193c11ee76704730d6a9a3f19618
+  metadata.gz: 0b24477694fe597e30eafdbf8539d5f72d5af965b3bea11a98c38fd7e1dbdb5e9f27aa7d39cc51aac77992919b8260fbcb5d5a32835f0cc4ed51a4e65db02ed3
+  data.tar.gz: df4e9accab5048946bf08d1685e99cd28717a5beac9f71bc47dc3083cd31a6d2989b8a12ec4889f09fe5c94e5ba3c83f40d92c787d68ead5975a10e47f5840ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    macaw (0.0.40)
+    macaw (0.0.41)
       i18n
       json_pure
       os

data/bin/macaw

@@ -275,19 +275,23 @@ class Macaw
     @@log.write(line) if @@log
   end
 
-  def self.system(cmd, onfail=:exit)
+  def self.system(cmd, options={})
+    onfail = options.delete(:onfail) || :exit
+    returntype = options.delete(:return) || :string
+    error "Unhandled system option #{options.inspect}" unless options.size == 0
+
     throw "errormode can only be #{ERRORMODES.inspect}" unless ERRORMODES.include?(onfail)
 
     cmd = cmd.compact.join(' ') if cmd.is_a?(Array)
     log(cmd)
 
-    output = ''
+    output = []
     begin
       Timeout::timeout(@@options.timeout || 0) {
         Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
           while line = stdout_err.gets
             self.log(line)
-            output += line + "\n"
+            output << line
           end
 
           exit_status = wait_thr.value
@@ -297,7 +301,12 @@ class Macaw
     rescue Timeout::Error
       error "#{cmd}: timed out after #{@@options.timeout} seconds" if failonerror
     end
-    return output
+
+    return case returntype
+      when :string then output.join("\n")
+      when :array then output
+      else error "Unexpected return type #{returntype} from system"
+    end
   end
 
   def self.load_rules

data/lib/macaw/rules/texcount.rb

@@ -1,9 +1,40 @@
+require 'i18n'
+
 # texcount rule for arara
 # author: Francesco Endrici
 # requires arara 3.0
 class Macaw
   # this probably needs to be a lot fancier, but I can't be arsed about it right now.
-  def texcount(parameters)
-    Macaw.system ['texcount'] + parameters
+  def texcount(includes=nil)
+
+    count = {}
+    Macaw.system(['texcount', ~@file], return: :array).each{|line|
+      Macaw.log(line)
+
+      case line
+        when /^Words in text:\s*([0-9]+)/
+          count[:all] = Integer($1)
+        when /\s([0-9]+)\+[0-9]+\+[0-9]\s+\([0-9]+\/[0-9]+\/[0-9]+\/[0-9]+\)\s+Section:\s*([^}]+)/
+          count[$2.strip] = Integer($1)
+      end
+    }
+
+    cleanfile = lambda{|f|
+      dir = File.dirname(f)
+      file = File.basename(f)
+
+      file = I18n.transliterate(file) # fold diacritics where possible
+      file.gsub!(/[^!-~]/, '') # remove non-ascii characters
+      file.gsub!(/#<\$\+%>!`&\*'\|{\?"=}\/:\\@/, '') # remove problematic characters
+      File.join(dir, file)
+    }
+
+    if includes
+      Dir["#{@base}*.count.txt"].each{|f| File.unlink(f) }
+      count.each_pair{|k, v|
+        f = cleanfile.call(@base + (k == :all ? '' : ".#{k}") + ".count.txt")
+        File.open(f, 'w') {|f| f.write(v)}
+      }
+    end
   end
 end

data/lib/macaw/version.rb

@@ -1,3 +1,3 @@
 class Macaw
-  VERSION = "0.0.40"
+  VERSION = "0.0.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macaw
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler