limarka 20.6.8.pre.350 → 20.6.8.pre.358

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36d248ccf20ef4fe2f1d54d4f376fde272fb463fa6904571e90932e3020b713c
-  data.tar.gz: 4537a2fc39a6e1fce79fa157b998e5d58e02c842364abf1779179751037f1de0
+  metadata.gz: 1e04e1b49b83129cd8175b2dbe0c7f0e22555265dc692905bcdccf685b500a06
+  data.tar.gz: 4f1b840ae56c1f1d31c04df4e310edd34dfac0caeedfe4b24f145a721e254bc2
 SHA512:
-  metadata.gz: 468e561e1518c0694cbe181dc6cc2d7cdf711db3d9680b00afaca039b19bd50c52478261074db283851c7f52ebbed189645694b582963ba40db093afbcc5d8f5
-  data.tar.gz: 81966466cd3d906ef1ebc42bbb897870617a7da6b9aa8bae079b7d3f258df9143962ecf687e64590eb92e7204970d032b21098ce87ccb1f16e0e712133fe9e35
+  metadata.gz: 98cc2bd28e4eeea96a0c542b13a85993d8f527a9752269d0bdaf65991974b2f2c00ed344ab3ee18b7dc5a4518643dc90d3f39e902a7836bf03f1720ae12c1b24
+  data.tar.gz: b5dbe027b9e14b8b1e7eb6cf451f5fbcfd6248642958d5262da09da2ef8538243ff2c45e6e694d384505827a747d701c7129dee1b881ecccecf29b25a8991ca1

data/.travis.yml

@@ -11,29 +11,35 @@ env:
 jobs:
   include:
     - stage: testes
+      name: "Testes RUBY"
       before_install:
       - sudo apt-get update -qq
-      - bin/instalador.sh -dp
+      - sudo bin/instaladores/dependencias_execucao_install.sh && sudo bin/instaladores/dependencias_desenvolvimento_install.sh
+      - sudo bin/instaladores/pandoc_install.sh -q
       before_script:
         - pandoc -v
-        - git clone https://github.com/abntex/trabalho-academico-limarka.git modelo-oficial
+        - git clone --depth=1 https://github.com/abntex/trabalho-academico-limarka.git modelo-oficial
       script:
       - bundle exec rake spec:ruby
       - bundle exec rake cucumber:ruby
     - stage: testes
+      name: "Testes com LaTeX (PDFs)"
       cache:
         directories:
           - $HOME/.TinyTeX
       before_install:
       - sudo apt-get update -qq
-      - export PATH=$PATH:~/.TinyTeX2/bin/x86_64-linux
-      - bin/instalador.sh -dptc
+      - sudo bin/instaladores/dependencias_execucao_install.sh && sudo bin/instaladores/dependencias_desenvolvimento_install.sh
+      - sudo bin/instaladores/pandoc_install.sh -q
+      - sudo bin/instaladores/tinytex_install.sh
+      - export PATH=$PATH:~/.TinyTeX/bin/x86_64-linux
       before_script:
+        - tlmgr --version && tlmgr show --only-installed
         - latexmk -v
         - xelatex -v
         - pdftotext -v
         - pandoc -v
-        - git clone https://github.com/abntex/trabalho-academico-limarka.git modelo-oficial
+        - git clone --depth=1 https://github.com/abntex/trabalho-academico-limarka.git modelo-oficial
       script:
       - bundle exec rspec spec/dependencias/latex_spec.rb
       - bundle exec rspec spec/simples_spec.rb
@@ -62,5 +68,5 @@ jobs:
         script: bin/build-docker.sh && bin/deploy-docker.sh $TRAVIS_TAG
         on:
           tags: true
-        after_failure:
+        after_script:
           - cat /root/.TinyTeX/texmf-var/web2c/tlmgr.log

data/bin/build-docker.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 # $1: limarka version
 echo "Gerando imagem do limarka..."
-docker build -t ruby-latex-pandoc - < containers/ruby-latex-pandoc.dockerfile
+docker build -t ruby-latex-pandoc . -f containers/ruby-latex-pandoc.dockerfile
 docker build -t limarka - < containers/limarka.dockerfile
 docker images

data/bin/deploy-docker.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 # $1: TAG
 # http://codewiki.wikidot.com/shell-script:if-else
 if [ -n "$1" ]

data/bin/instalador.sh

@@ -52,14 +52,21 @@ done
 if [ "$codename" = "bionic" ]; then
 
   if [ -n "$dependencias" ]; then
-    $dry sudo apt-get install -y -qq \
+    $dry sudo apt-get install -y -qq --no-install-recommends \
       language-pack-pt \
       locales \
       pdfgrep \
       poppler-utils \
-      ruby-full \
+      ruby-bundler \
+      ruby-json \
+      ruby-ffi \
+      libffi-dev \
       unzip \
-      xclip
+      xclip \
+      wget \
+      perl \
+      luajit \
+      python
   fi
 
   if [ -n "$tex" ]; then
@@ -80,33 +87,42 @@ if [ "$codename" = "bionic" ]; then
           abntex2 \
           babel-portuges \
           bookmark \
+          caption \
           enumitem \
           epstopdf-pkg \
-          ifetex \
           lastpage \
           lipsum \
           listings \
-          ltcaption \
           memoir \
           microtype \
           pdflscape \
           pdfpages \
+          psnfss \
+          shipunov \
+          texliveonfly \
           textcase \
           xcolor
 
           tlmgr option -- autobackup 0
       else
         $dry wget -qO- "https://yihui.name/gh/tinytex/tools/install-unx.sh" \| sh
-        $dry tlmgr install abntex2 \
+        $dry tlmgr install \
+          abntex2 \
           babel-portuges \
+          bookmark \
+          caption \
           enumitem \
-          ifetex \
+          epstopdf-pkg \
           lastpage \
           lipsum \
           listings \
           memoir \
           microtype \
+          pdflscape \
           pdfpages \
+          psnfss \
+          shipunov \
+          texliveonfly \
           textcase \
           xcolor
           $dry tlmgr option -- autobackup 0

data/bin/instaladores/dependencias_desenvolvimento_install.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+apt-get install -y -qq \
+  pdfgrep \
+  poppler-utils

data/bin/instaladores/dependencias_execucao_install.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+apt-get install -y -qq \
+  libfontconfig \
+  locales \
+  perl-doc \
+  wget \
+  unzip

data/bin/instaladores/pandoc_install.sh

@@ -11,10 +11,10 @@ while getopts "q" opt; do
   esac
 done
 
-if [ $quiet eq 1 ]
+if [ $quiet eq 1 ]; then
   wget -nv $PANDOC_DEB
 else
   wget -c $PANDOC_DEB
 fi
 
-sudo dpkg -i pandoc-*.deb && rm pandoc-*.deb
+dpkg -i pandoc-*.deb && rm pandoc-*.deb

data/bin/instaladores/tinytex_install.sh

@@ -1,25 +1,28 @@
 #!/usr/bin/env sh
 
-if command -v tlmgr > /dev/null; then
+if [ "$IGNORE_CACHE" != "1" ] && command -v tlmgr > /dev/null; then
   tex_em_cache=1
   echo TinyTeX não será instalado pois foi encontrado no cache.
-fi
-
-if [ $tex_em_cache -eq 1 ]; then
-  : #echo TinyTeX não será instalado.
 else
     wget -qO- "https://yihui.name/gh/tinytex/tools/install-unx.sh" | sh
-    tlmgr install abntex2 \
+    ~/bin/tlmgr install \
+      abntex2 \
       babel-portuges \
+      bookmark \
+      caption \
       enumitem \
-      ifetex \
+      epstopdf-pkg \
       lastpage \
       lipsum \
       listings \
       memoir \
       microtype \
+      pdflscape \
       pdfpages \
+      psnfss \
+      shipunov \
+      texliveonfly \
       textcase \
       xcolor
-      tlmgr option -- autobackup 0
+      ~/bin/tlmgr option -- autobackup 0
 fi

data/containers/ruby-latex-pandoc.dockerfile

@@ -5,37 +5,18 @@ LABEL maintainer="eduardo.ufpb@gmail.com"
 # Tentamos seguir as melhores práticas:
 # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
 
-RUN apt-get update && apt-get install -y -qq \
-	build-essential \
-	fontconfig \
-	locales \
-	pdfgrep \
-	poppler-utils \
-	unzip \
-	wget
+WORKDIR /tmp
+COPY bin/instaladores/dependencias_execucao_install.sh \
+	bin/instaladores/pandoc_install.sh \
+	bin/instaladores/tinytex_install.sh \
+	/tmp/
 
-# Instala tinytex (/root/.TinyTex)
-RUN wget -qO- "https://yihui.name/gh/tinytex/tools/install-unx.sh" | sh
-ENV PATH="/root/bin:${PATH}"
+RUN apt-get update && /tmp/dependencias_execucao_install.sh
 
-# instala bibliotecas para o abntex2/limarka
-RUN tlmgr install \
-	abntex2 \
-	babel-portuges \
-	bookmark \
-	enumitem \
-	epstopdf-pkg \
-	ifetex \
-	lastpage \
-	lipsum \
-	listings \
-	ltcaption \
-	memoir \
-	microtype \
-	pdflscape \
-	pdfpages \
-	textcase \
-	xcolor
+# Instala tinytex (/root/.TinyTex)
+# e bibliotecas para o abntex2/limarka
+RUN IGNORE_CACHE=1 /tmp/tinytex_install.sh
+ENV PATH="/root/bin:~/.TinyTeX/bin/x86_64-linux:${PATH}"
 
 # Configurando o idioma português #175: https://hub.docker.com/_/debian/#locales
 RUN rm -rf /var/lib/apt/lists/* \
@@ -43,7 +24,4 @@ RUN rm -rf /var/lib/apt/lists/* \
 ENV LANG pt_BR.UTF8
 
 # Instalação do pandoc
-WORKDIR /tmp
-RUN wget https://github.com/jgm/pandoc/releases/download/2.9.2.1/pandoc-2.9.2.1-1-amd64.deb \
-&& dpkg -i pandoc-*.deb \
-&& rm pandoc-*.deb
+RUN /tmp/pandoc_install.sh

data/lib/limarka/conversor.rb

@@ -58,6 +58,9 @@ module Limarka
     def compila
       Dir.chdir(options[:output_dir]) do
         basename = File.basename(texto_tex_file, '.tex')
+        if system ("whereis texliveonfly")
+          system "texliveonfly -c xelatex -f #{basename}",  :out=>'xxx-texliveonfly-std.txt'
+        end
         system "latexmk --quiet --xelatex -f #{basename}",  :out=>'xxx-latexmk-std.txt', :err=>'xxx-latexmk-erros.txt'
         if (usa_pdftotext) then
           system "pdftotext -enc UTF-8 #{basename}.pdf"

data/limarka.gemspec

@@ -50,5 +50,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pandoc_abnt", "~> 2.0.0"
   spec.add_dependency "guard"
   spec.add_dependency "guard-shell"
+  spec.add_dependency "guard-rake"
 
 end

data/rakelib/guard.rake

@@ -0,0 +1,28 @@
+ERB_TEMPLATE = <<~HEREDOC
+guard :shell do
+  <% all_tasks.each do |t, files| %>
+    watch(%r{^(<%= files.join('|') %>)$}) do |m|
+      system("rake <%= t %>")
+    end
+  <% end %>
+end
+HEREDOC
+
+desc "Generates a Guardfile from Rake tasks"
+task :guard do
+  app = Rake::application
+  app.init
+  app.load_rakefile
+
+  all_tasks = {}
+  app.tasks.each do |t|
+    t.sources.each do |src|
+      if File.file?(src) then
+        all_tasks[t.name] = [] unless all_tasks[t.name]
+        all_tasks[t.name] << src
+      end
+    end
+  end
+  template = ERB.new(ERB_TEMPLATE)
+  File.write('Guardfile', template.result(binding))
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: limarka
 version: !ruby/object:Gem::Version
-  version: 20.6.8.pre.350
+  version: 20.6.8.pre.358
 platform: ruby
 authors:
 - Eduardo de Santana Medeiros Alexandre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,6 +262,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Com essa ferramenta você poderá escrever sua monografia, dissertação
   ou tese utilizando Markdown (linguagem mais simples que Latex).
 email:
@@ -288,7 +302,8 @@ files:
 - bin/console
 - bin/deploy-docker.sh
 - bin/instalador.sh
-- bin/instaladores/dependencias_install.sh
+- bin/instaladores/dependencias_desenvolvimento_install.sh
+- bin/instaladores/dependencias_execucao_install.sh
 - bin/instaladores/pandoc_install.sh
 - bin/instaladores/tinytex_install.sh
 - bin/setup
@@ -346,6 +361,7 @@ files:
 - lib/limarka/trabalho.rb
 - lib/limarka/version.rb
 - limarka.gemspec
+- rakelib/guard.rake
 - referencias.bib
 homepage: https://github.com/abntex/limarka
 licenses:

data/bin/instaladores/dependencias_install.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-sudo apt-get install -y -qq \
-  language-pack-pt \
-  locales \
-  pdfgrep \
-  poppler-utils \
-  unzip