avmtrf1-tools 0.31.2 → 0.33.2

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

@@ -5,8 +5,8 @@ require 'avm/eac_webapp_base0/runner/deploy'
 
 module Avmtrf1
   module Tools
-    class Runner < ::EacRubyUtils::Console::DocoptRunner
-      class Trf1DspaceBase0 < ::EacRubyUtils::Console::DocoptRunner
+    class Runner
+      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.31.2'
+    VERSION = '0.33.2'
   end
 end

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,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.31.2
+  version: 0.33.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-06-22 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,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.102'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.76.1
+        version: 0.102.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '0.102'
     - - ">="
       - !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.102.1
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +154,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 +197,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 +229,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 +249,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
@@ -349,6 +284,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
@@ -365,6 +301,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
@@ -409,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Ferramentas para AVM-TRF1.

data/lib/avmtrf1/configs.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/console/configs'
-
-module Avmtrf1
-  CONFIGS_KEY = 'avm-trf1-tools'
-
-  class << self
-    attr_reader :configs_storage_path
-
-    def configs
-      @configs ||= ::EacRubyUtils::Console::Configs.new(CONFIGS_KEY, configs_options)
-    end
-
-    def configs_options
-      configs_storage_path.if_present({}) { |v| { storage_path: v } }
-    end
-
-    def configs_storage_path=(path)
-      @configs_storage_path = path
-      @configs = nil
-    end
-  end
-end

data/lib/avmtrf1/git/push_large/lfs_commit/_00_checkout_previous_revision.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Avmtrf1
-  module Git
-    class PushLarge
-      class LfsCommit
-        private
-
-        def checkout_base_uncached
-          if previous_revision.blank?
-            checkout_orphan
-          else
-            checkout_previous_revision
-          end
-        end
-
-        def checkout_orphan
-          infom message('Checkout orphan')
-          git.execute!('reset', '--hard')
-          git.execute!('clean', '-df')
-          git.execute!('checkout', source_commit.sha1)
-        end
-
-        def checkout_previous_revision
-          infom message("Checkout previous revision #{previous_revision}")
-          git.execute!('reset', '--hard')
-          git.execute!('clean', '-df')
-          git.execute!('checkout', previous_revision)
-        end
-      end
-    end
-  end
-end

data/lib/avmtrf1/git/push_large/lfs_commit/_01_cherry_pick_source_revision.rb

@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-module Avmtrf1
-  module Git
-    class PushLarge
-      class LfsCommit
-        private
-
-        def cherry_pick_source_revision_uncached
-          checkout_base
-          return unless previous_revision.present?
-
-          infom message("Cherry pick #{source_commit.sha1}")
-          result = git.execute('cherry-pick', '--allow-empty', '--allow-empty-message', '-Xtheirs',
-                               source_commit.sha1)
-          check_cherry_pick_result(result)
-        end
-
-        def check_cherry_pick_result(result)
-          return if result.fetch(:exit_code).zero?
-
-          raise "Cherry pick failed: #{result}" unless cherry_pick_conflict?
-
-          warn message('Cherry pick failed with conflict')
-          resolve_cherry_pick_conflicts
-
-          check_dirty_files
-          check_cherry_continue
-        end
-
-        def cherry_pick_conflict?
-          ::File.exist?(::File.join(git, '.git', 'CHERRY_PICK_HEAD'))
-        end
-
-        def resolve_cherry_pick_conflicts
-          git.status_files.each do |scf|
-            if scf.dirty == 'D'
-              remove_file(scf.path)
-            elsif scf.dirty.present?
-              add_file(scf.path)
-            end
-          end
-        end
-
-        def remove_file(path)
-          infov message('Removing file'), path
-          git.execute!('rm', path)
-        end
-
-        def add_file(path)
-          infov message('Adding file'), path
-          git.execute!('add', path)
-        end
-
-        def check_dirty_files
-          infom message('Checking dirty files...')
-          df = dirty_files
-          infov message('Dirty files?'), df.any?
-          return unless df.any?
-
-          df.each do |f|
-            infov message(f.path, 1), "|#{f.stage}|#{f.dirty}|"
-          end
-          raise 'There are dirty files'
-        end
-
-        def dirty_files
-          git.status_files.select { |scf| scf.dirty.present? }
-        end
-
-        def check_cherry_continue
-          infom message('Continuing cherry pick')
-          git.execute!('-c', "core.editor=#{bash_editor}", 'cherry-pick', '--continue')
-          raise 'Still in cherry-pick conflict' if cherry_pick_conflict?
-
-          infom message('Cherry pick continue successful')
-        end
-
-        def bash_editor
-          if source_commit.subject.present?
-            'true'
-          else
-            'bash -c "printf \\"Mensagem original em branco.\\n\\" > $1"'
-          end
-        end
-      end
-    end
-  end
-end

data/lib/avmtrf1/git/push_large/lfs_commit/_02_track_large_files.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Avmtrf1
-  module Git
-    class PushLarge
-      class LfsCommit
-        private
-
-        EXTENSIONS_REQUIRED_TO_TRACK = %w[
-          bak bkp bmp bpm cfm chm dat db doc fla flv gz jar log mp3 mp4 otf pdf ppt psd rar rtf swf
-          ttf wav wmf wmv wmz woff woff2 xmind z zip
-        ].freeze
-
-        def track_large_files_uncached
-          cherry_pick_source_revision
-          if lfs_file_min_size.present?
-
-            source_commit.files.each do |file|
-              next unless track_file_with_lfs?(file)
-
-              track_file(file)
-            end
-            raise 'None file was tracked' unless tracked_files.positive?
-          end
-          infov message('Tracked files'), @tracked_files
-        end
-
-        def track_file(file)
-          infov message('Tracking with LFS'), file
-          git.execute!('rm', '--cached', file.path)
-          git.execute!('lfs', 'track', file.path) unless tracked_file?(file)
-          @tracked_files += 1
-        end
-
-        def track_file_with_lfs?(file)
-          return false unless file.dst_size.positive?
-
-          required_extesion_to_track?(file) || (file.dst_size >= lfs_file_min_size)
-        end
-
-        def required_extesion_to_track?(file)
-          EXTENSIONS_REQUIRED_TO_TRACK.include?(::File.extname(file.path).gsub(/\A\./, ''))
-        end
-
-        def tracked_file?(file)
-          git.execute!('check-attr', '--all', '--', file.path).strip.present?
-        end
-      end
-    end
-  end
-end