dapp 0.23.3 → 0.23.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae0c6892f439eeb2733d7c3767b70769c94a492
-  data.tar.gz: 63a6652f3b687bc044c6a0312b9def251ba8f130
+  metadata.gz: 10aba50841edaf51a638a9c6343f4aadaacfd131
+  data.tar.gz: d711f069cc88acae89e5f95566e769d06c99e137
 SHA512:
-  metadata.gz: 0332c89d8ea89a0611f4cb10abcdd6af84ae81c0c5b75d8635f85e0880ad89ab2e0ac59e9ecff9e085c8334839924b42f8943c89dd2a0e640e2cab15dac4bcab
-  data.tar.gz: 8ae4bd3b958a1853d22e2424452dc8a9af548ff52443dc04972e0e799be4271d5302eb9f26196eebcb43fce2ec4f07958692e30cdddbabbc4705cfcaa07956f6
+  metadata.gz: d18bd976c005d9123e1d4c45a809319b2ebe427d23062324e5c9e171d06a45934b1ce0477e4c1da6af96ca0addec1bf9a07805c35651d4fe23b14753ffff733e
+  data.tar.gz: e0a31de68d9c6f569a16029774d9c4a96e9ce245cde1d469d9124cf71790fe757d4263ac95465b737999e05bf92da4578fe3af6ff81d793ce8156b4af53ea8da

data/lib/dapp/dapp/logging/base.rb

@@ -2,6 +2,18 @@ module Dapp
   class Dapp
     module Logging
       module Base
+        class << self
+          def included(base)
+            base.send(:extend, ClassMethods)
+          end
+        end
+
+        module ClassMethods
+          def log_time
+            "#{DateTime.now.strftime('%Y-%m-%dT%T%z')} "
+          end
+        end
+
         def log_quiet?
           option_quiet
         end
@@ -87,10 +99,6 @@ module Dapp
           self.class.log_time
         end
 
-        def self.log_time
-          "#{DateTime.now.strftime('%Y-%m-%dT%T%z')} "
-        end
-
         def log_format_string(str, time: true, indent: true, style: nil)
           str.to_s.lines.map do |line|
             line = paint_string(line, style) if style

data/lib/dapp/dimg/dapp/command/common.rb

@@ -54,7 +54,11 @@ module Dapp
           end
 
           def update_project_images_cache(project_images)
-            dapp_project_images.delete_if { |image| project_images.map { |i| i[:id] }.include?(image[:id]) }
+            array_hash_delete_if_by_id(dapp_project_images, project_images)
+          end
+
+          def array_hash_delete_if_by_id(project_images, *images)
+            project_images.delete_if { |image| images.flatten.any? { |i| image[:id] == i[:id] } }
           end
 
           def project_images_to_delete(project_images)

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

@@ -64,7 +64,7 @@ module Dapp
               dapp_project_image_artifacts_ids_in_labels(image).each { |aiid| except_image_id_with_parents(aiid, dimgstages) }
               i = image
               loop do
-                dimgstages.delete_if { |dimgstage| dimgstage == i }
+                array_hash_delete_if_by_id(dimgstages, i)
                 break if (i = dapp_project_image_parent(i)).nil?
               end
             end

data/lib/dapp/dimg/dapp/command/stages/cleanup_repo.rb

@@ -13,7 +13,7 @@ module Dapp
                   repo_dimgs      = repo_dimgs_images(registry)
                   repo_dimgstages = repo_dimgstages_images(registry)
 
-                  repo_dimgstages.delete_if { |dimgstage| repo_dimgs.any? { |dimg| dimgstage[:id] == dimg[:id] } } # ignoring stages with dimgs ids (v2)
+                  array_hash_delete_if_by_id(repo_dimgstages, repo_dimgs) # ignoring stages with dimgs ids (v2)
 
                   proper_repo_cache(registry, repo_dimgstages)                   if proper_cache_version?
                   repo_dimgstages_cleanup(registry, repo_dimgs, repo_dimgstages) if proper_repo_cache?
@@ -48,7 +48,7 @@ module Dapp
 
               ri = repo_image
               loop do
-                repo_dimgstages.delete_if { |dimgstage| dimgstage == ri }
+                array_hash_delete_if_by_id(repo_dimgstages, ri)
                 ri_parent_id = registry.image_parent_id(ri[:tag], ri[:dimg])
                 break if ri_parent_id.empty? || (ri = repo_image_by_id(ri_parent_id, repo_dimgstages)).nil?
               end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.23.3'.freeze
+  VERSION = '0.23.4'.freeze
   BUILD_CACHE_VERSION = 26
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.23.4
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout