dapp 0.13.21 → 0.13.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6fe51938164442f3a4d1c70c954505de2a819b2
-  data.tar.gz: 301499af3fb80b51c4a059134a897be3ea966e6c
+  metadata.gz: 328339d676470a5b9dde9b652176c9832d2d9b5f
+  data.tar.gz: 6cb726ff189d3a830ed5a7a5951106df4f325c53
 SHA512:
-  metadata.gz: ec4a97af9ac3c47067e8fc3ca2cea6b17b1beb309fe778a7ff4ed150c4ee1d2034dbaf4cb0e5ce24bd68d6bfb9f056f7f49a864564bf19f44acd4b35a1d45519
-  data.tar.gz: d045312a3c0b9292bfa1dd930ac9ce0b0ed1c5759aefeadc05211933ffe3903857728ac91ca8962553a2e25ad2de12a5f79ed8e5034c174f5f69ebcbe4e8b567
+  metadata.gz: 6f60a9c036e8c459ff91738d1412bfe4477162357fa81765e71a253068291ec2dbca7102f82cea8aee3d8878b9d69081f10ee727216af8900f09f33ede304795
+  data.tar.gz: f3051c94f5b2b4f9ca13fec239e8ce8d44c2996f17752f742b3460074a2cd47b9ce9d3f67e1f831256ff04efd49e36b4479e789e9c140121d9b0a20a552f6879

data/lib/dapp/config/config.rb

@@ -9,10 +9,6 @@ module Dapp
         !!@_dev_mode
       end
 
-      def after_parsing!
-        do_all!('_after_parsing!')
-      end
-
       def validate!
         do_all!('_validate!')
       end

data/lib/dapp/dapp/dappfile.rb

@@ -33,7 +33,6 @@ module Dapp
           ::Dapp::Config::Config.new(dapp: self).tap do |config|
             begin
               config.instance_eval File.read(dappfile_path), dappfile_path
-              config.after_parsing!
               config.validate!
             rescue SyntaxError, StandardError => e
               backtrace = e.backtrace.find { |line| line.start_with?(dappfile_path) }

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

@@ -8,10 +8,6 @@ module Dapp
 
         protected
 
-        def dimg_after_parsing!
-          _dimg.each(&:artifacts_after_parsing!)
-        end
-
         def dimg_config_validate!
           raise Error::Config, code: :dimg_name_required if _dimg.any? { |dimg| dimg._name.nil? } && _dimg.size > 1
           _dimg.each(&:validate!)

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

@@ -130,10 +130,6 @@ module Dapp
               end
             end
 
-            def artifacts_after_parsing!
-              _artifacts_auto_excluding!
-            end
-
             protected
 
             def builder(type)
@@ -144,42 +140,6 @@ module Dapp
             def passed_directives
               [:@_chef, :@_shell, :@_docker, :@_git_artifact, :@_mount, :@_artifact_groups, :@_builder]
             end
-
-            def _artifacts_auto_excluding!
-              path_to_relative = proc { |path| path.reverse.chomp('/').reverse }
-
-              all_artifacts.reduce({}) do |hash, artifact|
-                unless artifact._to.nil?
-                  to_common = artifact._to[/^\/[^\/]*/]
-                  hash[to_common] ||= []
-                  hash[to_common] << artifact
-                end
-                hash
-              end.each do |to_common, artifacts|
-                include_paths_common = artifacts.reduce([]) do |arr, artifact|
-                  arr << artifact._to.sub(to_common, '')
-                  arr.concat(artifact._include_paths.map { |path| File.join(artifact._to.sub(to_common, ''), path) } )
-                  arr
-                end.map(&path_to_relative).uniq
-
-                artifacts.each do |artifact|
-                  artifact_include_shift = path_to_relative.call(artifact._to.sub(to_common, ''))
-
-                  include_paths_common.each do |path|
-                    next if artifact_include_shift.start_with? path
-
-                    path = path_to_relative.call(path.sub(artifact_include_shift, ''))
-                    unless artifact._exclude_paths.any? { |epath| path.start_with? epath }
-                      artifact._exclude_paths << path
-                    end
-                  end
-                end
-              end
-            end
-
-            def all_artifacts
-              _artifact + _git_artifact._local + _git_artifact._remote
-            end
           end # InstanceMethods
           # rubocop:enable Metrics/ModuleLength
         end # Dimg

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

@@ -67,7 +67,7 @@ module Dapp
             end
 
             def validate_artifacts!
-              artifacts = validate_artifact_format(all_artifacts)
+              artifacts = validate_artifact_format(validated_artifacts)
               loop do
                 break if artifacts.empty?
                 verifiable_artifact = artifacts.shift
@@ -133,6 +133,10 @@ module Dapp
                 !(art._before.nil? && art._after.nil?)
               end
             end
+
+            def validated_artifacts
+              _artifact + _git_artifact._local + _git_artifact._remote
+            end
           end # Validation
           # rubocop:enable Metrics/ModuleLength
         end # Dimg

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.21'.freeze
-  BUILD_CACHE_VERSION = 17
+  VERSION = '0.13.22'.freeze
+  BUILD_CACHE_VERSION = 18
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.21
+  version: 0.13.22
 platform: ruby
 authors:
 - Dmitry Stolyarov