avmtrf1-tools 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fa3389e4e84740cbfd2cb9cf14b9b862adbecbaf6c2d821245738c25757274a
-  data.tar.gz: 1f2e0ff3ff7bc1ad21cbc8a032fb9b1e5235c26dd94e05984a09b12b7b15a5c5
+  metadata.gz: d1b7d9505f6acda9e3f2c0c173414bc0c5047fce4423c19a59eb3fc09a572117
+  data.tar.gz: c6c1b56d6d56a20f8773ab8160cd30eb736ce5033c1ada1181c86a2d8daa405e
 SHA512:
-  metadata.gz: 7a1e4d91393d3e7148bd32179569485e5a68f28d4aca93d952d5979690992c715260225a35b77f4b510f66cc519beed0f933917ff568007779d99bc7824c1b64
-  data.tar.gz: 2c155e8f0e720b17d74a10cb4c68b60afe8c5e3f83fd7cdc72960cff69a50c90f576c70ece78876b426f610205efed550c76e79be0a3260deb1b7952ca72b042
+  metadata.gz: b86fee54a530f4cb419333dde092fa6b8ecb815dd0717f5747588efc371874d2a6f30c46b151afa0604dfa27bd2332e1b24391657a3e8a282b8cd4c7ab9d76fd
+  data.tar.gz: a479ecc2d4de7bee391984f620818904d3c91d1fe7e8abbcc4f26b26e2ee9fe54838f3215b1937146c5876d9efe27ec7f542f13789576081d53210f03701945c

data/lib/avmtrf1/docker/image.rb

@@ -1,45 +1,14 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
-require 'avmtrf1/executables'
+require 'avm/docker/image'
 require 'avmtrf1/template'
 
 module Avmtrf1
   module Docker
-    class Image
-      def build
-        on_build_dir do
-          template_dir.apply(self, build_dir)
-          run_docker_build
-        end
-      end
-
-      def push
-        ::Avmtrf1::Executables.docker.command.append(['push', tag]).system!
-      end
-
-      def read_entry(path, _options = {})
-        method = path.gsub('.', '_')
-        return send(method) if respond_to?(path, true)
-
-        raise "Method \"#{method}\" not found for entry \"#{path}\""
-      end
-
-      private
-
-      attr_reader :build_dir
-
-      def run_docker_build
-        ::Avmtrf1::Executables.docker.command.append(
-          ['build', '-t', tag, build_dir]
-        ).system!
-      end
-
-      def on_build_dir
-        @build_dir = ::Dir.mktmpdir
-        yield
-      ensure
-        ::FileUtils.rm_rf(@build_dir)
+    class Image < ::Avm::Docker::Image
+      def generator_version
+        ::Avmtrf1::Tools::VERSION
       end
     end
   end

data/lib/avmtrf1/php/docker_image.rb

@@ -17,36 +17,29 @@ module Avmtrf1
       DOCKERFILE
 
       enable_simple_cache
-      common_constructor :registry_name, :version
 
-      def tag
-        "#{registry_name}:php-#{version}"
+      attr_reader :php_version
+
+      def initialize(registry, php_version)
+        super(registry)
+        @php_version = php_version
       end
 
-      def template_dir
-        ::Avmtrf1.template('avmtrf1/php/docker_image')
+      def stereotype_tag
+        "php-#{php_version}"
       end
 
-      def source_package_url
-        last_update_release.source_package_url
+      def template_dir
+        ::Avmtrf1.template('avmtrf1/php/docker_image')
       end
 
       def mcrypt_install
-        if ::Gem::Version.new(version) >= ::Gem::Version.new('7.2')
+        if ::Gem::Version.new(php_version) >= ::Gem::Version.new('7.2')
           MCRYPT_INSTALL_GREATER_EQUAL_7_2
         else
           MCRYPT_INSTALL_LESSER_7_2
         end
       end
-
-      private
-
-      def last_update_release_uncached
-        result = ::Avmtrf1::Php::Release.all.select { |r| r.to_s.start_with?("#{version}.") }.max
-        return result if result
-
-        raise "No releases found for version \"#{version}\""
-      end
     end
   end
 end

data/lib/avmtrf1/template.rb

@@ -2,22 +2,5 @@
 
 require 'eac_ruby_utils/templates/searcher'
 
-module Avmtrf1
-  class << self
-    def templates_root
-      ::File.expand_path('../../template', __dir__)
-    end
-
-    def template_searcher
-      @template_searcher ||= begin
-        r = ::EacRubyUtils::Templates::Searcher.new
-        r.included_paths << templates_root
-        r
-      end
-    end
-
-    def template(subpath)
-      template_searcher.template(subpath)
-    end
-  end
-end
+::EacRubyUtils::Templates::Searcher.default.included_paths <<
+  ::File.expand_path('../../template', __dir__)

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/docker/registry'
 require 'eac_ruby_utils/console/docopt_runner'
 require 'eac_ruby_utils/core_ext'
 require 'avmtrf1/php/docker_image'
@@ -10,6 +11,7 @@ module Avmtrf1
       class Php < ::EacRubyUtils::Console::DocoptRunner
         class Docker < ::EacRubyUtils::Console::DocoptRunner
           enable_console_speaker
+          enable_simple_cache
 
           DOC = <<~DOCOPT
             Constrói imagens Docker para PHP.
@@ -23,6 +25,8 @@ module Avmtrf1
               -d --default  Adiciona as versões padrão.
               -n --registry-name=<registry-name>  Nome do registro.
               -p --push     Envia a imagem.
+              -S --no-snapshot    Não adiciona "-snapshot" no nome da imagem.
+              -V --no-version    Não adiciona a versão do gerador no nome da imagem.
           DOCOPT
 
           def run
@@ -53,7 +57,7 @@ module Avmtrf1
           end
 
           def process_version(version)
-            image = ::Avmtrf1::Php::DockerImage.new(registry_name, version)
+            image = build_image(version)
             infom "Building Docker image \"#{image.tag}\""
             image.build
             image.push if options.fetch('--push')
@@ -62,6 +66,17 @@ module Avmtrf1
           def registry_name
             options.fetch('--registry-name') || ::Avmtrf1.configs.read_entry('docker.registry.name')
           end
+
+          def registry_uncached
+            ::Avm::Docker::Registry.new(registry_name)
+          end
+
+          def build_image(php_version)
+            r = ::Avmtrf1::Php::DockerImage.new(registry, php_version)
+            r.send('version=', !options.fetch('--no-version'))
+            r.snapshot = !options.fetch('--no-snapshot')
+            r
+          end
         end
       end
     end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.13.1'
+    VERSION = '0.14.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers