rubbr 1.0.5 → 1.0.6

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.6 / 2008-04-01
+
+* New option: more verbose output.
+* Somehow a graphic files were not copied to the builddir. This
+  was unnoticed since I've used the \graphicspath{} macro.
+
 == 1.0.5 / 2008-03-30
 
 * Small bugfixes and no default output on successful builds.

data/README.txt

@@ -9,11 +9,14 @@ Build LaTeX documents.
 
 == SYNOPSIS:
 
-  Usage: rubbr [options]
-      -f, --format [FORMAT]            Select output format (dvi, ps, pdf)
-      -v, --view                       View the document
-      -s, --spell                      Spell check source files
-      -h, --help                       Show this help message
+Usage: rubbr [options]
+  -f, --format [FORMAT]            Select output format (dvi, ps, pdf)
+  -e, --engine [ENGINE]            Select processing engine (latex, pdflatex)
+  -d, --display                    Display the document
+  -s, --spell                      Spell check source files
+  -v, --verbose                    Enable verbose feedback
+  -V, --verboser                   Enable very verbose feedback
+  -h, --help                       Show this help message
 
 Standard project layout:
 

data/lib/rubbr.rb

@@ -2,7 +2,7 @@ require 'optparse'
 $:.unshift File.dirname(__FILE__)
 
 module Rubbr
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   autoload :Options,       'rubbr/options'
   autoload :Cli,           'rubbr/cli'
@@ -24,7 +24,7 @@ module Rubbr
     def run(args = ARGV)
       opts = OptionParser.new do |opts|
         opts.version = Rubbr::VERSION
-        opts.banner = 'Usage: rubbr [@@cmd_opts]'
+        opts.banner = 'Usage: rubbr [options]'
 
         opts.on('-f', '--format [FORMAT]', [:dvi, :ps, :pdf],
           'Select output format (dvi, ps, pdf)') do |format|
@@ -48,6 +48,11 @@ module Rubbr
           @@cmd_opts[:verbose] = true
         end
 
+        opts.on('-V', '--verboser', 'Enable very verbose feedback') do
+          @@cmd_opts[:verbose] = true
+          @@cmd_opts[:verboser] = true
+        end
+
         opts.on('-h', '--help', 'Show this help message') do
           puts opts
           exit 1

data/lib/rubbr/builder/tex.rb

@@ -21,24 +21,23 @@ module Rubbr
           build_dir do
             copy_source_files
             copy_vendor_files
+            copy_graphic_files
 
-            latex = preprocessor.new(base_latex_file, true)
+            latex = preprocessor.new(base_latex_file)
             if base_bibtex_file && latex.warnings.join =~ /No file .+\.bbl/
-              bibtex = Rubbr::Runner::BibTeX.new(base_bibtex_file, true)
+              bibtex = Rubbr::Runner::BibTeX.new(base_bibtex_file)
             end
             if latex.warnings.join =~ /No file .+\.(aux|toc)/
-              latex = preprocessor.new(base_latex_file, true)
+              latex = preprocessor.new(base_latex_file)
             end
             if latex.warnings.join =~ /There were undefined citations/
-              latex = preprocessor.new(base_latex_file, true)
+              latex = preprocessor.new(base_latex_file)
             end
             if latex.warnings.join =~ /Label\(s\) may have changed\. Rerun/
-              latex = preprocessor.new(base_latex_file, true)
+              latex = preprocessor.new(base_latex_file)
             end
-            latex.silent = false
             latex.feedback
             if bibtex
-              bibtex.silent = false
               bibtex.feedback
             end
           end
@@ -63,6 +62,10 @@ module Rubbr
             copy_files(Rubbr.options[:vendor_dir], %w(sty clo cls cfg))
           end
 
+          def copy_graphic_files
+            copy_files(Rubbr.options[:graphics_dir], %w(eps png))
+          end
+
           def copy_files(source_dir, file_extensions)
             file_extensions.each do |file_extension|
               Dir["#{source_dir}/*.#{file_extension}"].each do |file|

data/lib/rubbr/options.rb

@@ -18,6 +18,7 @@ module Rubbr
           :spell_file        => 'dictionary.ispell',
           :distribution_name => distribution_name(root_dir),
           :verbose           => false,
+          :verboser          => false,
           :format            => :dvi,
           :engine            => :latex
         }

data/lib/rubbr/runner.rb

@@ -10,9 +10,6 @@ module Rubbr
       # The file to be run trough the latex process.
       attr_accessor :input_file
 
-      # If true no messages is sendt to standard out. Defaults to false.
-      attr_accessor :silent
-
       # The executable to be run.
       attr_accessor :executable
 
@@ -22,10 +19,9 @@ module Rubbr
       # Contains a list of possible errors after a run.
       attr_accessor :errors
 
-      def initialize(input_file, silent, executable)
+      def initialize(input_file, executable)
         @input_file = input_file
         @executable = valid_executable executable
-        @silent = silent
         @errors = []
 
         if File.exists? @input_file
@@ -37,9 +33,10 @@ module Rubbr
       end
 
       def run
-        disable_stdinn do
+        disable_stdinn do # No input in case of error correction dialogue
           messages = /^(Overfull|Underfull|No file|Package \w+ Warning:|LaTeX Warning:)/
           run = `#@executable #@input_file`
+          puts run if Rubbr.options[:verboser]
           @warnings = run.grep(messages).sort
           lines = run.split("\n")
           while lines.shift
@@ -47,12 +44,11 @@ module Rubbr
               3.times { @errors << lines.shift }
             end
           end
-          feedback
         end
       end
 
       def feedback
-        return if @silent
+        return if Rubbr.options[:verboser] # No preformatted output.
         unless @warnings.empty?
           notice "Warnings from #@executable:"
           @warnings.each do |message|

data/lib/rubbr/runner/bibtex.rb

@@ -1,7 +1,7 @@
 module Rubbr
   module Runner
     class BibTeX < Base
-      def initialize(input_file, silent=false, executable='bibtex')
+      def initialize(input_file, executable='bibtex')
         super
       end
 

data/lib/rubbr/runner/dvips.rb

@@ -1,7 +1,7 @@
 module Rubbr
   module Runner
     class DviPs < Base
-      def initialize(input_file, silent=false, executable='dvips')
+      def initialize(input_file, executable='dvips')
         super
       end
 

data/lib/rubbr/runner/latex.rb

@@ -1,7 +1,7 @@
 module Rubbr
   module Runner
     class LaTeX < Base
-      def initialize(input_file, silent=false, executable='latex')
+      def initialize(input_file, executable='latex')
         super
       end
     end

data/lib/rubbr/runner/pdflatex.rb

@@ -1,7 +1,7 @@
 module Rubbr
   module Runner
     class PdfLaTeX < Base
-      def initialize(input_file, silent=false, executable='pdflatex')
+      def initialize(input_file, executable='pdflatex')
         super
       end
     end

data/lib/rubbr/runner/ps2pdf.rb

@@ -1,7 +1,7 @@
 module Rubbr
   module Runner
     class Ps2Pdf < Base
-      def initialize(input_file, silent=false, executable='ps2pdf')
+      def initialize(input_file, executable='ps2pdf')
         super
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubbr
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Eivind Uggedal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-29 23:00:00 +01:00
+date: 2008-04-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency