avmtrf1-tools 0.31.2 → 0.33.2

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

@@ -1,29 +1,22 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/core_ext'
 require 'avmtrf1/oracle/connection/base.rb'
 require 'avmtrf1/oracle/connection/string_builder.rb'
-require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Oracle < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Oracle
         require_sub __FILE__
-        include ::EacRubyUtils::Console::Speaker
-
-        DOC = <<~DOCOPT
-          Usage:
-            __PROGRAM__ [options] __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                        Show this screen
-              -H --host=<host>                 Host Oracle (Ex.: 172.16.3.3)
-              -p --port=<port>                 Porta Oracle (Ex.: 1521) (Padrão: 1521).
-              -s --service-name=<service>      Serviço Oracle (Ex.: trf1.trf1.gov.br)
-              -u --user=<user>                 Usuário Oracle
-              -w --password=<password>         Senha Oracle
-        DOCOPT
+        runner_with :help, :subcommands do
+          arg_opt '-H', '--host', 'Host Oracle (Ex.: 172.16.3.3)'
+          arg_opt '-p', '--port', 'Porta Oracle (Ex.: 1521) (Padrão: 1521)'
+          arg_opt '-s', '--service-name', 'Serviço Oracle (Ex.: trf1.trf1.gov.br)'
+          arg_opt '-u', '--user', 'Usuário Oracle'
+          arg_opt '-w', '--password', 'Senha Oracle'
+          subcommands
+        end
 
         def connection
           @connection ||= ::Avmtrf1::Oracle::Connection::Base.new(connection_string)
@@ -31,11 +24,11 @@ module Avmtrf1
 
         def connection_string
           ::Avmtrf1::Oracle::Connection::StringBuilder.new(
-            host: options['--host'],
-            port: options['--port'],
-            user: options['--user'],
-            password: options['--password'],
-            service_name: options['--service-name']
+            host: parsed.host,
+            port: parsed.port,
+            user: parsed.user,
+            password: parsed.password,
+            service_name: parsed.service_name
           ).build
         end
       end

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

@@ -1,20 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'avmtrf1/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Oracle < ::EacRubyUtils::Console::DocoptRunner
-        class Query < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
+    class Runner
+      class Oracle
+        class Query
           DEFAULT_COLUMN_SEPARATOR = "\t"
           DEFAULT_ROW_SEPARATOR = "\n"
 
-          runner_definition do
+          runner_with :help do
             desc 'Executa queries Oracle.'
             arg_opt '-c', '--column-sep', 'Separator de colunas.'
             bool_opt '-C', '--columns', 'Imprime o nome das colunas.'
@@ -32,7 +28,7 @@ module Avmtrf1
           end
 
           def print_header
-            return unless options.fetch('--columns')
+            return unless parsed.columns?
 
             print_row(cursor.column_metadata.map(&:name))
           end
@@ -46,7 +42,7 @@ module Avmtrf1
           end
 
           def print_footer
-            return unless options.fetch('--count')
+            return unless parsed.count?
 
             print_row(["Count: #{count}"])
           end
@@ -54,11 +50,11 @@ module Avmtrf1
           private
 
           def column_separator_uncached
-            options.fetch('--column-sep').if_present(DEFAULT_COLUMN_SEPARATOR)
+            parsed.column_sep.if_present(DEFAULT_COLUMN_SEPARATOR)
           end
 
           def cursor_uncached
-            context(:connection).query(options.fetch('<sql>'))
+            runner_context.call(:connection).query(parsed.sql)
           end
 
           def print_row(array)
@@ -66,7 +62,7 @@ module Avmtrf1
           end
 
           def row_separator_uncached
-            options.fetch('--row-sep').if_present(DEFAULT_ROW_SEPARATOR)
+            parsed.row_sep.if_present(DEFAULT_ROW_SEPARATOR)
           end
         end
       end

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

@@ -1,32 +1,25 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'avmtrf1/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Oracle < ::EacRubyUtils::Console::DocoptRunner
-        class SourceGet < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Usage:
-              __PROGRAM__ [options] <name> <type>
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                        Show this screen
-          DOCOPT
+    class Runner
+      class Oracle
+        class SourceGet
+          runner_with :help do
+            pos_arg :name
+            pos_arg :type
+          end
 
           TABLE = 'all_source'
 
           def name
-            options.fetch('<name>')
+            parsed.name
           end
 
           def type
-            options.fetch('<type>')
+            parsed.type
           end
 
           def run
@@ -34,13 +27,13 @@ module Avmtrf1
             infov('Type', type)
             infov('Found', found_count)
             infov('Enconding', OCI8.encoding)
-            context(:connection).query(sql(false)) do |row|
+            connection.query(sql(false)) do |row|
               out(row['TEXT'].encode('UTF-8').to_s)
             end
           end
 
           def found_count
-            context(:connection).unique_value(sql(true)).to_i
+            connection.unique_value(sql(true)).to_i
           end
 
           def sql(count)
@@ -49,6 +42,12 @@ module Avmtrf1
             selection += " and lower(type) = lower('#{type}')" if type.present?
             "select #{projection} from #{TABLE} where #{selection} order by line"
           end
+
+          private
+
+          def connection
+            runner_context.call(:connection)
+          end
         end
       end
     end

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

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_cli/default_runner'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'avmtrf1/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Oracle < ::EacRubyUtils::Console::DocoptRunner
-        class UserClear < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
+    class Runner
+      class Oracle
+        class UserClear
           SELECTED_TYPES = %w[FUNCTION PACKAGE PROCEDURE SEQUENCE TABLE VIEW].freeze
 
-          runner_definition do
+          runner_with :confirmation, :help do
             desc 'Remove todos os objetos (Tabelas, views, etc) de um usuário Oracle.'
             bool_opt '-y', '--yes', 'Remove sem perguntar.'
             bool_opt '-d', '--drop', 'Remove os objetos.'
@@ -39,8 +35,8 @@ module Avmtrf1
           end
 
           def drop_objects
-            return unless options.fetch('--drop')
-            return unless confirm?
+            return unless parsed.drop
+            return unless confirm?('Confirma a remoção?')
 
             infom 'Removendo objetos...'
             objects.each do |object|
@@ -49,12 +45,8 @@ module Avmtrf1
             end
           end
 
-          def confirm?
-            options.fetch('--yes') || request_input('Confirma a remoção?', bool: true)
-          end
-
           def owner_uncached
-            context(:connection).objects.first(name: options.fetch('<owner-name>'), type: :user)
+            runner_context.call(:connection).objects.first(name: parsed.owner_name, type: :user)
           end
 
           def objects_uncached

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
@@ -37,8 +27,8 @@ module Avmtrf1
           end
 
           def default_versions
-            ::Avmtrf1.configs.read_entry('php.default_versions').split(',').map(&:strip)
-                     .reject(&:blank?)
+            ::Avm::Apps::Config.current.read_entry('php.default_versions').split(',').map(&:strip)
+                               .reject(&:blank?)
           end
 
           def 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 || ::Avm::Apps::Config.current.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

@@ -1,34 +1,30 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
-require 'eac_ruby_utils/simple_cache'
+require 'avmtrf1/core_ext'
 require 'avmtrf1/ini'
 require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Red < ::EacRubyUtils::Console::DocoptRunner
-        include ::EacRubyUtils::Console::Speaker
-        include ::EacRubyUtils::SimpleCache
-
-        DOC = <<~DOCOPT
-          Utilidades para RED.
-
-          Usage:
-            __PROGRAM__ [options] [-i <red-ini-path>] file put <file>
-            __PROGRAM__ -h | --help
+    class Runner
+      class Red
+        RED_PROFILE_DEFAULT = 'development'
+
+        runner_with :help do
+          desc 'Utilidades para RED.'
+          arg_opt '-i', '--red-ini', 'Arquivo red.ini com parâmetros de conexão e upload.'
+          arg_opt '-p', '--red-profile', 'Perfil/seção do red.ini' \
+            " [default: #{RED_PROFILE_DEFAULT}]."
+          arg_opt '--put', 'Envia um arquivo.'
+        end
 
-          Options:
-            -h --help                      Mostra esta ajuda.
-            -i --red-ini=<red-ini-path>    Arquivo red.ini com parâmetros de conexão e upload.
-            -p --red-profile=<red-profile>       Perfil/seção do red.ini [default: development].
-        DOCOPT
+        def put?
+          parsed.put.present?
+        end
 
         def run
           start_banner
-          if options.fetch('file') && options.fetch('put')
+          if put?
             file_put
           else
             fatal_error('Subcomando não mapeado (Isto é um defeito do software)')
@@ -36,9 +32,9 @@ module Avmtrf1
         end
 
         def start_banner
-          infov 'red.ini', options.fetch('--red-ini')
+          infov 'red.ini', parsed.red_ini
           infov 'Perfil de red.ini', red_profile_name
-          infov 'Arquivo para upload', options.fetch('<file>')
+          infov 'Arquivo para upload', parsed.put
         end
 
         def file_put
@@ -50,7 +46,7 @@ module Avmtrf1
         end
 
         def red_profile_name
-          options.fetch('--red-profile')
+          parsed.red_profile.if_present(RED_PROFILE_DEFAULT)
         end
 
         def red_profile_uncached
@@ -58,11 +54,11 @@ module Avmtrf1
         end
 
         def file
-          required_file('<file>')
+          required_file(:put)
         end
 
         def red_ini_path_uncached
-          required_file('--red-ini')
+          required_file(:red_ini)
         end
 
         def red_ini_uncached
@@ -76,7 +72,7 @@ module Avmtrf1
         end
 
         def required_file(option_key)
-          path = options.fetch(option_key)
+          path = parsed[option_key]
           return path if path
 
           fatal_error("Arquivo \"#{path}\" não existe (Informado na opção #{option_key})")