avmtrf1-tools 0.30.0 → 0.32.1

data/lib/avmtrf1/tools/runner/git/issues_check.rb

@@ -7,7 +7,7 @@ require 'avmtrf1/git/cached_repository'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Git < ::Avm::Tools::Runner::Git
         class IssuesCheck < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache

data/lib/avmtrf1/tools/runner/git/push_large.rb

@@ -5,7 +5,7 @@ require 'avmtrf1/git/push_large'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Git < ::Avm::Tools::Runner::Git
         class PushLarge < ::EacRubyUtils::Console::DocoptRunner
           DOC = <<~DOCOPT

data/lib/avmtrf1/tools/runner/inventario_sistemas.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/runner/check_point/login'
+require 'avmtrf1/inventario_sistemas/parser'
+require 'eac_cli/core_ext'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class InventarioSistemas
+        DEFAULT_OUTPUT_DIR = './inventario-sistemas'
+
+        runner_with :help do
+          desc 'Formata a planilha de inventário de sistemas do TRF1.'
+          bool_opt '-w', '--overwrite', 'Sobreescreve diretório de saída se já existir.'
+          arg_opt '-d', '--output-directory', "Diretório de saída [default: #{DEFAULT_OUTPUT_DIR}]."
+          pos_arg 'source-file-path'
+        end
+
+        def run
+          start_banner
+          prepare
+          build
+          end_banner
+        end
+
+        private
+
+        def end_banner
+          success "Aplicação gerada em #{output_directory}"
+        end
+
+        def build
+          site_build.run
+        end
+
+        def input_file_uncached
+          parsed.source_file_path.to_pathname.expand_path
+        end
+
+        def site_build_uncached
+          ::Avmtrf1::InventarioSistemas::SiteBuild.new(input_file, output_directory)
+        end
+
+        def output_directory_uncached
+          parsed.output_directory.if_present(DEFAULT_OUTPUT_DIR).to_pathname.expand_path
+        end
+
+        def overwrite?
+          parsed.overwrite?
+        end
+
+        def start_banner
+          infov 'Arquivo de entrada', input_file
+          infov 'Diretório de saída', output_directory
+        end
+
+        def prepare
+          return unless output_directory.exist?
+
+          if overwrite?
+            infom "Removendo \"#{output_directory}\"..."
+            ::FileUtils.rm_r(output_directory.to_path)
+          else
+            fatal_error "#{output_directory}: já existe (Utilize --overwrite para sobreescrever)"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/openvpn.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/executables'
+require 'eac_cli/core_ext'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Openvpn
+        runner_with :help do
+          desc 'Conecta-se utilizando OpenVPN com configurações dinâmicas.'
+          bool_opt '-S', '--no-sudo', 'Não executa com "sudo".'
+          pos_arg :ovpn_path
+        end
+
+        def run
+          infov 'Arquivo de configuração', parsed.ovpn_path
+          infov 'Linha de comando', ::Shellwords.join(command.args)
+          infov 'Resultado', command.system
+        end
+
+        private
+
+        def command_uncached
+          if parsed.no_sudo?
+            ::Avmtrf1::Executables.env.command(*openvpn_args)
+          else
+            ::Avmtrf1::Executables.sudo.command(*openvpn_args)
+          end
+        end
+
+        def openvpn_args
+          ['openvpn', '--config', parsed.ovpn_path]
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/oracle.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Oracle < ::EacRubyUtils::Console::DocoptRunner
         require_sub __FILE__
         include ::EacRubyUtils::Console::Speaker

data/lib/avmtrf1/tools/runner/oracle/query.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/console/speaker'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Oracle < ::EacRubyUtils::Console::DocoptRunner
         class Query < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner

data/lib/avmtrf1/tools/runner/oracle/source_get.rb

@@ -5,7 +5,7 @@ require 'eac_ruby_utils/console/speaker'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Oracle < ::EacRubyUtils::Console::DocoptRunner
         class SourceGet < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::Console::Speaker

data/lib/avmtrf1/tools/runner/oracle/user_clear.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/console/speaker'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Oracle < ::EacRubyUtils::Console::DocoptRunner
         class UserClear < ::EacRubyUtils::Console::DocoptRunner
           include ::EacCli::DefaultRunner

data/lib/avmtrf1/tools/runner/php.rb

