avmtrf1-tools 0.32.1 → 0.33.3

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

@@ -1,27 +1,16 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/forponto/user/day_registers'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/core_ext'
 
 module Avmtrf1
   module Tools
     class Runner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
-        class Marcacoes < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
-          enable_simple_cache
-
-          DOC = <<~DOCOPT
-            Mostra marcações Forponto do dia.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help           Show this screen.
-          DOCOPT
+      class Forponto
+        class Marcacoes
+          runner_with :help do
+            desc 'Mostra marcações Forponto do dia.'
+          end
 
           def run
             infov 'Date', day_registers.date
@@ -34,7 +23,7 @@ module Avmtrf1
           private
 
           def day_registers_uncached
-            ::Avmtrf1::Forponto::User::DayRegisters.new(context(:user))
+            ::Avmtrf1::Forponto::User::DayRegisters.new(runner_context.call(:user))
           end
         end
       end

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

@@ -1,27 +1,15 @@
 # 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'
 
 module Avmtrf1
   module Tools
     class Runner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
-        class Resumos < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-              Mostra os resumos.
-
-              Usage:
-                __PROGRAM__ [options]
-                __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                   Show this screen.
-          DOCOPT
+      class Forponto
+        class Resumos
+          runner_with :help do
+            desc 'Mostra os resumos.'
+          end
 
           def run
             sorted_months.each do |month|
@@ -32,7 +20,7 @@ module Avmtrf1
           def head_month
             today = ::Date.today
             date = ::Date.civil(today.year, today.month, 1)
-            context(:user).month(date.year, date.month)
+            runner_context.call(:user).month(date.year, date.month)
           end
 
           def show_month(month)

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

@@ -1,28 +1,17 @@
 # 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/forponto/user/balance'
 
 module Avmtrf1
   module Tools
     class Runner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
-        class Saldo < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Calcula saldo de horas atual.
-
-            Usage:
-              __PROGRAM__ [options]
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help           Show this screen.
-              -d --details        Show details.
-          DOCOPT
+      class Forponto
+        class Saldo
+          runner_with :help do
+            desc 'Calcula saldo de horas atual.'
+            bool_opt '-d', '--details', 'Show details.'
+          end
 
           def run
             balance.months_balances.each do |mb|
@@ -47,7 +36,7 @@ module Avmtrf1
 
           def show_month_attr_balance(mba, label)
             infov "  * #{label}", minutes_to_s(mba.initial_value)
-            return unless options.fetch('--details')
+            return unless parsed.details?
 
             show_month_withdrawals(mba)
             show_month_requests(mba)
@@ -93,7 +82,7 @@ module Avmtrf1
           end
 
           def balance_uncached
-            ::Avmtrf1::Forponto::User::Balance.new(context(:user))
+            ::Avmtrf1::Forponto::User::Balance.new(runner_context.call(:user))
           end
         end
       end

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

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
 require 'avm/tools/runner/git'
-require 'eac_ruby_utils/console/docopt_runner'
-require 'avmtrf1/tools/runner/git/issues_check'
-require 'avmtrf1/tools/runner/git/push_large'
-require 'avmtrf1/patches/avm/git/issue/complete'
+require 'avmtrf1/core_ext'
 
 module Avmtrf1
   module Tools
     class Runner
       class Git < ::Avm::Tools::Runner::Git
+        require_sub __FILE__
       end
     end
   end

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

@@ -1,28 +1,17 @@
 # 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/git/cached_repository'
 
 module Avmtrf1
   module Tools
     class Runner
       class Git < ::Avm::Tools::Runner::Git
-        class IssuesCheck < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
-
-          DOC = <<~DOCOPT
-            Confronta situação das demandas no Git com a situação nos trackers.
-
-            Usage:
-              __PROGRAM__ [options] <git-url>
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help       Mostra esta ajuda.
-          DOCOPT
+        class IssuesCheck
+          runner_with :help do
+            desc 'Confronta situação das demandas no Git com a situação nos trackers.'
+            pos_arg :git_url
+          end
 
           def run
             infov 'Repository path', git_url
@@ -34,7 +23,7 @@ module Avmtrf1
           private
 
           def git_url
-            options.fetch('<git-url>')
+            parsed.git_url
           end
 
           def git_uncached

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

@@ -1,35 +1,44 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
+require 'avmtrf1/core_ext'
 require 'avmtrf1/git/push_large'
 
 module Avmtrf1
   module Tools
     class Runner
       class Git < ::Avm::Tools::Runner::Git
-        class PushLarge < ::EacRubyUtils::Console::DocoptRunner
-          DOC = <<~DOCOPT
-            Realiza push de repositórios grandes
-            (Que falham com "pack exceeds maximum allowed size").
+        class PushLarge
+          DEFAULT_REPO_PATH = '.'
+          DEFAULT_REMOTE = 'origin'
 
-            Usage:
-              __PROGRAM__ [options] <source-ref> <target-ref>
-              __PROGRAM__ -h | --help
-
-            Options:
-              -h --help                     Mostra esta ajuda.
-              -C <git-local>                Caminho do repositório local [default: .].
-              -r --remote <remote-name>     Nome do remoto [default: origin].
-          DOCOPT
+          runner_with :help do
+            desc 'Realiza push de repositórios grandes (Que falham com "pack exceeds maximum' \
+              ' allowed size")'
+            arg_opt '-C', '--repo-path', 'Caminho do repositório local' \
+              " [default: #{DEFAULT_REPO_PATH}]."
+            arg_opt '-r', '--remote', "Nome do remoto [default: #{DEFAULT_REMOTE}]."
+            pos_arg :source_ref
+            pos_arg :target_ref
+          end
 
           def run
             ::Avmtrf1::Git::PushLarge.new(
-              ::File.expand_path(options.fetch('-C')),
-              options.fetch('--remote'),
-              options.fetch('<source-ref>'),
-              options.fetch('<target-ref>')
+              ::File.expand_path(repo_path),
+              remote,
+              parsed.source_ref,
+              parsed.target_ref
             ).run
           end
+
+          private
+
+          def repo_path
+            parsed.repo_path || DEFAULT_REPO_PATH
+          end
+
+          def remote
+            parsed.remote || DEFAULT_REMOTE
+          end
         end
       end
     end

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

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/ad_user'
 require 'avmtrf1/executables'
+require 'avmtrf1/openvpn/config/builder'
 require 'eac_cli/core_ext'
 
 module Avmtrf1
@@ -10,17 +12,25 @@ module Avmtrf1
         runner_with :help do
           desc 'Conecta-se utilizando OpenVPN com configurações dinâmicas.'
           bool_opt '-S', '--no-sudo', 'Não executa com "sudo".'
+          bool_opt '-A', '--no-ad-auth', 'Não utiliza autenticação do Active Directory.'
           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
+          on_temp_files do
+            start_banner
+            infov 'Resultado', command.system
+          end
         end
 
         private
 
+        attr_accessor :credentials_path, :ovpn_config_path
+
+        def ad_auth?
+          !parsed.no_ad_auth?
+        end
+
         def command_uncached
           if parsed.no_sudo?
             ::Avmtrf1::Executables.env.command(*openvpn_args)
@@ -29,8 +39,51 @@ module Avmtrf1
           end
         end
 
+        def config_builder_uncached
+          r = ::Avmtrf1::Openvpn::Config::Builder.new(parsed.ovpn_path)
+          r.simple_add_or_update('auth-user-pass', [credentials_path.to_path]) if ad_auth?
+          r
+        end
+
         def openvpn_args
-          ['openvpn', '--config', parsed.ovpn_path]
+          ['openvpn', '--config', ovpn_config_path]
+        end
+
+        def start_banner
+          infov 'Arquivo de configuração', parsed.ovpn_path
+          infov 'Linha de comando', ::Shellwords.join(command.args)
+        end
+
+        def on_temp_files
+          on_credentials_file do
+            on_config_file { yield }
+          end
+        end
+
+        def on_credentials_file(&block)
+          if ad_auth?
+            on_temp_file(:credentials_path, -> { credentials_content }, &block)
+          else
+            block.call
+          end
+        end
+
+        def on_config_file(&block)
+          on_temp_file(:ovpn_config_path, -> { config_builder.data }, &block)
+        end
+
+        def on_temp_file(attr, content_proc)
+          ::EacRubyUtils::Fs::Temp.on_file do |file|
+            file.write(content_proc.call)
+            send("#{attr}=", file)
+            yield
+            send("#{attr}=", nil)
+          end
+        end
+
+        def credentials_content
+          [::Avmtrf1.ad_user.username, ::Avmtrf1.ad_user.password]
+            .map { |v| "#{v}\n" }.join
         end
       end
     end

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
-      class Oracle < ::EacRubyUtils::Console::DocoptRunner
+      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
-      class Oracle < ::EacRubyUtils::Console::DocoptRunner
-        class Query < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
+      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