avm-tools 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cc8ec766645c9ba79f3bbee342a271a47dfbc9921b433b0de06c2dbdac82470
-  data.tar.gz: f2efe1291c604c06320b386de40ab0035641017c040ebc0fa3ff5a56a1b57b3b
+  metadata.gz: 4deaa72e5e51d1dc4db756e57ea2bd1c8c6578f531d1ef2084a330719d74fb15
+  data.tar.gz: 6dd2b7bf04bdaa95b24d020fa7f4947ed3197588e497fe40ce51c0a5f90a688c
 SHA512:
-  metadata.gz: 31f9530c35e93e73fa80ea12e25c1301dadeda7028624cea0ca58253b201f7c3f7b4f3c015f6e9bc6f4fd7db183010be9adb6c89fe8d858f3e38e97d600e90d7
-  data.tar.gz: 3aaa766a741baf3d4e3dd5d33219bc1342fe9c0683802e33ca79472327d7b7909c0e45c4d1fde482fbae3a3f817d9a5315958dac26a02ee9e534b02b23fb10e0
+  metadata.gz: 85cbe7adec68930b3d499a5d9765a8d86072a32f2f41730455c7236d5ba940dcee7fe259718840146143972c90cd0b50799c059f3745801051322ad5e733b978
+  data.tar.gz: 8dc0bb879ed769cc3760c4cbaf02dc2b62a7d765e97eb7bf7fcfc5cfaa15e761b1b95e57504e7ec79c7519dadd19077301a2ca679deddac41789feed60640fa0

data/lib/avm/docker/image.rb

@@ -7,6 +7,16 @@ require 'avm/patches/object/template'
 module Avm
   module Docker
     class Image
+      attr_reader :registry
+      attr_accessor :snapshot
+      attr_accessor :version
+
+      def initialize(registry)
+        @registry = registry
+        self.snapshot = true
+        self.version = true
+      end
+
       def build(extra_args = [])
         on_build_dir do
           template.apply(self, build_dir)
@@ -14,6 +24,10 @@ module Avm
         end
       end
 
+      def generator_version
+        ::Avm::Tools::VERSION
+      end
+
       def push
         ::Avm::Executables.docker.command.append(['push', tag]).system!
       end
@@ -29,6 +43,30 @@ module Avm
         run_run(instance) if container_exist?(instance)
       end
 
+      def tag
+        r = tag_name
+        r += ":#{tag_version}" if tag_version.present?
+        r
+      end
+
+      def tag_name
+        return registry.name if registry.name.present?
+
+        raise 'Registry name is blank'
+      end
+
+      def tag_version
+        [tag_version_version, stereotype_tag].reject(&:blank?).join('_')
+      end
+
+      def tag_version_version
+        return nil unless version
+
+        r = generator_version
+        r += '-snapshot' if snapshot
+        r
+      end
+
       private
 
       attr_reader :build_dir

data/lib/avm/docker/runner.rb

@@ -25,6 +25,8 @@ module Avm
           -B --build-arg=<build-arg>  Argument for "docker build".
           -E --entrypoint-arg=<run-arg>    Argument for entrypoint on "docker run"
           -c --clear  Remove container if exist before run.
+          -S --no-snapshot    Does not add "-snapshot" to image tag.
+          -V --no-version   Does not add version to image tag.
       DOCOPT
 
       def run
@@ -38,11 +40,17 @@ module Avm
       private
 
       def setup
-        instance.docker_registry = registry
+        instance.docker_image_options = {
+          registry: registry,
+          snapshot: snapshot?,
+          version: version?
+        }
       end
 
       def banner
         infov 'Registry name', registry
+        infov 'Version?', version?
+        infov 'Snapshot?', snapshot?
         infov 'Image name', instance.docker_image.tag
         infov 'Build arguments', build_args
         infov 'Entrypoint arguments', entrypoint_args
@@ -79,6 +87,14 @@ module Avm
         end
       end
 
+      def snapshot?
+        !options.fetch('--no-snapshot')
+      end
+
+      def version?
+        !options.fetch('--no-version')
+      end
+
       def instance
         context(:instance)
       end

data/lib/avm/instances/base/dockerizable.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
 require 'avm/docker/container'
 
 module Avm
@@ -7,10 +8,10 @@ module Avm
     class Base
       module Dockerizable
         enable_simple_cache
-        attr_reader :docker_registry
+        attr_reader :docker_image_options
 
-        def docker_registry=(new_value)
-          @docker_registry = new_value
+        def docker_image_options=(options)
+          @docker_image_options = ::ActiveSupport::HashWithIndifferentAccess.new(options)
           reset_cache
         end
 
@@ -31,7 +32,10 @@ module Avm
         end
 
         def docker_image_uncached
-          docker_image_class.new(docker_registry)
+          r = docker_image_class.new(docker_image_options.fetch(:registry))
+          r.version = docker_image_options[:version] if docker_image_options.key?(:version)
+          r.snapshot = docker_image_options[:snapshot] if docker_image_options.key?(:snapshot)
+          r
         end
       end
     end

data/lib/avm/self/docker_image.rb

@@ -6,10 +6,8 @@ require 'avm/docker/image'
 module Avm
   module Self
     class DockerImage < ::Avm::Docker::Image
-      common_constructor :registry
-
-      def tag
-        registry.name
+      def stereotype_tag
+        nil
       end
     end
   end

data/lib/avm/stereotypes/eac_ubuntu_base0/docker_image.rb

@@ -7,11 +7,8 @@ module Avm
   module Stereotypes
     module EacUbuntuBase0
       class DockerImage < ::Avm::Docker::Image
-        enable_simple_cache
-        common_constructor :registry
-
-        def tag
-          "#{registry.name}:eac_ubuntu_base0"
+        def stereotype_tag
+          'eac_ubuntu_base0'
         end
       end
     end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.23.0'
+    VERSION = '0.24.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers