kafo 6.1.0 → 6.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kafo/kafo_configure.rb +1 -1
- data/lib/kafo/puppet_command.rb +8 -1
- data/lib/kafo/version.rb +1 -1
- metadata +2 -3
- data/doc/plantuml.jar +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a9ce6e0d19780eb90d3fce6d40bdb0cc6dad3c249e5f3462cbcfbc5c785abd95
|
4
|
+
data.tar.gz: 0acbff7b82150ef61629a12bae8769c11fbf509e7458ebe39288493774bdcacf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3a829dd674a2a4c21593b72b15fd348dcea9f7c555c02a3d3ebcfc3f84fa24abc1f46a38586399e539114a0020c74841efa4622a3b0a4b732e72dfbebe321369
|
7
|
+
data.tar.gz: d047bafa9ee5b763c14c66f8dd5dfed0f35a2c18babd2609e7567b7d02b8379dd54ac07afe779fc0eb64032bc9044623e86f29f0ce16ce0385a9579f5e8b2235
|
data/lib/kafo/kafo_configure.rb
CHANGED
@@ -143,7 +143,7 @@ module Kafo
|
|
143
143
|
# so we limit parsing only to app config options (because of --help and later defined params)
|
144
144
|
parse clamp_app_arguments
|
145
145
|
parse_app_arguments # set values from ARGS to config.app
|
146
|
-
Logging.setup(verbose: config.app[:verbose])
|
146
|
+
Logging.setup(verbose: config.app[:verbose]) unless ARGV.any? { |option| ['--help', '--full-help'].include? option }
|
147
147
|
self.class.set_color_scheme
|
148
148
|
|
149
149
|
self.class.hooking.execute(:init)
|
data/lib/kafo/puppet_command.rb
CHANGED
@@ -43,8 +43,15 @@ module Kafo
|
|
43
43
|
File.join([bin_path, bin_name].compact)
|
44
44
|
end
|
45
45
|
|
46
|
+
def self.is_aio_puppet?
|
47
|
+
puppet_command = search_puppet_path('puppet')
|
48
|
+
File.realpath(puppet_command).start_with?('/opt/puppetlabs')
|
49
|
+
rescue Errno::ENOENT
|
50
|
+
false
|
51
|
+
end
|
52
|
+
|
46
53
|
def self.format_command(command)
|
47
|
-
if
|
54
|
+
if is_aio_puppet?
|
48
55
|
[clean_env_vars, command, :unsetenv_others => true]
|
49
56
|
else
|
50
57
|
[::ENV, command, :unsetenv_others => false]
|
data/lib/kafo/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kafo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 6.1.
|
4
|
+
version: 6.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Marek Hulan
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-11-
|
11
|
+
date: 2020-11-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -217,7 +217,6 @@ files:
|
|
217
217
|
- config/kafo.yaml.example
|
218
218
|
- doc/kafo_run.png
|
219
219
|
- doc/kafo_run.uml
|
220
|
-
- doc/plantuml.jar
|
221
220
|
- lib/kafo.rb
|
222
221
|
- lib/kafo/app_option/declaration.rb
|
223
222
|
- lib/kafo/app_option/definition.rb
|
data/doc/plantuml.jar
DELETED
Binary file
|