avmtrf1-tools 0.31.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c5bad455467daeed4b784815ef6ced2bc39df34293b23d68154fb346df27684
-  data.tar.gz: dfc6d8d87add56ea1ac6d24a454908ef787950b5613c7527659a288e3f11a99b
+  metadata.gz: 28aaea569505102ad3211b02ec77cf0c2b290acc629b3530190acf0603f289d1
+  data.tar.gz: 755924e206af72290f5958622a20a545cf925882b4ebc6a8c1e5fc7821bbe6ef
 SHA512:
-  metadata.gz: ede8d1068d069269c3574f8b19a8ff457290cf42b9d159dbf4ffcf30a0161673d892e34b9c463e384118660363490e02a4b4e767a1af84d37f732d726bcfbe9c
-  data.tar.gz: fe50b0768fed63003306e5886a83841de7c814bd0e545885624d502e9a1a0af83e3378121c322591ac80acb348af1ac798000fdcbe72a10c8c3b2173845a9f92
+  metadata.gz: 767c2478bcc066672821f52114c903f4bf6e30f44b6a1a746c045cce80c33b8589f1fc36051b33009fc02318ff6971b15cc039cc9aad7b725ea93a291a5aa563
+  data.tar.gz: 382e3a8930764a843005e9c24a2f8e9f1cb3deb89886433ed34bcfa40996aaf2a57324c8e61a146cb1834810dff2deeb4fc13fddbb53eb8fbc75610fab557f43

data/lib/avmtrf1/check_point/session.rb

@@ -2,10 +2,13 @@
 
 require 'avmtrf1/ad_user'
 require 'avmtrf1/check_point/session/login'
+require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module CheckPoint
     class Session
+      enable_simple_cache
+
       ROOT_URL = 'https://cp.trf1.jus.br'
       LOGIN_URL = "#{ROOT_URL}/connect/PortalMain"
       LOGGED_TITLE_TEXT = 'Network Access Granted'
@@ -24,15 +27,7 @@ module Avmtrf1
         end
       end
 
-      attr_reader :username, :password, :session
-
-      def initialize(username, password, driver_options = {})
-        @username = username
-        @password = password
-        @session = ::Aranha::Selenium::Session.new(
-          driver_options.merge(accept_insecure_certs: true)
-        )
-      end
+      common_constructor :username, :password, :driver_options, default: [{}]
 
       def logged?
         session.navigate.to LOGIN_URL
@@ -54,6 +49,12 @@ module Avmtrf1
         end
         result_text
       end
+
+      private
+
+      def session_uncached
+        ::Aranha::Selenium::Session.new(driver_options.merge(accept_insecure_certs: true))
+      end
     end
   end
 end

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/forponto/user/month.rb

@@ -117,7 +117,7 @@ module Avmtrf1
         def cached_data
           raise 'There is no data cached' unless data_cache.cached?
 
-          ::EacRubyUtils::Yaml.load_common(data_cache.read)
+          ::EacRubyUtils::Yaml.load(data_cache.read)
         end
 
         def fresh_data

data/lib/avmtrf1/openvpn/config/builder.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/openvpn/config/parser'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/temp'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Builder
+        common_constructor :source_data do
+          unless source_data.is_a?(::Hash)
+            self.source_data = ::Avmtrf1::Openvpn::Config::Parser.new(source_data.to_s).data
+          end
+        end
+
+        def data
+          [simple, tags].reject(&:blank?).join("\n")
+        end
+
+        def on_data_file
+          ::EacRubyUtils::Fs::Temp.on_file do |file|
+            file.write(data)
+            yield(file)
+          end
+        end
+
+        def simple
+          source_data.fetch(:simple)
+                     .map { |s| ::Shellwords.join([s.fetch(:attribute)] + s.fetch(:args)) }
+                     .map { |s| "#{s}\n" }.join
+        end
+
+        def simple_add_or_update(name, args)
+          new_data = { attribute: name, args: args }
+          s = simple_find(name)
+          if s
+            s.merge!(new_data)
+          else
+            source_data.fetch(:simple) << new_data
+          end
+        end
+
+        def tags
+          source_data.fetch(:tags).map { |t| tag_to_data(t) }
+        end
+
+        def tag_to_data(tag)
+          ["<#{tag.fetch(:name)}>", tag.fetch(:content), "</#{tag.fetch(:name)}>"]
+            .map { |v| "#{v}\n" }.join
+        end
+
+        def simple_find(name)
+          source_data.fetch(:simple).find { |s| s.fetch(:attribute) == name }
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        require_sub __FILE__
+
+        def data
+          builder = ::Avmtrf1::Openvpn::Config::Parser::Builder.new
+          content.each_line { |line| builder.add_line(line) }
+          { simple: builder.simple.map(&:data), tags: builder.tags.map(&:data) }
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/builder.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/openvpn/config/parser/line'
+require 'avmtrf1/openvpn/config/parser/simple'
+require 'avmtrf1/openvpn/config/parser/tag'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Builder
+          attr_reader :simple, :tags
+
+          def initialize
+            @simple = []
+            @tags = []
+          end
+
+          def add_line(line_text)
+            line = ::Avmtrf1::Openvpn::Config::Parser::Line.new(line_text)
+            if on_tag?
+              add_line_on_tag(line)
+            else
+              add_line_not_on_tag(line)
+            end
+          end
+
+          def add_line_on_tag(line)
+            if line.close_tag?
+              if line.tag_name != current_tag.name
+                raise("Closing tag \"#{line.tag_name}\" does not match current tag " \
+                    "\"#{current_tag}\"")
+              end
+
+              current_tag.close
+            else
+              current_tag.add_line(line.text)
+            end
+          end
+
+          def add_line_not_on_tag(line)
+            return if line.blank_text?
+
+            if line.open_tag?
+              tags << ::Avmtrf1::Openvpn::Config::Parser::Tag.new(line.tag_name)
+            else
+              simple << ::Avmtrf1::Openvpn::Config::Parser::Simple.new(line.simple_parts)
+            end
+          end
+
+          def current_tag
+            tags.last
+          end
+
+          def on_tag?
+            tags.last.if_present(false, &:open?)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/line.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Line
+          OPEN_TAG_PATTERN = /\A<(.+)>\z/.freeze
+          CLOSE_TAG_PATTERN = %r{\A</(.+)>\z}.freeze
+          SIMPLE_PATTERN = /\A(\S+)(?:\s+(\S.*))\z/.freeze
+
+          common_constructor :text do
+            self.text = text.rstrip
+          end
+
+          def simple_parts
+            ::Shellwords.split(text)
+          end
+
+          def blank_text?
+            text.blank?
+          end
+
+          def open_tag?
+            OPEN_TAG_PATTERN.match?(text)
+          end
+
+          def close_tag?
+            CLOSE_TAG_PATTERN.match?(text)
+          end
+
+          def tag_name
+            if close_tag?
+              CLOSE_TAG_PATTERN.if_match(text) { |m| m[1] }
+            elsif open_tag?
+              OPEN_TAG_PATTERN.if_match(text) { |m| m[1] }
+            else
+              raise "Unmapped branch in #{__method__}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/simple.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Simple
+          common_constructor :parts
+
+          def data
+            { attribute: attribute, args: args }
+          end
+
+          def attribute
+            parts.first
+          end
+
+          def args
+            parts[1..-1]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/tag.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Tag
+          common_constructor :name do
+            @open = true
+          end
+
+          def add_line(text)
+            lines << text
+          end
+
+          def data
+            { name: name, content: lines.join("\n") }
+          end
+
+          def open?
+            @open
+          end
+
+          def close
+            @open = false
+          end
+
+          private
+
+          def lines
+            @lines ||= []
+          end
+        end
+      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,91 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/ad_user'
+require 'avmtrf1/executables'
+require 'avmtrf1/openvpn/config/builder'
+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".'
+          bool_opt '-A', '--no-ad-auth', 'Não utiliza autenticação do Active Directory.'
+          pos_arg :ovpn_path
+        end
+
+        def run
+          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)
+          else
+            ::Avmtrf1::Executables.sudo.command(*openvpn_args)
+          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', 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
+  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.31.0'
+    VERSION = '0.33.0'
   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.31.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-02-26 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
@@ -299,6 +305,12 @@ files:
 - lib/avmtrf1/jira/entities.rb
 - lib/avmtrf1/jira/entities/issue.rb
 - lib/avmtrf1/jira/instance.rb
+- lib/avmtrf1/openvpn/config/builder.rb
+- lib/avmtrf1/openvpn/config/parser.rb
+- lib/avmtrf1/openvpn/config/parser/builder.rb
+- lib/avmtrf1/openvpn/config/parser/line.rb
+- lib/avmtrf1/openvpn/config/parser/simple.rb
+- lib/avmtrf1/openvpn/config/parser/tag.rb
 - lib/avmtrf1/oracle.rb
 - lib/avmtrf1/oracle/connection.rb
 - lib/avmtrf1/oracle/connection/base.rb
@@ -343,6 +355,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
@@ -359,6 +372,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