avmtrf1-tools 0.32.1 → 0.33.3

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
-      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 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
-      class Oracle < ::EacRubyUtils::Console::DocoptRunner
-        class UserClear < ::EacRubyUtils::Console::DocoptRunner
-          include ::EacCli::DefaultRunner
-
+      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/docker.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'avm/docker/registry'
 require 'avmtrf1/php/docker_image'
 require 'eac_cli/core_ext'
+require 'eac_docker/registry'
 
 module Avmtrf1
   module Tools
@@ -27,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.entry('php.default_versions').value.split(',').map(&:strip)
+                               .reject(&:blank?)
           end
 
           def versions_to_s
@@ -54,11 +54,11 @@ module Avmtrf1
           end
 
           def registry_name
-            parsed.registry_name || ::Avmtrf1.configs.read_entry('docker.registry.name')
+            parsed.registry_name || ::Avm::Apps::Config.current.entry('docker.registry.name').value
           end
 
           def registry_uncached
-            ::Avm::Docker::Registry.new(registry_name)
+            ::EacDocker::Registry.new(registry_name)
           end
 
           def build_image(php_version)

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
-      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 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})")

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

@@ -1,32 +1,23 @@
 # frozen_string_literal: true
 
-require 'eac_ruby_utils/console/docopt_runner'
-require 'eac_ruby_utils/core_ext'
+require 'avmtrf1/core_ext'
 require 'avmtrf1/trf1_dspace_base0/instance'
 
 module Avmtrf1
   module Tools
     class Runner
-      class Trf1DspaceBase0 < ::EacRubyUtils::Console::DocoptRunner
-        ::EacRubyUtils.require_sub(__FILE__)
-
-        enable_simple_cache
-
-        DOC = <<~DOCOPT
-          Utilities for Trf1DspaceBase0 instances.
-
-          Usage:
-            __PROGRAM__ [options] <instance_id> __SUBCOMMANDS__
-            __PROGRAM__ -h | --help
-
-          Options:
-            -h --help             Show this screen.
-        DOCOPT
+      class Trf1DspaceBase0
+        require_sub __FILE__
+        runner_with :help, :subcommands do
+          desc 'Utilities for Trf1DspaceBase0 instances.'
+          pos_arg :instance_id
+          subcommands
+        end
 
         private
 
         def instance_uncached
-          ::Avmtrf1::Trf1DspaceBase0::Instance.by_id(options['<instance_id>'])
+          ::Avmtrf1::Trf1DspaceBase0::Instance.by_id(parsed.instance_id)
         end
       end
     end

data/lib/avmtrf1/tools/runner/trf1_dspace_base0/deploy.rb

@@ -6,7 +6,7 @@ require 'avm/eac_webapp_base0/runner/deploy'
 module Avmtrf1
   module Tools
     class Runner
-      class Trf1DspaceBase0 < ::EacRubyUtils::Console::DocoptRunner
+      class Trf1DspaceBase0
         class Deploy < ::Avm::EacWebappBase0::Runner::Deploy
           def stereotype_module
             ::Avmtrf1::Trf1DspaceBase0

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.32.1'
+    VERSION = '0.33.3'
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.3
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: aranha-parsers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: aranha-selenium
   requirement: !ruby/object:Gem::Requirement
@@ -50,82 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.76.1
+        version: '0.104'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.76.1
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-- !ruby/object:Gem::Dependency
-  name: eac_cli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: eac_ruby_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.51'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.51.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.51'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.51.1
-- !ruby/object:Gem::Dependency
-  name: filesize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.104'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +148,7 @@ files:
 - lib/avmtrf1/check_point.rb
 - lib/avmtrf1/check_point/session.rb
 - lib/avmtrf1/check_point/session/login.rb
-- lib/avmtrf1/configs.rb
+- lib/avmtrf1/core_ext.rb
 - lib/avmtrf1/default_esosti.rb
 - lib/avmtrf1/default_jira.rb
 - lib/avmtrf1/default_redmine.rb
@@ -273,15 +191,15 @@ files:
 - lib/avmtrf1/git/push_large.rb
 - lib/avmtrf1/git/push_large/_utils.rb
 - lib/avmtrf1/git/push_large/lfs_commit.rb
-- lib/avmtrf1/git/push_large/lfs_commit/_00_checkout_previous_revision.rb
-- lib/avmtrf1/git/push_large/lfs_commit/_01_cherry_pick_source_revision.rb
-- lib/avmtrf1/git/push_large/lfs_commit/_02_track_large_files.rb
-- lib/avmtrf1/git/push_large/lfs_commit/_03_commit_changes.rb
-- lib/avmtrf1/git/push_large/lfs_commit/_04_push.rb
-- lib/avmtrf1/git/push_large/lfs_commit/_cache.rb
-- lib/avmtrf1/git/push_large/lfs_commit/_helpers.rb
+- lib/avmtrf1/git/push_large/lfs_commit/cache.rb
+- lib/avmtrf1/git/push_large/lfs_commit/checkout_previous_revision.rb
+- lib/avmtrf1/git/push_large/lfs_commit/commit_changes.rb
+- lib/avmtrf1/git/push_large/lfs_commit/helpers.rb
+- lib/avmtrf1/git/push_large/lfs_commit/pick_source_revision.rb
+- lib/avmtrf1/git/push_large/lfs_commit/push.rb
+- lib/avmtrf1/git/push_large/lfs_commit/track_large_files.rb
 - lib/avmtrf1/git/push_large/source_commit.rb
-- lib/avmtrf1/git/push_large/source_commit/_push.rb
+- lib/avmtrf1/git/push_large/source_commit/push.rb
 - lib/avmtrf1/git/reference.rb
 - lib/avmtrf1/ini.rb
 - lib/avmtrf1/ini/profile.rb
@@ -305,6 +223,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
@@ -319,8 +243,13 @@ files:
 - lib/avmtrf1/oracle/objects/sql_builder.rb
 - lib/avmtrf1/oracle/oci8.rb
 - lib/avmtrf1/patches.rb
+- lib/avmtrf1/patches/avm.rb
+- lib/avmtrf1/patches/avm/git.rb
+- lib/avmtrf1/patches/avm/git/issue.rb
 - lib/avmtrf1/patches/avm/git/issue/complete.rb
-- lib/avmtrf1/patches/eac_launcher/git/base.rb
+- lib/avmtrf1/patches/avm/launcher.rb
+- lib/avmtrf1/patches/avm/launcher/git.rb
+- lib/avmtrf1/patches/avm/launcher/git/base.rb
 - lib/avmtrf1/patches/inifile.rb
 - lib/avmtrf1/php.rb
 - lib/avmtrf1/php/docker_image.rb
@@ -411,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ferramentas para AVM-TRF1.