dapp 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 953875fd2962ef0556c4e9024c80766b1f21b00a
-  data.tar.gz: dbd4be0b9029832784a411227a8ccb5825e73fe7
+  metadata.gz: b4e5c7613863b4e3513c88cb084d0b323c9edc54
+  data.tar.gz: 8f9c887894a7af4f10b903a4b384bc0476eef466
 SHA512:
-  metadata.gz: 638074e5ff306047fca2b4c6ac54f4db5039476f962407fc29e013cc88bd25bc1910ef365bc827a47ec4f8161c960ff3f0ef96e45cd557181c398908bfef0001
-  data.tar.gz: 851a3da2f34d463d16359151eaeebe5d469455fe6a2654119f370463670a0dfb7c9050ab99c1fe0cf7b6cce756cee57e692323828454830f97c62e73e1bb6387
+  metadata.gz: aaedc840723eade1037daa909219ad3b009ea44f19405f20dcc42f80afa9058d4d084eaed63738a6c98d60ac36da914fc0a9df6e8dd0de46eb9f6d06bfa52108
+  data.tar.gz: 553efb13630ccb41e2ba2c22d81b3af28b746651b13bd012aff21ff082cdf941d3082372d89a3eaa0335ae61ac5dd9660a0c4afc28e19cf4b3cf49aad50cf7c5

data/lib/dapp/dapp.rb

@@ -36,7 +36,7 @@ module Dapp
         elsif git_path
           File.basename(File.dirname(git_path))
         else
-          File.basename(path)
+          path.basename
         end
       end
     end
@@ -58,8 +58,9 @@ module Dapp
       end
     end
 
-    def path
+    def path(*path)
       @path ||= expand_path(dappfile_path)
+      make_path(@path, *path)
     end
 
     def build_path
@@ -67,7 +68,7 @@ module Dapp
         if options[:build_dir]
           Pathname.new(options[:build_dir])
         else
-          Pathname.new(path).join('.dapp_build')
+          path('.dapp_build')
         end.expand_path.tap(&:mkpath)
       end
     end

data/lib/dapp/dapp/chef.rb

@@ -10,7 +10,7 @@ module Dapp
       end
 
       def builder_cookbook_path
-        Pathname.new(path).join('.dapp_chef')
+        path('.dapp_chef')
       end
     end # Chef
   end # Dapp

data/lib/dapp/dimg/dimg/path.rb

@@ -3,7 +3,7 @@ module Dapp
     class Dimg
       module Path
         def home_path(*path)
-          make_path(dapp.path, *path).expand_path
+          dapp.path(*path).expand_path
         end
 
         def tmp_base_dir

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

@@ -25,6 +25,11 @@ BANNER
              default: [],
              proc: proc { |v| composite_options(:helm_set) << v }
 
+      option :helm_values_options,
+             long: '--values FILE_PATH',
+             default: [],
+             proc: proc { |v| composite_options(:helm_values) << v }
+
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         repo = self.class.required_argument(self, 'repo')

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

@@ -16,7 +16,11 @@ module Dapp
           end
 
           def secret
-            @secret ||= Secret.new(ENV['DAPP_SECRET_KEY']) if ENV.key?('DAPP_SECRET_KEY')
+            @secret ||= begin
+              secret_key = ENV['DAPP_SECRET_KEY']
+              secret_key ||= path('.dapp_secret_key').read.chomp if path('.dapp_secret_key').file?
+              Secret.new(secret_key) if secret_key
+            end
           end
 
           def kubernetes

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

@@ -19,8 +19,8 @@ module Dapp
               kube_generate_helm_chart_tpl
 
               additional_values = [].tap do |options|
-                options << "--values #{kube_chart_path("values/#{kube_namespace}.yaml")}" if kube_chart_path("values/#{kube_namespace}.yaml").exist?
                 options << "--values #{kube_tmp_chart_secret_values_path.exist? ? kube_tmp_chart_secret_values_path : kube_chart_secret_values_path}" if kube_chart_secret_values_path.exist?
+                options.concat(self.options[:helm_values_options].map { |opt| "--values #{opt}" })
               end
 
               set_options = [].tap do |options|
@@ -186,7 +186,7 @@ module Dapp
           end
 
           def kube_chart_path(*path)
-            make_path(self.path, '.helm', *path).expand_path
+            self.path('.helm', *path).expand_path
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Dapp
       module Command
         module SecretKeyGenerate
           def kube_secret_key_generate
-            puts Secret.generate_key
+            puts "DAPP_SECRET_KEY=#{Secret.generate_key}"
           end
         end
       end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.2'.freeze
+  VERSION = '0.13.3'.freeze
   BUILD_CACHE_VERSION = 13
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Dmitry Stolyarov