dapp 0.30.0 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 259d9afe89f767678121d96c8ef2b64c1521207c
-  data.tar.gz: 667396adfa0c4f566621b4ed577636e1e82df25a
+  metadata.gz: ac16a9c84e2d3af89ad9a59a0aa51f7073c09552
+  data.tar.gz: 5efbf94424686ef128e7d3d14e4ec34fd001b8ad
 SHA512:
-  metadata.gz: 434fe4c12cdc155d0ce888cce71948ac9fdf29daafcc8327d64d7649b78df948205ea76a2ee777488e1d12f32273178f5e7f03a64671cb5727b3bb207dd91cef
-  data.tar.gz: 97a9dc7ae4e16c42cb1e9002e8eff1dc90d572a013288638b2fc61a124862d37b5089f4f0d7afec841fdfa0413aba323033922b5ba54e8f002bda9cdcd030ed7
+  metadata.gz: 2ab041b8537358ccc8137f7d737d343ab46debcd7fe128e269f7672f99bb479e4f2aef120d7373dc5d0c013008c46c83bfc2817b554f1a5e03d84cb2fbc67c29
+  data.tar.gz: 65dde18c5f79aa88fc1f3f16af037ab377cb463e4ee5f59a5df7118a026060878033d603d18d7c9ebdab47f2afd05c0c5c635aaebe878d63bc9e450fda29e2a1

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

@@ -27,10 +27,6 @@ BANNER
               description: 'Redefine resource locking timeout (in seconds)',
               proc: ->(v) { v.to_i }
 
-        option :git_artifact_branch,
-              long: '--git-artifact-branch BRANCH',
-              description: 'Default branch to archive artifacts from'
-
         option :build_context_directory,
               long: '--build-context-directory DIR_PATH',
               default: nil

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

@@ -24,10 +24,6 @@ BANNER
                description: 'Redefine resource locking timeout (in seconds)',
                proc: ->(v) { v.to_i }
 
-        option :git_artifact_branch,
-               long: '--git-artifact-branch BRANCH',
-               description: 'Default branch to archive artifacts from'
-
         option :build_context_directory,
                long: '--build-context-directory DIR_PATH',
                default: nil

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

@@ -18,10 +18,6 @@ BANNER
                description: 'Redefine resource locking timeout (in seconds)',
                proc: ->(v) { v.to_i }
 
-        option :git_artifact_branch,
-               long: '--git-artifact-branch BRANCH',
-               description: 'Default branch to archive artifacts from'
-
         option :with_stages,
                long: '--with-stages',
                boolean: true

data/lib/dapp/dimg/dimg/git_artifact.rb

@@ -2,30 +2,30 @@ module Dapp
   module Dimg
     class Dimg
       module GitArtifact
-        def git_artifacts
-          [*local_git_artifacts, *remote_git_artifacts].compact
+        def git_artifacts(omit_empty: true)
+          [*local_git_artifacts(omit_empty: omit_empty), *remote_git_artifacts(omit_empty: omit_empty)].compact
         end
 
-        def local_git_artifacts
+        def local_git_artifacts(omit_empty: true)
           @local_git_artifact_list ||= [].tap do |artifacts|
             break artifacts if (local_git_artifacts = Array(config._git_artifact._local)).empty?
             repo = GitRepo::Own.new(dapp)
             local_git_artifacts.map do |ga_config|
-              artifacts.concat(generate_git_artifacts(repo, **ga_config._artifact_options))
+              artifacts.concat(generate_git_artifacts(repo, omit_empty: omit_empty, **ga_config._artifact_options))
             end unless repo.empty?
           end
         end
 
-        def remote_git_artifacts
+        def remote_git_artifacts(omit_empty: true)
           @remote_git_artifact_list ||= [].tap do |artifacts|
             Array(config._git_artifact._remote).each do |ga_config|
               repo = GitRepo::Remote.get_or_create(dapp, ga_config._name, url: ga_config._url, ignore_git_fetch: ignore_git_fetch)
-              artifacts.concat(generate_git_artifacts(repo, **ga_config._artifact_options)) unless repo.empty?
+              artifacts.concat(generate_git_artifacts(repo, omit_empty: omit_empty, **ga_config._artifact_options)) unless repo.empty?
             end
           end
         end
 
-        def generate_git_artifacts(repo, **git_artifact_options)
+        def generate_git_artifacts(repo, omit_empty: true, **git_artifact_options)
           [].tap do |artifacts|
             artifacts << (artifact = ::Dapp::Dimg::GitArtifact.new(repo, self, ignore_signature_auto_calculation: ignore_signature_auto_calculation, **git_artifact_options))
             if ENV['DAPP_DISABLE_GIT_SUBMODULES']
@@ -34,7 +34,7 @@ module Dapp
               artifacts.concat(generate_git_embedded_artifacts(artifact))
             end
           end.select do |artifact|
-            !artifact.empty?
+            !omit_empty || !artifact.empty?
           end
         end
 

data/lib/dapp/dimg/git_artifact.rb

@@ -21,7 +21,7 @@ module Dapp
 
         @ignore_signature_auto_calculation = ignore_signature_auto_calculation
 
-        @branch = branch || repo.dapp.options[:git_artifact_branch] || repo.branch
+        @branch = branch || repo.branch
         @commit = commit
 
         @to = to

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

@@ -96,7 +96,7 @@ module Dapp
             dimg_data["docker_image"] = [[repo, dimg.name].compact.join("/"), docker_tag].join(":")
             dimg_data["docker_image_id"] = docker_image_id
 
-            [*dimg.local_git_artifacts, *dimg.remote_git_artifacts].each do |ga|
+            dimg.git_artifacts(omit_empty: false).each do |ga|
               if ga.as
                 commit_id = dimg_labels[dapp.dimgstage_g_a_commit_label(ga.paramshash)] || TEMPLATE_EMPTY_VALUE
 

data/lib/dapp/kube/kubernetes/config.rb

@@ -7,10 +7,10 @@ module Dapp
 
         class << self
           def new_auto_if_available
-            if ENV['KUBECONFIG']
-              Kubernetes::Config.new_from_kubeconfig(ENV['KUBECONFIG'])
-            elsif Kubernetes::Config.kubectl_available?
+            if Kubernetes::Config.kubectl_available?
               Kubernetes::Config.new_from_kubectl
+            elsif ENV['KUBECONFIG']
+              Kubernetes::Config.new_from_kubeconfig(ENV['KUBECONFIG'])
             else
               default_path = File.join(ENV['HOME'], '.kube/config')
               if File.exists? default_path
@@ -43,11 +43,14 @@ module Dapp
           end
 
           def new_from_kubectl
-            cmd_res = shellout("kubectl config view")
+            cmd_res = shellout(
+              "kubectl config view --raw",
+              env: {"KUBECONFIG" => ENV["KUBECONFIG"]}
+            )
 
             shellout_cmd_should_succeed! cmd_res
 
-            self.new YAML.load(cmd_res.stdout), "kubectl config view"
+            self.new YAML.load(cmd_res.stdout), "kubectl config view --raw"
           end
         end # << self
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.30.0"
+  VERSION = "0.30.1"
   BUILD_CACHE_VERSION = 30
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.30.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout