avmtrf1-tools 0.39.5 → 0.39.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0a64d3ed7f56d7527f21bd3d827e504623e49dfc7beb4d0584faa538a33e26
-  data.tar.gz: d743696b387e4bef1c0799786e84d1034eb89eb539b9bc0b4c858970eb7851db
+  metadata.gz: 3ff10204c30ec6cd792506a13db51d8fc7460eb9e86b17832596808f32f6e17d
+  data.tar.gz: 1ccf217dbdb39e3b5249a04a5cba1abc103cb7a9573a77823fff7be433b6f6ea
 SHA512:
-  metadata.gz: 79f00f9a091a4a6392d296daaf0f3929d4e72b75d61f156a9d85fbaed0aa20a3768e178df4d9dcfdec01e29eb467e21feb0ee9b53f40bba7f8c58b54e080a654
-  data.tar.gz: 39ba20d1d841d414b791354ff364d638ed231806db5dfd32b4d6b5faf9f37048d7594d94637f0ab333a0c92895335303f95f50776efdd833cd42c62681c5e14b
+  metadata.gz: 8bb6a402eecd5eec3a2addaa090f700b48c4bd7d95385e9661a1102429d4284f3d3715f88a67520288c8df43684b7e00fa6685d3bc6422f81feda21dd019998f
+  data.tar.gz: 258fd349764cb1cf8ae5f37375bb8954840a74fab6a54dc871071b2b63bfe84bb25c67d69e622728445035d52bf9522886e7d127d5ffeee992246532fbf66c5b

data/Gemfile

@@ -8,7 +8,5 @@ group :oracle do
   gem 'ruby-oci8'
 end
 
-gem 'httpclient', git: 'https://github.com/livelink/httpclient.git'
-
 local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
 eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/lib/avmtrf1/docker/image.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'avm/docker/image'
+require 'avmtrf1/tools/version'
 require 'eac_templates/sources/from_all_gems'
 
 module Avmtrf1
@@ -11,6 +12,27 @@ module Avmtrf1
 
       common_constructor :registry, :platform_version
 
+      APT_SETUP = <<CODE
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get -y update
+RUN apt-get -y dist-upgrade
+CODE
+      DEBIAN_STRETCH_FIX_SOURCES = <<CODE
+RUN echo 'deb http://security.debian.org/debian-security stable-security/updates main' > /etc/apt/sources.list
+RUN echo 'deb http://archive.debian.org/debian stretch main' >> /etc/apt/sources.list
+CODE
+      DEBIAN_STRETCH_APT_SETUP = DEBIAN_STRETCH_FIX_SOURCES + APT_SETUP
+
+      # @return [String]
+      def apt_setup
+        APT_SETUP
+      end
+
+      # @return [String]
+      def debian_stretch_apt_setup
+        DEBIAN_STRETCH_APT_SETUP
+      end
+
       def platform_stereotype_tag
         self.class.name.split('::')[-2].underscore.dasherize
       end

data/lib/avmtrf1/node_js/docker_image.rb

@@ -5,6 +5,10 @@ require 'avmtrf1/docker/image'
 module Avmtrf1
   module NodeJs
     class DockerImage < ::Avmtrf1::Docker::Image
+      # @return [String]
+      def apt_setup
+        debian_stretch_apt_setup.gsub('-y dist-upgrade', '-y --allow-unauthenticated dist-upgrade')
+      end
     end
   end
 end

data/lib/avmtrf1/php/docker_images/base.rb

@@ -11,7 +11,6 @@ module Avmtrf1
         enable_abstract_methods
         abstract_methods :mcrypt_install, :xdebug_pecl_package
 
-        DEFAULT_BEFORE_CODE = ''
         GD_OPTIONS = %w[--with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir
                         --with-xpm-dir --with-freetype-dir].freeze
         PLATFORM_STEREOTYPE_TAG = 'php'
@@ -23,11 +22,6 @@ module Avmtrf1
           end
         end
 
-        # @return [String]
-        def before_code
-          DEFAULT_BEFORE_CODE
-        end
-
         # @return [String]
         def php_dist_curl_args
           '-sS "https://www.php.net/distributions/php-$PHP_VERSION.tar.gz"'

data/lib/avmtrf1/php/docker_images/v5.rb

@@ -7,10 +7,6 @@ module Avmtrf1
   module Php
     module DockerImages
       class V5 < ::Avmtrf1::Php::DockerImages::Base
-        BEFORE_CODE = <<CODE
-RUN echo 'deb http://security.debian.org/debian-security stable-security/updates main' > /etc/apt/sources.list
-RUN echo 'deb http://archive.debian.org/debian stretch main' >> /etc/apt/sources.list
-CODE
         MCRYPT_INSTALL = <<~CODE
         RUN docker-php-ext-install mcrypt
         CODE
@@ -28,8 +24,8 @@ RUN cd /tmp && \
 CODE
 
         # @return [String]
-        def before_code
-          BEFORE_CODE
+        def apt_setup
+          debian_stretch_apt_setup
         end
 
         # @return [String]

data/lib/avmtrf1/red/helper.rb

@@ -1,36 +1,21 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-require 'active_support/core_ext/string'
-require 'eac_ruby_utils/patches/module/speaker'
+require 'eac_envs/http/request'
+require 'eac_ruby_utils/core_ext'
 require 'erb'
-require 'httpclient'
 require 'nokogiri'
 
 module Avmtrf1
   module Red
     module Helper
-      extend ::ActiveSupport::Concern
-
-      included do
+      common_concern do
         enable_speaker
       end
 
-      def http_client
-        @http_client ||= ::HTTPClient.new
-      end
-
-      def check_request_result(url, result)
-        return if result.status == 200
-
-        raise "#{url} returned #{result.status}\n#{result.body}"
-      end
-
       def post(url, *post_args)
         infom "Requesting \"#{url}\""
-        res = http_client.post(url, *post_args)
-        check_request_result(url, res)
-        res.body
+        ::EacEnvs::Http::Request.new.url(url.to_s).verb(:post).body_data(post_args.first).response
+          .body_str_or_raise
       end
 
       def post_xml(url_suffix, xml_body)

data/lib/avmtrf1/red/profile.rb

@@ -2,13 +2,13 @@
 
 require 'avmtrf1/red/client'
 require 'avmtrf1/red/helper'
-require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Red
     class Profile
       include ::Avmtrf1::Red::Helper
-      include ::EacRubyUtils::SimpleCache
+      enable_simple_cache
 
       class << self
         def by_ini_profile(ini_profile)
@@ -19,14 +19,10 @@ module Avmtrf1
         end
       end
 
-      attr_reader :client, :metadados
-
+      # @!method initialize(client, metadados)
       # @param client [Avmtrf1::Red::Client]
       # @param metadados [Hash]
-      def initialize(client, metadados)
-        @client = client
-        @metadados = metadados.dup.freeze
-      end
+      common_constructor :client, :metadados
 
       def put_file(file_path)
         auth_url = client.authorization_url
@@ -39,16 +35,7 @@ module Avmtrf1
       private
 
       def put_file_request(auth_url, file_path)
-        post(auth_url, put_file_args(file_path))
-      end
-
-      def put_file_args(file_path)
-        {
-          body: put_file_body(file_path),
-          header: {
-            'Content-Type' => 'multipart/form-data'
-          }
-        }
+        post(auth_url, put_file_body(file_path))
       end
 
       def metadados_file_path_uncached

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.39.5'
+    VERSION = '0.39.7'
   end
 end

data/template/avmtrf1/node_js/docker_image/Dockerfile.template

@@ -1,6 +1,20 @@
 # base image
 FROM node:%%PLATFORM_VERSION%%
 
+%%APT_SETUP%%
+
+# ASDF - 0.12.0
+ENV ASDF_DIR='/opt/asdf'
+ENV ASDF_PACKAGE='https://github.com/asdf-vm/asdf/archive/816195d615427b033a7426a4fb4d7fac4cf2d791.tar.gz'
+RUN mkdir -p "${ASDF_DIR}"
+RUN wget -qO- "${ASDF_PACKAGE}" | tar -xzf - --strip-components 1 -C "${ASDF_DIR}"
+
+# Python
+ENV PYTHON_VERSION='3.6.15'
+RUN "${ASDF_DIR}/bin/asdf" plugin add python
+RUN "${ASDF_DIR}/bin/asdf" install python "${PYTHON_VERSION}"
+RUN "${ASDF_DIR}/bin/asdf" global python "${PYTHON_VERSION}"
+
 # Inicializador
 RUN mkdir '/auxiliary'
 RUN mkdir '/auxiliary/eac-bash-lib'

data/template/avmtrf1/node_js/docker_image/auxiliary/init.sh

@@ -10,6 +10,7 @@ done
 export AUX_ROOT="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
 source "$AUX_ROOT/lib.sh"
+source "${ASDF_DIR}/asdf.sh"
 
 # Caminho raiz da aplicação
 path_set 'APP_ROOT' '/' '/app'

data/template/avmtrf1/php/docker_images/base/Dockerfile.template

@@ -1,11 +1,6 @@
 FROM php:%%PLATFORM_VERSION%%-apache
 
-%%BEFORE_CODE%%
-
-# Base ubuntu
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get -y update
-RUN apt-get -y dist-upgrade
+%%APT_SETUP%%
 
 # Apache HTTP
 RUN a2enmod rewrite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.5
+  version: 0.39.7
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium