rubbr 1.0.4 → 1.0.5

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.5 / 2008-03-30
+
+* Small bugfixes and no default output on successful builds.
+
 == 1.0.4 / 2008-03-07
 
 * Added support for the pdflatex engine.

data/lib/rubbr.rb

@@ -2,7 +2,7 @@ require 'optparse'
 $:.unshift File.dirname(__FILE__)
 
 module Rubbr
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 
   autoload :Options,       'rubbr/options'
   autoload :Cli,           'rubbr/cli'
@@ -15,34 +15,37 @@ module Rubbr
   autoload :Spell,         'rubbr/spell'
 
   class << self
-    # Setting up an options accessor.
+    @@cmd_opts = {}
+
     def options
-      @@options ||= Rubbr::Options.setup
+      @@global_opts ||= Rubbr::Options.setup.merge(@@cmd_opts)
     end
 
     def run(args = ARGV)
-      options = {}
-
       opts = OptionParser.new do |opts|
         opts.version = Rubbr::VERSION
-        opts.banner = 'Usage: rubbr [options]'
+        opts.banner = 'Usage: rubbr [@@cmd_opts]'
 
         opts.on('-f', '--format [FORMAT]', [:dvi, :ps, :pdf],
           'Select output format (dvi, ps, pdf)') do |format|
-          options[:format] = format
+          @@cmd_opts[:format] = format
         end
 
         opts.on('-e', '--engine [ENGINE]', [:pdflatex, :ps, :pdf],
           'Select processing engine (latex, pdflatex)') do |engine|
-          options[:engine] = engine
+          @@cmd_opts[:engine] = engine
         end
 
-        opts.on('-v', '--view', 'View the document') do
-          options[:view] = true
+        opts.on('-d', '--display', 'Display the document') do
+          @@cmd_opts[:view] = true
         end
 
         opts.on('-s', '--spell', 'Spell check source files') do
-          options[:spell] = true
+          @@cmd_opts[:spell] = true
+        end
+
+        opts.on('-v', '--verbose', 'Enable verbose feedback') do
+          @@cmd_opts[:verbose] = true
         end
 
         opts.on('-h', '--help', 'Show this help message') do
@@ -58,32 +61,14 @@ module Rubbr
         exit 1
       end
 
-      if options[:spell]
-        spell
-      elsif options[:view]
-        view(options[:format], options[:engine])
+      if @@cmd_opts[:spell]
+        Rubbr::Spell.new.check
+      elsif @@cmd_opts[:view]
+        Rubbr::Builder.build
+        Rubbr::Viewer.view
       else
-        build(options[:format], options[:engine])
+        Rubbr::Builder.build
       end
     end
-
-    private
-
-      def build(format, engine)
-        if engine
-          Rubbr::Builder.build(format, engine)
-        else
-          Rubbr::Builder.build(format)
-        end
-      end
-
-      def view(format, engine)
-        build(format, engine)
-        Rubbr::Viewer.view(format)
-      end
-
-      def spell
-        Rubbr::Spell.new.check
-      end
   end
 end

data/lib/rubbr/builder.rb

@@ -11,16 +11,18 @@ module Rubbr
   module Builder
 
     # Build to the spesified format.
-    def self.build(format = :pdf, engine = :latex)
-      case format
-      when :dvi
+    def self.build
+      if Rubbr.options[:engine] == :pdflatex
         Rubbr::Builder::Tex.build
-      when :ps
-        Rubbr::Builder::Tex.build
-        Rubbr::Builder::Dvi.build
       else
-        Rubbr::Builder::Tex.build(engine)
-        if engine == :latex
+        case Rubbr.options[:format]
+        when :dvi
+          Rubbr::Builder::Tex.build
+        when :ps
+          Rubbr::Builder::Tex.build
+          Rubbr::Builder::Dvi.build
+        else
+          Rubbr::Builder::Tex.build
           Rubbr::Builder::Dvi.build
           Rubbr::Builder::Ps.build
         end

data/lib/rubbr/builder/tex.rb

@@ -2,20 +2,20 @@ module Rubbr
   module Builder
     class Tex < Base
       class << self
-        def build(engine = :latex)
+        def build
 
           clean_build_dir
 
           base_latex_file = Rubbr.options[:base_latex_file]
           base_bibtex_file = Rubbr.options[:base_bibtex_file]
 
-          case engine
-          when :latex
-            @output_format = :dvi
-            preprocessor = Rubbr::Runner::LaTeX
+          case Rubbr.options[:engine]
           when :pdflatex
             @output_format = :pdf
             preprocessor = Rubbr::Runner::PdfLaTeX
+          else
+            @output_format = :dvi
+            preprocessor = Rubbr::Runner::LaTeX
           end
 
           build_dir do

data/lib/rubbr/cli.rb

@@ -3,11 +3,11 @@ module Rubbr
   # Handles command line output and input.
   module Cli
     def notice(message)
-      puts message
+      puts message if Rubbr.options[:verbose]
     end
 
     def warning(message)
-      puts "  - #{message}"
+      puts "  - #{message}" if Rubbr.options[:verbose]
     end
 
     def error(message)

data/lib/rubbr/options.rb

@@ -11,13 +11,15 @@ module Rubbr
           :source_dir        => source_dir,
           :build_dir         => 'tmp',
           :distribution_dir  => 'dist',
-          :template_file     => 'template.erb',
           :base_file         => 'base',
           :vendor_dir        => source_dir + '/vendor',
           :graphics_dir      => source_dir + '/graphics',
           :spell_dir         => source_dir,
           :spell_file        => 'dictionary.ispell',
-          :distribution_name => distribution_name(root_dir)
+          :distribution_name => distribution_name(root_dir),
+          :verbose           => false,
+          :format            => :dvi,
+          :engine            => :latex
         }
       end
 
@@ -49,16 +51,11 @@ module Rubbr
         end
 
         def absolute_paths(options)
-          relatives = %w(source_dir
-                         build_dir
-                         distribution_dir
-                         template_file
-                         vendor_dir
-                         graphics_dir
-                         spell_dir)
-          relatives.each do |key|
-            options[key.to_sym] = File.join(options[:root_dir],
-                                            options[key.to_sym])
+          options.each_key do |key|
+            if key.to_s =~ /\w+_dir/ && key != :root_dir
+              options[key.to_sym] = File.join(options[:root_dir],
+                                              options[key.to_sym])
+            end
           end
           options
         end

data/lib/rubbr/viewer.rb

@@ -2,14 +2,18 @@ module Rubbr
   module Viewer
 
     # View the spesified format.
-    def self.view(format)
-      case format
-      when :dvi
-        Rubbr::Viewer::Dvi.new.launch
-      when :ps
-        Rubbr::Viewer::Ps.new.launch
-      else
+    def self.view
+      if Rubbr.options[:engine] == :pdflatex
         Rubbr::Viewer::Pdf.new.launch
+      else
+        case Rubbr.options[:format]
+        when :dvi
+          Rubbr::Viewer::Dvi.new.launch
+        when :ps
+          Rubbr::Viewer::Ps.new.launch
+        else
+          Rubbr::Viewer::Pdf.new.launch
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubbr
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Eivind Uggedal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-07 00:00:00 +01:00
+date: 2008-03-29 23:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.1
     version: 
 description: Build LaTeX documents.
 email: eu@redflavor.com