dapp 0.7.22 → 0.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d331bc07f3e624682ffd414440632af1539623
-  data.tar.gz: fb78b3ad52f34339480699c0732f3257e591c679
+  metadata.gz: 0a274af8b41a35e353f391b7f9c7b0bde96981e5
+  data.tar.gz: 9b40b2671fe479229e8e4c0e3e923af694514255
 SHA512:
-  metadata.gz: 2645b1233f00e1cdf09f22f42da53659df25b187e89e93541eb9a35f281bda3e1fa860396e36404671ddd5953c23e11677a41bf07a6a400abfc7c067304c7e6c
-  data.tar.gz: d9360bf403e44a3c5dd96bd3d65c4c036b9e74c6f6f256f78c0aa4c34527e5274fee9b5d9bf343d2211785061b38f241d605ebb0e9f7d812c295586341290bea
+  metadata.gz: 34c747b33c7cf04d4509141c1d4ed8715854b61656fbc146dafb162eb62dcb6688c4da8206ca8a31a37d126e4099f0867edd2963c89211ade78fc73a409a052b
+  data.tar.gz: 1722b58dad85758d12405cfed80afbfe9eff1cfc4bfd7378e18f7c21da6efc8ca03156314cf30ce274bcf688f04daae53cf065428fbfa83f4eaf23023c883f7c

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

@@ -72,10 +72,6 @@ module Dapp
           def validate!
             raise Error::Config, code: :export_to_required if _to.nil?
           end
-
-          def path_format(path)
-            path.chomp('/')
-          end
         end
 
         protected

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

@@ -12,6 +12,10 @@ module Dapp
         def clone_to_artifact
           clone
         end
+
+        def path_format(path)
+          path.to_s.chomp('/')
+        end
       end
     end
   end

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

@@ -41,8 +41,8 @@ module Dapp
             @_onbuild.concat(args)
           end
 
-          def workdir(val)
-            @_workdir = val
+          def workdir(path)
+            @_workdir = path_format(path)
           end
 
           def user(val)

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

@@ -8,17 +8,17 @@ module Dapp
 
         def initialize(to, **kwargs, &blk)
           raise Error::Config, code: :mount_to_absolute_path_required unless Pathname((to = to.to_s)).absolute?
-          @_to = to
+          @_to = path_format(to)
 
           super(**kwargs, &blk)
         end
 
         protected
 
-        def from(path_or_type)
-          path_or_type = path_or_type.to_sym
-          raise Error::Config, code: :mount_from_type_required unless [:tmp_dir, :build_dir].include? path_or_type
-          @_type = path_or_type
+        def from(type)
+          type = type.to_sym
+          raise Error::Config, code: :mount_from_type_required unless [:tmp_dir, :build_dir].include? type
+          @_type = type
         end
       end
     end

data/lib/dapp/project/command/stages/cleanup_local.rb

@@ -95,15 +95,15 @@ module Dapp
 
           def proper_git_commit
             log_proper_git_commit do
-              unproper_images = []
+              unproper_images_names = []
               project_images_detailed.each do |_, attrs|
                 attrs['Config']['Labels'].each do |repo_name, commit|
                   next if (repo = project_git_repositories[repo_name]).nil?
                   git = repo.name == 'own' ? :git : :git_bare
-                  unproper_images.concat(image_hierarchy(attrs['Id'])) unless repo.send(git).exists?(commit)
+                  unproper_images_names.concat(image_hierarchy_by_id(attrs['Id'])) unless repo.send(git).exists?(commit)
                 end
               end
-              remove_images(unproper_images.uniq)
+              remove_images(unproper_images_names.uniq)
             end
           end
 
@@ -117,12 +117,12 @@ module Dapp
             end
           end
 
-          def image_hierarchy(image_id)
+          def image_hierarchy_by_id(image_id)
             hierarchy = []
             iids = [image_id]
 
             loop do
-              hierarchy.concat(iids)
+              hierarchy.concat(project_images_detailed.map { |name, attrs| name if iids.include?(attrs['Id']) }.compact)
               break if begin
                 iids.map! do |iid|
                   project_images_detailed.map { |_, attrs| attrs['Id'] if attrs['Parent'] == iid }.compact

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.22'.freeze
+  VERSION = '0.7.23'.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.22
+  version: 0.7.23
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout