rutex 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a109437a1fab0035da570f512d6280fab45ed5da7ff418c0362672c1fed7c8d
-  data.tar.gz: 531719ff61028adc2afde56dbeff66a7ec94310a72fb742cc312b87522471023
+  metadata.gz: 2d1778f9c254e131282f0cb5edb930ac63e860341206494d0fcf7bc7f46c9846
+  data.tar.gz: affe81dd3e2e234127477b301f8f721735cadd870e7b25e45c911f4db3d6598c
 SHA512:
-  metadata.gz: '01063887af0845f41b5b2467465924cc690b826950f4f3940d205b996b0670d05112f8ec6040ad7d26d45627542492bd96216c8e7dc8faaddbd7805a37fe6ae1'
-  data.tar.gz: dc16f7aa28e8b802bdb06cecef112a32abf91c43a078722f3938491849172345d8d28f68ebaff46ded8dace212361e3a0852310ae350eb7518992e539a3f625a
+  metadata.gz: 16e40a9985a176feb0d32e9d46b1a5f4b2dadb27ffa5b84f518aa1b14b1ea732d4450df968a00b504e1eb65623509f82d2a5c4d7c5a8a676d6d11a619bb548ea
+  data.tar.gz: 9af7dddadca679980a796f9b941add10ea33e21649325adcdfb95ace2fe7887ae4f3d0b36b933ffd444ea7ae416937e45ae372c46602fbc877652c4eff65ca9b

data/.gitignore

@@ -10,3 +10,5 @@
 TODO.md
 .rake*
 *.swp
+*.tex
+*.png

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rutex (0.1.3)
+    rutex (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/exe/rutex

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+
 require "rutex"
 
 Rutex.entry(ARGV)

data/lib/rutex/version.rb

@@ -1,3 +1,3 @@
 module Rutex
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/rutex.rb

@@ -1,99 +1,113 @@
+$LOAD_PATH.unshift __dir__
 require 'rutex/version'
 require 'tempfile'
 
-class RutexError < StandardError; end
-class PdfError < RutexError; end
-class ConvertError < RutexError; end
+class RutexError < StandardError; end # :nodoc:
+class PdfError < RutexError; end # :nodoc:
+class PackageError < RutexError; end # :nodoc:
 
 module Rutex
   extend self
 
+  attr_accessor :color, :equation, :args, :output_file
+
   def entry(args)
     @args=args
 
-    if args.size<1 or !(args & %w(-h --help)).empty?
-      help
+    unless pdflatex
+      raise PdfError "Missing pdflatex binary from texlive package"
     end
 
-    parse_options
+    help if (args.include?('-h') or args.include?('--help'))
+
+    version if args.include?('-v')
 
+    if args.include?('-f')
+      _, @output_file = args.slice!(args.index('-f'),2)
+    end
+    @output_file||=Tempfile.new(['equation','.png']).path
+
+    if args.include?('-c')
+      _, @color = args.slice!(args.index('-c'),2)
+    end
     @color||='black'
-    @eqn=args.join
-    tex_file=make_tex
-    @outfile||=(tex_file.sub %r(.*/),'')+'.png'
-    puts "Generating #{outfile}"
-    convert_tex(tex_file)
+
+    help if args.empty?
+
+    @equation=args.join
+    make_tex_file
+    puts "Generating #{output_file}"
+    pdflatex_command
+    #convert_tex(tex_file)
   end
 
-  def parse_options
-    opts=%w(c f)
+  def version
+    puts "rutex #{VERSION}"
+    exit
+  end
 
-    opts_idx=args.map.with_index do |e,i|
-      e.match(/^-[#{opts}.join]/) ? i : nil
-    end.compact.reverse
+  def pdflatex
+    %x(type -p pdflatex)
+    $?.exitstatus==0 ? true : false
+  end
 
-    return if opts_idx.empty?
+  def pdflatex_options
+    "-halt-on-error -interaction=nonstopmode -output-directory=#{output_dir}"
+  end
 
-    opts_idx.each do |i|
-      opt,value=args.slice!(i,2)
-      if opt=='-f'
-        @outfile=value
-      elsif opt=='-c'
-        @color=value
-      end
-    end
+  def pdflatex_command
+    %x(pdflatex #{pdflatex_options} #{tex_file})
+    raise PdfError "Error logged in #{output_dir}" unless $?.exitstatus==0
+  rescue PdfError => e
+    puts "PdfError (#{e.message})"
+    exit
+  end
+
+  def install_standalone_package
+    'http://mirrors.ctan.org/macros/latex/contrib/standalone.zip'
   end
 
   def help
     puts <<~eof
-    Usage: rutex <equation> [options]
+    Usage:
+      rutex <equation> [options]
 
     Options:
-      -c --color
-        set color of equation (default black)
-      -f --file
-        set output file
+      -c, --color     set color of equation (default black)
+      -f,  --file     set output file
 
     Examples:
       rutex E = mc^2
       rutex '2\\neq\\sqrt{9}'
-      rutex 3=\\\\sqrt{9} -c white -f myeqn.png
+      rutex 3=\\\\sqrt{9} -c white -f myequation.png
     eof
     exit
   end
 
-  def texstr
-    <<~eof
+  def tex_string
+  end
+
+  def output_dir
+    File.dirname(File.expand_path(output_file))
+  end
+
+  def make_tex_file
+    tex_string = <<~str
     \\documentclass[preview]{standalone}
     \\usepackage{xcolor}
     \\begin{document}
-    $\\color{#{color}}#{eqn}$
+    $\\color{#{color}}#{equation}$
     \\end{document}
-    eof
+    str
+    File.write(tex_file, tex_string)
   end
 
-  def make_tex
-    tmp=Tempfile.new('eqn')
-    tmp.write(texstr)
-    path=tmp.path
-    dir=path.sub(%r(.*\K/.*),'')
-    tmp.close
-
-    unless has_pdflatex
-      "Cannot proceed: RuTeX depends on pdflatex"
-      exit
-    end
-
-    %x(pdflatex --halt-on-error --output-directory=#{dir} #{path})
-    raise PdfError unless $?.exitstatus==0
-    path
-  rescue => e
-    puts "#{e.message}:\nError logged in #{path}.log"
-    exit
+  def tex_file
+    "#{output_dir}/#{File.basename(output_file,File.extname(output_file))}.tex"
   end
 
   def convert_tex(tex_file)
-    %x(convert -density 300 #{tex_file}.pdf #{outfile} 2>/dev/null)
+    %x(convert -density 300 #{tex_file}.pdf #{output_file} 2>/dev/null)
     raise ConvertError unless $?.exitstatus==0
   rescue => e
     puts "#{e.message}"
@@ -101,22 +115,6 @@ module Rutex
   end
 
   def has_pdflatex
-    system('type','-p', 'pdflatex', out: File::NULL, err: File::NULL)
-  end
-
-  def color
-    @color
-  end
-
-  def eqn
-    @eqn
-  end
-
-  def args
-    @args
-  end
-
-  def outfile
-    @outfile
+    system('type','-p', 'pdflatex', [:out, :err] => File::NULL)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rutex
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - sergioro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug