erbtex 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f067b2e9d4e0a83eb0a956c21623146a1a0bc5471ebc6b0c2f1f6d623c2536b4
-  data.tar.gz: 1cf76c21cdd007c9c2d19339ac8d85bd67a094119788f5d3755997b41a16301c
+  metadata.gz: da849bbae335cabdeb22f9817d5408660b1d37ed1036eba721ce8bdace2668f2
+  data.tar.gz: 4e933a21dfa948f00151d1cd695f425dfb17aec6f1ac1d940dd68d32799229d6
 SHA512:
-  metadata.gz: af2c459fdb7d898bce5857bcd54513db08bc16b10362aa14ccff792c628d9f25728985b3efe800a4c5f46b46839d155cbf65014f5c573cfc5ad8478aa134bcb2
-  data.tar.gz: c48ca28f0cd277621ab711a973b69dbcd3d72a7b3bc6e2f2372e022be13bda12e84e6a420dfcd1cead428be08c9f25f62e5c08cc69243d2f7c9b92b8d68eb181
+  metadata.gz: b1cf7577a154c728e92b44d555e464b62ff714ddcccad23744f1d5dc0b53ddcbc88d43e31698aecc2a1b4494bcf0660e1677c42c70998bcc76da743a5aa893c5
+  data.tar.gz: '051332985184a47f5515dda043d598bf835488d0d812dd753e9ec05cdaafdeebf51279bfdc1fb7307b97ac8155d3007f8572340175ec1148bc80a13d2fee557c'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    erbtex (0.4.2)
+    erbtex (0.4.3)
       erubis
       fat_core
 
@@ -19,7 +19,7 @@ GEM
     damerau-levenshtein (1.3.1)
     diff-lcs (1.3)
     erubis (2.7.0)
-    fat_core (4.5.0)
+    fat_core (4.6.0)
       activesupport
       damerau-levenshtein
     i18n (1.6.0)

data/erbtex.gemspec

@@ -7,15 +7,14 @@ Gem::Specification.new do |gem|
   gem.version = ErbTeX::VERSION
   gem.platform = Gem::Platform::RUBY
   gem.date = %q{2012-05-13}
-  gem.homepage = ''
+  gem.homepage = 'https://github.com/ddoherty03/erbtex'
   gem.authors = ['Daniel E. Doherty']
-  gem.email = %q{ded-erbtex@ddoherty.net}
+  gem.email = %q{ded@ddoherty.net}
   gem.summary = %q{Preprocesses TeX and LaTeX files with erubis for ruby.}
-  gem.description = %q{Create a local link called pdflatex to erbtex and it will
-                     act just like pdflatex except that it will process ruby fragments
-                     between {: and :} markers, greatly expanding the ability to generate
+  gem.description = %q{erbtex will act just like pdflatex except that it will
+                     process ruby fragments between {: and :} markers,
+                     greatly expanding the ability to generate
                      automated TeX and LaTeX documents.}
-
   gem.files         = `git ls-files`.split("\n")
   gem.files.delete_if { |f| f =~ /\.(log|etc|aux|etx|pdf|gem|tmp)$/ }
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/examples/dms.rb

@@ -2,7 +2,6 @@
 
 # A class for maipulating angles expressed as degreed, minutes,
 # and seconds.
-
 class DMS
   include Comparable
 
@@ -10,21 +9,21 @@ class DMS
 
   @@precision = 4
 
-  def initialize(d, m = 0, s = 0.0)
-    @degrees = d.to_i
-    @minutes = m.to_i
-    @seconds = s.to_f
-    self.normalize
+  def initialize(deg, min = 0, sec = 0.0)
+    @degrees = deg.to_i
+    @minutes = min.to_i
+    @seconds = sec.to_f
+    normalize
   end
 
-  def DMS.from_radians(r)
-    if r < 0
-      r = -r
+  def self.from_radians(rad)
+    if rad < 0
+      rad = -rad
       sign = -1
     else
       sign = 1
     end
-    deg = r * (360.0 / (2.0 * Math::PI))
+    deg = rad * (360.0 / (2.0 * Math::PI))
     degrees = deg.floor
     min = (deg - degrees) * 60.0
     minutes = min.floor
@@ -32,10 +31,10 @@ class DMS
     DMS.new(degrees, minutes, seconds)
   end
 
-  def DMS.precision=(p)
+  def self.precision=(p)
     @@precision = p
   end
-  
+
   def to_s
     "#{@degrees}* #{@minutes}' %0.*f''" % [@@precision, @seconds]
   end
@@ -45,14 +44,14 @@ class DMS
   end
 
   def to_radians
-    self.to_f * ((2.0 * Math::PI) / 360.0)
+    to_f * ((2.0 * Math::PI) / 360.0)
   end
 
   # If degrees are at well-known values, eppress as radians
   # symbolically, using TeX notation
   def to_radians_tex
     unless @seconds == 0.0 and @minutes == 0
-      return "$%0.*f$" % [@@precision, self.to_radians]
+      return '$%0.*f$' % [@@precision, to_radians]
     end
 
     # This gets deg to 0 <= x <= 360, even for negative
@@ -60,51 +59,50 @@ class DMS
     deg = @degrees.divmod(360)[1]
     case deg
     when 0
-      "$0$"
+      '$0$'
     when 30
-      "$\\pi/6$"
+      '$\\pi/6$'
     when 60
-      "$\\pi/3$"
+      '$\\pi/3$'
     when 90
-      "$\\pi/2$"
+      '$\\pi/2$'
     when 120
-      "$2\\pi/2$"
+      '$2\\pi/2$'
     when 150
-      "$5\\pi/6$"
+      '$5\\pi/6$'
     when 180
-      "$\\pi$"
+      '$\\pi$'
     when 210
-      "$7\\pi/6$"
+      '$7\\pi/6$'
     when 240
-      "$4\\pi/3$"
+      '$4\\pi/3$'
     when 270
-      "$3\\pi/2$"
+      '$3\\pi/2$'
     when 300
-      "5\\pi/3$"
+      '5\\pi/3$'
     when 330
-      "11\\pi/6$"
+      '11\\pi/6$'
     when 360
-      "$2\\pi$"
+      '$2\\pi$'
     else
-      "$%0.*f$" % [@@precision, self.to_radians]
+      '$%0.*f$' % [@@precision, to_radians]
     end
   end
-      
+
   def to_tex
-    # "$#{@degrees}^\\circ #{@minutes}' %0.*f''$" % [@@precision, @seconds] #"
     "$%02d^\\circ~%02d'~%02.*f''$" % [@degrees, @minutes, @@precision, @seconds] #"
   end
-  
+
   def -@
     DMS.new(-@degrees, @minutes, @seconds)
   end
- 
+
   def +@
     DMS.new(@degrees, @minutes, @seconds)
   end
 
   def <=>(other)
-    self.to_radians <=> other.to_radians
+    to_radians <=> other.to_radians
   end
 
   def +(other)
@@ -128,34 +126,34 @@ class DMS
   end
 
   def sin
-    Math.sin(self.to_radians)
+    Math.sin(to_radians)
   end
-  
+
   def cos
-    Math.cos(self.to_radians)
+    Math.cos(to_radians)
   end
-  
+
   def tan
-    Math.tan(self.to_radians)
+    Math.tan(to_radians)
   end
-  
+
   def sec
-    (1.0 / Math.cos(self.to_radians))
+    (1.0 / Math.cos(to_radians))
   end
-  
+
   def csc
-    (1.0 / Math.sin(self.to_radians))
+    (1.0 / Math.sin(to_radians))
   end
-  
+
   def cotan
-    (1.0 / Math.tan(self.to_radians))
+    (1.0 / Math.tan(to_radians))
   end
-  
+
   # Ensure that seconds and minutes are 0 <= x  < 60.
   # After normalization, only degrees can be negative,
   # which will represent a negative quantity
   def normalize
-    q, r  = @seconds.divmod(60.0)
+    q, r = @seconds.divmod(60.0)
     @seconds = r
     @minutes += q
     q, r = @minutes.divmod(60)
@@ -164,22 +162,22 @@ class DMS
   end
 end
 
-class Fixnum
+class Integer
   alias times *
-  def *(dms)
-    case dms
+  def *(other)
+    case other
     when DMS
-      dms * self
+      other * self
     else
-      self.times(dms)
+      times(other)
     end
   end
 end
-    
+
 if __FILE__ == $0
-  print "Fifty seconds: #{DMS.new(0, 0, 50).to_radians}\n"
-  print "One minute: #{DMS.new(0, 1, 0).to_radians}\n"
-  print "Fifty seconds: #{DMS.new(0, 0, 50).to_f}\n"
-  print "One minute: #{DMS.new(0, 1, 0).to_f}\n"
-  print "#{DMS.from_radians(Math::PI / 2.0)}\n"
+  print "Fifty seconds in radians: #{DMS.new(0, 0, 50).to_radians}\n"
+  print "One minute in radians: #{DMS.new(0, 1, 0).to_radians}\n"
+  print "Fifty seconds in degrees: #{DMS.new(0, 0, 50).to_f}\n"
+  print "One minute in degrees: #{DMS.new(0, 1, 0).to_f}\n"
+  print "One-half PI radians in DMS: #{DMS.from_radians(Math::PI / 2.0)}\n"
 end

data/lib/erbtex.rb

@@ -13,3 +13,4 @@ require 'fat_core'
 require 'erbtex/version'
 require 'erbtex/command_line'
 require 'erbtex/runner'
+require 'erbtex/file_names'

data/lib/erbtex/command_line.rb

@@ -59,7 +59,7 @@ module ErbTeX
       # assumed to be the name of the input_file.
       @input_file = nil
       if !argv.empty? && argv[-1] !~ /\A[-&]/
-        @input_file = CommandLine.expand_input_file(argv.pop)
+        @input_file = ErbTeX.expand_input_file(argv.pop)
       end
 
       # What remains in argv should be the tex program's '-options', which
@@ -75,31 +75,6 @@ module ErbTeX
       "#{tex_file}"
         .strip.squeeze(' ')
     end
-
-    # Return the name of the input file based on the name given in the command
-    # line. Try to find the right extension for the input file if none is given.
-    def self.expand_input_file(input_file)
-      return '' if input_file.blank?
-
-      md = %r{\A(.*)(\.[\w.]+)?\z}.match(input_file)
-      if md
-        input_base = md[1]
-        input_ext = md[2]
-      end
-      if input_ext.nil?
-        if File.exist?("#{input_base}.tex.erb")
-          "#{input_base}.tex.erb"
-        elsif File.exist?("#{input_base}.tex")
-          "#{input_base}.tex"
-        elsif File.exist?("#{input_base}.erb")
-          "#{input_base}.erb"
-        else
-          input_base
-        end
-      else
-        input_base
-      end
-    end
   end
 end
 

data/lib/erbtex/file_names.rb

@@ -0,0 +1,64 @@
+module ErbTeX
+  # Given an arbitrary file name, parse it into its components in one go.  It
+  # separates three parts of a filename: (1) the directory, if any, (2) the
+  # base name (including such things as .configrc) which is considered a base
+  # name rather than an extension, and (3) any extension, including a compound
+  # extension such as .tex.erb
+  def self.parse_file_name(path)
+    fn_re = %r{\A(?<dir>([^\/]*\/)*)  (?<base>.?[^\/.]*)  (?<ext>\.[\w.]+)?}x
+    md = fn_re.match(path)
+    { dir: md[:dir], base: md[:base], ext: md[:ext] }
+  end
+
+  # Return the name of the input file based on the name given in the command
+  # line. Try to add the right extension for the input file if none is given.
+  def self.expand_input_file(input_file)
+    return '' if input_file.blank?
+
+    fn = ErbTeX.parse_file_name(input_file)
+    input_dir = fn[:dir]
+    input_base = fn[:base]
+    input_ext = fn[:ext]
+    if input_ext.nil?
+      path = "#{input_dir}#{input_base}"
+      if File.exist?("#{path}.tex.erb")
+        "#{path}.tex.erb"
+      elsif File.exist?("#{path}.tex")
+        "#{path}.tex"
+      elsif File.exist?("#{path}.erb")
+        "#{path}.erb"
+      else
+        input_base
+      end
+    else
+      input_file
+    end
+  end
+
+  # Map the extension of the erbtex input file to the extension of the erubis
+  # output file in the following order of preference:
+  #
+  # base.tex.erb -> base.tex
+  # base.tex -> base.etx
+  # base.erb -> base.tex
+  # base.* -> base.tex
+  def self.out_file_name(in_file)
+    fn_parts = parse_file_name(in_file)
+    in_base = fn_parts[:base]
+    in_ext = fn_parts[:ext]
+
+    out_ext =
+      case in_ext
+      when '.tex.erb'
+        '.tex'
+      when '.tex'
+        '.etx'
+      when '.erb'
+        '.tex'
+      else
+        '.tex'
+      end
+    # Do not include the input directory, only output to current directory.
+    "#{in_base}#{out_ext}"
+  end
+end

data/lib/erbtex/runner.rb

@@ -4,13 +4,15 @@ require 'English'
 
 # Name space module for erbtex program.
 module ErbTeX
+  # Perform the erubis pre-processing and the TeX processing on the input
+  # file.
   def self.run(cmd_line)
     report_version && exit(0) if cmd_line.print_version
     report_help && exit(0) if cmd_line.print_help
 
-    tex_dir = input_dir(cmd_line.input_file)
-    tex_file = erb_to_tex(cmd_line.input_file, tex_dir) if cmd_line.input_file
-    run_tex(cmd_line.tex_command(tex_file), tex_dir)
+    in_dir = parse_file_name(cmd_line.input_file)[:dir]
+    tex_file = erb_to_tex(cmd_line.input_file, in_dir) if cmd_line.input_file
+    run_tex(cmd_line.tex_command(tex_file), in_dir)
   end
 
   def self.report_version
@@ -26,6 +28,7 @@ module ErbTeX
     true
   end
 
+  # Display the help for erbtex.
   def self.report_help
     puts <<~HELP
       Usage: erbtex [erbtex_options] [tex_prog_args] [file]
@@ -49,44 +52,53 @@ module ErbTeX
     true
   end
 
-  # Run the TeX program, adding add_dir to the front of TEXINPUTS, unless it is
-  # already in TEXINPUTS.
-  def self.run_tex(cmd, add_dir = nil)
+  # Run the TeX program on the erubis-processed output file, which is the
+  # input file to the TeX program.  Return the exit status.
+  def self.run_tex(cmd, in_dir = nil)
+    # If the input file is located in another directory (in_dir), add that
+    # directory to TEXINPUTS if its not already there so that the input file
+    # can \include or \input files using relative file names.
     new_env = {}
-    if add_dir
-      add_dir = File.absolute_path(File.expand_path(add_dir))
+    if in_dir
+      in_dir = File.absolute_path(File.expand_path(in_dir))
+      ENV['TEXINPUTS'] ||= ''
       unless ENV['TEXINPUTS'].split(File::PATH_SEPARATOR)
                .reject { |p| p.strip.empty? }
-               .any? { |p| add_dir == File.absolute_path(File.expand_path(p)) }
-        new_env['TEXINPUTS'] = "#{add_dir}:#{ENV['TEXINPUTS']}"
+               .any? { |p| in_dir == File.absolute_path(File.expand_path(p)) }
+        new_env['TEXINPUTS'] = "#{in_dir}:#{ENV['TEXINPUTS']}"
       end
     end
-    unless system(cmd)
+    # Call cmd with the environment augmented by possibly expanded TEXINPUTS
+    # environment variable.
+    unless system(new_env, cmd)
       warn "Call to '#{cmd}' failed."
       exit $CHILD_STATUS
     end
+    # Run a second time unless its latexmk
+    unless cmd =~ /\A *latexmk/
+      unless system(new_env, cmd)
+        warn "Call to '#{cmd}' failed."
+        exit $CHILD_STATUS
+      end
+    end
     $CHILD_STATUS
   end
 
-  def self.input_dir(in_file)
-    return nil unless in_file
-
-    in_file_absolute = File.absolute_path(File.expand_path(in_file))
-    in_file_absolute[%r{\A(.*/)([^/.]+)(\.[\w.]+)\z}, 1]
-  end
-
-  # Pre-process the input file with erubis, adding the add_dir to the front of
-  # the ruby load path if its not already in the load path.  Return the name of
-  # the processed file.
-  def self.erb_to_tex(in_file, add_dir = nil)
-    if File.exist?(add_dir)
-      add_dir = File.absolute_path(File.expand_path(add_dir))
+  # Pre-process the input file with erubis, adding the in_dir to the front of
+  # the ruby load path if its not already in the load path so that requires in
+  # the input file can be found if they are in the in_dir.  Return the name of
+  # the output file.
+  def self.erb_to_tex(in_file, in_dir = nil)
+    # Add input to ruby LOAD_PATH, $:,if its not already there.
+    if File.exist?(in_dir)
+      in_dir = File.absolute_path(File.expand_path(in_dir))
       unless $LOAD_PATH
-               .any? { |p| add_dir == File.absolute_path(File.expand_path(p)) }
-        $LOAD_PATH.unshift(add_dir)
+               .any? { |p| in_dir == File.absolute_path(File.expand_path(p)) }
+        $LOAD_PATH.unshift(in_dir)
       end
     end
 
+    # Read the input
     in_contents = nil
     File.open(in_file) do |f|
       in_contents = f.read
@@ -95,7 +107,7 @@ module ErbTeX
 
     pat = ENV['ERBTEX_PATTERN'] || '{: :}'
 
-    out_file = out_file_name(in_file)
+    out_file = ErbTeX.out_file_name(in_file)
     File.open(out_file, 'w') do |f|
       er = ::Erubis::Eruby.new(in_contents, pattern: pat)
       f.write(er.result)
@@ -108,53 +120,4 @@ module ErbTeX
     warn "Erubis pre-processing failed: #{e}"
     exit 1
   end
-
-  def self.out_file_name(in_file)
-    in_file_absolute = File.absolute_path(File.expand_path(in_file))
-    in_dir = File.dirname(in_file_absolute)
-    in_base = File.basename(in_file_absolute)
-    # Note that File.extname only gets the last extension.  We want all
-    # extensions following the basename, but we don't count a dot at the
-    # beginning of a filename as introducing an extension.  So, we cook our
-    # own solution here with Regexp's.
-    if in_base =~ /[^.](.[^.]+)+\z/
-      in_ext = $1
-      in_base = File.basename(in_base, in_ext)
-    else
-      in_ext = ''
-    end
-
-    out_ext = if in_ext.empty?
-                if File.exist?("#{in_file}.tex.erb")
-                  '.tex'
-                elsif File.exist?("#{in_file}.tex")
-                  '.etx'
-                elsif File.exist?("#{in_file}.erb")
-                  '.tex'
-                else
-                  '.tex'
-                end
-              else
-                case in_ext
-                when '.tex.erb'
-                  '.tex'
-                when '.tex'
-                  '.etx'
-                when '.erb'
-                  '.tex'
-                else
-                  '.tex'
-                end
-              end
-
-    # Find a writable directory, prefering the one the input file came
-    # from, or the current directory, and a temp file as a last resort.
-    if File.writable?(in_dir)
-      File.join(in_dir, "#{in_base}#{out_ext}")
-    elsif File.writable?('.')
-      File.join('.', "#{in_base}#{out_ext}")
-    else
-      Tempfile.new([in_base, out_ext]).path
-    end
-  end
 end

data/lib/erbtex/version.rb

@@ -1,3 +1,3 @@
 module ErbTeX
-  VERSION = "0.4.2"
+  VERSION = '0.4.3'
 end

data/spec/example_files/roots.tex

@@ -0,0 +1,23 @@
+\documentclass{article}
+\usepackage[mathbf]{euler}
+\usepackage{longtable}
+
+\begin{document}
+\begin{longtable}[c]{r|r}
+\hline\hline
+\multicolumn{1}{c|}{\mathversion{bold}$x$}&
+\multicolumn{1}{c}{\mathversion{bold}\rule{0pt}{12pt}$\sqrt{x}$}\\
+\hline\hline
+\endhead
+\hline\hline
+\endfoot
+
+%% Here is the loop for the body of the table, which starts with
+%% x one step beyond 0 and pre-computes some of the functions
+{:0.upto(100).each do |x| :}
+  {:= "\\mathversion{bold}$%0.4f$" % x :}&
+  {:= "$%0.8f$" % Math.sqrt(x) :}\\
+{:end:}
+%% End the table and document---this version comes to 315 pages!
+\end{longtable}
+\end{document}

data/spec/example_files/roots.tex.erb

@@ -0,0 +1,23 @@
+\documentclass{article}
+\usepackage[mathbf]{euler}
+\usepackage{longtable}
+
+\begin{document}
+\begin{longtable}[c]{r|r}
+\hline\hline
+\multicolumn{1}{c|}{\mathversion{bold}$x$}&
+\multicolumn{1}{c}{\mathversion{bold}\rule{0pt}{12pt}$\sqrt{x}$}\\
+\hline\hline
+\endhead
+\hline\hline
+\endfoot
+
+%% Here is the loop for the body of the table, which starts with
+%% x one step beyond 0 and pre-computes some of the functions
+{:0.upto(100).each do |x| :}
+  {:= "\\mathversion{bold}$%0.4f$" % x :}&
+  {:= "$%0.8f$" % Math.sqrt(x) :}\\
+{:end:}
+%% End the table and document---this version comes to 315 pages!
+\end{longtable}
+\end{document}

data/spec/lib/command_line_spec.rb

@@ -18,6 +18,16 @@ module ErbTeX
             -recorder -shell-escape -src-specials cr,display,hbox,math,par
             -translate-file willy -version &myformat file_name.tex.erb
           )
+        @argv_with_remote_file =
+          %w(
+            -draftmode -enc -etex -file-line-error -fmt junk
+            -halt-on-error -ini -interaction batchmode -ipc -ipc-start
+            -jobname junk -kpathsea-debug 8 -mktex tex --invoke=pdflatex
+            -mltex -nomktex tfm -ouptput-comment This\ is\ a\ long\ comment
+            -output-directory ~/texmf/tex -parse-first-line -progname pdflatex
+            -recorder -shell-escape -src-specials cr,display,hbox,math,par
+            -translate-file willy -version &myformat example_files/file_name.tex.erb
+          )
         @argv_with_invoke_and_file =
           %w(
             --invoke=lualatex
@@ -69,6 +79,22 @@ module ErbTeX
         EOS
       end
 
+      it 'parse command line with remote file name' do
+        cl = CommandLine.new(@argv_with_remote_file)
+        expect(cl.erbtex_name).to eq('erbtex')
+        expect(cl.tex_program).to eq('pdflatex')
+        expect(cl.input_file).to eq('example_files/file_name.tex.erb')
+        expect(cl.tex_command).to eq(<<~'EOS'.tr("\n", ' ').strip)
+          pdflatex -draftmode -enc -etex -file-line-error -fmt junk -halt-on-error
+          -ini -interaction batchmode -ipc -ipc-start -jobname junk -kpathsea-debug 8
+          -mktex tex -mltex -nomktex tfm
+          -ouptput-comment This\ is\ a\ long\ comment
+          -output-directory \~/texmf/tex -parse-first-line -progname pdflatex
+          -recorder -shell-escape -src-specials cr,display,hbox,math,par
+          -translate-file willy -version \&myformat example_files/file_name.tex.erb
+        EOS
+      end
+
       it 'parse command line with invoke and file name' do
         cl = CommandLine.new(@argv_with_invoke_and_file)
         expect(cl.erbtex_name).to eq('erbtex')
@@ -120,54 +146,5 @@ module ErbTeX
         EOS
       end
     end
-
-    describe 'expand input file' do
-      before :all do
-        unless Dir.exist?('tmp')
-          FileUtils.mkdir_p('tmp')
-        end
-      end
-
-      before :each do
-        FileUtils.rm_f Dir.glob('tmp/*')
-      end
-
-      after :all do
-        FileUtils.rm_rf('tmp')
-      end
-
-      it 'expand file name with no extension and .tex existing' do
-        FileUtils.touch('tmp/junk.tex')
-        expect(CommandLine.expand_input_file('tmp/junk')).to eq('tmp/junk.tex')
-      end
-
-      it 'expand file name with no extension and .tex.erb existing' do
-        FileUtils.touch('tmp/junk.tex.erb')
-        expect(CommandLine.expand_input_file('tmp/junk'))
-          .to eq('tmp/junk.tex.erb')
-      end
-
-      it 'expand file name with no extension and .erb existing' do
-        FileUtils.touch('tmp/junk.erb')
-        expect(CommandLine.expand_input_file('tmp/junk'))
-          .to eq('tmp/junk.erb')
-      end
-
-      it 'expand file name with .tex extension and existing' do
-        FileUtils.touch('tmp/junk.tex')
-        expect(CommandLine.expand_input_file('tmp/junk'))
-          .to eq('tmp/junk.tex')
-      end
-
-      it 'expand file name with .tex extension and not existing' do
-        expect(CommandLine.expand_input_file('tmp/junk.tex'))
-          .to eq('tmp/junk.tex')
-      end
-
-      it 'expand file name with funny extension and not existing' do
-        expect(CommandLine.expand_input_file('tmp/junk.arb'))
-          .to eq('tmp/junk.arb')
-      end
-    end
   end
 end

data/spec/lib/file_names_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+module ErbTeX
+  describe 'expand input file' do
+    before :all do
+      unless Dir.exist?('tmp')
+        FileUtils.mkdir_p('tmp')
+      end
+    end
+
+    before :each do
+      FileUtils.rm_f Dir.glob('tmp/*')
+    end
+
+    after :all do
+      FileUtils.rm_rf('tmp')
+    end
+
+    it 'expand file name with no extension and .tex existing' do
+      FileUtils.touch('tmp/junk.tex')
+      expect(ErbTeX.expand_input_file('tmp/junk')).to eq('tmp/junk.tex')
+    end
+
+    it 'expand file name with no extension and .tex.erb existing' do
+      FileUtils.touch('tmp/junk.tex.erb')
+      expect(ErbTeX.expand_input_file('tmp/junk'))
+        .to eq('tmp/junk.tex.erb')
+    end
+
+    it 'expand file name with no extension and .erb existing' do
+      FileUtils.touch('tmp/junk.erb')
+      expect(ErbTeX.expand_input_file('tmp/junk'))
+        .to eq('tmp/junk.erb')
+    end
+
+    it 'expand file name with no extension and .tex existing' do
+      FileUtils.touch('tmp/junk.tex')
+      expect(ErbTeX.expand_input_file('tmp/junk'))
+        .to eq('tmp/junk.tex')
+    end
+
+    it 'expand file name with .tex extension and .tex existing' do
+      FileUtils.touch('tmp/junk.tex')
+      expect(ErbTeX.expand_input_file('tmp/junk.tex'))
+        .to eq('tmp/junk.tex')
+    end
+
+    it 'expand file name with .tex extension and not existing' do
+      FileUtils.rm_rf('tmp/junk.tex') if File.exist?('tmp/junk.tex')
+      expect(ErbTeX.expand_input_file('tmp/junk.tex'))
+        .to eq('tmp/junk.tex')
+    end
+
+    it 'expand file name with funny extension and not existing' do
+      expect(ErbTeX.expand_input_file('tmp/junk.arb'))
+        .to eq('tmp/junk.arb')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erbtex
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Daniel E. Doherty
@@ -137,11 +137,11 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
-  Create a local link called pdflatex to erbtex and it will
-                       act just like pdflatex except that it will process ruby fragments
-                       between {: and :} markers, greatly expanding the ability to generate
+  erbtex will act just like pdflatex except that it will
+                       process ruby fragments between {: and :} markers,
+                       greatly expanding the ability to generate
                        automated TeX and LaTeX documents.
-email: ded-erbtex@ddoherty.net
+email: ded@ddoherty.net
 executables:
 - erbtex
 extensions: []
@@ -165,11 +165,15 @@ files:
 - examples/testbind.tex
 - lib/erbtex.rb
 - lib/erbtex/command_line.rb
+- lib/erbtex/file_names.rb
 - lib/erbtex/runner.rb
 - lib/erbtex/version.rb
+- spec/example_files/roots.tex
+- spec/example_files/roots.tex.erb
 - spec/lib/command_line_spec.rb
+- spec/lib/file_names_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/ddoherty03/erbtex
 licenses: []
 metadata: {}
 post_install_message: