avmtrf1-tools 0.31.2 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b0f6e21f65419282e6935854bf52b8a2cb66df48b0ec5d3514b22f63998a46
-  data.tar.gz: 3719e0002280f131142e156889f28bb876376cfedf9ae1d94b6f0c285813c026
+  metadata.gz: d9aa73e79e88cb8fc99c82fcba49ed37759cbedf50e56638043a5c2d2eb21ead
+  data.tar.gz: 10cd681c9fdf7204ad4a2f1b114618cb1423275488dbf4a10c6b9131109a9d82
 SHA512:
-  metadata.gz: 37002181a2dcc8e46eb145596133b4052b3db605e37cf8a4ad3b92cbd5081d226a2781ba91cf8e6eebe033f6d3db5dd044ba1c00eeaf9d7e9fad7ec8d9792592
-  data.tar.gz: 30192eca0adf53cd4e89e89541402c8a0475ad3c7e5e1afdab159cd2e18726505166c072be7a6860952d60c8954b5aba6471471fe8e4d23d9107b1efea6355c6
+  metadata.gz: 25533ea02ba54e86d4db42d91c79d9d5c8dcaf08f91530e0a8b94cfce4bdf13a32bec4972186d021ea1716111dc352a57e6fb929bef1c7b8f3d3ce6e389e07fc
+  data.tar.gz: 2999ace653f5ae5a4d97ac0ab859e52ba103ac2a7907f27d7d6de11017b6ad2b3b86635922c28040d9a1accacd4f52c005baa2c79bbbe93538e16d05b633bfce

data/lib/avmtrf1/executables.rb

@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module Avmtrf1
   module Executables
     class << self
+      enable_simple_cache
+
       def env
         ::EacRubyUtils::Envs.local
       end
 
-      def docker
-        @docker ||= env.executable('docker', '--version')
+      private
+
+      %w[docker sudo].each do |program|
+        define_method(program.underscore + '_uncached') do
+          env.executable(program, '--version')
+        end
       end
     end
   end

data/lib/avmtrf1/tools/application.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_base0/application'
+
+module Avmtrf1
+  module Tools
+    class << self
+      def application
+        @application ||= ::EacRubyBase0::Application.new(::File.expand_path('../../..', __dir__))
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner.rb

@@ -1,39 +1,29 @@
 # frozen_string_literal: true
 
 require 'aranha/selenium/driver_factory/base'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/require_sub'
-require 'avmtrf1/tools/version'
 require 'avmtrf1/ruby/gems/not_found_error'
-require 'eac_ruby_utils/console/speaker'
+require 'avmtrf1/tools/application'
+require 'eac_ruby_base0/runner'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      ::EacRubyUtils.require_sub(__FILE__)
-      include ::EacRubyUtils::Console::Speaker
-
-      DOC = <<~DOCOPT
-        Utilidades para AVM-TRF1 (http://redmine.trf1.gov.br/projects/avm-trf1).
-
-        Usage:
-          __PROGRAM__ [options] __SUBCOMMANDS__
-          __PROGRAM__ -h | --help
-          __PROGRAM__ --version
+    class Runner
+      require_sub __FILE__
+      include ::EacRubyBase0::Runner
+
+      runner_definition do
+        desc 'Utilidades para AVM-TRF1 (http://redmine.trf1.gov.br/projects/avm-trf1).'
+        bool_opt '-H', '--headless',
+                 'Quando usando Selenium não mostra a interface gráfica do navegador web.'
+      end
 
-        Options:
-          -h --help       Show this screen.
-          -v --version    Show version.
-          -H --headless   Quando usando Selenium não mostra a interface gráfica do navegador web.
-      DOCOPT
+      def application
+        ::Avmtrf1::Tools.application
+      end
 
       def run
-        ::Aranha::Selenium::DriverFactory::Base.default_headless = options.fetch('--headless')
-        if options.fetch('--version')
-          out(::Avmtrf1::Tools::VERSION + "\n")
-        else
-          run_with_subcommand
-        end
+        ::Aranha::Selenium::DriverFactory::Base.default_headless = parsed.headless?
+        super
       rescue ::Avmtrf1::Ruby::Gems::NotFoundError => e
         on_gem_not_found(e.dependency)
       end

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

@@ -5,7 +5,7 @@ require 'avmtrf1/tools/runner/check_point/login'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class CheckPoint < ::EacRubyUtils::Console::DocoptRunner
         DOC = <<~DOCOPT
           Utilidades para Check Point (https://cp.trf1.jus.br).

data/lib/avmtrf1/tools/runner/check_point/login.rb

@@ -8,7 +8,7 @@ require 'avmtrf1/check_point/session'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class CheckPoint < ::EacRubyUtils::Console::DocoptRunner
         class Login < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache

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

@@ -8,7 +8,7 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Esosti < ::EacRubyUtils::Console::DocoptRunner
         require_sub __FILE__
         enable_console_speaker

data/lib/avmtrf1/tools/runner/esosti/changed.rb

@@ -8,7 +8,7 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Esosti < ::EacRubyUtils::Console::DocoptRunner
         class Changed < ::EacRubyUtils::Console::DocoptRunner
           enable_console_speaker

data/lib/avmtrf1/tools/runner/esosti/fetch.rb

@@ -8,7 +8,7 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Esosti < ::EacRubyUtils::Console::DocoptRunner
         class Fetch < ::EacRubyUtils::Console::DocoptRunner
           enable_console_speaker

data/lib/avmtrf1/tools/runner/esosti/request.rb

@@ -8,7 +8,7 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Esosti < ::EacRubyUtils::Console::DocoptRunner
         class Request < ::EacRubyUtils::Console::DocoptRunner
           enable_console_speaker

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

@@ -9,7 +9,7 @@ require 'avmtrf1/forponto/user'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Forponto < ::EacRubyUtils::Console::DocoptRunner
         include ::EacRubyUtils::SimpleCache
         include ::EacRubyUtils::Console::Speaker

data/lib/avmtrf1/tools/runner/forponto/espelho.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/simple_cache'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Forponto < ::EacRubyUtils::Console::DocoptRunner
         class Espelho < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache

data/lib/avmtrf1/tools/runner/forponto/marcacoes.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Forponto < ::EacRubyUtils::Console::DocoptRunner
         class Marcacoes < ::EacRubyUtils::Console::DocoptRunner
           enable_console_speaker

data/lib/avmtrf1/tools/runner/forponto/resumos.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/simple_cache'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Forponto < ::EacRubyUtils::Console::DocoptRunner
         class Resumos < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache

data/lib/avmtrf1/tools/runner/forponto/saldo.rb

@@ -6,7 +6,7 @@ require 'eac_ruby_utils/simple_cache'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Forponto < ::EacRubyUtils::Console::DocoptRunner
         class Saldo < ::EacRubyUtils::Console::DocoptRunner
           include ::EacRubyUtils::SimpleCache

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

@@ -8,7 +8,7 @@ require 'avmtrf1/patches/avm/git/issue/complete'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
       class Git < ::Avm::Tools::Runner::Git
       end
     end

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

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
 require 'avmtrf1/tools/runner/check_point/login'
 require 'avmtrf1/inventario_sistemas/parser'
+require 'eac_cli/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class InventarioSistemas < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacCli::DefaultRunner
-
+    class Runner
+      class InventarioSistemas
         DEFAULT_OUTPUT_DIR = './inventario-sistemas'
 
-        runner_definition do
+        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}]."
@@ -37,7 +35,7 @@ module Avmtrf1
         end
 
         def input_file_uncached
-          options.fetch('<source-file-path>').to_pathname.expand_path
+          parsed.source_file_path.to_pathname.expand_path
         end
 
         def site_build_uncached
@@ -45,11 +43,11 @@ module Avmtrf1
         end
 
         def output_directory_uncached
-          options.fetch('--output-directory').if_present(DEFAULT_OUTPUT_DIR).to_pathname.expand_path
+          parsed.output_directory.if_present(DEFAULT_OUTPUT_DIR).to_pathname.expand_path
         end
 
         def overwrite?
-          options.fetch('--overwrite')
+          parsed.overwrite?
         end
 
         def start_banner

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

@@ -5,7 +5,7 @@ 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::EacWebappBase0::Runner::Deploy
           def stereotype_module

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.31.2'
+    VERSION = '0.32.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.32.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -349,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
@@ -365,6 +366,7 @@ files:
 - 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