limarka 20.6.8.pre.347 → 20.6.8.pre.354

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2086ee691d20cd8319ffe7093a7cb5b92fa8bb4355e89481e0ef618c56821cb6
-  data.tar.gz: f396d35f44f67c0d99a453db953a0e567bd1ee6e68f442a837d48acd02f132fb
+  metadata.gz: 2cdced2bed63c39cd0d7a3c53f0d173f0c6055b7c126357b093c0190bd6f4376
+  data.tar.gz: 819791f59b79d7dc9eab61ce3db6d29d8ad1aed6bbf43a148f7d0ae873ec7d8a
 SHA512:
-  metadata.gz: 5192624798d909f0aaec395709aaaf225f721b68647a1b92bbabe5b82cc706c69d809033dcbaf19699290febabb9c00e4470d5fd87bdf18c407d6d5daffb3f9e
-  data.tar.gz: 5682f187f8a7928c9576d9fd06c3f63d05020c1093b59ef6b19c97e7903f52c5f4844c3513ea4f980c03d7201be085c49eac4d729c5497539dade46723db867f
+  metadata.gz: e47ba713bec00ae9097b4110015fbba740f19b351eeb382cb0c4b68a85578b8c02bcad4d7c7baacc46cfdccc7fed8e4755ee2ab64bd0bdd6865c9e14bed3d0ab
+  data.tar.gz: 12287d6639af0445c9ee62e25bb61676028afb802eab92395db6fe6fbf8eafd813409ac812c9b739fcc245a8ae0c23467a87d2542b7e90a0101d637e94a75800

data/.travis.yml

@@ -11,29 +11,35 @@ env:
 jobs:
   include:
     - stage: testes
+      name: "Testes do ruby (sem compilação pdf)"
       before_install:
       - sudo apt-get update -qq
-      - bin/instalador.sh -dp
+      - bin/instaladores/dependencias_execucao_install.sh && bin/instaladores/dependencias_desenvolvimento_install.sh
+      - 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 do latex (com compilação pdf)"
       cache:
         directories:
           - $HOME/.TinyTeX
       before_install:
       - sudo apt-get update -qq
-      - export PATH=$PATH:~/.TinyTeX2/bin/x86_64-linux
-      - bin/instalador.sh -dptc
+      - bin/instaladores/dependencias_execucao_install.sh && bin/instaladores/dependencias_desenvolvimento_install.sh
+      - bin/instaladores/pandoc_install.sh -q
+      - 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
@@ -52,23 +58,15 @@ jobs:
         api_key:
           secure: YLuHbYsHGPTHoXIBr874CbIAn0/z0H0B8aW39NDQIwk7SMsd4HBgTq/6zgtUVLsp3AO9daHzk0FGcMKAOh9fxFzUuA5MmQTdQA8A3VI7JRM2BEVl8x6Hw2bjMTYMCAVGNGZT9oFKIq2lHByf9zDoQlT7CobKCY3Ofa0MTKcGgvfnqaW+VGosKrcYyZ9HPxBkH8SGnzef1joIcdtWOi3HHV28AacgRslWEkwTmYrsQcamTafQazuIbdhQ5UzvKS6PuIX56wvP6ugy9QTPtsU82x7oaDk+5e8ULJ2BMu/jwM4H3/aJ8ASg17a2EeIJRFckjQpMc+P3WCnbTu4tV2NqsXRzNmTcqwsM4bHTX2/WPlvVNwmTE9f5wSR9uCoQbDvCimCoo0miAE7xMbik0zvWVYZFtIcw3Rn+F+36jXXzY5xLSSYIZgJATbQgnNrYzCs54mUtmF+kUhYzDov4VfYcbc4ihEP6A/AdxvxuO4/xkGIsxlzxjCSw/Bs369zDXO5uUtORSQsLYPW4gZM+p++UMR63l7Radaq45HX0AVtkg9oWMj/UO8XCE2nMEUelcfeseuyy8ZB/Ga97KFVQH/LZLJYYU8+qDXQdfe8oWOlthuOA2QKyErDWQ9YWW2LVRhTacVjLBkYeChgpCReT1FDW982jfSWFCJTtb/XkM+D/90U=
         on:
-          branches:
-            only:
-              - master
-      - provider: rubygems
-        api_key:
-          secure: YLuHbYsHGPTHoXIBr874CbIAn0/z0H0B8aW39NDQIwk7SMsd4HBgTq/6zgtUVLsp3AO9daHzk0FGcMKAOh9fxFzUuA5MmQTdQA8A3VI7JRM2BEVl8x6Hw2bjMTYMCAVGNGZT9oFKIq2lHByf9zDoQlT7CobKCY3Ofa0MTKcGgvfnqaW+VGosKrcYyZ9HPxBkH8SGnzef1joIcdtWOi3HHV28AacgRslWEkwTmYrsQcamTafQazuIbdhQ5UzvKS6PuIX56wvP6ugy9QTPtsU82x7oaDk+5e8ULJ2BMu/jwM4H3/aJ8ASg17a2EeIJRFckjQpMc+P3WCnbTu4tV2NqsXRzNmTcqwsM4bHTX2/WPlvVNwmTE9f5wSR9uCoQbDvCimCoo0miAE7xMbik0zvWVYZFtIcw3Rn+F+36jXXzY5xLSSYIZgJATbQgnNrYzCs54mUtmF+kUhYzDov4VfYcbc4ihEP6A/AdxvxuO4/xkGIsxlzxjCSw/Bs369zDXO5uUtORSQsLYPW4gZM+p++UMR63l7Radaq45HX0AVtkg9oWMj/UO8XCE2nMEUelcfeseuyy8ZB/Ga97KFVQH/LZLJYYU8+qDXQdfe8oWOlthuOA2QKyErDWQ9YWW2LVRhTacVjLBkYeChgpCReT1FDW982jfSWFCJTtb/XkM+D/90U=
-        on:
-          tag: true
-          all_branches: true
+          branch: master
       - provider: script
         script: bin/build-docker.sh && bin/deploy-docker.sh
         on:
           repo: abntex/limarka
-          branches:
-            only:
-              - master
+          branch: master
       - provider: script
         script: bin/build-docker.sh && bin/deploy-docker.sh $TRAVIS_TAG
         on:
           tags: true
+        after_failure:
+          - cat /root/.TinyTeX/texmf-var/web2c/tlmgr.log

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
@@ -76,36 +83,46 @@ if [ "$codename" = "bionic" ]; then
     else
       if [ -z "$dry" ]; then
         wget -qO- "https://yihui.name/gh/tinytex/tools/install-unx.sh" | sh
-        tlmgr install abntex2 \
+        tlmgr install \
+          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
+
+sudo apt-get install -y -qq \
+  pdfgrep \
+  poppler-utils

data/bin/instaladores/{dependencias_install.sh → dependencias_execucao_install.sh}

@@ -3,6 +3,4 @@
 sudo apt-get install -y -qq \
   language-pack-pt \
   locales \
-  pdfgrep \
-  poppler-utils \
   unzip

data/bin/instaladores/pandoc_install.sh

@@ -11,7 +11,7 @@ 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

data/bin/instaladores/tinytex_install.sh

@@ -9,16 +9,23 @@ 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 \
+    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

data/containers/ruby-latex-pandoc.dockerfile

@@ -44,6 +44,6 @@ ENV LANG pt_BR.UTF8
 
 # Instalação do pandoc
 WORKDIR /tmp
-RUN wget https://github.com/jgm/pandoc/releases/download/2.7.3/pandoc-2.7.3-1-amd64.deb \
+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

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.347
+  version: 20.6.8.pre.354
 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: