dapp 0.27.1 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a054313430584b23e761f254913b80a57ecfc3
-  data.tar.gz: a4945c4837361278b2653fb91d161c5bc34e22f7
+  metadata.gz: b89b8d4526cea7d52e65da52a8f820d57b2c8b3d
+  data.tar.gz: cf18d0448c6bb51ada30b15d38c3ace94d36196d
 SHA512:
-  metadata.gz: dcb3d7d9da637efd3e4357d6176af9af5158796de59912641f511facc61a6fcd11087e3d7c5a068e804f4ccff2bd3c7a5fd5237161c85c168b5e210c759f1fab
-  data.tar.gz: 3bf56658b7dc5cde6ca97bbdeb42771e74291f3f49959a155f9bcf9cf422a20aae6ebbaeb7c469e920369b5ce61c99ee012ff7e7dbd946f7867e4aed8feab9c9
+  metadata.gz: f9366275d1b264accbb4b261d7571597d91b0a00a0dc23ae851f79071e80b3118d31debe6709ddcc896cae1a0c69d93451971da3f470299707476233972dd49c
+  data.tar.gz: 676e2185ce05f47b0d2e85ac8a345f9a4df91bb90df4bf5fadc96ce5e1cac433aa2a05831b4268fb6c911a471eaeb5f94579ade04dcb1aa1c1feeee60d476ef3

data/lib/dapp/cli/command/base.rb

@@ -56,10 +56,10 @@ module Dapp
           super()
         end
 
-        def run_dapp_command(run_method, options: {}, log_running_time: true, try_host_docker_login: false)
+        def run_dapp_command(run_method, options: {}, try_host_docker_login: false)
           dapp = ::Dapp::Dapp.new(options: options)
 
-          log_dapp_running_time(dapp, ignore: !log_running_time) do
+          log_dapp_running_time(dapp) do
             begin
               dapp.try_host_docker_login if try_host_docker_login
 
@@ -74,8 +74,8 @@ module Dapp
           end
         end
 
-        def log_dapp_running_time(dapp, ignore: false)
-          return yield if ignore
+        def log_dapp_running_time(dapp)
+          return yield unless log_running_time
 
           begin
             start_time = Time.now
@@ -85,6 +85,10 @@ module Dapp
           end
         end
 
+        def log_running_time
+          true
+        end
+
         def run(_argv = ARGV)
           raise
         end

data/lib/dapp/cli/command/slug.rb

@@ -12,10 +12,14 @@ BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
           str = self.class.required_argument(self, 'string')
-          run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+          run_dapp_command(nil, options: cli_options) do |dapp|
             dapp.slug([cli_arguments, str].flatten.join(' '))
           end
         end
+
+        def log_running_time
+          false
+        end
       end
     end
   end

data/lib/dapp/cli.rb

@@ -5,7 +5,7 @@ module Dapp
     extend Helper::Cli
     include Helper::Trivia
 
-    SUBCOMMANDS = ['dimg', 'deployment', 'kube', 'update', 'slug'].freeze
+    SUBCOMMANDS = ['dimg', 'kube', 'update', 'slug'].freeze
 
     banner <<BANNER.freeze
 Usage: dapp subcommand [subcommand options]
@@ -13,7 +13,6 @@ Usage: dapp subcommand [subcommand options]
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
   dapp dimg
-  dapp deployment
   dapp kube
   dapp update
   dapp slug STRING

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

@@ -23,7 +23,8 @@ module Dapp
             @artifacts ||= begin
               dimg.config.public_send("_#{name}").map do |artifact|
                 artifact_dimg = dimg.dapp.artifact_dimg(config: artifact._config,
-                                                        ignore_git_fetch: dimg.ignore_git_fetch)
+                                                        ignore_git_fetch: dimg.ignore_git_fetch,
+                                                        ignore_signature_auto_calculation: dimg.ignore_signature_auto_calculation)
                 { options: artifact._artifact_options, dimg: artifact_dimg }
               end
             end

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

@@ -29,8 +29,8 @@ module Dapp
 
           def commit_list
             dimg.git_artifacts
-              .map { |git_artifact| layer_commit(git_artifact) if git_artifact.patch_any_changes?(self) }
-              .compact
+              .select { |ga| ga.repo.commit_exists?(prev_stage.layer_commit(ga)) && ga.patch_any_changes?(self) }
+              .map(&method(:layer_commit))
           end
 
           def git_artifacts_dev_patch_hashes

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

@@ -11,6 +11,9 @@ Usage:
 
 Options:
 BANNER
+        def log_running_time
+          false
+        end
       end
     end
   end

data/lib/dapp/dimg/cli/command/dimg/run.rb

@@ -64,10 +64,14 @@ BANNER
 
           stage_name = config.delete(:stage)
 
-          run_dapp_command(nil, options: cli_options(dimgs_patterns: patterns), log_running_time: false) do |dapp|
+          run_dapp_command(nil, options: cli_options(dimgs_patterns: patterns)) do |dapp|
             dapp.run(stage_name, docker_options, command)
           end
         end
+
+        def log_running_time
+          false
+        end
       end
     end
   end

data/lib/dapp/dimg/cli/command/dimg/stage_image.rb

@@ -18,6 +18,15 @@ BANNER
                in: [:from, :before_install, :before_install_artifact, :g_a_archive, :g_a_pre_install_patch, :install,
                     :g_a_post_install_patch, :after_install_artifact, :before_setup, :before_setup_artifact, :g_a_pre_setup_patch,
                     :setup, :g_a_post_setup_patch, :after_setup_artifact, :g_a_latest_patch, :docker_instructions]
+        def log_running_time
+          false
+        end
+
+        def cli_options(**kwargs)
+          super.tap do |config|
+            config[:quiet] ||= !config[:verbose]
+          end
+        end
       end
     end
   end

data/lib/dapp/dimg/cli/command/dimg/stages/base.rb

@@ -3,8 +3,8 @@ module Dapp::Dimg::CLI
     class Dimg < ::Dapp::CLI
       class Stages < ::Dapp::CLI
         class Base < Base
-          def run_dapp_command(run_command, options: {}, log_running_time: true, **extra_options)
-            super(run_command, options: options.merge(verbose: true), log_running_time: log_running_time, **extra_options)
+          def run_dapp_command(run_command, options: {}, **extra_options)
+            super(run_command, options: options.merge(verbose: true), **extra_options)
           end
         end
       end

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

@@ -56,7 +56,7 @@ module Dapp
             def dapp_git_repositories
               @dapp_git_repositories ||= begin
                 {}.tap do |repositories|
-                  dimgs = build_configs.map { |config| dimg(config: config, ignore_git_fetch: true) }
+                  dimgs = build_configs.map { |config| dimg(config: config, ignore_git_fetch: true, ignore_signature_auto_calculation: true) }
                   dimgs.each do |dimg|
                     [dimg, dimg.artifacts]
                       .flatten

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

@@ -36,7 +36,7 @@ module Dapp
             (self.last_stage = last_stage_class.new(self)).tap do |stage|
               dapp.log_secondary_process("#{name || 'nameless'}: calculating stages signatures") do
                 stage.signature
-              end
+              end unless ignore_signature_auto_calculation
             end
           end
         end

data/lib/dapp/dimg/dimg.rb

@@ -10,15 +10,17 @@ module Dapp
 
       attr_reader :config
       attr_reader :ignore_git_fetch
+      attr_reader :ignore_signature_auto_calculation
       attr_reader :should_be_built
       attr_reader :dapp
 
-      def initialize(config:, dapp:, should_be_built: false, ignore_git_fetch: false)
+      def initialize(config:, dapp:, should_be_built: false, ignore_git_fetch: false, ignore_signature_auto_calculation: false)
         @config = config
         @dapp = dapp
 
-        @ignore_git_fetch = ignore_git_fetch
-        @should_be_built = should_be_built
+        @ignore_git_fetch                  = ignore_git_fetch
+        @ignore_signature_auto_calculation = ignore_signature_auto_calculation
+        @should_be_built                   = should_be_built
 
         @dapp._terminate_dimg_on_terminate(self)
 

data/lib/dapp/kube/cli/command/kube/lint.rb

@@ -38,7 +38,7 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
 
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+        run_dapp_command(nil, options: cli_options) do |dapp|
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else
@@ -50,6 +50,10 @@ BANNER
           dapp.public_send(run_method)
         end
       end
+
+      def log_running_time
+        false
+      end
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/render.rb

@@ -53,7 +53,7 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+        run_dapp_command(nil, options: cli_options) do |dapp|
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else
@@ -65,6 +65,10 @@ BANNER
           dapp.public_send(run_method)
         end
       end
+
+      def log_running_time
+        false
+      end
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/secret_edit.rb

@@ -17,10 +17,14 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         file_path = self.class.required_argument(self, 'FILE_PATH')
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+        run_dapp_command(nil, options: cli_options) do |dapp|
           dapp.public_send(run_method, file_path)
         end
       end
+
+      def log_running_time
+        false
+      end
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/secret_extract.rb

@@ -26,10 +26,14 @@ BANNER
             self.class.required_argument(self, 'FILE_PATH')
           end
         end
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+        run_dapp_command(nil, options: cli_options) do |dapp|
           dapp.public_send(run_method, file_path)
         end
       end
+
+      def log_running_time
+        false
+      end
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/secret_generate.rb

@@ -21,10 +21,14 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         file_path = cli_arguments.empty? ? nil : cli_arguments.first
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+        run_dapp_command(nil, options: cli_options) do |dapp|
           dapp.public_send(run_method, file_path)
         end
       end
+
+      def log_running_time
+        false
+      end
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/secret_key_generate.rb

@@ -8,8 +8,8 @@ Usage:
 
 Options:
 BANNER
-      def run_dapp_command(run_method, options: {}, log_running_time: false, **extra_options)
-        super(run_method, options: options, log_running_time: log_running_time, **extra_options)
+      def log_running_time
+        false
       end
     end
   end

data/lib/dapp/kube/cli/command/kube/secret_regenerate.rb

@@ -16,10 +16,14 @@ BANNER
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+        run_dapp_command(nil, options: cli_options) do |dapp|
           dapp.public_send(run_method, *cli_arguments)
         end
       end
+
+      def log_running_time
+        false
+      end
     end
   end
 end

data/lib/dapp/kube/cli/command/kube/value_get.rb

@@ -29,7 +29,7 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
 
-        run_dapp_command(nil, options: cli_options, log_running_time: false) do |dapp|
+        run_dapp_command(nil, options: cli_options) do |dapp|
           repo = if not cli_arguments[1].nil?
             self.class.required_argument(self, "repo")
           else
@@ -42,7 +42,10 @@ BANNER
           dapp.public_send(run_method, value_key)
         end
       end
+    end
 
+    def log_running_time
+      false
     end
   end
 end

data/lib/dapp/kube/helm/values.rb

@@ -63,7 +63,7 @@ module Dapp
           end
 
           dimgs = dapp.build_configs.map do |config|
-            dapp.dimg(config: config, ignore_git_fetch: true)
+            dapp.dimg(config: config, ignore_git_fetch: true, ignore_signature_auto_calculation: true)
           end.uniq do |dimg|
             dimg.name
           end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.27.1"
+  VERSION = "0.27.2"
   BUILD_CACHE_VERSION = 28
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -741,7 +741,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell