texas 0.1.4 → 0.1.5

data/lib/texas/option_parser.rb

@@ -24,6 +24,7 @@ module Texas
       options.load_local_libs = true
       options.contents_dir = Texas.contents_subdir_name
       options.contents_template = find_contents_file("contents")
+      options.backtrace = false
       options.colors = true
       options.merge_config = nil
       options.verbose = false
@@ -71,17 +72,18 @@ module Texas
         opts.separator ""
         opts.separator "Common options:"
 
-        # Boolean switch.
+        opts.on("--[no-]backtrace", "Switch backtrace") do |v|
+          options.backtrace = v
+        end
+
         opts.on("-c", "--[no-]color", "Switch colors") do |v|
           options.colors = v
         end
 
-        # Boolean switch.
         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
           options.verbose = v
         end
 
-        # Boolean switch.
         opts.on("-w", "--[no-]warnings", "Switch warnings") do |v|
           options.warnings = v
         end

data/lib/texas/runner.rb

@@ -37,9 +37,20 @@ module Texas
       Texas.warnings = @options.warnings
       load_local_libs if @options.load_local_libs
       @task_instance = task_class.new(@options)
-      @task_instance.run
+      run
     end
     
+    # Display the error message that caused the exception.
+    def display_error_message(ex)
+      puts "#{@options.task} aborted!"
+      puts ex.message
+      if @options.backtrace
+        puts ex.backtrace
+      else
+        puts "(See full trace with --backtrace)"
+      end
+    end
+
     def extend_string_class
       mod = @options.colors ? Term::ANSIColor : Term::NoColor
       String.send :include, mod
@@ -50,6 +61,13 @@ module Texas
       require init_file if File.exist?(init_file)
     end
 
+    def run
+      @task_instance.run
+    rescue Exception => ex
+      display_error_message ex
+      exit 1
+    end
+
     def task_class
       map = {
         :build      => Build::Final,

data/lib/texas/task/base.rb

@@ -12,10 +12,6 @@ module Texas
         @build ||= klass.run(options)
       end
 
-      def track
-        build.track
-      end
-
       def run
       end
     end

data/lib/texas/template.rb

@@ -60,3 +60,4 @@ Texas::Template.known_extensions = []
 
 require_relative 'template/helper'
 require_relative 'template/runner'
+require_relative 'template/template_error'

data/lib/texas/template/helper/base.rb

@@ -57,7 +57,7 @@ module Texas
           if filename = find_template_file(parts, possible_exts, possible_paths)
             filename
           else
-            raise "File doesnot exists anywhere: #{parts.inspect}#{possible_exts.inspect} in #{possible_paths.inspect} #{}"
+            raise TemplateError.new(self, "File doesnot exists anywhere: #{parts.size > 1 ? parts : parts.first}")
           end
         end
 
@@ -69,9 +69,25 @@ module Texas
 
         # Renders a template with the given locals.
         #
-        def render(name, locals = {})
-          template_file = find_template_file!([name], template_extensions)
-          Texas::Template.create(template_file, build).__run__(locals)
+        def render(options, locals = {})
+          if [String, Symbol].include?(options.class)
+            options = {:templates => [options]}
+          end
+          if name = options[:template]
+            options[:templates] = [name]
+          end
+          if glob = options[:glob]
+            options[:templates] = templates_by_glob(glob)
+          end
+          options[:locals] = locals unless locals.empty?
+          render_as_array(options).join(options[:join].to_s)
+        end
+
+        def render_as_array(options)
+          options[:templates].map do |name|
+            template_file = find_template_file!([name], template_extensions)
+            Texas::Template.create(template_file, build).__run__(options[:locals])
+          end
         end
 
         # Returns all extensions the Template::Runner can handle.

data/lib/texas/template/runner/base.rb

@@ -46,6 +46,10 @@ module Texas
     def __render__(locals = {})
       @locals = OpenStruct.new(locals)
       ERB.new(@content, nil, nil, "@erbout").result(binding)
+    rescue TemplateError => ex
+      raise ex
+    rescue Exception => ex
+      raise TemplateError.new(self, ex.message, ex)
     end
 
     def __run__(locals = {})

data/lib/texas/template/template_error.rb

@@ -0,0 +1,34 @@
+class TemplateError < StandardError
+  attr_accessor :original, :template
+
+  def initialize(template, message, original = nil)
+    super(message)
+    self.template = template
+    self.original = original
+  end
+
+  def filename
+    template.filename.gsub(template.build_path, '')
+  end
+
+  def parse_backtrace_for_origin
+    arr = original ? original.backtrace : backtrace
+    arr.each_with_index do |line, index| 
+      if line =~ /\(erb\):(\d+)/ 
+        @line_number = $1.to_i
+        line_before = backtrace[index-1]
+        @method_name = line_before =~ /\d+:in\s+`([^\)]+)'/ && $1
+        return
+      end
+    end
+  end
+
+  def origin
+    parse_backtrace_for_origin
+    "#{filename}:#{@line_number}:in `#{@method_name}'"
+  end
+
+  def message
+    super + "\n#{origin}".cyan
+  end
+end

data/lib/texas/version.rb

@@ -2,7 +2,7 @@ module Texas
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    BUILD = 4
+    BUILD = 5
 
     STRING = [MAJOR, MINOR, BUILD].join('.').freeze
   end

data/spec/fixtures/helper-methods-tex/contents/some_chapter/test_include.tex.erb

@@ -2,6 +2,12 @@ Should find this template relatively and render the template another\_include be
 
 <%= render "another_include" %>
 
+<%= render :template => "another_include" %>
+
+<%= render :templates => ["another_include"] %>
+
+<%= render :glob => "another_*" %>
+
 When using the LaTeX input command, the path should be relative to master.tex e.g. some\_chapter/another\_include
 
 <%= input "another_include" %>

data/spec/fixtures/helper-methods-tex/contents/some_chapter/test_include.tex.should

@@ -2,6 +2,12 @@ Should find this template relatively and render the template another\_include be
 
 This file is a static .tex file.
 
+This file is a static .tex file.
+
+This file is a static .tex file.
+
+This file is a static .tex file.
+
 When using the LaTeX input command, the path should be relative to master.tex e.g. some\_chapter/another\_include
 
 \input{some_chapter/another_include}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: texas
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -72,6 +72,7 @@ files:
 - lib/texas/template/helper/info.rb
 - lib/texas/template/helper/base.rb
 - lib/texas/template/runner.rb
+- lib/texas/template/template_error.rb
 - lib/texas/template/runner/md.rb
 - lib/texas/template/runner/tex.rb
 - lib/texas/template/runner/base.rb