dapp 0.33.16 → 0.34.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 683863c1cfabe3f6b7f44926a166226301feeb05eaa548e1e2a903aad09abbab
-  data.tar.gz: f304084c357d7172404d8047d7773d9fedc5aaed24c6c6ad804263f3bbe55802
+  metadata.gz: e0a8968d5231c2d82c357d03c7a211bad9f8d67e0c9e4a32c503e5dffabe4547
+  data.tar.gz: cf04012f24a2fa85c636b4179e4df6662db85505e7c8b075c7a17702d1ae8229
 SHA512:
-  metadata.gz: 4e63f93bd4cdee9ed6afa002b7fbb755bcf7f9be7b9fed12cf235cdbcec8a9cf1fd68c4449c5614f007625b678a002db9b56e2ef5984e543031cb2d2c0cc7de1
-  data.tar.gz: 86e35d59fff4f2b9de9a5abbbd380e875653258fae5ac2d64726c3839ffc696088300751c95a24c3c964c97f09a6f41c65cf2a98786614133b4a627a349f8a0f
+  metadata.gz: 7417bf6f91c6b2b3f3b402e484a773d6ad9d286045951aa66ba2f98cb16b0f5ea71af505e6ae6c8568270b0e9d3351005ddc55c9906b6106949f4fab502ca13f
+  data.tar.gz: cee7bd6f30ad9e50778362c3db5f1777b4edf959bf8d6f6918284d02b06e85da6f3bce38fe8267a1cae751d30f8fa16650d41c1370e9a7dbb4db478268484004

data/bin/dapp

@@ -74,29 +74,7 @@ set_gitlab_cancel_handler if ENV["GITLAB_CI"]
 begin
   begin
     begin
-      begin
-        Dapp::CLI.new.run
-      ensure
-        if Time.now.to_date < Date.parse("2019-11-01")
-          STDERR.puts
-          STDERR.puts ::Paint["###################################################################", :red, :bold]
-          STDERR.puts ::Paint["###                   DEPRECATION WARNING!                      ###", :red, :bold]
-          STDERR.puts ::Paint["###  Dapp will be deprecated for use starting with 01.11.2019!  ###", :red, :bold]
-          STDERR.puts ::Paint["###            Please port your project to werf:                ###", :red, :bold]
-          STDERR.puts ::Paint["###                     https://werf.io                         ###", :red, :bold]
-          STDERR.puts ::Paint["###################################################################", :red, :bold]
-          STDERR.puts
-        else
-          STDERR.puts
-          STDERR.puts ::Paint["######################################################################", :red, :bold]
-          STDERR.puts ::Paint["###                     DEPRECATION WARNING!                       ###", :red, :bold]
-          STDERR.puts ::Paint["###  Dapp is deprecated for use and will not receive any support!  ###", :red, :bold]
-          STDERR.puts ::Paint["###               Please port your project to werf:                ###", :red, :bold]
-          STDERR.puts ::Paint["###                       https://werf.io                          ###", :red, :bold]
-          STDERR.puts ::Paint["######################################################################", :red, :bold]
-          STDERR.puts
-        end
-      end
+      Dapp::CLI.new.run
     rescue Dapp::Error::Base => e
       unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
         $stderr.puts(message)

data/lib/dapp/dimg/build/stage/base.rb

@@ -329,7 +329,7 @@ module Dapp
 
           def should_be_not_present?
             return false if next_stage.nil?
-            !current_or_related_image_should_be_untagged? && (next_stage.image.tagged? && !next_stage.image_should_be_untagged_condition || next_stage.should_be_not_present?)
+            !current_or_related_image_should_be_untagged? && (next_stage.image.tagged? || next_stage.should_be_not_present?)
           end
 
           def image_name

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

@@ -225,65 +225,59 @@ module Dapp
           # pod items[] spec containers[] image
           def pod_images(client)
             client.pod_list['items'].map do |item|
-              images_from_pod_spec(item)
+              item['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # cronjob items[] spec jobTemplate spec template spec containers[] image
           def cronjob_images(client)
             client.cronjob_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['jobTemplate']['spec']['template'])
+              item['spec']['jobTemplate']['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # daemonsets   items[] spec template spec containers[] image
           def daemonset_images(client)
             client.daemonset_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # deployment   items[] spec template spec containers[] image
           def deployment_images(client)
             client.deployment_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # job          items[] spec template spec containers[] image
           def job_images(client)
             client.job_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # replicasets  items[] spec template spec containers[] image
           def replicaset_images(client)
             client.replicaset_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
            # replicasets  items[] spec template spec containers[] image
            def statefulset_images(client)
             client.statefulset_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
           # replicationcontroller    items[] spec template spec containers[] image
           def replicationcontroller_images(client)
             client.replicationcontroller_list['items'].map do |item|
-              images_from_pod_spec(item['spec']['template'])
+              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
             end
           end
 
-          def images_from_pod_spec(pod_spec)
-            containers = Array(pod_spec['spec']['containers'])
-            initContainers = Array(pod_spec['spec']['initContainers'])
-            (containers + initContainers).map { |cont| cont['image'] }
-          end
-
           def without_kube?
             !!options[:without_kube]
           end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.33.16"
+  VERSION = "0.34.1"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.33.16
+  version: 0.34.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell