texas 0.1.6 → 0.1.7

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

@@ -1,11 +1,11 @@
-require 'texas/template/helper/md'
+require_relative '../helper/md'
 
 class Texas::Template::Runner::Markdown < Texas::Template::Runner::Base
   include Texas::Template::Helper::Markdown
 
   def after_write
     if `which pandoc`.empty?
-      puts "\nAborting build: pandoc not found in PATH (required for Markdown rendering)"
+      trace "\nAborting build: pandoc not found in PATH (required for Markdown rendering)"
       exit
     end
     tex_filename = Texas::Template.basename(@output_filename) + ".tex"

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

@@ -1,4 +1,4 @@
-require 'texas/template/helper/tex'
+require_relative '../helper/tex'
 
 class Texas::Template::Runner::TeX < Texas::Template::Runner::Base
   include Texas::Template::Helper::TeX
@@ -8,4 +8,4 @@ class Texas::Template::Runner::TeX < Texas::Template::Runner::Base
   end
 end
 
-Texas::Template.register_handler %w(tex tex.erb), Texas::Template::Runner::TeX
+Texas::Template.register_handler %w(tex.erb tex), Texas::Template::Runner::TeX

data/lib/texas/template/template_error.rb

@@ -5,6 +5,11 @@ class TemplateError < StandardError
     super(message)
     self.template = template
     self.original = original
+    parse_backtrace_for_origin
+  end
+
+  def __backtrace__
+    original ? original.backtrace : backtrace
   end
 
   def filename
@@ -12,11 +17,12 @@ class TemplateError < StandardError
   end
 
   def parse_backtrace_for_origin
-    arr = original ? original.backtrace : backtrace
+    arr = __backtrace__ || []
     arr.each_with_index do |line, index| 
       if line =~ /\(erb\):(\d+)/ 
+        @pre_erb_backtrace = arr[0...index]
         @line_number = $1.to_i
-        line_before = backtrace[index-1]
+        line_before = arr[index-1]
         @method_name = line_before =~ /\d+:in\s+`([^\)]+)'/ && $1
         return
       end
@@ -24,11 +30,19 @@ class TemplateError < StandardError
   end
 
   def origin
-    parse_backtrace_for_origin
-    "#{filename}:#{@line_number}:in `#{@method_name}'"
+    "#{filename}:#{@line_number}"
+  end
+
+  def pre_erb_backtrace
+    if @pre_erb_backtrace
+      arr = @pre_erb_backtrace.map do |line| 
+        line.gsub(template.build.root, '.')
+      end
+      str = arr.empty? ? "" : arr.join("\n").dark + "\n"
+    end
   end
 
   def message
-    super + "\n#{origin}".cyan
+    super + "\n#{pre_erb_backtrace}#{origin.cyan}"
   end
 end

data/lib/texas/version.rb

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

data/spec/fixtures/new-project/lib/init.rb

@@ -1,4 +1,4 @@
 glob = File.join( File.dirname(__FILE__), "helpers", "**.rb" )
 Dir[glob].each do |filename|
-  require filename
+  load filename
 end

data/spec/fixtures/pdflatex-error/contents/contents.tex.erb

@@ -0,0 +1 @@
+\aaaaaa

data/spec/spec_helper.rb

@@ -6,6 +6,13 @@ require 'rspec'
 require 'fileutils'
 
 require 'texas'
+module Texas
+  module OutputHelper
+    def trace(*args)
+      # void
+    end
+  end
+end
 
 def default_options
   {:open_pdf => false, :warnings => false}
@@ -23,7 +30,7 @@ def original_test_data_dir(scenario)
   File.join(File.dirname(__FILE__), 'fixtures', scenario.to_s)
 end
 
-def test_data_dir(scenario)
+def test_data_dir(scenario = "")
   File.join(tmp_dir, scenario.to_s)
 end
 
@@ -38,7 +45,7 @@ def use_scenario(scenario)
 end
 
 def run_scenario(scenario, options = {}, &block)
-  options = default_options.merge(options)
+  options = default_options.merge(options) if options.is_a?(Hash)
   work_dir = use_scenario(scenario)
   runner = Texas::Runner.new(options)
   if block_given?
@@ -52,13 +59,15 @@ def match_should_templates(work_dir)
   should_templates = Dir[File.join(work_dir, "tmp", "build", "**/*.tex.should")]
   should_templates.each do |should_file|
     generated_file = should_file.gsub(/\.should$/, '')
-    File.read(generated_file).should == File.read(should_file)
+    if File.exist?(generated_file)
+      File.read(generated_file).should == File.read(should_file)
+    end
   end
 end
 
 RSpec.configure do |config|
-  config.before(:each) {
-#    rebuild_test_data_dir!
-#    Dir.chdir(test_data_dir)
-  }
+  config.before(:each) do
+    FileUtils.mkdir_p test_data_dir
+    Dir.chdir test_data_dir
+  end
 end

data/spec/texas/build/base_spec.rb

@@ -2,6 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Texas::Build::Base do
 
+  def fake_options
+    options = OpenStruct.new({
+      :work_dir => "/tmp/test_project",
+      :contents_dir => "contents",
+      :contents_template => "contents"
+      })
+  end
+
+  def fake_build
+    Texas::Build::Base.new(fake_options)
+  end
+  
   def test_build
     @test_build ||= get_runner_instance
   end
@@ -12,15 +24,6 @@ describe Texas::Build::Base do
     end
   end
 
-  describe "#ran_templates" do
-    it "returns the templates" do
-      filenames = test_build.ran_templates.map(&:filename)
-      basenames = filenames.map { |f| f.gsub(test_build.__path__+'/', '') }
-      basenames.size.should > 0
-      basenames.include?("unused_template.tex.erb").should == false
-    end
-  end
-
   class FoobarTask
     class << self
       attr_accessor :foo
@@ -41,5 +44,46 @@ describe Texas::Build::Base do
       FoobarTask.foo.should == :bar
     end
   end
+
+  describe "#ran_templates" do
+    it "returns the templates" do
+      filenames = test_build.ran_templates.map(&:filename)
+      basenames = filenames.map { |f| f.gsub(test_build.__path__+'/', '') }
+      basenames.size.should > 0
+      basenames.include?("sub_dir/unused_template.tex.erb").should == false
+    end
+  end
+
+  describe "#__path__" do
+    it "should return the build path" do
+      build = fake_build
+      build.__path__.should == "#{fake_options.work_dir}/tmp/build"
+    end
+  end
+  
+  describe "#store" do
+    it "should return an object that can store values" do
+      build = fake_build
+      store = build.store
+      store.test_value.should be_nil
+      store.test_value = 42
+      store.test_value.should == 42
+    end
+  end
+
+  describe "#config" do
+    it "should return an object that can be accessed by []" do
+      build = fake_build
+      config = build.config
+      config[:test_value].should be_nil
+    end
+  end
+
+  describe "#dest_file" do
+    it "should return the PDF's filename" do
+      build = fake_build
+      build.dest_file.should == "#{fake_options.work_dir}/bin/#{fake_options.contents_template}.pdf"
+    end
+  end
   
 end

data/spec/texas/build/config_spec.rb

@@ -0,0 +1,73 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Texas::Build::Config do
+
+  def texasrc_filename
+    File.join(original_test_data_dir(:texasrc), ".texasrc")
+  end
+
+  describe "#new" do
+    it "takes a hash and makes it accessible via methods" do
+      config = Texas::Build::Config.new({:foo => :bar})
+      config.foo.should == :bar
+      lambda { config.some_value }.should raise_error(NoMethodError)
+    end
+  end
+
+  describe "#[]" do
+    it "takes a string" do
+      config = Texas::Build::Config.new({:foo => :bar})
+      config["foo"].should == :bar
+    end
+
+    it "takes a symbol" do
+      config = Texas::Build::Config.new({:foo => :bar})
+      config[:foo].should == :bar
+    end
+  end
+
+  describe "#document" do
+    it "takes a hash" do
+      config = Texas::Build::Config.new({:document => {:foo => :bar}})
+      config.document.should_not be_nil
+      config.document.foo.should == :bar
+    end
+    it "does not raise errors for none existing keys" do
+      config = Texas::Build::Config.new({:document => {:foo => :bar}})
+      config.document.some_other_value.should be_nil
+    end
+  end
+
+  describe "#merge!" do
+    it "deep_merges a key into the config" do
+      hash = {
+        :document => {:foo => :bar, :some_other_value => true}, 
+        :other_mode => {:document => {:foo => 42}}
+      }
+      config = Texas::Build::Config.new(hash)
+      config.document.should_not be_nil
+      config.document.foo.should == :bar
+      config.document.some_other_value.should be_true
+      config.merge! "other_mode"
+      config.document.foo.should == 42
+      config.document.some_other_value.should be_true
+    end
+  end
+
+  describe "#create" do
+    it "takes a filename" do
+      config = Texas::Build::Config.create({:document => {:some_value => 42}})
+      config.document.should_not be_nil
+      config.document.some_value.should == 42
+      config.document.some_other_value.should be_nil
+    end
+
+    it "takes a filename and a merge key" do
+      config = Texas::Build::Config.create({:document => {:some_value => 42}, :other_mode => {:document => {:some_value => 24, :some_other_value => 42}}}, "other_mode")
+      config.document.should_not be_nil
+      config.document.some_value.should == 24
+      config.document.some_other_value.should be_true
+    end
+  end
+
+end

data/spec/texas/build/task/base_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+describe Texas::Build::Task::Base do
+
+  describe "#new" do
+    it "should not require a build" do
+      Texas::Build::Task::Base.new()
+    end
+    it "should take a build" do
+      build = Object.new
+      Texas::Build::Task::Base.new(build)
+    end
+  end
+
+  describe "#run" do
+    it "should not raise errors" do
+      Texas::Build::Task::Base.new.run
+    end
+  end
+  
+end

data/spec/texas/option_parser_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Texas::OptionParser do
+  describe "#initialize" do
+    it "takes an array" do
+      op = Texas::OptionParser.new(%w(-d))
+    end
+  end
+
+  describe "#parse" do
+    it "should abort if check_mandatory fails" do
+      op = Texas::OptionParser.new(%w(-d))
+      lambda { op.parse }.should raise_error SystemExit
+    end
+
+    it "should identify the right contents_dir and contents_template options" do
+      use_scenario "basic-tex"
+
+      options = Texas::OptionParser.new(%w()).parse
+      options.contents_dir.should == "contents"
+      options.contents_template.should == "contents"
+
+      options = Texas::OptionParser.new(%w(contents/input_template)).parse
+      options.contents_dir.should == "contents"
+      options.contents_template.should == "input_template"
+
+      options = Texas::OptionParser.new(%w(contents/sub_dir/unused_template)).parse
+      options.contents_dir.should == "contents"
+      options.contents_template.should == "sub_dir/unused_template"
+    end
+  end
+
+  describe ".parse_additional_options" do
+    it "should take a block" do
+      Texas::OptionParser.parse_additional_options do |parser, options|
+        options.check_mandatory_arguments = false
+        options.foo = true
+        parser.on("--[no-]foo", "Switch foo") do |v|
+          options.foo = v
+        end
+      end
+      op = Texas::OptionParser.new(%w())
+      options = op.parse
+      options.foo.should be_true
+      op = Texas::OptionParser.new(%w(--foo))
+      options = op.parse
+      options.foo.should be_true
+      op = Texas::OptionParser.new(%w(--no-foo))
+      options = op.parse
+      options.foo.should be_false
+    end
+  end
+end

data/spec/texas/task/base_spec.rb

@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Texas::Task::Base do
+
+  describe "#new" do
+    it "should not require a build" do
+      options = OpenStruct.new
+      Texas::Task::Base.new(options)
+    end
+    it "should take options and a build" do
+      options = OpenStruct.new
+      build = MockBuild.new
+      Texas::Task::Base.new(options, build)
+    end
+  end
+
+  class MockBuild
+    attr_accessor :foo
+    
+    def initialize(*args); end
+
+    def run
+      @foo = :bar
+    end
+  end
+
+  describe "#run" do
+    it "should not raise errors" do
+      options = OpenStruct.new
+      build = MockBuild.new
+      Texas::Task::Base.new(options, build).run
+    end
+  end
+  
+  describe "#build" do
+    it "should not raise errors" do
+      options = OpenStruct.new
+      build = MockBuild.new
+      task = Texas::Task::Base.new(options, build)
+      task.build.should == build
+    end
+    it "should lazy init the build object" do
+      options = OpenStruct.new
+      task = Texas::Task::Base.new(options)
+      task.build(MockBuild).should_not be_nil
+    end
+  end
+
+end

data/spec/texas_spec.rb

@@ -1,5 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+def pandoc_present?
+  where = `which pandoc`
+  !where.empty?
+end
+
 describe Texas::Runner do
   describe "#initialize" do
 
@@ -7,7 +12,19 @@ describe Texas::Runner do
       run_scenario "basic-tex"
     end
 
-    it "run basic markdown scenario" do
+    it "run basic tex scenario with some arguments" do
+      run_scenario "basic-tex", %w(-d -v)
+    end
+
+    it "run basic tex scenario with another contents_template" do
+      run_scenario "basic-tex", %w(-d contents/input_template)
+    end
+
+    it "run basic tex scenario with another subdir contents_template" do
+      run_scenario "basic-tex", %w(-d contents/sub_dir/unused_template)
+    end
+
+    it "run basic markdown scenario", :if => pandoc_present? do
       run_scenario "basic-md"
     end
 
@@ -15,12 +32,41 @@ describe Texas::Runner do
       run_scenario "different-master-tex"
     end
 
-    it "run scenario for TeX helper methods" do
+    it "run scenario for TeX helper methods", :if => pandoc_present? do
       run_scenario "helper-methods-tex"
     end
 
     it "run scenario for .texasrc" do
-      run_scenario "texasrc"
+      run_scenario "texasrc" do |runner|
+        build = runner.task_instance
+        config = build.config
+        lambda {
+          config.some_other_value_from_parent_dir_config.should be_true
+        }.should raise_error
+      end
+    end
+
+    it "run scenario for .texasrc with a parent .texasrc" do
+      other_config_file = File.join(test_data_dir(""), ".texasrc")
+      FileUtils.cp File.join(test_data_dir("texasrc"), ".other.texasrc"), other_config_file
+      run_scenario "texasrc" do |runner|
+        FileUtils.rm other_config_file # remove parent .texasrc
+        build = runner.task_instance
+        config = build.config
+        config.document.some_other_value_from_parent_dir_config.should be_true
+      end
+    end
+
+    it "run scenario for .texasrc with --merge-config and fail" do
+      lambda {
+        run_scenario "texasrc", :merge_config => "other_mode"
+      }.should raise_error
+    end
+
+    it "run scenario for pdflatex-error and fail" do
+      lambda {
+        run_scenario "pdflatex-error"
+      }.should raise_error
     end
 
     it "run scenario for lib/ helpers" do