dapp 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c89aa17f75b85d02ff8e2d61509be25b24c255
-  data.tar.gz: d74d06d30d4373f63ba4c7f72017ba040bcab164
+  metadata.gz: 1223a0b22f91c564551e09f54d54c02b253d4a84
+  data.tar.gz: cb646a75d24b8f3b045940d9c5dfeea1497e6188
 SHA512:
-  metadata.gz: 718e02aeac16f13c76837713b9b6c0c131f6bcfe3d209c38880ca7651f7c136954ea059e3cd33cd694660271460cab1d8e8efdb33c6952acc9b48009ba3672b0
-  data.tar.gz: 796cf6110efe254a07a73edfd4c662041d91abe11f8fda48f78f5dfcb2ede70cf5f68cbf56d663d96e377a52e1c2b601743fea1bff68082bdce4e18d07492fe0
+  metadata.gz: a49317f02f402ad669021275646da2792c8ea7ec3abd3f4eae3487b5a375869812d86186ba2c91af411ca09a682055f167f99c37059a90c4b0a20c94882d59f9
+  data.tar.gz: cc1034b50a63384ca0535d16f34dfe591b674864db78201bdb56e3f0efc8a3d8382113e86b4bb8de9f325e8d6051ce61c63156cd3c889e7ddf8c86fc55547fad

data/config/en/net_status.yml

@@ -83,6 +83,8 @@ en:
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
       git_artifact_remote_branch_with_commit: "Remote git repo: use `commit` or `branch` directive!"
       artifact_conflict: "Conflict between artifacts!\n\n%{dappfile_context}"
+      artifact_not_found: "Invalid Dappfile: artifact `%{name}` should be defined before import directive!"
+      artifact_already_exists: "Invalid Dappfile: artifact `%{name}` already exists!"
       scratch_unsupported_directive: "Scratch dimg has unsupported directive `%{directive}`!"
       scratch_artifact_required: "Scratch dimg without artifacts!"
       scratch_artifact_associated: "Scratch artifact can't be associated: not expected `before`/`after` attribute!"

data/lib/dapp.rb

@@ -235,6 +235,7 @@ require 'dapp/dimg/dapp/command/build_context/import'
 require 'dapp/dimg/dapp/command/build_context/common'
 require 'dapp/dimg/dapp/dappfile'
 require 'dapp/dimg/dapp/dimg'
+require 'dapp/dimg/dapp/config_artifact_group'
 require 'dapp/dimg/dapp/dapp'
 require 'dapp/dimg/docker_registry'
 require 'dapp/dimg/docker_registry/base/request'

data/lib/dapp/dimg/build/stage/artifact_base.rb

@@ -48,7 +48,7 @@ module Dapp
           end
 
           def artifacts_dimgs_build!
-            artifacts.each do |artifact|
+            artifacts.uniq { |artifact| artifact[:dimg] }.each do |artifact|
               process = dimg.dapp.t(code: 'process.artifact_building', data: { name: artifact[:name] })
               dimg.dapp.log_secondary_process(process) { artifact[:dimg].build! }
             end

data/lib/dapp/dimg/config/directive/artifact.rb

@@ -22,6 +22,14 @@ module Dapp
             attr_accessor :_config
             attr_accessor :_before, :_after
 
+            def _cwd
+              @_cwd ||= @_to
+            end
+
+            def _to
+              @_to ||= @_cwd
+            end
+
             def before(stage)
               sub_directive_eval do
                 stage = stage.to_sym

data/lib/dapp/dimg/config/directive/artifact_base.rb

@@ -55,10 +55,6 @@ module Dapp
               }
             end
 
-            def _cwd
-              @_cwd ||= _to
-            end
-
             def _cwd=(value)
               return if value.nil?
               raise ::Dapp::Error::Config, code: :export_cwd_absolute_path_required unless Pathname(value).absolute?

data/lib/dapp/dimg/config/directive/artifact_group.rb

@@ -3,8 +3,23 @@ module Dapp
     module Config
       module Directive
         class ArtifactGroup < DimgGroup
+          attr_reader :_name
+
+          def initialize(name = nil, dapp:)
+            super(dapp: dapp)
+            @_name = name
+          end
+
           def export(*args, &blk)
-            artifact_config = pass_to(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", dapp: dapp))
+            _artifact_export(_artifact_config, *args, &blk)
+          end
+
+          def _artifact_config
+            artifact_config_name = "artifact-#{[_name, SecureRandom.hex(2)].compact.join('-')}"
+            pass_to(ArtifactDimg.new(artifact_config_name, dapp: dapp))
+          end
+
+          def _artifact_export(artifact_config, *args, &blk)
             artifact = Artifact.new(dapp: dapp, config: artifact_config)
             artifact.export(*args, &blk).tap do
               _export.concat artifact._export

data/lib/dapp/dimg/config/directive/dimg/instance_methods.rb

@@ -22,9 +22,17 @@ module Dapp
               directive_eval(_docker, &blk)
             end
 
-            def artifact(&blk)
-              pass_to(ArtifactGroup.new(dapp: dapp), :clone_to_artifact).tap do |artifact_group|
+            def artifact(name = nil, &blk)
+              pass_to(ArtifactGroup.new(name, dapp: dapp), :clone_to_artifact).tap do |artifact_group|
                 _context_artifact_groups << directive_eval(artifact_group, &blk)
+                dapp.artifact_config(name, artifact_group._artifact_config) unless name.nil?
+              end
+            end
+
+            def import(name, from = nil, &blk)
+              ArtifactGroup.new(dapp: dapp).tap do |artifact_group|
+                artifact_group._artifact_export(dapp.artifact_config_by_name(name), from, &blk)
+                _context_artifact_groups << artifact_group
               end
             end
 

data/lib/dapp/dimg/config/directive/dimg/validation.rb

@@ -29,6 +29,7 @@ module Dapp
                   elm.validate! if elm.respond_to?(:validate!)
                 end
               end
+              _context_artifact_groups.each(&:validate!)
               _mount.map(&:_to).tap do |mounts_points|
                 mounts_points.each do |path|
                   raise ::Dapp::Error::Config, code: :mount_duplicate_to, data: { path: path } if mounts_points.count(path) > 1

data/lib/dapp/dimg/config/directive/dimg_group.rb

@@ -21,7 +21,7 @@ module Dapp
             super
           end
 
-          def artifact(&blk)
+          def artifact(name = nil, &blk)
             check_dimg_group_directive_order(:artifact)
             super
           end

data/lib/dapp/dimg/dapp/config_artifact_group.rb

@@ -0,0 +1,20 @@
+module Dapp
+  module Dimg
+    module Dapp
+      module ConfigArtifactGroup
+        def artifact_config_by_name(name)
+          artifacts_configs[name] || raise(::Dapp::Error::Config, code: :artifact_not_found, data: { name: name })
+        end
+
+        def artifact_config(name, artifact_config)
+          raise(::Dapp::Error::Config, code: :artifact_already_exists, data: { name: name }) if artifacts_configs.key?(name)
+          artifacts_configs[name] = artifact_config
+        end
+
+        def artifacts_configs
+          @artifacts_configs ||= {}
+        end
+      end # Dimg
+    end # Dapp
+  end # Dimg
+end # Dapp

data/lib/dapp/dimg/dapp/dapp.rb

@@ -4,6 +4,7 @@ module Dapp
       module Dapp
         include Dappfile
         include Dimg
+        include ConfigArtifactGroup
 
         include Command::Common
         include Command::Run

data/lib/dapp/dimg/dimg.rb

@@ -189,6 +189,8 @@ module Dapp
       end
 
       def cleanup_tmp
+        return unless tmp_dir_exists?
+
         # В tmp-директории могли остаться файлы, владельцами которых мы не являемся.
         # Такие файлы могут попасть туда при экспорте файлов артефакта.
         # Чтобы от них избавиться — запускаем docker-контейнер под root-пользователем

data/lib/dapp/dimg/dimg/path.rb

@@ -6,6 +6,10 @@ module Dapp
           dapp.path(*path).expand_path
         end
 
+        def tmp_dir_exists?
+          @tmp_path != nil
+        end
+
         def tmp_path(*path)
           @tmp_path ||= Dir.mktmpdir('dapp-', dapp.tmp_base_dir)
           make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.26.2"
+  VERSION = "0.26.3"
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -612,6 +612,7 @@ files:
 - lib/dapp/dimg/dapp/command/stages/pull.rb
 - lib/dapp/dimg/dapp/command/stages/push.rb
 - lib/dapp/dimg/dapp/command/tag.rb
+- lib/dapp/dimg/dapp/config_artifact_group.rb
 - lib/dapp/dimg/dapp/dapp.rb
 - lib/dapp/dimg/dapp/dappfile.rb
 - lib/dapp/dimg/dapp/dimg.rb