dapp 0.19.4 → 0.19.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e2815b928fa26bc13bfed975ed8db6a8195d2754dfdb9901eb2814b39bfcb30
-  data.tar.gz: e9abce964ca0bdbf38481cbcd786ee2f737e200fcb7ec2289e46176d1144cfbd
+  metadata.gz: aae9ac6942e53a5dfc819ef116bace7d9b6ee0b796854c19f1bbef759384fbd1
+  data.tar.gz: e6755cecd0d3974ecbd5f02272e1d7838fe1abd6e969753290420ca653821653
 SHA512:
-  metadata.gz: 096bd88a409386a5809b0034692264e204387e8e9467a2f1696bb2fd6b34981bc78ef0d67f092f0cdef945da1dc1d356acbe740328d35ed6ae1251588cd0eba0
-  data.tar.gz: 2f513c059c08b4d653161f0a546e88b1294339c7028f816efb0e27844907d2f44f1d13c16616455f28cbfa577371cf196bab6471027d34bdaa47faf05d705242
+  metadata.gz: 82b164a8819abb9deac8ec34f7c3bf21853bb0e625698b73bf895ad1075ecf25c14666ceb5c1db2426c6fff0c28148541160cb93b49feb9d9b6e39c68143b57e
+  data.tar.gz: f72c0dcada882ed289d89f94574c0d06c4f32f08d8241f616c6c2e72c50b11506e2957e8a6359960791f53b7bf4949f6baa22468a226cf7090fe24ac638ff1a1

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

@@ -87,7 +87,7 @@ module Dapp
             image.add_service_change_label dapp: dimg.stage_dapp_label
             image.add_service_change_label 'dapp-version'.to_sym => ::Dapp::VERSION
             image.add_service_change_label 'dapp-cache-version'.to_sym => ::Dapp::BUILD_CACHE_VERSION
-            image.add_service_change_label 'dapp-dev-mode'.to_sym => true if dimg.dev_mode_cache?
+            image.add_service_change_label 'dapp-dev-mode'.to_sym => true if dimg.dev_mode?
 
             if dimg.dapp.ssh_auth_sock
               image.add_volume "#{dimg.dapp.ssh_auth_sock}:/tmp/dapp-ssh-agent"

data/lib/dapp/dimg/dimg.rb

@@ -42,7 +42,7 @@ module Dapp
       end
 
       def after_stages_build!
-        return unless last_stage.image.built? || dev_mode_cache?
+        return unless last_stage.image.built? || dev_mode? || force_save_cache?
         last_stage.save_in_cache!
         artifacts.each { |artifact| artifact.last_stage.save_in_cache! }
       end
@@ -154,12 +154,12 @@ module Dapp
         dapp.dev_mode?
       end
 
-      def dev_mode_cache?
-        dev_mode? || !!dapp.options[:force_save_cache]
+      def force_save_cache?
+        !!dapp.options[:force_save_cache]
       end
 
       def build_cache_version
-        [::Dapp::BUILD_CACHE_VERSION, dev_mode_cache? ? 1 : 0]
+        [::Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
       end
 
       def introspect_image!(image:, options:)

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

@@ -9,9 +9,12 @@ module Dapp
                 if options[:templates].any?
                   release.templates.select do |template_path, _|
                     options[:templates].map { |t| "#{t}*" }.any? do |template_path_pattern|
-                      template_relative_path_pattern = Pathname(File.expand_path(template_path_pattern)).subpath_of(path('.helm', 'templates'))
+                      template_path_without_chart_name = template_path[/.*?\/(.*)/, 1]
+                      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)
+
+                      File.fnmatch(template_relative_path_pattern, template_path_without_chart_name) ||
+                        File.fnmatch(template_relative_path_pattern, template_path)
                     end
                   end
                 else

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

@@ -63,7 +63,7 @@ module Dapp
           current_template = nil
           spec = 0
           evaluation_output.lines.each do |l|
-            if (match = l[/# Source: #{dapp.name}\/templates\/(.*)/, 1])
+            if (match = l[/# Source: (.*)/, 1])
               spec = 0
               t[current_template = match] ||= []
             end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.19.4'.freeze
+  VERSION = '0.19.5'.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.4
+  version: 0.19.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout