dapp 0.14.14 → 0.14.15

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c1b7e7684566d30bc19a41fb62c1949a3b43fc2e
4
- data.tar.gz: 79a978234d842d546750f9a8336d9feefd5c880d
3
+ metadata.gz: 487636cae0782284b7daa01c9343c5f17abffd2a
4
+ data.tar.gz: 56e4a7ade53cfa3c92da2056be1002daf5ff508d
5
5
  SHA512:
6
- metadata.gz: 8be35aa704ed8e0f45d741c564084d0843b1eff2df60c7e64bb5132998b234a08e929a1bb19e6cc11f8a9d23ac47a07579f09008f27e74335dded52d7a3fb85d
7
- data.tar.gz: dcc36bf24708a901302796c77aa674c5f190f1eaf00a79eb28cd4216b599fe78db19d275f50a6e6a66b42a9c7163074252fd543ebce0a3452b8a3102959aa031
6
+ metadata.gz: dac115260a344ed9619022fefae7e8aa2431a6e031c25c607131e879940902d42c48f9d8f49c4ed6f04630e74af1f5234734d4bb58789968ecc59ec7c5bccaec
7
+ data.tar.gz: 72d73b6a0d5f292e2321dd360a06967d46f2d32bcda7e7276863ae48f43e2cebf8f5975b32ef69aea701a3df5823dc44f128de40a9d944db7017ab2e83d5dca0
@@ -59,14 +59,11 @@ module Dapp
59
59
  def run_dapp_command(run_method, *args)
60
60
  dapp = ::Dapp::Dapp.new(*args)
61
61
  begin
62
- dapp.host_docker_login
63
62
  if run_method.nil?
64
63
  yield dapp if block_given?
65
64
  else
66
65
  dapp.public_send(run_method)
67
66
  end
68
- ensure
69
- dapp.terminate
70
67
  end
71
68
  end
72
69
 
data/lib/dapp/dapp.rb CHANGED
@@ -118,7 +118,7 @@ module Dapp
118
118
  def host_docker_login
119
119
  return unless option_repo
120
120
 
121
- login = proc {|u, p| shellout!("#{host_docker} login #{option_repo} -u #{u} -p #{p}")}
121
+ login = proc {|u, p| shellout!("#{host_docker} login \"#{option_repo}\" -u \"#{u}\" -p \"#{p}\"")}
122
122
  if options.key?(:registry_username) && options.key?(:registry_password)
123
123
  login.call(options[:registry_username], options[:registry_password])
124
124
  elsif ENV.key?('CI_JOB_TOKEN')
@@ -6,6 +6,17 @@ module Dapp::Dimg::CLI
6
6
  run_dapp_command(run_method, options: cli_options(dimgs_patterns: cli_arguments))
7
7
  end
8
8
 
9
+ def run_dapp_command(run_method, *args)
10
+ super(run_method, *args) do |dapp|
11
+ begin
12
+ dapp.host_docker_login
13
+ yield dapp if run_method.nil? && block_given?
14
+ ensure
15
+ dapp.terminate
16
+ end
17
+ end
18
+ end
19
+
9
20
  def run_method
10
21
  class_to_lowercase
11
22
  end
data/lib/dapp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = '0.14.14'.freeze
2
+ VERSION = '0.14.15'.freeze
3
3
  BUILD_CACHE_VERSION = 16
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.14.14
4
+ version: 0.14.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-19 00:00:00.000000000 Z
11
+ date: 2017-09-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout