avmtrf1-tools 0.39.0 → 0.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd64d76397e3809b07f574cdf7452b7b3140e0ab17dd70c212e19449a81668e4
-  data.tar.gz: 5b345d3e854d87d99e03dc662f9fa9ca5f467d5dc62974eec4f08cf86b4e1212
+  metadata.gz: f18fafef35d11fbe741daa7a8947becf6740c513250ffcc40df6c107429d22cc
+  data.tar.gz: 5f561f1f0414b3c7ce8bea5ea7e70aee0c2f637ff9badb670f977ed9b1405932
 SHA512:
-  metadata.gz: 3b1b36a0440b0103dfacc9bafd011facceeb5e6839de3e9fb8a97ef2a22e80b150a7ca53a14388fd4a993d6f593fcd1244fbf028f654cf5a639d428d48e2b784
-  data.tar.gz: 487c8476da28d45658b40cdccbe8f6d645fc4347f0ad0c479c1c8c0e2d3810a5e32dacb72a1112f34e38d9d0f534410bf4a73fc08cf7bab2b0fae0ff0fbae3ae
+  metadata.gz: 14726142418dea3e9388c0060be2673b83f366c0c0f9436c09cb19be46a9313b204e83bfdc8aa832696628ef06e0b50cbf5c971cd4111c17e67553696ff93cd9
+  data.tar.gz: 176d11774e1a5e0012d040c4ee4c553d42c92cb3dd9c5a5475bcfa68620d50b2adf543323fc36455b595c29be5432cde86c4dcf5e97728e72134aecdc19cc4b8

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.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
-        "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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'rubygems'
+require 'avmtrf1/docker/image'
+
+module Avmtrf1
+  module Php
+    module DockerImages
+      class Base < ::Avmtrf1::Docker::Image
+        enable_abstract_methods
+        abstract_methods :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
+        PLATFORM_STEREOTYPE_TAG = 'php'
+
+        def platform_stereotype_tag
+          PLATFORM_STEREOTYPE_TAG
+        end
+
+        def write_in_provide_dir
+          ::Avmtrf1::Php::DockerImages::Base.template.apply(self, provide_dir)
+        end
+
+        def gd_options
+          GD_OPTIONS.join(' ')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/php/docker_images/v5'
+require 'avmtrf1/php/docker_images/v7'
+require 'avmtrf1/php/docker_images/v7_v4'
+require 'eac_ruby_utils/core_ext'
+require 'rubygems'
+
+module Avmtrf1
+  module Php
+    module DockerImages
+      class Factory
+        V7 = ::Gem::Version.new('7')
+        V7V4 = ::Gem::Version.new('7.4')
+
+        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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/php/docker_images/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Php
+    module DockerImages
+      class V5 < ::Avmtrf1::Php::DockerImages::Base
+        MCRYPT_INSTALL = <<~CODE
+          RUN docker-php-ext-install mcrypt
+        CODE
+        XDEBUG_PECL_PACKAGE = 'xdebug-2.5.5'
+
+        def mcrypt_install
+          MCRYPT_INSTALL
+        end
+
+        def xdebug_pecl_package
+          XDEBUG_PECL_PACKAGE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/php/docker_images/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Php
+    module DockerImages
+      class V7 < ::Avmtrf1::Php::DockerImages::Base
+        MCRYPT_INSTALL = <<~CODE
+          RUN pecl install mcrypt
+          RUN echo extension=mcrypt.so > "$PHP_INI_DIR/conf.d/mcrypt.ini"
+        CODE
+        XDEBUG_PECL_PACKAGE = 'xdebug'
+
+        def mcrypt_install
+          MCRYPT_INSTALL
+        end
+
+        def xdebug_pecl_package
+          XDEBUG_PECL_PACKAGE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/php/docker_images/v7'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Php
+    module DockerImages
+      class V7V4 < ::Avmtrf1::Php::DockerImages::V7
+        GD_OPTION_PARSER = /\A(.+)-dir\z/.to_parser do |m|
+          m[1]
+        end
+        GD_OPTION_REJECT = %w[--with-gd --with-png --with-zlib].freeze
+
+        # Referência: https://github.com/docker-library/php/issues/912
+        def gd_options
+          GD_OPTIONS
+            .map { |option| gd_option_replace(option) }
+            .reject { |option| GD_OPTION_REJECT.include?(option) }
+            .join(' ')
+        end
+
+        def gd_option_replace(option)
+          GD_OPTION_PARSER.parse(option).if_present(option)
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/php/docker_images.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Php
+    module DockerImages
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avmtrf1/php/docker_image'
+require 'avmtrf1/php/docker_images/factory'
 require 'avmtrf1/docker/image_runner'
 require 'eac_cli/core_ext'
 require 'eac_docker/registry'
@@ -10,6 +10,9 @@ module Avmtrf1
     class Runner
       class Php
         class Docker < ::Avmtrf1::Docker::ImageRunner
+          def docker_image_class(platform_version)
+            ::Avmtrf1::Php::DockerImages::Factory.new(platform_version).result
+          end
         end
       end
     end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.39.0'
+    VERSION = '0.39.2'
   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_image → 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
@@ -17,8 +17,7 @@ RUN docker-php-ext-install bz2
 # Extensão PHP "gd"
 # 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-configure gd %%GD_OPTIONS%%
 RUN docker-php-ext-install gd
 
 # Extensão PHP "intl"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.39.2
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium
@@ -16,54 +16,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.141'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.131'
+        version: '0.141'
 - !ruby/object:Gem::Dependency
   name: eac_rest
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
         version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.13.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.13.8
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +144,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,12 +285,16 @@ 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_image.rb
+- lib/avmtrf1/php/docker_images.rb
+- lib/avmtrf1/php/docker_images/base.rb
+- lib/avmtrf1/php/docker_images/factory.rb
+- lib/avmtrf1/php/docker_images/v5.rb
+- lib/avmtrf1/php/docker_images/v7.rb
+- lib/avmtrf1/php/docker_images/v7_v4.rb
 - lib/avmtrf1/red.rb
 - lib/avmtrf1/red/client.rb
 - lib/avmtrf1/red/client/authorization.xml.erb
@@ -365,19 +363,19 @@ files:
 - template/avmtrf1/node_js/docker_image/auxiliary/ng_serve.sh
 - template/avmtrf1/node_js/docker_image/auxiliary/npm_install.sh
 - template/avmtrf1/node_js/docker_image/auxiliary/start.sh
-- template/avmtrf1/php/docker_image/Dockerfile.template
-- template/avmtrf1/php/docker_image/aux/apache_foreground.sh
-- template/avmtrf1/php/docker_image/aux/apache_user.sh
-- template/avmtrf1/php/docker_image/aux/config_banner.sh
-- template/avmtrf1/php/docker_image/aux/init.sh
-- template/avmtrf1/php/docker_image/aux/laravel.sh
-- template/avmtrf1/php/docker_image/aux/lib.sh
-- template/avmtrf1/php/docker_image/aux/pear.sh
-- template/avmtrf1/php/docker_image/aux/php_composer.sh
-- template/avmtrf1/php/docker_image/aux/php_values.sh
-- template/avmtrf1/php/docker_image/aux/setup_apache_site.sh
-- template/avmtrf1/php/docker_image/aux/start.sh
-- template/avmtrf1/php/docker_image/aux/templates/apache_site.conf
+- 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/config_banner.sh
+- template/avmtrf1/php/docker_images/base/aux/init.sh
+- template/avmtrf1/php/docker_images/base/aux/laravel.sh
+- template/avmtrf1/php/docker_images/base/aux/lib.sh
+- template/avmtrf1/php/docker_images/base/aux/pear.sh
+- template/avmtrf1/php/docker_images/base/aux/php_composer.sh
+- template/avmtrf1/php/docker_images/base/aux/php_values.sh
+- template/avmtrf1/php/docker_images/base/aux/setup_apache_site.sh
+- template/avmtrf1/php/docker_images/base/aux/start.sh
+- template/avmtrf1/php/docker_images/base/aux/templates/apache_site.conf
 - template/avmtrf1/tools/msgraph/token_retrieve/python_retriever.py
 homepage: http://redmine.trf1.gov.br/projects/avm-trf1
 licenses: []

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__)

data/lib/avmtrf1/php/docker_image.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-require 'rubygems'
-require 'avmtrf1/docker/image'
-
-module Avmtrf1
-  module Php
-    class DockerImage < ::Avmtrf1::Docker::Image
-      MCRYPT_INSTALL_GREATER_EQUAL_7_2 = <<~DOCKERFILE
-        RUN pecl install mcrypt
-        RUN echo extension=mcrypt.so > "$PHP_INI_DIR/conf.d/mcrypt.ini"
-      DOCKERFILE
-
-      MCRYPT_INSTALL_LESSER_7_2 = <<~DOCKERFILE
-        RUN docker-php-ext-install mcrypt
-      DOCKERFILE
-
-      XDEBUG_PECL_PACKAGE_LESSER_7 = 'xdebug-2.5.5'
-      XDEBUG_PECL_PACKAGE_GREATER_EQUAL = 'xdebug'
-
-      def mcrypt_install
-        if ::Gem::Version.new(plataform_version) >= ::Gem::Version.new('7.2')
-          MCRYPT_INSTALL_GREATER_EQUAL_7_2
-        else
-          MCRYPT_INSTALL_LESSER_7_2
-        end
-      end
-
-      def xdebug_pecl_package
-        if ::Gem::Version.new(plataform_version) < ::Gem::Version.new('7')
-          XDEBUG_PECL_PACKAGE_LESSER_7
-        else
-          XDEBUG_PECL_PACKAGE_GREATER_EQUAL
-        end
-      end
-    end
-  end
-end