@@ -1,24 +1,17 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/require_sub'
+require 'eac_cli/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Php < ::EacRubyUtils::Console::DocoptRunner
-        ::EacRubyUtils.require_sub(__FILE__)
+    class Runner
+      class Php
+        require_sub __FILE__
 
-        DOC = <<~DOCOPT
-          Utilidades para PHP.
-
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help   Mostra esta ajuda.
-        DOCOPT
+        runner_with :help, :subcommands do
+          desc 'Utilidades para PHP.'
+          subcommands
+        end
       end
     end
   end

data/lib/avmtrf1/tools/runner/php/docker.rb

@@ -1,33 +1,23 @@
 # frozen_string_literal: true
 
 require 'avm/docker/registry'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/php/docker_image'
+require 'eac_cli/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Php < ::EacRubyUtils::Console::DocoptRunner
-        class Docker < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
-          enable_simple_cache
-
-          DOC = <<~DOCOPT
-            Constrói imagens Docker para PHP.
-
-            Usage:
-              __PROGRAM__ [options] [<version>...]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help     Mostra esta ajuda.
-              -d --default  Adiciona as versões padrão.
-              -n --registry-name=<registry-name>  Nome do registro.
-              -p --push     Envia a imagem.
-              -S --no-snapshot    Não adiciona "-snapshot" no nome da imagem.
-              -V --no-version    Não adiciona a versão do gerador no nome da imagem.
-          DOCOPT
+    class Runner
+      class Php
+        class Docker
+          runner_with :help do
+            bool_opt '-h', '--help', 'Mostra esta ajuda.'
+            bool_opt '-d', '--default', 'Adiciona as versões padrão.'
+            arg_opt '-n', '--registry-name', 'Nome do registro.'
+            bool_opt '-p', '--push', 'Envia a imagem.'
+            bool_opt '-S', '--no-snapshot', 'Não adiciona "-snapshot" no nome da imagem.'
+            bool_opt '-V', '--no-version', 'Não adiciona a versão do gerador no nome da imagem.'
+            pos_arg :version, repeat: true, optional: true
+          end
 
           def run
             infov 'Versions to build', versions_to_s
@@ -51,8 +41,8 @@ module Avmtrf1
 
           def versions
             (
-              options.fetch('<version>') +
-              (options.fetch('--default') ? default_versions : [])
+              parsed.version +
+              (parsed.default? ? default_versions : [])
             ).uniq.sort
           end
 
@@ -60,11 +50,11 @@ module Avmtrf1
             image = build_image(version)
             infom "Building Docker image \"#{image.tag}\""
             image.build
-            image.push if options.fetch('--push')
+            image.push if parsed.push?
           end
 
           def registry_name
-            options.fetch('--registry-name') || ::Avmtrf1.configs.read_entry('docker.registry.name')
+            parsed.registry_name || ::Avmtrf1.configs.read_entry('docker.registry.name')
           end
 
           def registry_uncached
@@ -73,8 +63,8 @@ module Avmtrf1
 
           def build_image(php_version)
             r = ::Avmtrf1::Php::DockerImage.new(registry, php_version)
-            r.send('version=', !options.fetch('--no-version'))
-            r.snapshot = !options.fetch('--no-snapshot')
+            r.send('version=', !parsed.no_version?)
+            r.snapshot = !parsed.no_snapshot?
             r
           end
         end

data/lib/avmtrf1/tools/runner/red.rb

@@ -8,7 +8,7 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Red < ::EacRubyUtils::Console::DocoptRunner
         include ::EacRubyUtils::Console::Speaker
         include ::EacRubyUtils::SimpleCache

data/lib/avmtrf1/tools/runner/trf1_dspace_base0.rb

@@ -6,7 +6,7 @@ require 'avmtrf1/trf1_dspace_base0/instance'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Trf1DspaceBase0 < ::EacRubyUtils::Console::DocoptRunner
         ::EacRubyUtils.require_sub(__FILE__)
 

data/lib/avmtrf1/tools/runner/trf1_dspace_base0/deploy.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/trf1_dspace_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/runner/deploy'
+require 'avm/eac_webapp_base0/runner/deploy'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Trf1DspaceBase0 < ::EacRubyUtils::Console::DocoptRunner
-        class Deploy < ::Avm::Stereotypes::EacWebappBase0::Runner::Deploy
+        class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
           def stereotype_module
             ::Avmtrf1::Trf1DspaceBase0
           end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.30.0'
+    VERSION = '0.32.1'
   end
 end

data/lib/avmtrf1/trf1_dspace_base0/deploy.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/stereotypes/eac_webapp_base0/deploy'
-require 'avm/stereotypes/eac_webapp_base0/deploy/file_unit' # To be fixed in gem "avm-tools"
+require 'avm/eac_webapp_base0/deploy'
+require 'avm/eac_webapp_base0/deploy/file_unit' # To be fixed in gem "avm-tools"
 
 module Avmtrf1
   module Trf1DspaceBase0
-    class Deploy < ::Avm::Stereotypes::EacWebappBase0::Deploy
+    class Deploy < ::Avm::EacWebappBase0::Deploy
       set_callback :assert_instance_branch, :after do
         mvn_package
         ant_update

data/template/avmtrf1/php/docker_image/Dockerfile.template

@@ -15,7 +15,10 @@ RUN apt-get install -y libbz2-dev
 RUN docker-php-ext-install bz2
 
 # Extensão PHP "gd"
-RUN apt-get install -y libpng-dev
+# Referência: https://stackoverflow.com/a/51041727
+RUN apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libwebp-dev libxpm-dev
+RUN docker-php-ext-configure gd --with-gd --with-webp-dir --with-jpeg-dir --with-png-dir \
+    --with-zlib-dir --with-xpm-dir --with-freetype-dir
 RUN docker-php-ext-install gd
 
 # Extensão PHP "intl"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -50,14 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.76'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.76.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.76'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.76.1
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +98,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.51'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.51.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.51'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.51.1
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +174,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +285,20 @@ files:
 - lib/avmtrf1/git/reference.rb
 - lib/avmtrf1/ini.rb
 - lib/avmtrf1/ini/profile.rb
+- lib/avmtrf1/inventario_sistemas.rb
+- lib/avmtrf1/inventario_sistemas/parser.rb
+- lib/avmtrf1/inventario_sistemas/parser/body.rb
+- lib/avmtrf1/inventario_sistemas/parser/body_row.rb
+- lib/avmtrf1/inventario_sistemas/parser/header.rb
+- lib/avmtrf1/inventario_sistemas/parser/header_column.rb
+- lib/avmtrf1/inventario_sistemas/site_build.rb
+- lib/avmtrf1/inventario_sistemas/site_build/html_page_base.rb
+- lib/avmtrf1/inventario_sistemas/site_build/html_page_base/elements.rb
+- lib/avmtrf1/inventario_sistemas/site_build/html_page_base/layout.rb
+- lib/avmtrf1/inventario_sistemas/site_build/html_page_base/stylesheet.css
+- lib/avmtrf1/inventario_sistemas/site_build/index.rb
+- lib/avmtrf1/inventario_sistemas/site_build/sistema.rb
+- lib/avmtrf1/inventario_sistemas/site_build/sistemas_index.rb
 - lib/avmtrf1/issues.rb
 - lib/avmtrf1/issues/factory.rb
 - lib/avmtrf1/jira.rb
@@ -309,6 +349,7 @@ files:
 - lib/avmtrf1/ruby/gems/not_found_error.rb
 - lib/avmtrf1/template.rb
 - lib/avmtrf1/tools.rb
+- lib/avmtrf1/tools/application.rb
 - lib/avmtrf1/tools/runner.rb
 - lib/avmtrf1/tools/runner/check_point.rb
 - lib/avmtrf1/tools/runner/check_point/login.rb
@@ -324,6 +365,8 @@ files:
 - lib/avmtrf1/tools/runner/git.rb
 - lib/avmtrf1/tools/runner/git/issues_check.rb
 - lib/avmtrf1/tools/runner/git/push_large.rb
+- lib/avmtrf1/tools/runner/inventario_sistemas.rb
+- lib/avmtrf1/tools/runner/openvpn.rb
 - lib/avmtrf1/tools/runner/oracle.rb
 - lib/avmtrf1/tools/runner/oracle/query.rb
 - lib/avmtrf1/tools/runner/oracle/source_get.rb
@@ -368,8 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ferramentas para AVM-TRF1.