dapp 0.26.5 → 0.26.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccf825a07836692f74d5cc646cd70097b4523df2
-  data.tar.gz: 7eeec05c6467aae9a5c93efcdab6e19fedec36e9
+  metadata.gz: 2cf103585b6af6f69328db17a5361fb4af9c78f4
+  data.tar.gz: f2602f349771558cfcad3320b758f1fbbaa9e766
 SHA512:
-  metadata.gz: d61986ed6e35c8861cf2f503dd9db4abe534ea5a48ee8665598b1f9ec85c2ae7a72b0391c9b06aa8fc19583eadbf2d50add9b33f9392d673285b27c01b72e649
-  data.tar.gz: 8a6c2d8e70fc68ffcbf0e93d97741741952988e72ea4f24f2ccc6565d5bf110671796f1f7b9f341483928e8aaaf005b2cf838dde3bf69e73e584f1067f87ed47
+  metadata.gz: 707366341a8cd92b8c1ca5d20d33c1bc48df7924d14d0af49a2939aa5927be075c2dbad3582ea35ea19f65f475ed5f9d2201b17c2cfb92a08bdc410c62ba5bc4
+  data.tar.gz: d86ff224672bb834c6076c3066b3245cf0917e0b9473bfe5aba3aebea5a9de346b74f02686540c05b2ef1f9f01acd02e33eb6470af1abb44d6649b2b7c7bd66e

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

@@ -37,10 +37,11 @@ module Dapp
 
           def prepare_docker_images(extra_args, **extra_fields)
             [].tap do |images|
-              shellout!(%(#{host_docker} images --format="{{.ID}};{{.Repository}}:{{.Tag}};{{.CreatedAt}}" -f "dangling=false" -f "label=dapp=#{name}" --no-trunc #{extra_args}))
+              shellout!(%(#{host_docker} images --format='{{if ne "<none>" .Tag }}{{.ID}};{{.Repository}}:{{.Tag}};{{.CreatedAt}}{{ end }}' -f "dangling=false" -f "label=dapp=#{name}" --no-trunc #{extra_args}))
                 .stdout
                 .lines
                 .map(&:strip)
+                .reject(&:empty?)
                 .each do |l|
                 id, name, created_at = l.split(';')
                 images << { id: id, name: name, created_at: Time.parse(created_at), **extra_fields }
@@ -73,13 +74,19 @@ module Dapp
             remove_images_by_query(%(#{host_docker} images -f "dangling=true" -f "label=dapp" -q --no-trunc))
           end
 
+          def dapp_tagless_images_flush
+            remove_images_by_query(%(#{host_docker} images --format='{{if eq "<none>" .Tag }}{{.ID}}{{ end }}' -f "dangling=false" -f "label=dapp" -q --no-trunc))
+          end
+
           def remove_images_by_query(images_query)
             with_subquery(images_query) { |ids| remove_images(ids) }
           end
 
           def remove_images(images_ids_or_names)
-            images_ids_or_names = ignore_used_images(images_ids_or_names.uniq)
-            remove_base("#{host_docker} rmi%{force_option} %{ids}", images_ids_or_names, force: false)
+            ids_chunks(images_ids_or_names) do |chunk|
+              chunk = ignore_used_images(chunk)
+              remove_base("#{host_docker} rmi%{force_option} %{ids}", chunk, force: false)
+            end
           end
 
           def ignore_used_images(images_ids_or_names)
@@ -107,14 +114,20 @@ module Dapp
           end
 
           def remove_containers(ids)
-            remove_base("#{host_docker} rm%{force_option} %{ids}", ids.uniq, force: true)
+            ids_chunks(ids) do |chunk|
+              remove_base("#{host_docker} rm%{force_option} %{ids}", chunk, force: true)
+            end
           end
 
-          def remove_base(query_format, ids, force: false)
+          def ids_chunks(ids, &blk)
             return if ids.empty?
+            ids.uniq.each_slice(50, &blk)
+          end
+
+          def remove_base(query_format, ids, force: false)
             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(' '))) }
+            run_command(format(query_format, force_option: force_option, ids: ids.join(' ')))
           end
 
           def with_subquery(query)

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

@@ -17,6 +17,7 @@ module Dapp
               end
 
               dapp_dangling_images_flush
+              dapp_tagless_images_flush
             end
           end
           # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
@@ -72,17 +73,19 @@ module Dapp
           end
 
           def proper_cache_all_images_names
-            shellout!(%(#{host_docker} images --format="{{.Repository}}:{{.Tag}}" -f "dangling=false" -f "label=dapp" -f "label=dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}"))
+            shellout!(%(#{host_docker} images --format='{{if ne "<none>" .Tag }}{{.Repository}}:{{.Tag}}{{ end }}' -f "label=dapp" -f "label=dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}"))
               .stdout
               .lines
               .map(&:strip)
+              .reject(&:empty?)
           end
 
           def dapp_images_names_by_label(label)
-            shellout!(%(#{host_docker} images --format="{{.Repository}}:{{.Tag}}" -f "dangling=false" -f "label=dapp" -f "label=#{label}"))
+            shellout!(%(#{host_docker} images --format='{{if ne "<none>" .Tag }}{{.Repository}}:{{.Tag}}{{ end }}' -f "label=dapp" -f "label=#{label}"))
               .stdout
               .lines
               .map(&:strip)
+              .reject(&:empty?)
           end
         end
       end

data/lib/dapp/dimg/git_artifact.rb

@@ -121,7 +121,7 @@ module Dapp
           last_part_path = path_parts.shift
           test_path      = [test_path, last_part_path].compact.join('/')
 
-          non_match    = !File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME)
+          non_match    = !File.fnmatch(test_path, embedded_rel_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
           part_for_all = (last_part_path == '**')
 
           if non_match || part_for_all

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

@@ -232,8 +232,8 @@ module Dapp
           ignore_path_base(path, exclude_paths: exclude_paths) do
             paths.empty? ||
               paths.any? do |p|
-                File.fnmatch?(p, path, File::FNM_PATHNAME) ||
-                  File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME)
+                File.fnmatch?(p, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
+                  File.fnmatch?(File.join(p, '**', '*'), path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
               end
           end
         end

data/lib/dapp/helper/trivia.rb

@@ -29,11 +29,11 @@ module Dapp
       end
 
       def check_path?(path, format)
-        path_checker(path) { |checking_path| File.fnmatch(format, checking_path, File::FNM_PATHNAME) }
+        path_checker(path) { |checking_path| File.fnmatch(format, checking_path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
       end
 
       def check_subpath?(path, format)
-        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME) }
+        path_checker(format) { |checking_path| File.fnmatch(checking_path, path, File::FNM_PATHNAME|File::FNM_DOTMATCH) }
       end
 
       def path_checker(path)

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

@@ -13,8 +13,8 @@ module Dapp
                       template_relative_path_pattern = Pathname(File.expand_path(template_path_pattern)).subpath_of(path('.helm'))
                       template_relative_path_pattern ||= template_path_pattern
 
-                      File.fnmatch?(template_relative_path_pattern, template_path_without_chart_name, File::FNM_PATHNAME) ||
-                        File.fnmatch?(template_relative_path_pattern, template_path, File::FNM_PATHNAME)
+                      File.fnmatch?(template_relative_path_pattern, template_path_without_chart_name, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
+                        File.fnmatch?(template_relative_path_pattern, template_path, File::FNM_PATHNAME|File::FNM_DOTMATCH)
                     end
                   end
                 else

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.26.5"
-  BUILD_CACHE_VERSION = 26
+  VERSION = "0.26.6"
+  BUILD_CACHE_VERSION = 27
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.26.5
+  version: 0.26.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout