dapp 0.13.19 → 0.13.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38c5fab04c8e1983a3f844993553bfb70e17fbd8
-  data.tar.gz: f842b2277f5d980d7142c8a7cc634e02e0ab9c7e
+  metadata.gz: 76cb1be7940f4087220a9b04e6d8352cfecae333
+  data.tar.gz: 2a0af558bbf26b660f8bd53524bf8c1cfde2692d
 SHA512:
-  metadata.gz: f66a88d08eb638b1fa6182756ba003db7170846b960d8bebd0cb679ed27cf0b09f3379d3f57ae587c16567332f46ba98aea305e4decf206586858454a1b7cb7a
-  data.tar.gz: fd392a3aff576ce4ba99336a7eea0bc37d6d2188a75175676ad6756af4327bfd03c2725a6370ed1730ea90d790fbdc272f531ec4133157243520fbe8c8beea72
+  metadata.gz: 59003aea36976ff49f4687fdca7052a32643617c21aa0bb6dfba445a865c1f66b46421bc1b8a3ef7fc1d68225a41f529ddf068d8a6a0c2ae7dd14952b2da886a
+  data.tar.gz: 1249d96364c8bddee9d369513c146c0e20710f0efa20d00942ce846ac502841043b94634c704fc7947fc3aebcc594080e40089a17bea75a6a546ba76541060c2

data/lib/dapp/config/config.rb

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

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

@@ -48,21 +48,22 @@ module Dapp
 
         def pass_to(obj, clone_method = :clone)
           passed_directives.each do |directive|
-            next if (variable = instance_variable_get(directive)).nil?
-
-            obj.instance_variable_set(directive, begin
-              case variable
-              when Base then variable.public_send(clone_method)
-              when String, Symbol, Integer, TrueClass, FalseClass then variable
-              when Array, Hash then marshal_clone(variable)
-              else
-                raise
-              end
-            end)
+            obj.instance_variable_set(directive, clone_variable(instance_variable_get(directive), clone_method))
           end
           obj
         end
 
+        def clone_variable(var, clone_method = :clone)
+          case var
+          when Base then var.public_send(clone_method)
+          when String, Symbol, Integer, TrueClass, FalseClass then var
+          when Array, Hash then marshal_clone(var)
+          when NilClass then nil
+          else
+            raise
+          end
+        end
+
         def passed_directives
           []
         end
@@ -78,10 +79,7 @@ module Dapp
         end
 
         def marshal_load(variable_values)
-          variable_values.each do |variable, value|
-            instance_variable_set(variable, value)
-          end
-
+          variable_values.each { |variable, value| instance_variable_set(variable, clone_variable(value)) }
           self
         end
 

data/lib/dapp/dapp/dappfile.rb

@@ -33,6 +33,7 @@ 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/build/stage/artifact_default.rb

@@ -17,10 +17,10 @@ module Dapp
             group = artifact[:options][:group]
             to = artifact[:options][:to]
 
-            command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_name).to_s, nil, nil, include_paths, exclude_paths)
+            command = safe_cp(cwd, artifact_dimg.container_tmp_path(artifact_name, 'data').to_s, nil, nil, include_paths, exclude_paths)
             run_artifact_dimg(artifact_dimg, artifact_name, command)
 
-            command = safe_cp(dimg.container_tmp_path('artifact', artifact_name).to_s, to, owner, group, include_paths, exclude_paths)
+            command = safe_cp(dimg.container_tmp_path('artifact', artifact_name, 'data').to_s, to, owner, group, include_paths, exclude_paths)
             image.add_command command
             image.add_volume "#{dimg.tmp_path('artifact', artifact_name)}:#{dimg.container_tmp_path('artifact', artifact_name)}:ro"
           end
@@ -71,7 +71,7 @@ module Dapp
 
               # Слэш после from — это инструкция rsync'у для копирования
               # содержимого директории from, а не самой директории.
-              cmd << " #{from}/ #{to}"
+              cmd << " $(if [ -d #{from} ] ; then echo #{from}/ ; else echo #{from} ; fi) #{to}"
             end
           end
           # rubocop:enable Metrics/ParameterLists

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

@@ -8,6 +8,10 @@ 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,6 +130,10 @@ module Dapp
               end
             end
 
+            def artifacts_after_parsing!
+              _artifacts_auto_excluding!
+            end
+
             protected
 
             def builder(type)
@@ -140,6 +144,42 @@ 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(validated_artifacts)
+              artifacts = validate_artifact_format(all_artifacts)
               loop do
                 break if artifacts.empty?
                 verifiable_artifact = artifacts.shift
@@ -133,10 +133,6 @@ 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/kube/kubernetes/client.rb

@@ -106,13 +106,16 @@ module Dapp
         rescue Excon::Error::Timeout
           raise Error::Timeout
         rescue Error::Base => err
-          if err.net_status[:code] == :bad_request and
-             err.net_status[:data][:response_body] and
-             err.net_status[:data][:response_body]['message'].end_with? 'ContainerCreating'
-             raise Error::Pod::ContainerCreating, data: err.net_status[:data]
-          else
-            raise
+          if err.net_status[:code] == :bad_request and err.net_status[:data][:response_body]
+            msg = err.net_status[:data][:response_body]['message']
+            if msg.end_with? 'ContainerCreating'
+              raise Error::Pod::ContainerCreating, data: err.net_status[:data]
+            elsif msg.end_with? 'PodInitializing'
+              raise Error::Pod::PodInitializing, data: err.net_status[:data]
+            end
           end
+
+          raise
         end
 
         def event_list(**query_parameters)

data/lib/dapp/kube/kubernetes/client/error.rb

@@ -19,11 +19,18 @@ module Dapp
 
       module Pod
         class NotFound < Kubernetes::Client::Error::NotFound ; end
+
         class ContainerCreating < Kubernetes::Client::Error::Base
           def initialize(**net_status)
             super({code: :container_creating}.merge(net_status))
           end
         end
+
+        class PodInitializing < Kubernetes::Client::Error::Base
+          def initialize(**net_status)
+            super({code: :pod_initializing}.merge(net_status))
+          end
+        end
       end # Pod
     end # Kubernetes::Client::Error
   end # Kube

data/lib/dapp/kube/kubernetes/manager/container.rb

@@ -38,7 +38,7 @@ module Dapp
                     [timestamp, data]
                   end
                   .reject {|timestamp, _| @processed_log_timestamps.include? timestamp}
-              rescue Kubernetes::Client::Error::Pod::ContainerCreating
+              rescue Kubernetes::Client::Error::Pod::ContainerCreating, Kubernetes::Client::Error::Pod::PodInitializing
                 sleep 0.1
                 next
               end

data/lib/dapp/kube/kubernetes/manager/deployment.rb

@@ -129,7 +129,7 @@ module Dapp
                                   [timestamp, data]
                                 end
                               }.compact
-                          rescue Kubernetes::Client::Error::Pod::ContainerCreating
+                          rescue Kubernetes::Client::Error::Pod::ContainerCreating, Kubernetes::Client::Error::Pod::PodInitializing
                             next
                           end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.19'.freeze
-  BUILD_CACHE_VERSION = 15
+  VERSION = '0.13.20'.freeze
+  BUILD_CACHE_VERSION = 16
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.19
+  version: 0.13.20
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout