dapp 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90b0d828dd6eed7a831eb41a850e6f477ec745ae45500c45ec92064ce8efc57
-  data.tar.gz: e3ac3d726d9fcbdc7a656b98fc75169b18ddc5edc00c917ff66e2285151fa335
+  metadata.gz: c037e5dce35bc69e87ce7c2c6213552ffc64e754a598ef8194a0368cd3457b7d
+  data.tar.gz: a3eccff3be519589029e7dc4b6fd0e6130594b9b86e9e891ab5f5e23f1c04708
 SHA512:
-  metadata.gz: 59bf6ebbb392d75f93a1c2038d91dcf24af9c32a53f969af7757eca44cd7ba371707e05ff2c51d54970f153246adb06af4c8b7a3606c8c4e87b88a6ccfc90af2
-  data.tar.gz: 004e77880d894da5c31396319ac188c4e7b7cb8c84ed07f944c82e28c51251e535be7d12cbc06cfe9507208903737b4323a38ed6a0ed9c705401a859272b2262
+  metadata.gz: 99bbba3a27f3bceb41525fe07768bf947beafd4dee895673b30f958dc6e5f17446d3ae38fae6582bcd027a81e700bbe5b2d29906c6ab4def3ec00d69270f08d4
+  data.tar.gz: dcff4f27aa9c00289a709178f2be6b33a80e65802f53fc181c3ffdc1f83eb44e289acf64b685f1cf4469727bd54f2606f744acc62a033cebda6fc151c352ca47

data/lib/dapp.rb

@@ -203,6 +203,7 @@ require 'dapp/dimg/cli/command/dimg/build_context'
 require 'dapp/dimg/cli/command/dimg/build_context/export'
 require 'dapp/dimg/cli/command/dimg/build_context/import'
 require 'dapp/dimg/cli/command/dimg/stages'
+require 'dapp/dimg/cli/command/dimg/stages/base'
 require 'dapp/dimg/cli/command/dimg/stages/flush_local'
 require 'dapp/dimg/cli/command/dimg/stages/flush_repo'
 require 'dapp/dimg/cli/command/dimg/stages/cleanup_local'

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

@@ -0,0 +1,13 @@
+module Dapp::Dimg::CLI
+  module Command
+    class Dimg < ::Dapp::CLI
+      class Stages < ::Dapp::CLI
+        class Base < Base
+          def run_dapp_command(run_command, options: {})
+            super(run_command, options: options.merge(verbose: true))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -36,7 +36,7 @@ module Dapp
 
           def dapp_project_images
             @dapp_project_images ||= [].tap do |images|
-              shellout!(%(#{host_docker} images --format="{{.ID}};{{.Repository}}:{{.Tag}};{{.CreatedAt}}" -f "label=dapp" #{stage_cache} --no-trunc))
+              shellout!(%(#{host_docker} images --format="{{.ID}};{{.Repository}}:{{.Tag}};{{.CreatedAt}}" -f "label=dapp" --no-trunc #{stage_cache}))
                   .stdout
                   .lines
                   .map(&:strip)
@@ -113,6 +113,7 @@ module Dapp
           def remove_base(query_format, ids, force: false)
             return if ids.empty?
             force_option = force ? ' -f' : ''
+            log(ids.join("\n")) if log_verbose? || dry_run?
             ids.each_slice(50) { |chunk| run_command(format(query_format, force_option: force_option, ids: chunk.join(' '))) }
           end
 
@@ -122,7 +123,6 @@ module Dapp
           end
 
           def run_command(cmd)
-            log(cmd) if log_verbose? || dry_run?
             shellout!(cmd) unless dry_run?
           end
 

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

@@ -30,7 +30,7 @@ module Dapp
 
             def actual_cache_project_images_ids
               @actual_cache_project_images_ids ||= begin
-                shellout!(%(#{host_docker} images -f "label=dapp" -f "label=dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}" #{stage_cache} -q --no-trunc))
+                shellout!(%(#{host_docker} images -f "label=dapp" -f "label=dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}" -q --no-trunc #{stage_cache}))
                   .stdout
                   .lines
                   .map(&:strip)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.19.1'.freeze
+  VERSION = '0.19.2'.freeze
   BUILD_CACHE_VERSION = 21
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -545,6 +545,7 @@ files:
 - lib/dapp/dimg/cli/command/dimg/spush.rb
 - lib/dapp/dimg/cli/command/dimg/stage_image.rb
 - lib/dapp/dimg/cli/command/dimg/stages.rb
+- lib/dapp/dimg/cli/command/dimg/stages/base.rb
 - lib/dapp/dimg/cli/command/dimg/stages/cleanup_local.rb
 - lib/dapp/dimg/cli/command/dimg/stages/cleanup_repo.rb
 - lib/dapp/dimg/cli/command/dimg/stages/flush_local.rb