avmtrf1-tools 0.31.1 → 0.33.1

data/lib/avmtrf1/red/helper.rb

@@ -2,7 +2,7 @@
 
 require 'active_support/concern'
 require 'active_support/core_ext/string'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'erb'
 require 'httpclient'
 require 'nokogiri'
@@ -13,7 +13,7 @@ module Avmtrf1
       extend ::ActiveSupport::Concern
 
       included do
-        include ::EacRubyUtils::Console::Speaker
+        enable_speaker
       end
 
       def http_client

data/lib/avmtrf1/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/templates/searcher'
+require 'eac_templates/searcher'
 
-::EacRubyUtils::Templates::Searcher.default.included_paths <<
+::EacTemplates::Searcher.default.included_paths <<
   ::File.expand_path('../../template', __dir__)

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,38 +1,31 @@
 # frozen_string_literal: true
 
+require 'avm/apps/config'
 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
+        ::Avm::Apps::Config.context.on(application.build_config) do
+          ::Aranha::Selenium::DriverFactory::Base.default_headless = parsed.headless?
+          super
         end
       rescue ::Avmtrf1::Ruby::Gems::NotFoundError => e
         on_gem_not_found(e.dependency)

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 require 'avmtrf1/tools/runner/check_point/login'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class CheckPoint < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class CheckPoint < ::EacCli::DocoptRunner
         DOC = <<~DOCOPT
           Utilidades para Check Point (https://cp.trf1.jus.br).
 

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

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/docopt_runner'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/simple_cache'
 require 'avmtrf1'
 require 'avmtrf1/check_point/session'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class CheckPoint < ::EacRubyUtils::Console::DocoptRunner
-        class Login < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class CheckPoint < ::EacCli::DocoptRunner
+        class Login < ::EacCli::DocoptRunner
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          enable_speaker
 
           DOC = <<~DOCOPT
             Login no CheckPoint (https://cp.trf1.jus.br).

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/default_esosti'
 require 'avmtrf1/ini'
@@ -8,10 +8,10 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Esosti < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Esosti < ::EacCli::DocoptRunner
         require_sub __FILE__
-        enable_console_speaker
+        enable_speaker
         enable_simple_cache
 
         DOC = <<~DOCOPT

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/default_esosti'
 require 'avmtrf1/ini'
@@ -8,10 +8,10 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Esosti < ::EacRubyUtils::Console::DocoptRunner
-        class Changed < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
+    class Runner
+      class Esosti < ::EacCli::DocoptRunner
+        class Changed < ::EacCli::DocoptRunner
+          enable_speaker
           enable_simple_cache
 
           DOC = <<~DOCOPT

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/default_esosti'
 require 'avmtrf1/ini'
@@ -8,10 +8,10 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Esosti < ::EacRubyUtils::Console::DocoptRunner
-        class Fetch < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
+    class Runner
+      class Esosti < ::EacCli::DocoptRunner
+        class Fetch < ::EacCli::DocoptRunner
+          enable_speaker
           enable_simple_cache
 
           DOC = <<~DOCOPT

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/default_esosti'
 require 'avmtrf1/ini'
@@ -8,10 +8,10 @@ require 'avmtrf1/red/profile'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Esosti < ::EacRubyUtils::Console::DocoptRunner
-        class Request < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
+    class Runner
+      class Esosti < ::EacCli::DocoptRunner
+        class Request < ::EacCli::DocoptRunner
+          enable_speaker
           enable_simple_cache
 
           DOC = <<~DOCOPT

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

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/docopt_runner'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/require_sub'
 ::EacRubyUtils.require_sub(__FILE__)
-require 'avmtrf1/configs'
+require 'avm/apps/config'
 require 'avmtrf1/forponto/user'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Forponto < ::EacCli::DocoptRunner
         include ::EacRubyUtils::SimpleCache
-        include ::EacRubyUtils::Console::Speaker
+        enable_speaker
 
         DEFAULT_VALUES = {
           url: 'http://pontoeletronico.trf1.jus.br/forponto/fptoweb.exe'
@@ -55,7 +55,7 @@ module Avmtrf1
         end
 
         def value_by_entry(name, read_options)
-          ::Avmtrf1.configs.read_entry("trf1.forponto.#{name}", read_options)
+          ::Avm::Apps::Config.current.read_entry("trf1.forponto.#{name}", read_options)
         end
 
         def user_uncached

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

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/docopt_runner'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/simple_cache'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
-        class Espelho < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Forponto < ::EacCli::DocoptRunner
+        class Espelho < ::EacCli::DocoptRunner
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          enable_speaker
 
           DOC = <<~DOCOPT
             Recupera e trata dados do Forponto.

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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 require 'avmtrf1/forponto/user/day_registers'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
-        class Marcacoes < ::EacRubyUtils::Console::DocoptRunner
-          enable_console_speaker
+    class Runner
+      class Forponto < ::EacCli::DocoptRunner
+        class Marcacoes < ::EacCli::DocoptRunner
+          enable_speaker
           enable_simple_cache
 
           DOC = <<~DOCOPT

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

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/docopt_runner'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/simple_cache'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
-        class Resumos < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Forponto < ::EacCli::DocoptRunner
+        class Resumos < ::EacCli::DocoptRunner
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          enable_speaker
 
           DOC = <<~DOCOPT
               Mostra os resumos.

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

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/console/speaker'
+require 'eac_cli/docopt_runner'
+require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/simple_cache'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Forponto < ::EacRubyUtils::Console::DocoptRunner
-        class Saldo < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      class Forponto < ::EacCli::DocoptRunner
+        class Saldo < ::EacCli::DocoptRunner
           include ::EacRubyUtils::SimpleCache
-          include ::EacRubyUtils::Console::Speaker
+          enable_speaker
 
           DOC = <<~DOCOPT
             Calcula saldo de horas atual.

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'avm/tools/runner/git'
-require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_cli/docopt_runner'
 require 'avmtrf1/tools/runner/git/issues_check'
 require 'avmtrf1/tools/runner/git/push_large'
 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

@@ -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 < ::EacRubyUtils::Console::DocoptRunner
+    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 < ::EacRubyUtils::Console::DocoptRunner
+    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