dapp 0.7.19 → 0.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb95faf56ca420cff6868898fb7507b2282f0d0
-  data.tar.gz: bf64455dcb33e447d8044c898d0159f2e5290eb9
+  metadata.gz: 96bc677343a9749478a52286ccb933740bc6e557
+  data.tar.gz: ab744c2f9d2be05923483460de051cafce13d646
 SHA512:
-  metadata.gz: 5bd04cc708034bd5bdade09dba0bf77f0d2c0d8c0ed434409b32437fca1ffaa86bd25b3c296fc8eab22b80234caf3eeb0922ae6c834d541d8c60cb6eb0d9bfac
-  data.tar.gz: 2a992ce6691468ac9207592e3cea2011664213768a86189b2def78da5acea80ef5df6cb3116a3038b28268472b4670aeabcb703d4b9bd205866cfebb43d44e13
+  metadata.gz: 4f229985856b89b0ff2379b465b37255729adc1f4c2fa9ae527885a7a08dbd1a4bd1927e520bdb13cdd0d6bcf6a2eb6b51dfbbda92e7542b202c7e07cfc7b7a5
+  data.tar.gz: 9c43f662cdabe89c20e063f001bc0bf1cfe2779d8cf03bb45f37b1708050ab3b461304b41bf5d79382ad0573fd1374c72637ef0e6d49c9fd4166bb56ba1dc31c

data/config/en/net_status.yml

@@ -40,6 +40,7 @@ en:
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
       docker_from_incorrect: "`docker.from` has incorrect value `%{name}`!"
+      docker_from_without_tag: "`docker.from`: image `%{name}` without !"
       stage_artifact_not_associated: "Artifact not associated with any stage: expected `before` or `after` attribute!"
       stage_artifact_double_associate: "Cannot use `%{stage}` stage for artifact, already used in `%{conflict_stage}` stage!"
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"

data/lib/dapp.rb

@@ -64,6 +64,7 @@ require 'dapp/filelock'
 require 'dapp/config/base'
 require 'dapp/config/directive/base'
 require 'dapp/config/dimg/instance_methods'
+require 'dapp/config/dimg/merging'
 require 'dapp/config/dimg/validation'
 require 'dapp/config/dimg'
 require 'dapp/config/artifact_dimg'

data/lib/dapp/build/stage/artifact_default.rb

@@ -37,7 +37,7 @@ module Dapp
           excludes = find_command_excludes(from, exclude_paths).join(' ')
 
           copy_files = proc do |from_, path_ = ''|
-            "if [[ -d #{File.join(from_, path_)} ]]; then " \
+            "if [[ -d #{File.join(from_, path_)} ]] || [[ -f #{File.join(from_, path_)} ]]; then " \
             "#{dimg.project.find_bin} #{File.join(from_, path_)} #{excludes} -type f -exec " \
             "#{dimg.project.bash_bin} -ec '#{dimg.project.install_bin} -D #{credentials} {} " \
             "#{File.join(to, '$(echo {} | ' \

data/lib/dapp/config/artifact_dimg.rb

@@ -2,7 +2,9 @@ module Dapp
   module Config
     # ArtifactDimg
     class ArtifactDimg < Dimg
-      attr_reader :_artifact_dependencies
+      def _artifact_dependencies
+        @_artifact_dependencies ||= []
+      end
 
       def validate_scratch!
       end

data/lib/dapp/config/artifact_group.rb

@@ -30,14 +30,9 @@ module Dapp
 
       def export(*args, &blk)
         _export.concat begin
-          artifact_config = pass_to_default(ArtifactDimg.new(
-            "artifact-#{SecureRandom.hex(2)}",
-            project: project
-          ))
-
+          artifact_config = pass_to(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", project: project))
           artifact = Directive::Artifact.new(project: project, config: artifact_config)
           artifact.send(:export, *args, &blk)
-
           artifact._export
         end
       end
@@ -48,10 +43,8 @@ module Dapp
       def check_dimg_group_directive_order(_directive)
       end
 
-      def pass_to_default(obj)
-        super(obj).tap do |artifact_dimg|
-          artifact_dimg.instance_variable_set(:@_artifact_dependencies, _artifact_dependencies.dup)
-        end
+      def passed_directives
+        super << :artifact_dependencies
       end
     end
   end

data/lib/dapp/config/base.rb

@@ -28,10 +28,6 @@ module Dapp
       def _clone
         Marshal.load Marshal.dump(self)
       end
-
-      def _clone_to(obj)
-        obj.marshal_load marshal_dump
-      end
     end
   end
 end

data/lib/dapp/config/dimg.rb

@@ -4,6 +4,7 @@ module Dapp
     class Dimg < Base
       include Validation
       include InstanceMethods
+      include Merging
 
       attr_reader :_name
 

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

@@ -20,12 +20,12 @@ module Dapp
         end
 
         def chef(&blk)
-          builder_validation(:chef)
+          builder(:chef)
           directive_eval(_chef, &blk)
         end
 
         def shell(&blk)
-          builder_validation(:shell)
+          builder(:shell)
           directive_eval(_shell, &blk)
         end
 
@@ -35,7 +35,7 @@ module Dapp
 
         def artifact(&blk)
           _artifact.concat begin
-                             pass_to_custom(ArtifactGroup.new(project: project), :clone_to_artifact).tap do |artifact_group|
+                             pass_to(ArtifactGroup.new(project: project)).tap do |artifact_group|
                                artifact_group.instance_eval(&blk) if block_given?
                              end._export
                            end
@@ -150,7 +150,7 @@ module Dapp
 
         protected
 
-        def builder_validation(type)
+        def builder(type)
           @_builder = type if _builder == :none
           raise Error::Config, code: :builder_type_conflict unless @_builder == type
         end
@@ -160,33 +160,34 @@ module Dapp
           directive
         end
 
-        def pass_to_default(dimg)
-          pass_to_custom(dimg, :clone)
-        end
-
-        def pass_to_custom(obj, clone_method)
+        def pass_to(obj)
           passed_directives.each do |directive|
-            next if (variable = instance_variable_get(directive)).nil?
-
-            obj.instance_variable_set(directive, begin
-              case variable
-              when Directive::Base, GitArtifact then variable.send(clone_method)
-              when Symbol then variable
-              when Array then variable.dup
-              when TrueClass, FalseClass then variable
+            directive_variable_name = :"@_#{directive}"
+
+            next if (value = instance_variable_get(directive_variable_name)).nil?
+            obj_value = obj.instance_variable_get(directive_variable_name)
+
+            if value.is_a?(Directive::Base)
+              obj.builder(directive) if [:chef, :shell].include? directive
+              if obj_value.nil?
+                obj.instance_variable_set(directive_variable_name, value.send(:_clone))
               else
-                raise
+                obj_value.send(:merge, value)
               end
-            end)
+            elsif respond_to?(:"merge_#{directive}", true)
+              obj.instance_variable_set(directive_variable_name, send(:"merge_#{directive}", obj_value, value))
+            else
+              raise
+            end
           end
           obj
         end
 
         def passed_directives
-          [:@_chef, :@_shell, :@_docker,
-           :@_git_artifact, :@_mount,
-           :@_artifact, :@_builder, :@_dev_mode,
-           :@_install_dependencies, :@_setup_dependencies]
+          [:chef, :shell, :docker,
+           :git_artifact, :mount,
+           :artifact, :builder, :dev_mode,
+           :install_dependencies, :setup_dependencies]
         end
       end
     end

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

@@ -0,0 +1,28 @@
+module Dapp
+  module Config
+    class Dimg < Base
+      # Merging
+      module Merging
+        protected
+
+        [:mount, :artifact].each do |directive|
+          define_method "merge_#{directive}" do |a, b|
+            b.map { |a| a.send(:_clone) }.concat(Array(a))
+          end
+        end
+
+        [:install_dependencies, :setup_dependencies, :artifact_dependencies].each do |directive|
+          define_method "merge_#{directive}" do |a, b|
+            b.dup.concat(Array(a))
+          end
+        end
+
+        [:builder, :dev_mode].each do |directive|
+          define_method "merge_#{directive}" do |a, b|
+            a.nil? ? b : a
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -22,8 +22,9 @@ module Dapp
         end
 
         def directives_validate!
-          passed_directives.each do |v|
-            next if (value = instance_variable_get(v)).nil?
+          passed_directives.each do |directive|
+            directive_variable_name = :"@_#{directive}"
+            next if (value = instance_variable_get(directive_variable_name)).nil?
             Array(value).each do |elm|
               elm.send(:validate!) if elm.methods.include?(:validate!)
             end

data/lib/dapp/config/dimg_group.rb

@@ -3,6 +3,7 @@ module Dapp
     # DimgGroup
     class DimgGroup < DimgGroupBase
       include Dimg::InstanceMethods
+      include Dimg::Merging
 
       def chef(&blk)
         check_dimg_directive_order(:chef)
@@ -37,11 +38,11 @@ module Dapp
       protected
 
       def before_dimg_eval(dimg)
-        pass_to_default(dimg)
+        pass_to(dimg)
       end
 
       def before_dimg_group_eval(dimg_group)
-        pass_to_default(dimg_group)
+        pass_to(dimg_group)
       end
 
       def check_dimg_directive_order(directive)

data/lib/dapp/config/dimg_group_base.rb

@@ -17,16 +17,16 @@ module Dapp
 
       def dimg(name = nil, &blk)
         Config::Dimg.new(name, project: project).tap do |dimg|
-          before_dimg_eval(dimg)
           dimg.instance_eval(&blk) if block_given?
+          after_dimg_eval(dimg)
           @_dimg << dimg
         end
       end
 
       def dimg_group(&blk)
         Config::DimgGroup.new(project: project).tap do |dimg_group|
-          before_dimg_group_eval(dimg_group)
           dimg_group.instance_eval(&blk) if block_given?
+          after_dimg_group_eval(dimg_group)
           @_dimg_group << dimg_group
         end
       end
@@ -37,16 +37,16 @@ module Dapp
 
       protected
 
-      def before_dimg_eval(dimg)
-        pass_to_default(dimg)
+      def after_dimg_eval(dimg)
+        pass_to(dimg)
       end
 
-      def before_dimg_group_eval(dimg_group)
-        pass_to_default(dimg_group)
+      def after_dimg_group_eval(dimg_group)
+        pass_to(dimg_group)
       end
 
-      def pass_to_default(obj)
-        obj.instance_variable_set(:@_dev_mode, @_dev_mode)
+      def pass_to(obj)
+        obj.instance_variable_set(:@_dev_mode, obj.instance_variable_get(:@_dev_mode) || @_dev_mode)
       end
     end
   end

data/lib/dapp/config/directive/base.rb

@@ -9,8 +9,26 @@ module Dapp
           _clone
         end
 
-        def clone_to_artifact
-          clone
+        def merge(obj)
+          cloned_obj = obj.clone
+
+          instance_variables.each do |variable_name|
+            next if (obj_value = cloned_obj.instance_variable_get(variable_name)).nil?
+            value = instance_variable_get(variable_name)
+
+            case obj_value
+            when Directive::Base
+              if value.nil?
+                instance_variable_set(variable_name, obj_value)
+              else
+                value.send(:merge, obj_value)
+              end
+            when Array then instance_variable_set(variable_name, obj_value.concat(Array(value)))
+            when Hash then instance_variable_set(variable_name, obj_value.merge(Hash(value)))
+            else
+              instance_variable_set(variable_name, value || obj_value)
+            end
+          end
         end
       end
     end

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

@@ -66,14 +66,6 @@ module Dapp
               entrypoint: _entrypoint
             }
           end
-
-          protected
-
-          def clone_to_artifact
-            Artifact.new(project: project).tap do |docker|
-              docker.instance_variable_set('@_from', @_from)
-            end
-          end
         end
       end
     end

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

@@ -54,10 +54,6 @@ module Dapp
           def empty?
             (_before_install_command + _before_setup_command + _install_command + _setup_command).empty?
           end
-
-          def clone_to_artifact
-            _clone_to Artifact.new(project: project)
-          end
         end
       end
     end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.19'.freeze
+  VERSION = '0.7.20'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.19
+  version: 0.7.20
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -438,6 +438,7 @@ files:
 - lib/dapp/config/base.rb
 - lib/dapp/config/dimg.rb
 - lib/dapp/config/dimg/instance_methods.rb
+- lib/dapp/config/dimg/merging.rb
 - lib/dapp/config/dimg/validation.rb
 - lib/dapp/config/dimg_group.rb
 - lib/dapp/config/dimg_group_base.rb