trex 1.0.8 → 1.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f439654d11b3e47c4c0e95532694ab1d99cb7979
+  data.tar.gz: fcf324be079039f7e2b8e692a1bcf5c2ae90b023
+SHA512:
+  metadata.gz: 81130811e1175ad9d48f31d9c9760f0a1ad1fbbb52cda21e979e8c122654b172323076a36bc593f4d0e76bb474e7e5d40c51414e229e4d122cae20be150871b9
+  data.tar.gz: 0463e282529bf11b1cc916c85f9ea70c3219d9b80e942e23c58eab67ae174b032e79731a6bc0a2be0accfd3c61d98d60eb394da979bde90b8c968a923d87cb89

data/lib/trex.rb

@@ -11,7 +11,7 @@
 #   ./trex check    # run afterthedeadline / latex checker on the document
 #
 # == Usage
-#   trex [options] [view|compile|tex|clean|check]
+#   trex [options] [view|compile|tex|clean|check|count]
 #   For help use: trex -h
 #
 # == Options
@@ -223,19 +223,40 @@ class TReX
     # ------------------------------------------------------------------------
     def count
         @options.quiet = true
+        self.count_wc
+        self.count_texcount
         self.compile
-        puts 'Sources'.red + ":"
-        self.print_wc_results `wc #{@options.source}`
-        puts 'PDFtoText'.red + ":"
-        #TODO create a tmp file instead of saving locally
-        self.print_wc_results `pdftotext -enc UTF-8 -nopgbrk #{@options.output} - | wc`
-        `rm -f #{@options.sourceBase}.txt`
-        if self.has_command? 'texcount'
-            puts 'texcount'.red + ":"
-            puts `texcount -relaxed -sum #{@options.source}`
-        end
+        self.count_pdf_info
+        self.count_pdf_to_text
+    end
+
+    def count_wc
+      puts "Source:".red + " #{@options.source}:"
+      self.print_wc_results `wc #{@options.source}`
+    end
+
+    def count_pdf_info
+      rutn unless self.has_command? 'pdfinfo'
+      puts 'PDFInfo'.red + ":"
+      puts `pdfinfo #{@options.output}`
+    end
+
+    def count_pdf_to_text
+      return unless self.has_command? 'pdftotext'
+      puts 'PDFtoText'.red + ":"
+      #TODO create a tmp file instead of saving locally
+      self.print_wc_results `pdftotext -enc UTF-8 -nopgbrk #{@options.output} - | wc`
+      `rm -f #{@options.sourceBase}.txt`
+
+    end
+
+    def count_texcount
+        return unless self.has_command? 'texcount'
+        puts 'texcount'.red + ":"
+        puts `texcount -relaxed -sum -inc -merge -col -sub=chapter #{@options.source} 2> /dev/null`
     end
 
+
     def print_wc_results(result)
         result = result.split()[0..2]
         max    = result.map{|l| l.size}.max
@@ -300,7 +321,7 @@ class TReX
             return @opts unless @opts.nil?
 
             @opts = OptionParser.new do |opts|
-                opts.banner = "#{executable_name} [options] [view|compile|tex|clean|spell]"
+                opts.banner = "#{executable_name} [options] [view|compile|tex|clean|spell|count]"
 
                 opts.separator ''
                 opts.separator 'Automate compilation of LaTeX documents, making the output human-readable.'
@@ -435,11 +456,9 @@ class TReX
             # /some/path in PATH, mode 040777 )
             @warn = $-v
             $-v   = nil
-            Open3.popen3(command+' --help') { |stdin, stdout, stderr|
-                return stderr.read.length == 0
-            }
+            result = system('type #{command} >/dev/null 2>&1')
             $-v   = @warn
-            return true
+            return result
         end
 
         # ---------------------------------------------------------------------
@@ -958,3 +977,4 @@ class TexError < TexWarning
 end
 
 #  vim: set ts=4 sw=4 ts=4 :
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trex
 version: !ruby/object:Gem::Version
-  version: 1.0.8
-  prerelease: 
+  version: 1.0.9
 platform: ruby
 authors:
 - Camillo Bruni
@@ -11,22 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
 description: trex is script simplifying the compilation of latex files by creating
@@ -38,30 +35,29 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/trex.rb
 - bin/trex
+- lib/trex.rb
 homepage: https://github.com/dh83/trex
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automate compilation of LaTeX documents, making the output human-readable.
 test_files: []