dapp 0.7.20 → 0.7.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96bc677343a9749478a52286ccb933740bc6e557
-  data.tar.gz: ab744c2f9d2be05923483460de051cafce13d646
+  metadata.gz: 1f9e155a712a0ed1bf5eee4f2eb9eb3ee058e38d
+  data.tar.gz: f490000499dcdb9654ed0afb7d92b2bd6d8d5073
 SHA512:
-  metadata.gz: 4f229985856b89b0ff2379b465b37255729adc1f4c2fa9ae527885a7a08dbd1a4bd1927e520bdb13cdd0d6bcf6a2eb6b51dfbbda92e7542b202c7e07cfc7b7a5
-  data.tar.gz: 9c43f662cdabe89c20e063f001bc0bf1cfe2779d8cf03bb45f37b1708050ab3b461304b41bf5d79382ad0573fd1374c72637ef0e6d49c9fd4166bb56ba1dc31c
+  metadata.gz: 0ecc323bb36092b93fb788ee1ac3fb152b42891f64b7e4d904c905f55fdc6d4393252763789f03c1484fd4df06d35c3c1d6e3a0efafe930ae8508289cd195b3f
+  data.tar.gz: 0e3bac35a542c600f1cd39d561ddcef7c41899faecdbefc94aeca8b53e25b251f6c3324238529583889c2d386843d53b81ce84153561d11c891395e7bcca543c

data/lib/dapp.rb

@@ -64,7 +64,6 @@ 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/config/artifact_group.rb

@@ -30,9 +30,14 @@ module Dapp
 
       def export(*args, &blk)
         _export.concat begin
-          artifact_config = pass_to(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", project: project))
+          artifact_config = pass_to_default(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
@@ -44,7 +49,7 @@ module Dapp
       end
 
       def passed_directives
-        super << :artifact_dependencies
+        super << :@_artifact_dependencies
       end
     end
   end

data/lib/dapp/config/base.rb

@@ -28,6 +28,10 @@ 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,7 +4,6 @@ module Dapp
     class Dimg < Base
       include Validation
       include InstanceMethods
-      include Merging
 
       attr_reader :_name
 

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

@@ -35,7 +35,7 @@ module Dapp
 
         def artifact(&blk)
           _artifact.concat begin
-                             pass_to(ArtifactGroup.new(project: project)).tap do |artifact_group|
+                             pass_to_custom(ArtifactGroup.new(project: project), :clone_to_artifact).tap do |artifact_group|
                                artifact_group.instance_eval(&blk) if block_given?
                              end._export
                            end
@@ -160,34 +160,33 @@ module Dapp
           directive
         end
 
-        def pass_to(obj)
-          passed_directives.each do |directive|
-            directive_variable_name = :"@_#{directive}"
-
-            next if (value = instance_variable_get(directive_variable_name)).nil?
-            obj_value = obj.instance_variable_get(directive_variable_name)
+        def pass_to_default(dimg)
+          pass_to_custom(dimg, :clone)
+        end
 
-            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))
+        def pass_to_custom(obj, clone_method)
+          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
               else
-                obj_value.send(:merge, value)
+                raise
               end
-            elsif respond_to?(:"merge_#{directive}", true)
-              obj.instance_variable_set(directive_variable_name, send(:"merge_#{directive}", obj_value, value))
-            else
-              raise
-            end
+            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/validation.rb

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

data/lib/dapp/config/dimg_group.rb

@@ -3,7 +3,6 @@ module Dapp
     # DimgGroup
     class DimgGroup < DimgGroupBase
       include Dimg::InstanceMethods
-      include Dimg::Merging
 
       def chef(&blk)
         check_dimg_directive_order(:chef)
@@ -38,11 +37,11 @@ module Dapp
       protected
 
       def before_dimg_eval(dimg)
-        pass_to(dimg)
+        pass_to_default(dimg)
       end
 
       def before_dimg_group_eval(dimg_group)
-        pass_to(dimg_group)
+        pass_to_default(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 after_dimg_eval(dimg)
-        pass_to(dimg)
+      def before_dimg_eval(dimg)
+        pass_to_default(dimg)
       end
 
-      def after_dimg_group_eval(dimg_group)
-        pass_to(dimg_group)
+      def before_dimg_group_eval(dimg_group)
+        pass_to_default(dimg_group)
       end
 
-      def pass_to(obj)
-        obj.instance_variable_set(:@_dev_mode, obj.instance_variable_get(:@_dev_mode) || @_dev_mode)
+      def pass_to_default(obj)
+        obj.instance_variable_set(:@_dev_mode, @_dev_mode)
       end
     end
   end

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

@@ -9,26 +9,8 @@ module Dapp
           _clone
         end
 
-        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
+        def clone_to_artifact
+          clone
         end
       end
     end

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

@@ -66,6 +66,14 @@ 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,6 +54,10 @@ 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/project/command/list.rb

@@ -8,7 +8,7 @@ module Dapp
         def list
           build_configs.each do |config|
             if config._name.nil?
-              log_warning("Project '#{name}' with nameless dimg!")
+              log_warning('Dappfile has unnamed dimg!') if log_verbose?
             else
               puts config._name
             end

data/lib/dapp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.20
+  version: 0.7.21
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -438,7 +438,6 @@ 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

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

@@ -1,28 +0,0 @@
-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