avmtrf1-tools 0.39.1 → 0.39.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb146491f1e709ff475103267c4b962cab6299d7bfc8d50eca496da7340721a
-  data.tar.gz: 3bccb7ce04db3a8b84352bf3a19cf2a6ba815aab2923b046b66ca75e4b9443b0
+  metadata.gz: c4e87303045206c85cc7dceca6eae42524d5fc999445d3c70da7aaa25264edd6
+  data.tar.gz: 48be5540c28b183937a35de6e520be9c527fb01324467d9fc65628788da44d8c
 SHA512:
-  metadata.gz: 89e292994cc3d04b9862fde3513c8e6838ce21294c2ad6f570c9903f48d87759b13cd0534aa6657c425de1668925535089f855434d7376109f9019be9a775837
-  data.tar.gz: c191c0b8d719cd70f67117ee37276908b18c394af7ea625097e6d9dabf443468ed48b4c3b6db9049dfb278cc828b09914fdbe96df88b268c39795073b3bb1e49
+  metadata.gz: 24c987f0759a6f50da0732e8b5c2f9427c65fece5d01cadae7f5b773cb07af6f594f488a43aee3c5e632ffcd6e7126d8f4a8f83f5f546dd57f9ebec7b8815e50
+  data.tar.gz: 333344fa2141dab8c1bd1515398cf603895936f90d93a67b55e10cc694b393f1e8946a8e1f8434d63f81cd2cb03a97b001be371857c91f4fb78ae936a42a1465

data/Gemfile

@@ -9,3 +9,6 @@ group :oracle do
 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

@@ -9,14 +9,14 @@ module Avmtrf1
     class Image < ::Avm::Docker::Image
       enable_simple_cache
 
-      common_constructor :registry, :plataform_version
+      common_constructor :registry, :platform_version
 
-      def plataform_stereotype_tag
+      def platform_stereotype_tag
         self.class.name.split('::')[-2].underscore.dasherize
       end
 
       def stereotype_tag
-        "#{plataform_stereotype_tag}-#{plataform_version}"
+        "#{platform_stereotype_tag}-#{platform_version}"
       end
 
       def generator_version

data/lib/avmtrf1/docker/image_runner.rb

@@ -60,22 +60,22 @@ module Avmtrf1
         ::EacDocker::Registry.new(registry_name)
       end
 
-      def build_image(plataform_version)
-        r = docker_image_class(plataform_version).new(registry, plataform_version)
+      def build_image(platform_version)
+        r = docker_image_class(platform_version).new(registry, platform_version)
         r.send('version=', !parsed.no_version?)
         r.snapshot = !parsed.no_snapshot?
         r
       end
 
       def default_versions_config_key
-        "#{plataform_name.underscore}.default_versions"
+        "#{platform_name.underscore}.default_versions"
       end
 
-      def docker_image_class(_plataform_version)
-        "Avmtrf1::#{plataform_name}::DockerImage".constantize
+      def docker_image_class(_platform_version)
+        "Avmtrf1::#{platform_name}::DockerImage".constantize
       end
 
-      def plataform_name
+      def platform_name
         self.class.name.split('::')[-2]
       end
     end

data/lib/avmtrf1/git/cached_repository.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 
 module Avmtrf1
   module Git
-    class CachedRepository < ::Avm::Launcher::Git::Base
+    class CachedRepository < ::Avm::Git::Launcher::Base
       attr_reader :url
 
       def initialize(url)

data/lib/avmtrf1/git/push_large.rb

@@ -5,7 +5,7 @@ require 'ostruct'
 require 'eac_ruby_utils/patches/module/speaker'
 require 'eac_ruby_utils/require_sub'
 require 'eac_ruby_utils/simple_cache'
-require 'avmtrf1/patches/avm/launcher/git/base'
+require 'avmtrf1/patches/avm/git/launcher/base'
 
 module Avmtrf1
   module Git
@@ -18,7 +18,7 @@ module Avmtrf1
       attr_reader :git, :remote_name, :source_ref, :target_ref, :last_pushed_revision
 
       def initialize(git_local_path, remote_name, source_ref, target_ref)
-        @git = ::Avm::Launcher::Git::Base.new(git_local_path)
+        @git = ::Avm::Git::Launcher::Base.new(git_local_path)
         @remote_name = remote_name
         @source_ref = source_ref
         @target_ref = target_ref

data/lib/avmtrf1/patches/avm/{launcher/git → git/launcher}/base.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'avm/launcher/git/base'
+require 'avm/git/launcher/base'
 require 'eac_ruby_utils/patch'
 require 'active_support/concern'
 
 module Avmtrf1
   module Patches
     module Avm
-      module Launcher
-        module Git
+      module Git
+        module Launcher
           module Base
             extend ActiveSupport::Concern
 
@@ -41,6 +41,6 @@ module Avmtrf1
 end
 
 ::EacRubyUtils.patch(
-  ::Avm::Launcher::Git::Base,
-  ::Avmtrf1::Patches::Avm::Launcher::Git::Base
+  ::Avm::Git::Launcher::Base,
+  ::Avmtrf1::Patches::Avm::Git::Launcher::Base
 )

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

@@ -13,6 +13,18 @@ module Avmtrf1
 
         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'
+
+        class << self
+          # @return [Gem::Version]
+          def php_version
+            const_get('PHP_VERSION')
+          end
+        end
+
+        def platform_stereotype_tag
+          PLATFORM_STEREOTYPE_TAG
+        end
 
         def write_in_provide_dir
           ::Avmtrf1::Php::DockerImages::Base.template.apply(self, provide_dir)

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

@@ -3,6 +3,7 @@
 require 'avmtrf1/php/docker_images/v5'
 require 'avmtrf1/php/docker_images/v7'
 require 'avmtrf1/php/docker_images/v7_v4'
+require 'avmtrf1/php/docker_images/v8'
 require 'eac_ruby_utils/core_ext'
 require 'rubygems'
 
@@ -10,21 +11,25 @@ module Avmtrf1
   module Php
     module DockerImages
       class Factory
-        V7 = ::Gem::Version.new('7')
-        V7V4 = ::Gem::Version.new('7.4')
+        VERSIONS = [
+          ::Avmtrf1::Php::DockerImages::V8,
+          ::Avmtrf1::Php::DockerImages::V7V4,
+          ::Avmtrf1::Php::DockerImages::V7,
+          ::Avmtrf1::Php::DockerImages::V5
+        ].freeze
 
         common_constructor :platform_version do
           self.platform_version = ::Gem::Version.new(platform_version)
         end
 
         def result
-          if platform_version < V7
-            ::Avmtrf1::Php::DockerImages::V5
-          elsif platform_version >= V7V4
-            ::Avmtrf1::Php::DockerImages::V7V4
-          else
-            ::Avmtrf1::Php::DockerImages::V7
+          versions = VERSIONS.dup
+          lesser_version = versions.pop
+          versions.each do |version|
+            return version if platform_version >= version.php_version
           end
+
+          lesser_version
         end
       end
     end

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

@@ -11,7 +11,8 @@ module Avmtrf1
           RUN pecl install mcrypt
           RUN echo extension=mcrypt.so > "$PHP_INI_DIR/conf.d/mcrypt.ini"
         CODE
-        XDEBUG_PECL_PACKAGE = 'xdebug'
+        PHP_VERSION = ::Gem::Version.new('7')
+        XDEBUG_PECL_PACKAGE = 'xdebug-3.1.6'
 
         def mcrypt_install
           MCRYPT_INSTALL

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

@@ -11,6 +11,7 @@ module Avmtrf1
           m[1]
         end
         GD_OPTION_REJECT = %w[--with-gd --with-png --with-zlib].freeze
+        PHP_VERSION = ::Gem::Version.new('7.4')
 
         # Referência: https://github.com/docker-library/php/issues/912
         def gd_options

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/php/docker_images/v7_v4'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Php
+    module DockerImages
+      class V8 < ::Avmtrf1::Php::DockerImages::V7V4
+        PHP_VERSION = ::Gem::Version.new('8')
+        XDEBUG_PECL_PACKAGE = 'xdebug'
+
+        def xdebug_pecl_package
+          XDEBUG_PECL_PACKAGE
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/php/docker.rb

@@ -10,8 +10,8 @@ module Avmtrf1
     class Runner
       class Php
         class Docker < ::Avmtrf1::Docker::ImageRunner
-          def docker_image_class(plataform_version)
-            ::Avmtrf1::Php::DockerImages::Factory.new(plataform_version).result
+          def docker_image_class(platform_version)
+            ::Avmtrf1::Php::DockerImages::Factory.new(platform_version).result
           end
         end
       end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.39.1'
+    VERSION = '0.39.3'
   end
 end

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

@@ -1,5 +1,5 @@
 # base image
-FROM node:%%PLATAFORM_VERSION%%
+FROM node:%%PLATFORM_VERSION%%
 
 # Inicializador
 RUN mkdir '/auxiliary'

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

@@ -1,4 +1,4 @@
-FROM php:%%PLATAFORM_VERSION%%-apache
+FROM php:%%PLATFORM_VERSION%%-apache
 
 # Base ubuntu
 RUN apt-get -y update
@@ -100,7 +100,7 @@ RUN curl -sS https://getcomposer.org/installer | \
 # Inicializador
 RUN mkdir '/aux'
 RUN mkdir '/aux/eac-bash-lib'
-RUN wget -qO- https://github.com/esquilo-azul/eac-bash-lib/archive/v0.6.1.tar.gz \
+RUN wget -qO- https://codeload.github.com/esquilo-azul/eac-bash-lib/tar.gz/refs/tags/v0.17.1 \
   | tar -xzf - --strip-components 1 -C '/aux/eac-bash-lib'
 ADD aux '/aux'
 CMD '/aux/start.sh'

data/template/avmtrf1/php/docker_images/base/aux/app_user_run.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -u
+set -e
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+source "$DIR/init.sh"
+
+source "$AUX_ROOT/apache_user.sh"
+infom "Executando \"app_user_run $@\"..."
+app_user_run "$@"

data/template/avmtrf1/php/docker_images/base/aux/laravel.sh

@@ -40,7 +40,7 @@ function artisan_migrate() {
 function artisan_migrate_with_result() {
   set +e
   infom "Executando \"php artisan migrate\" em \"$1\"..."
-  (cd "$1"; php artisan migrate --no-interaction --force 2>&1)
+  APP_USER_RUN_DIR="$1" app_user_run php artisan migrate --no-interaction --force 2>&1
   LAST_ARTISAN_MIGRATE_RESULT=$?
   set -e
 }
@@ -53,6 +53,6 @@ infom "Executando \"artisan migrate\" nos diretórios de \"$LARAVEL_PATH\"..."
 IFSBAK="$IFS"
 IFS=:
 for LARAVEL_DIR in $LARAVEL_PATH; do
-  run_laravel "$(join_paths "$LARAVEL_DIR" "$APP_ROOT")"
+  run_laravel "$(path_expand "$LARAVEL_DIR" "$APP_ROOT")"
 done
 IFS="$IFSBAK"

data/template/avmtrf1/php/docker_images/base/aux/lib.sh

@@ -3,6 +3,13 @@ set -e
 
 source "$AUX_ROOT/eac-bash-lib/init.sh"
 
+function app_user_run() {
+  if var_blank_r 'APP_USER_RUN_DIR'; then
+    APP_USER_RUN_DIR="$APP_ROOT"
+  fi
+  (cd "$APP_USER_RUN_DIR" ;  su "$(id -nu "$APP_USER_ID")" --command "$(shell_join "$@")" )
+}
+
 function bool_set() {
   VARIABLE_NAME="$1"
   DEFAULT_VALUE="$2"
@@ -14,17 +21,6 @@ function bool_set() {
   export $VARIABLE_NAME="$(bool_s "$RESULT")"
 }
 
-function join_paths() {
-  PATH_ARG="$1"
-  BASE_ARG="$2"
-
-  if [[ "$PATH_ARG" == '/'* ]]; then
-    printf -- "%s\n" "$PATH_ARG"
-  else
-    printf -- "%s/%s\n" "$BASE_ARG" "$PATH_ARG"
-  fi
-}
-
 function path_set() {
   VARIABLE_NAME="$1"
   BASE_PATH="$2"
@@ -32,7 +28,7 @@ function path_set() {
 
   RESULT="$DEFAULT_VALUE"
   if var_present_r "$VARIABLE_NAME"; then
-    RESULT="$(join_paths "${!VARIABLE_NAME}" "$BASE_PATH")"
+    RESULT="$(path_expand "${!VARIABLE_NAME}" "$BASE_PATH")"
   fi
   if [ ! -d "$RESULT" ]; then
     fatal_error "Caminho \"$RESULT\" (\$$VARIABLE_NAME) não existe ou não é um diretório"
@@ -40,6 +36,20 @@ function path_set() {
   export $VARIABLE_NAME="$RESULT"
 }
 
+function shell_join() {
+  RESULT=''
+  FIRST=true
+  for ARG in "$@"; do
+    if bool_r "$FIRST"; then
+      FIRST=false
+    else
+      outout ' '
+    fi
+    printf '%q' "$ARG"
+  done
+  outout "\n"
+}
+
 function text_set() {
   VARIABLE_NAME="$1"
   DEFAULT_VALUE="$2"

data/template/avmtrf1/php/docker_images/base/aux/php_composer.sh

@@ -15,17 +15,17 @@ source "$DIR/init.sh"
 function run_composer() {
   COMPOSER_DIR="$1"
   infom "Executando \"composer install\" para \"$COMPOSER_DIR\"..."
-  COMPOSER_FILE="$(join_paths 'composer.json' "$COMPOSER_DIR")"
+  COMPOSER_FILE="$(path_expand 'composer.json' "$COMPOSER_DIR")"
   if [[ ! -f "$COMPOSER_FILE" ]]; then
     fatal_error "Arquivo \"$COMPOSER_FILE\" (\$COMPOSER_PATH) não encontrado"
   fi
-  su "$(id -nu "$APP_USER_ID")" -c "composer install '--working-dir=$COMPOSER_DIR'"
+  app_user_run composer install "--working-dir=$COMPOSER_DIR"
 }
 
 infom "Executando \"composer install\" nos diretórios de \"$COMPOSER_PATH\"..."
 IFSBAK="$IFS"
 IFS=:
 for COMPOSER_DIR in $COMPOSER_PATH; do
-  run_composer "$(join_paths "$COMPOSER_DIR" "$APP_ROOT")"
+  run_composer "$(path_expand "$COMPOSER_DIR" "$APP_ROOT")"
 done
 IFS="$IFSBAK"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.39.3
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium
@@ -16,54 +16,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.142'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.142.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.142'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.142.8
 - !ruby/object:Gem::Dependency
   name: eac_rest
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +101,7 @@ dependencies:
         version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.13.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +111,7 @@ dependencies:
         version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.13.10
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +138,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -291,9 +279,8 @@ files:
 - lib/avmtrf1/patches/avm/git.rb
 - lib/avmtrf1/patches/avm/git/issue.rb
 - lib/avmtrf1/patches/avm/git/issue/complete.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/avm/git/launcher.rb
+- lib/avmtrf1/patches/avm/git/launcher/base.rb
 - lib/avmtrf1/patches/inifile.rb
 - lib/avmtrf1/php.rb
 - lib/avmtrf1/php/docker_images.rb
@@ -302,6 +289,7 @@ files:
 - lib/avmtrf1/php/docker_images/v5.rb
 - lib/avmtrf1/php/docker_images/v7.rb
 - lib/avmtrf1/php/docker_images/v7_v4.rb
+- lib/avmtrf1/php/docker_images/v8.rb
 - lib/avmtrf1/red.rb
 - lib/avmtrf1/red/client.rb
 - lib/avmtrf1/red/client/authorization.xml.erb
@@ -373,6 +361,7 @@ files:
 - template/avmtrf1/php/docker_images/base/Dockerfile.template
 - template/avmtrf1/php/docker_images/base/aux/apache_foreground.sh
 - template/avmtrf1/php/docker_images/base/aux/apache_user.sh
+- template/avmtrf1/php/docker_images/base/aux/app_user_run.sh
 - template/avmtrf1/php/docker_images/base/aux/config_banner.sh
 - template/avmtrf1/php/docker_images/base/aux/init.sh
 - template/avmtrf1/php/docker_images/base/aux/laravel.sh

data/lib/avmtrf1/patches/avm/launcher/git.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/require_sub'
-::EacRubyUtils.require_sub(__FILE__)