dapp 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dbff2ff0349b92efd0c4662cc5ba5bb9c77a107
-  data.tar.gz: e97fcc44533ceea1d85f3ca6e2384738885c83b9
+  metadata.gz: ab58b121ba8d5549900c91ed049cf981726887f1
+  data.tar.gz: 95dd37e1e372fadebaa843ad40b2b4322603258a
 SHA512:
-  metadata.gz: 830eb29eb810e75dd9404f44771813b39b5eaffc6a6739f93214d3917138cdc67ecb4f8582da684c28f296158400bae84497854a4dceef89340f7299205a13bc
-  data.tar.gz: 7676eef00836559b62814f9833d4877f6f8dd042a9d936f0b758c2e5127aa6f88c25bf6e2076245c62077239e1a9d84586a6bc5d028b7d0946e3d46891a5fb80
+  metadata.gz: 660a01b17f02ac9d417af94f301620869d2ef4df9e8b936d1ee1d19cf4f53080e526aef13214c621f5661506a5ba10a79240dd0128509c732b92158c36f2fbe6
+  data.tar.gz: 993c9515fd21ceca54ee401891b4c8858a48379615c02e7fa6610c5d5d3a6c46fa8f37d2c844ec755128f9769d5671900d39929e2370dcee40b4422d806c95bc

data/lib/dapp.rb

@@ -53,6 +53,7 @@ require 'dapp/error/shellout'
 require 'dapp/exception/base'
 require 'dapp/cli'
 require 'dapp/cli/options/tag'
+require 'dapp/cli/options/ssh'
 require 'dapp/cli/command/base'
 require 'dapp/cli/command/update'
 require 'dapp/cli/command/slug'

data/lib/dapp/cli/options/ssh.rb

@@ -0,0 +1,18 @@
+module Dapp
+  class CLI
+    module Options
+      module Ssh
+        def self.extended(klass)
+          klass.class_eval do
+            option :ssh_key,
+                  long: '--ssh-key SSH_KEY',
+                  description: ['Enable only specified ssh keys ',
+                                '(use system ssh-agent by default)'].join,
+                  default: nil,
+                  proc: ->(v) { composite_options(:ssh_key) << v }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -16,6 +16,7 @@ BANNER
         # build options
 
         extend ::Dapp::Dimg::CLI::Options::Introspection
+        extend ::Dapp::CLI::Options::Ssh
 
         option :tmp_dir_prefix,
               long: '--tmp-dir-prefix PREFIX',
@@ -30,13 +31,6 @@ BANNER
               long: '--git-artifact-branch BRANCH',
               description: 'Default branch to archive artifacts from'
 
-        option :ssh_key,
-              long: '--ssh-key SSH_KEY',
-              description: ['Enable only specified ssh keys ',
-                            '(use system ssh-agent by default)'].join,
-              default: nil,
-              proc: ->(v) { composite_options(:ssh_key) << v }
-
         option :build_context_directory,
               long: '--build-context-directory DIR_PATH',
               default: nil

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

@@ -13,6 +13,7 @@ Options:
 BANNER
 
         extend ::Dapp::Dimg::CLI::Options::Introspection
+        extend ::Dapp::CLI::Options::Ssh
 
         option :tmp_dir_prefix,
                long: '--tmp-dir-prefix PREFIX',
@@ -27,13 +28,6 @@ BANNER
                long: '--git-artifact-branch BRANCH',
                description: 'Default branch to archive artifacts from'
 
-        option :ssh_key,
-               long: '--ssh-key SSH_KEY',
-               description: ['Enable only specified ssh keys ',
-                             '(use system ssh-agent by default)'].join,
-               default: nil,
-               proc: ->(v) { composite_options(:ssh_key) << v }
-
         option :build_context_directory,
                long: '--build-context-directory DIR_PATH',
                default: nil

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

@@ -12,18 +12,14 @@ Usage:
 
 Options:
 BANNER
+
+        extend ::Dapp::CLI::Options::Ssh
+
         option :stage,
                long:        '--stage STAGE',
                description: "Run one of the following stages (#{list_msg_format(DIMG_STAGES)})",
                proc:        STAGE_PROC.call(DIMG_STAGES)
 
-        option :ssh_key,
-               long: '--ssh-key SSH_KEY',
-               description: ['Enable only specified ssh keys ',
-                             '(use system ssh-agent by default)'].join,
-               default: nil,
-               proc: ->(v) { composite_options(:ssh_key) << v }
-
         def read_options(args)
           self.class.cli_wrapper(self) do
             args.each_with_index do |arg, i|

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

@@ -9,6 +9,7 @@ Usage:
 Options:
 BANNER
       extend ::Dapp::CLI::Options::Tag
+      extend ::Dapp::CLI::Options::Ssh
 
       option :namespace,
              long: '--namespace NAME',

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

@@ -4,6 +4,8 @@ module Dapp
       module Command
         module Deploy
           def kube_deploy
+            setup_ssh_agent
+
             helm_release do |release|
               do_deploy = proc do
                 kube_run_deploy(release)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.28.0"
+  VERSION = "0.28.1"
   BUILD_CACHE_VERSION = 28
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -469,6 +469,7 @@ files:
 - lib/dapp/cli/command/base.rb
 - lib/dapp/cli/command/slug.rb
 - lib/dapp/cli/command/update.rb
+- lib/dapp/cli/options/ssh.rb
 - lib/dapp/cli/options/tag.rb
 - lib/dapp/config/config.rb
 - lib/dapp/config/directive/base.rb