dapp 0.30.10 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4c1137d99bca8582e137ec38539839bf85b023c4c45447ee8c624beaa8d3cd7
-  data.tar.gz: 4f072a87f2c5135af2a402c0572feef6078ff3b30b5ab2006b70b564bb44e670
+  metadata.gz: 5589825e906db3c287d0abc4cd312c9fcc8efc96e36945cb7e3655370d8b288d
+  data.tar.gz: a0164e08a37faf5f8c03bba714da833458ae7081549085e8aecf6a089f51f003
 SHA512:
-  metadata.gz: 6abf78c9f3ecfb0b09ed6c21b468a6c1c9b7a7434e65ac055de082e74367bab1e9773e62d0a43cc2dc496c4a5951d44670d14aa410d9ba9536cc22edb1b95f19
-  data.tar.gz: 7490558a078f43c40e40f745ab2369d8dcb58a9ce2e812bac70bec5eac5cbc190770fb2a78f276ec8dbb8d6f9b2029c161d74484356cd5acc40207d4e686e66d
+  metadata.gz: bafb007a39acc411b6add0c23a6f437120e7dd8235aeb9382de3ad025d8800e4cc1f7acd586d6eca933f0f45ef1d52e09bc358977f8d05f869098ffd0ba1076e
+  data.tar.gz: ea5c715b0f06b4170b424ec2231504e951e9b12f54a783dee04327cd662a802316a2274313d9cf61fd42eb0140d7be798643b17127f8230e7e33dd2cb6a44a16

data/bin/dapp

@@ -10,29 +10,7 @@ Thread.abort_on_exception = true
 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.rb

@@ -166,6 +166,7 @@ require 'dapp/dimg/build/stage/mod/group'
 require 'dapp/dimg/build/stage/base'
 require 'dapp/dimg/build/stage/ga_base'
 require 'dapp/dimg/build/stage/ga_related_base'
+require 'dapp/dimg/build/stage/instructions'
 require 'dapp/dimg/build/stage/artifact_base'
 require 'dapp/dimg/build/stage/artifact_default'
 require 'dapp/dimg/build/stage/from'

data/lib/dapp/cli/command/sample/list.rb

@@ -14,6 +14,10 @@ BANNER
             self.class.parse_options(self, argv)
             run_dapp_command(run_method, options: cli_options)
           end
+
+          def log_running_time
+            false
+          end
         end
       end
     end

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

@@ -2,30 +2,16 @@ module Dapp
   module Dimg
     module Build
       module Stage
-        class BeforeInstall < Base
+        class BeforeInstall < Instructions
           def initialize(dimg, next_stage)
             @prev_stage = From.new(dimg, self)
             super
           end
 
-          def empty?
-            !dimg.builder.before_install?
-          end
-
           def dependencies
             [builder_checksum]
           end
 
-          def builder_checksum
-            dimg.builder.before_install_checksum
-          end
-
-          def prepare_image
-            super do
-              dimg.builder.before_install(image)
-            end
-          end
-
           def image_should_be_untagged_condition
             false
           end

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

@@ -2,29 +2,11 @@ module Dapp
   module Dimg
     module Build
       module Stage
-        class BeforeSetup < Base
+        class BeforeSetup < Instructions
           def initialize(dimg, next_stage)
             @prev_stage = AfterInstallArtifact.new(dimg, self)
             super
           end
-
-          def empty?
-            !dimg.builder.before_setup?
-          end
-
-          def context
-            [git_artifacts_dependencies, builder_checksum]
-          end
-
-          def builder_checksum
-            dimg.builder.before_setup_checksum
-          end
-
-          def prepare_image
-            super do
-              dimg.builder.before_setup(image)
-            end
-          end
         end # BeforeSetup
       end # Stage
     end # Build

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

@@ -2,29 +2,11 @@ module Dapp
   module Dimg
     module Build
       module Stage
-        class BuildArtifact < Base
+        class BuildArtifact < Instructions
           def initialize(dimg)
             @prev_stage = GAArtifactPatch.new(dimg, self)
             @dimg = dimg
           end
-
-          def empty?
-            !dimg.builder.build_artifact?
-          end
-
-          def context
-            [git_artifacts_dependencies, builder_checksum]
-          end
-
-          def builder_checksum
-            dimg.builder.build_artifact_checksum
-          end
-
-          def prepare_image
-            super do
-              dimg.builder.build_artifact(image)
-            end
-          end
         end # BuildArtifact
       end # Stage
     end # Build

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

@@ -8,7 +8,7 @@ module Dapp
           end
 
           def empty?
-            dimg.stage_by_name(related_stage_name).empty? || super
+            dimg.stage_by_name(related_stage_name).context.compact.empty? || super
           end
 
           def related_stage_name

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

@@ -3,31 +3,13 @@ module Dapp
     module Build
       module Stage
         module Install
-          class Install < Base
+          class Install < Instructions
             include Mod::Group
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreInstallPatch.new(dimg, self)
               super
             end
-
-            def empty?
-              !dimg.builder.install?
-            end
-
-            def context
-              [git_artifacts_dependencies, builder_checksum]
-            end
-
-            def builder_checksum
-              dimg.builder.install_checksum
-            end
-
-            def prepare_image
-              super do
-                dimg.builder.install(image)
-              end
-            end
           end # Install
         end # Install
       end # Stage

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

@@ -0,0 +1,27 @@
+module Dapp
+  module Dimg
+    module Build
+      module Stage
+        class Instructions < Base
+          def empty?
+            !dimg.builder.public_send(:"#{name}?")
+          end
+
+          def context
+            [git_artifacts_dependencies, builder_checksum]
+          end
+
+          def builder_checksum
+            dimg.builder.public_send(:"#{name}_checksum")
+          end
+
+          def prepare_image
+            super do
+              dimg.builder.public_send(name, image)
+            end
+          end
+        end # Instructions
+      end # Stage
+    end # Build
+  end # Dimg
+end # Dapp

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

@@ -3,31 +3,13 @@ module Dapp
     module Build
       module Stage
         module Setup
-          class Setup < Base
+          class Setup < Instructions
             include Mod::Group
 
             def initialize(dimg, next_stage)
               @prev_stage = GAPreSetupPatch.new(dimg, self)
               super
             end
-
-            def empty?
-              !dimg.builder.setup?
-            end
-
-            def context
-              [git_artifacts_dependencies, builder_checksum]
-            end
-
-            def builder_checksum
-              dimg.builder.setup_checksum
-            end
-
-            def prepare_image
-              super do
-                dimg.builder.setup(image)
-              end
-            end
           end # Setup
         end # Setup
       end # Stage

data/lib/dapp/dimg/builder/ansible.rb

@@ -137,11 +137,14 @@ module Dapp
         }
 
         define_method("#{stage}_checksum") do
-          dimg.hashsum [
-            JSON.dump(stage_config(stage)['tasks']),
-            dimg.config._ansible["#{stage}_version"],
-            dimg.config._ansible["version"]
-          ]
+          checksum_args = []
+          checksum_args << JSON.dump(stage_config(stage)['tasks']) unless stage_config(stage)['tasks'].empty?
+          checksum_args << public_send("#{stage}_version_checksum")
+          _checksum checksum_args
+        end
+
+        define_method("#{stage}_version_checksum") do
+          _checksum(dimg.config._ansible["#{stage}_version"], dimg.config._ansible['version'])
         end
 
         define_method(stage.to_s) do |image|
@@ -171,14 +174,14 @@ module Dapp
       end
 
       def stage_empty?(stage)
-        stage_config(stage)['tasks'].empty?
+        stage_config(stage)['tasks'].empty? && public_send("#{stage}_version_checksum").nil?
       end
 
       # host directory in tmp_dir with directories structure
       def host_workdir(stage)
         @host_workdirs ||= {}
         @host_workdirs[stage.to_s] ||= begin
-          dimg.tmp_path(dimg.dapp.consistent_uniq_slugify(dimg.config._name || "nameless"), "ansible-workdir-#{stage.to_s}").tap {|p| p.mkpath}
+          dimg.tmp_path(dimg.dapp.consistent_uniq_slugify(dimg.config._name || "nameless"), "ansible-workdir-#{stage}").tap {|p| p.mkpath}
         end
       end
 
@@ -186,7 +189,7 @@ module Dapp
       def host_tmpdir(stage)
         @host_tmpdirs ||= {}
         @host_tmpdirs[stage.to_s] ||= begin
-          dimg.tmp_path(dimg.dapp.consistent_uniq_slugify(dimg.config._name || "nameless"), "ansible-tmpdir-#{stage.to_s}").tap do |p|
+          dimg.tmp_path(dimg.dapp.consistent_uniq_slugify(dimg.config._name || "nameless"), "ansible-tmpdir-#{stage}").tap do |p|
             p.mkpath
             p.join('local').mkpath
             p.join('remote').mkpath

data/lib/dapp/dimg/builder/base.rb

@@ -72,6 +72,11 @@ module Dapp
       def build_artifact_checksum
         raise
       end
+
+      def _checksum(*args)
+        return if args.flatten.compact.delete_if { |val| val.respond_to?(:empty?) && val.empty? }.empty?
+        dimg.hashsum args
+      end
     end # Builder::Base
   end # Dimg
 end # Dapp

data/lib/dapp/dimg/builder/shell.rb

@@ -3,9 +3,13 @@ module Dapp
     class Builder::Shell < Builder::Base
       [:before_install, :before_setup, :install, :setup, :build_artifact].each do |stage|
         define_method("#{stage}_checksum") do
-          [dimg.config._shell.public_send("_#{stage}_command"),
-           dimg.config._shell.public_send("_#{stage}_version"),
-           dimg.config._shell._version].flatten
+          _checksum(
+            dimg.config._shell.public_send("_#{stage}_command"),
+            public_send("#{stage}_version_checksum")
+          )
+        end
+        define_method("#{stage}_version_checksum") do
+          _checksum(dimg.config._shell.public_send("_#{stage}_version"), dimg.config._shell._version)
         end
         define_method("#{stage}?") { !stage_empty?(stage) }
         define_method(stage.to_s) do |image|
@@ -14,7 +18,7 @@ module Dapp
       end
 
       def stage_empty?(stage)
-        stage_commands(stage).empty?
+        stage_commands(stage).empty? && public_send("#{stage}_version_checksum").nil?
       end
 
       def stage_commands(stage)

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

@@ -180,65 +180,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/kube/helm/values.rb

@@ -17,8 +17,7 @@ module Dapp
                 "repo" => repo,
                 "docker_tag" => docker_tag,
               },
-              # TODO: enable again with chars escape
-              # "ci" => ENV.select { |k, _| k.start_with?('CI_') && k != "CI_ENVIRONMENT_URL" },
+              "ci" => ENV.select { |k, _| k.start_with?('CI_') && k != "CI_ENVIRONMENT_URL" },
             }
           }
 

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

@@ -35,12 +35,6 @@ module Dapp
           '/apis/batch/v1' => [:job, ],
           '/apis/batch/v1beta1' => [:cronjob, ],
         },
-        '1.11' => {
-          '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
-          '/apis/apps/v1' => [:daemonset, :deployment, :replicaset, :statefulset, ],
-          '/apis/batch/v1' => [:job, ],
-          '/apis/batch/v1beta1' => [:cronjob, ],
-        },
         'stable' => {
           '/api/v1' => [:service, :replicationcontroller, :pod, :podtemplate, ],
           '/apis/batch/v1' => [:job, ],

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.30.10"
+  VERSION = "0.31.0"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.30.10
+  version: 0.31.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -527,6 +527,7 @@ files:
 - lib/dapp/dimg/build/stage/install/ga_post_install_patch.rb
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb
 - lib/dapp/dimg/build/stage/install/install.rb
+- lib/dapp/dimg/build/stage/instructions.rb
 - lib/dapp/dimg/build/stage/mod/group.rb
 - lib/dapp/dimg/build/stage/mod/logging.rb
 - lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb
@@ -743,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