dapp 0.27.14 → 0.27.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1e356c889e25cdc2f7b750b0f4287be9bd65cf
-  data.tar.gz: 82527a84402c3da81168db0ceaef36677dfda4b9
+  metadata.gz: 460f233a1160e8f9daee0a58e57b9ae4c2c81fb2
+  data.tar.gz: 9876833f80e3d3786ed1da2b1bb0342fdf934d43
 SHA512:
-  metadata.gz: d07d2fdb9f51df0830723a3d25243cb392fc4bd03c0a0457aeff770c01864c4157913dde166cb027dc4ab99de5cff198e969b667231c4d0ec2e6aed1b8c0c206
-  data.tar.gz: ecce3d4c3fefb767449b3f406494ec65013b0a89930062a0e7087c5fb31f3c58dd462bdd0461fcda161d24b2421fbed24e122ae6922f8e14d77944c9c92ab398
+  metadata.gz: a14a725b02dc19683a3e2b3785d987614f1bd673f549feefe20e15a55c0f4d0855e00184607bd44b0f31f6d437a27f474a754c4a515ce0d6008a8e25899d6287
+  data.tar.gz: 2344b7c50583c3caf458cbde85a564a74bd312fbe504ff423d9631df2279d1fcc2be417bf6ea7cdc8fb569bb50c6435635e6948a7ce0b8af025cd70fa8541da9

data/lib/dapp.rb

@@ -53,6 +53,7 @@ require 'dapp/error/shellout'
 require 'dapp/exception/base'
 require 'dapp/cli'
 require 'dapp/cli/command/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

@@ -26,6 +26,8 @@ BANNER
           :g_a_pre_setup_patch, :setup, :after_setup_artifact, :g_a_artifact_patch, :build_artifact
         ]
 
+        extend ::Dapp::CLI::Options::Ssh
+
         option :tmp_dir_prefix,
               long: '--tmp-dir-prefix PREFIX',
               description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
@@ -59,13 +61,6 @@ BANNER
               description: "Introspect one of the following stages (#{list_msg_format(artifact_introspected_stages)})",
               proc: proc { |val| val.to_sym.tap { |v| in_validate!(v, artifact_introspected_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 }
-
         option :build_context_directory,
               long: '--build-context-directory DIR_PATH',
               default: nil

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

@@ -25,6 +25,8 @@ BANNER
           end
         end
 
+        extend ::Dapp::CLI::Options::Ssh
+
         option :tmp_dir_prefix,
                long: '--tmp-dir-prefix PREFIX',
                description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
@@ -68,13 +70,6 @@ BANNER
                description: "Introspect stage before one of the following stages (#{list_msg_format(artifact_stages[1..-1])})",
                proc:        before_stage_proc.call(artifact_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 }
-
         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

@@ -8,7 +8,9 @@ Usage:
 
 Options:
 BANNER
+
       extend ::Dapp::CLI::Command::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.27.14"
+  VERSION = "0.27.15"
   BUILD_CACHE_VERSION = 28
 end

metadata

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