dapp 0.23.5 → 0.23.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1672f9ce8c2f27ed332a84192f58e5f7bcd0ac4
-  data.tar.gz: 1fca50e98ca0e2ce4b7a92e6d3e550294f2760fe
+  metadata.gz: 4b7414b86082d6d690431f65221118dd25133296
+  data.tar.gz: cb0a237e5551ae18f7b95fceee867a233afb35e9
 SHA512:
-  metadata.gz: 723888bf022b14c57707e0a11f4129a43bb4abe2016eb5a013c296ac2f95d09e068cc8fade9ea221ded9d14b4f1f6d768db2a6d32d6aefbea9cb1288aa761ddd
-  data.tar.gz: e817219bea8f79e6ea181e44e7a38a4940f4d7e28889be4de2bf98be6601b6a7573867360c1005cad4e5f86b146d1da93f70caf8328eaadb61e28a9b6599df3f
+  metadata.gz: 02f5765c3636cfcdd0d81c75f181ff1285ea21f5af17865256918f08d780ea2064155dcc0df1eb1e96456689f6d783b6478fa99c6820468a4fd59b4849d107d4
+  data.tar.gz: 25d51ee250add4172c3b5c458cbfc9f20fd91d3b416ebb7d5ff450a10dcc6492ef069b0968ab85d3bb6c15846d8158aeaa0ecc508df4674aab02afa935a9869d

data/config/en/net_status.yml

@@ -80,7 +80,7 @@ en:
       stage_artifact_double_associate: "Can't use `%{stage}` stage for artifact; already used in `%{conflict_stage}` stage!"
       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 paths!"
+      artifact_conflict: "Conflict between artifacts!\n\n%{dappfile_context}"
       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/dimg/config/directive/artifact_dimg.rb

@@ -5,13 +5,6 @@ module Dapp
         class ArtifactDimg < Dimg
           def validate_scratch!
           end
-
-          def validate_artifacts_artifacts!
-          end
-
-          def validated_artifacts
-            _git_artifact._local + _git_artifact._remote
-          end
         end
       end
     end

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

@@ -136,6 +136,7 @@ module Dapp
 
             def artifacts_after_parsing!
               _artifacts_auto_excluding!
+              _artifact.map(&:_config).each(&:artifacts_after_parsing!)
             end
 
             protected

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

@@ -71,12 +71,39 @@ module Dapp
                 verifiable_artifact = artifacts.shift
                 artifacts.select { |a| a[:to] == verifiable_artifact[:to] }.each do |artifact|
                   next if verifiable_artifact[:index] == artifact[:index]
-                  validate_artifact!(verifiable_artifact, artifact)
-                  validate_artifact!(artifact, verifiable_artifact)
+                  begin
+                    validate_artifact!(verifiable_artifact, artifact)
+                    validate_artifact!(artifact, verifiable_artifact)
+                  rescue ::Dapp::Error::Config => e
+                    conflict_between_artifacts!(artifact, verifiable_artifact) if e.net_status[:code] == :artifact_conflict
+                    raise
+                  end
                 end
               end
             end
 
+            def conflict_between_artifacts!(*formatted_artifacts)
+              artifacts = formatted_artifacts.flatten.map { |formatted_artifact| formatted_artifact[:related_artifact] }
+              dappfile_context = artifacts.map do |artifact|
+                artifact_directive = []
+                artifact_directive << begin
+                  if artifact.is_a? Artifact::Export
+                    "artifact.export('#{artifact._cwd}') do"
+                  else
+                    "git#{"('#{artifact._url}')" if artifact.respond_to?(:_url)}.add('#{artifact._cwd}') do"
+                  end
+                end
+                [:include_paths, :exclude_paths].each do |directive|
+                  next if (paths = artifact.send("_#{directive}")).empty?
+                  artifact_directive << "  #{directive} '#{paths.join("', '")}'"
+                end
+                artifact_directive << "  to '#{artifact._to}'"
+                artifact_directive << 'end'
+                artifact_directive.join("\n")
+              end.join("\n\n")
+              raise ::Dapp::Error::Config, code: :artifact_conflict, data: { dappfile_context: dappfile_context }
+            end
+
             def validate_artifact_format(artifacts)
               artifacts.map do |a|
                 path_format = proc { |path| File.expand_path(File.join('/', path, '/'))[1..-1] }
@@ -104,7 +131,8 @@ module Dapp
                   index: artifacts.index(a),
                   to: to,
                   include_paths: include_paths,
-                  exclude_paths: exclude_paths
+                  exclude_paths: exclude_paths,
+                  related_artifact: a
                 }
               end
             end
@@ -113,17 +141,26 @@ module Dapp
               verifiable_artifact[:include_paths].each do |verifiable_path|
                 potential_conflicts = artifact[:include_paths].select { |path| path.start_with?(verifiable_path) }
                 validate_artifact_path!(verifiable_artifact, potential_conflicts)
-              end.empty? && verifiable_artifact[:exclude_paths].empty? && raise(::Dapp::Error::Config, code: :artifact_conflict)
-              validate_artifact_path!(verifiable_artifact, artifact[:include_paths]) if verifiable_artifact[:include_paths].empty?
+              end
+
+              if verifiable_artifact[:include_paths].empty?
+                if artifact[:include_paths].empty? || verifiable_artifact[:exclude_paths].empty?
+                  raise ::Dapp::Error::Config, code: :artifact_conflict
+                else
+                  validate_artifact_path!(verifiable_artifact, artifact[:include_paths])
+                end
+              end
             end
 
             def validate_artifact_path!(verifiable_artifact, potential_conflicts)
-              potential_conflicts.all? do |path|
-                loop do
-                  break if verifiable_artifact[:exclude_paths].include?(path) || ((path = File.dirname(path)) == '.')
+              raise ::Dapp::Error::Config, code: :artifact_conflict unless begin
+                potential_conflicts.all? do |path|
+                  loop do
+                    break if verifiable_artifact[:exclude_paths].include?(path) || ((path = File.dirname(path)) == '.')
+                  end
+                  verifiable_artifact[:exclude_paths].include?(path)
                 end
-                verifiable_artifact[:exclude_paths].include?(path)
-              end.tap { |res| res || raise(::Dapp::Error::Config, code: :artifact_conflict) }
+              end
             end
 
             def _associated_artifacts

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

@@ -20,7 +20,7 @@ module Dapp
           end
 
           def commit(value)
-            sub_directive_eval { @_commit = value }
+            sub_directive_eval { @_commit = value.to_s }
           end
 
           def _export
@@ -42,11 +42,11 @@ module Dapp
             end
 
             def branch(value)
-              sub_directive_eval { @_branch = value }
+              sub_directive_eval { @_branch = value.to_s }
             end
 
             def commit(value)
-              sub_directive_eval { @_commit = value }
+              sub_directive_eval { @_commit = value.to_s }
             end
 
             def validate!

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.23.5"
+  VERSION = "0.23.6"
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.23.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -721,7 +721,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell