pd1_tools 0.45.2 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 305e3271b5a66c20ab4141ea5bd0bf80d6e7efa1dfa1f04fafe29cc5f29ea603
-  data.tar.gz: 8a6ec1d717caed34a7bdb2431f57b4b5717dcd86b5a41879a19e7e8e0fbd815f
+  metadata.gz: a111980c747031f68b2c39fcbf051c5c3463645061b3198e7d8ea7fc627f240d
+  data.tar.gz: e7ce309ec2c8bb26c938ced74e45e50d8a78f3b28c871eca60ee9481b3ce4c9e
 SHA512:
-  metadata.gz: 0f727b46f91027f9f3caad8e463a49df99bf88fb120e99ff15c9ec34c7a7b838c9b10282abd4e6b421cace9e614e40d68e57e1e8f03e4c1954bd9b3ec36f67d0
-  data.tar.gz: ae72bce282916b9293f705f583afd343ded9ba73853587b92179c5dbb55d5e8b7d252e7c64081163d123186ca181fda5cb952f1da1253e33948f1abb665d196b
+  metadata.gz: f09bc45b2ad88e40be7d72bc4836d700b4e19f7c481d1c3735aeb1d443fb6ffc766b3bf39eaac2694319297e5dc282cd14b1dde10fcf3f5183613c27d2ac6f8b
+  data.tar.gz: e879bfa81995317485ea7af8e53b98207aa653675a39fced160e8e59dab645fa21dab6b43e475ba837a188b9f9a45d582ce9b3dcf447d3afa42ba37e912fa7a6

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

@@ -5,12 +5,12 @@ module Avmtrf1
     class PushLarge
       class LfsCommit
         module Push
-          private
-
           PACK_ERROR_MESSAGE = 'pack exceeds maximum allowed size'
           PACK_ERROR_TRUE = 'true'
           PACK_ERROR_FALSE = 'false'
 
+          private
+
           def push_ok_uncached
             commit
             fresh_push if push_pack_error_cache.read.blank?

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

@@ -5,13 +5,13 @@ module Avmtrf1
     class PushLarge
       class LfsCommit
         module TrackLargeFiles
-          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
 
+          private
+
           def track_large_files_uncached
             cherry_pick_source_revision
             if lfs_file_min_size.present?
@@ -40,7 +40,8 @@ module Avmtrf1
           end
 
           def required_extesion_to_track?(file)
-            EXTENSIONS_REQUIRED_TO_TRACK.include?(::File.extname(file.path).gsub(/\A\./, ''))
+            EXTENSIONS_REQUIRED_TO_TRACK.include?(::File.extname(file.path).gsub(/\A\./,
+                                                                                 ''))
           end
 
           def tracked_file?(file)

data/lib/avmtrf1/git/push_large/source_commit/push.rb

@@ -7,10 +7,10 @@ module Avmtrf1
     class PushLarge
       class SourceCommit
         module Push
-          private
-
           LFS_FILE_MIN_SIZES = [nil, 1_048_576, 524_288, 131_072].freeze
 
+          private
+
           def pushed_revision_uncached
             fs_cache.child('pushed_revision')
           end

data/lib/avmtrf1/tools/runner.rb

@@ -18,9 +18,7 @@ module Avmtrf1
                  'Quando usando Selenium não mostra a interface gráfica do navegador web.'
       end
 
-      def application
-        ::Avmtrf1::Tools.application
-      end
+      delegate :application, to: :'::Avmtrf1::Tools'
 
       def run
         ::Aranha::Selenium::DriverFactory::Base.default_headless = parsed.headless?

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

@@ -9,7 +9,7 @@ module Pd1Tools
     module DockerImages
       class Base < ::Pd1Tools::Docker::Image
         enable_abstract_methods
-        abstract_methods :mcrypt_install, :xdebug_pecl_package
+        abstract_methods :apcu_install, :mcrypt_install, :xdebug_pecl_package
 
         GD_OPTIONS = %w[--with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir
                         --with-xpm-dir --with-freetype-dir].freeze

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

@@ -7,6 +7,10 @@ module Pd1Tools
   module Php
     module DockerImages
       class V5 < ::Pd1Tools::Php::DockerImages::Base
+        APCU_INSTALL = <<~CODE
+          RUN pecl install apcu-4.0.11
+          RUN docker-php-ext-enable apcu
+        CODE
         MCRYPT_INSTALL = <<~CODE
           RUN docker-php-ext-install mcrypt
         CODE
@@ -23,6 +27,11 @@ module Pd1Tools
             rm -rf /tmp/xdebug
         CODE
 
+        # @return [String]
+        def apcu_install
+          APCU_INSTALL
+        end
+
         # @return [String]
         def apt_setup
           debian_stretch_apt_setup

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

@@ -7,6 +7,12 @@ module Pd1Tools
   module Php
     module DockerImages
       class V7 < ::Pd1Tools::Php::DockerImages::Base
+        APCU_INSTALL = <<~CODE
+          RUN pecl install apcu
+          RUN pecl install apcu_bc
+          RUN docker-php-ext-enable apcu --ini-name 10-docker-php-ext-apcu.ini
+          RUN docker-php-ext-enable apc --ini-name 20-docker-php-ext-apc.ini
+        CODE
         MCRYPT_INSTALL = <<~CODE
           RUN pecl install mcrypt
           RUN echo extension=mcrypt.so > "$PHP_INI_DIR/conf.d/mcrypt.ini"
@@ -14,6 +20,11 @@ module Pd1Tools
         PHP_VERSION = ::Gem::Version.new('7')
         XDEBUG_PECL_PACKAGE = 'xdebug-3.1.6'
 
+        # @return [String]
+        def apcu_install
+          APCU_INSTALL
+        end
+
         def mcrypt_install
           MCRYPT_INSTALL
         end

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

@@ -7,9 +7,18 @@ module Pd1Tools
   module Php
     module DockerImages
       class V8 < ::Pd1Tools::Php::DockerImages::V7V4
+        APCU_INSTALL = <<~CODE
+          RUN pecl install apcu
+          RUN docker-php-ext-enable apcu
+        CODE
         PHP_VERSION = ::Gem::Version.new('8')
         XDEBUG_PECL_PACKAGE = 'xdebug'
 
+        # @return [String]
+        def apcu_install
+          APCU_INSTALL
+        end
+
         def xdebug_pecl_package
           XDEBUG_PECL_PACKAGE
         end

data/lib/pd1_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pd1Tools
-  VERSION = '0.45.2'
+  VERSION = '0.48.0'
 end

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

@@ -2,8 +2,15 @@ FROM php:%%PLATFORM_VERSION%%-apache
 
 %%APT_SETUP%%
 
-# Apache HTTP
+# Apache HTTPD
+RUN apt-get install -y ssl-cert
 RUN a2enmod rewrite
+RUN echo 'ServerTokens Prod' > /etc/apache2/conf-available/zzz_after.conf
+RUN echo 'ServerSignature Off' >> /etc/apache2/conf-available/zzz_after.conf
+RUN a2enconf zzz_after
+
+# Extensão PHP "apcu"
+%%APCU_INSTALL%%
 
 # Extensão PHP "bcmath"
 RUN docker-php-ext-install bcmath
@@ -18,7 +25,7 @@ RUN apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libpng-dev libwebp-d
 RUN docker-php-ext-configure gd %%GD_OPTIONS%%
 RUN docker-php-ext-install gd
 
-# Extensão PHP "intl"
+# Extensão PHP "imap"
 RUN apt-get install -y libc-client-dev libkrb5-dev
 RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl
 RUN docker-php-ext-install imap
@@ -36,37 +43,10 @@ RUN docker-php-ext-install ldap
 RUN apt-get install -y libmcrypt-dev
 %%MCRYPT_INSTALL%%
 
-# Extensão PHP "pcntl"
-RUN docker-php-ext-install pcntl
+# Extensão PHP "mysqli"
+RUN docker-php-ext-install mysqli
 
-# Extensão PHP "snmp"
-RUN apt-get install -y libsnmp-dev snmp
-RUN docker-php-ext-install snmp
-
-# Extensão PHP "soap"
-RUN apt-get install -y libxml2-dev
-RUN docker-php-ext-install soap
-
-# Extensão PHP "xdebug"
-%%XDEBUG_INSTALL%%
-RUN docker-php-ext-enable xdebug
-
-# Extensão PHP "xsl"
-RUN apt-get install -y libxslt1-dev
-RUN docker-php-ext-install xsl
-
-# Extensão PHP "zip"
-RUN apt-get install -y libzip-dev
-RUN docker-php-ext-install zip
-
-# Extensões MySql
-RUN docker-php-ext-install mysqli pdo_mysql
-
-# Extensões PHP PostgreSQL
-RUN apt-get install -y libpq-dev
-RUN docker-php-ext-install pdo_pgsql pgsql
-
-# Extensão PHP oci
+# Extensão PHP "oci8"
 RUN apt-get install -y libarchive-tools libaio1
 RUN curl -sS https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-basic-linux.x64-12.2.0.1.0.zip | bsdtar -xvf- -C /usr/local
 RUN curl -sS https://raw.githubusercontent.com/caffeinalab/php-fpm-oci8/master/oracle/instantclient-sdk-linux.x64-12.2.0.1.0.zip | bsdtar -xvf-  -C /usr/local
@@ -78,6 +58,12 @@ RUN ln -s /usr/local/instantclient/sqlplus /usr/bin/sqlplus
 RUN docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/local/instantclient
 RUN docker-php-ext-install oci8
 
+# Extensão PHP "pcntl"
+RUN docker-php-ext-install pcntl
+
+# Extensão PHP "pdo_mysql"
+RUN docker-php-ext-install pdo_mysql
+
 # Extensão PHP pdo_oci
 RUN mkdir /tmp/php_source
 RUN curl %%PHP_DIST_CURL_ARGS%% | \
@@ -90,18 +76,42 @@ RUN make install
 RUN echo extension=pdo_oci.so > "$PHP_INI_DIR/conf.d/pdo_oci.ini"
 RUN echo 'date.timezone = "America/Sao_Paulo"' >> "$PHP_INI_DIR/php.ini"
 
+# Extensão PHP "pdo_pgsql"
+RUN apt-get install -y libpq-dev
+RUN docker-php-ext-install pdo_pgsql
+
+# Extensão PHP "pgsql"
+RUN docker-php-ext-install pgsql
+
+# Extensão PHP "snmp"
+RUN apt-get install -y libsnmp-dev snmp
+RUN docker-php-ext-install snmp
+
+# Extensão PHP "soap"
+RUN apt-get install -y libxml2-dev
+RUN docker-php-ext-install soap
+
+# Extensão PHP "xdebug"
+%%XDEBUG_INSTALL%%
+RUN docker-php-ext-enable xdebug
+
+# Extensão PHP "xsl"
+RUN apt-get install -y libxslt1-dev
+RUN docker-php-ext-install xsl
+
+# Extensão PHP "zip"
+RUN apt-get install -y libzip-dev
+RUN docker-php-ext-install zip
+
 # Composer
 RUN apt-get install -y git unzip
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer
 
-# SSL
-RUN apt-get install -y ssl-cert
-
 # Inicializador
 RUN mkdir '/aux'
 RUN mkdir '/aux/eac-bash-lib'
-RUN curl -sS https://codeload.github.com/esquilo-azul/eac-bash-lib/tar.gz/refs/tags/v0.17.1 \
+RUN curl -sS https://codeload.github.com/esquilo-azul/eac-bash-lib/tar.gz/refs/tags/v0.27.0 \
   | tar -xzf - --strip-components 1 -C '/aux/eac-bash-lib'
 ADD aux '/aux'
 CMD '/aux/start.sh'

data/template/pd1_tools/php/docker_images/base/aux/setup_apache_sites.sh

@@ -17,6 +17,8 @@ function setup_site() {
   a2ensite "${2}"
 }
 
+export APACHE_SITE_COMMONS="$(template_apply "$TEMPLATES_ROOT/apache_site_commons.conf")"
+
 infom "Configuração site Apache..."
 setup_site 'apache_site_nossl' '000-default'
 setup_site 'apache_site_ssl' 'default-ssl'

data/template/pd1_tools/php/docker_images/base/aux/templates/apache_site_commons.conf

@@ -0,0 +1,12 @@
+DocumentRoot "%%DOCUMENT_ROOT%%"
+
+ErrorLog ${APACHE_LOG_DIR}/error.log
+CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+<Directory %%DOCUMENT_ROOT%%>
+  Options Indexes FollowSymLinks
+  AllowOverride All
+  Require all granted
+</Directory>
+
+RedirectMatch 404 /\.

data/template/pd1_tools/php/docker_images/base/aux/templates/apache_site_nossl.conf

@@ -1,12 +1,3 @@
 <VirtualHost *:80>
-  DocumentRoot %%DOCUMENT_ROOT%%
-
-  ErrorLog ${APACHE_LOG_DIR}/error.log
-  CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-  <Directory %%DOCUMENT_ROOT%%>
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    Require all granted
-  </Directory>
+  %%APACHE_SITE_COMMONS%%
 </VirtualHost>

data/template/pd1_tools/php/docker_images/base/aux/templates/apache_site_ssl.conf

@@ -3,14 +3,5 @@
   SSLCertificateFile "%%SSL_CERTIFICATE_FILE%%"
   SSLCertificateKeyFile "%%SSL_CERTIFICATE_KEY_FILE%%"
 
-  DocumentRoot "%%DOCUMENT_ROOT%%"
-
-  ErrorLog ${APACHE_LOG_DIR}/error.log
-  CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-  <Directory %%DOCUMENT_ROOT%%>
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    Require all granted
-  </Directory>
+  %%APACHE_SITE_COMMONS%%
 </VirtualHost>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pd1_tools
 version: !ruby/object:Gem::Version
-  version: 0.45.2
+  version: 0.48.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-02-10 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -543,6 +543,7 @@ files:
 - template/pd1_tools/php/docker_images/base/aux/setup_apache_modules.sh
 - template/pd1_tools/php/docker_images/base/aux/setup_apache_sites.sh
 - template/pd1_tools/php/docker_images/base/aux/start.sh
+- template/pd1_tools/php/docker_images/base/aux/templates/apache_site_commons.conf
 - template/pd1_tools/php/docker_images/base/aux/templates/apache_site_nossl.conf
 - template/pd1_tools/php/docker_images/base/aux/templates/apache_site_ssl.conf
 - template/pd1_tools/php/docker_images/base/aux/variables.sh