kafo 6.1.1 → 6.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +7 -0
- data/lib/kafo/app_option/declaration.rb +0 -2
- data/lib/kafo/app_option/definition.rb +0 -2
- data/lib/kafo/color_scheme.rb +1 -1
- data/lib/kafo/configuration.rb +1 -1
- data/lib/kafo/kafo_configure.rb +2 -2
- data/lib/kafo/param.rb +3 -3
- data/lib/kafo/puppet_module.rb +6 -6
- data/lib/kafo/scenario_manager.rb +4 -4
- data/lib/kafo/store.rb +1 -1
- data/lib/kafo/string_helper.rb +1 -1
- data/lib/kafo/version.rb +1 -1
- data/lib/kafo/wizard.rb +7 -7
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d5b062b74a81972dc7e0029799071d8b634ff87d50921e971bea9160ac007179
|
4
|
+
data.tar.gz: 91d16fcc9ce37cece41968d07ca8f44150016ac58cdc66adaef07ec9efa21d9f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 57abd42df5d5718db2a0ad815fac3c9b7c7e670baa394c9227cedadf3cd0c18f433168d035f23b8aaf4e48d8fe2d2ae17a19371dc8f8756b0857eb31878b5a8c
|
7
|
+
data.tar.gz: ef4f963505fc2e6315fbe19ed8e71e69faa44bf852491b0eebcb3ac778a8ecd86d03989bb2784735e6502ff539f026bd5ae51a12062c01d467601c03fea5ea3e
|
data/Rakefile
CHANGED
@@ -3,7 +3,6 @@ require_relative 'definition'
|
|
3
3
|
module Kafo
|
4
4
|
module AppOption
|
5
5
|
module Declaration
|
6
|
-
|
7
6
|
include Clamp::Option::Declaration
|
8
7
|
|
9
8
|
def app_option(switches, type, description, opts = {}, &block)
|
@@ -13,7 +12,6 @@ module Kafo
|
|
13
12
|
declared_options << option
|
14
13
|
end
|
15
14
|
end
|
16
|
-
|
17
15
|
end
|
18
16
|
end
|
19
17
|
end
|
@@ -1,7 +1,6 @@
|
|
1
1
|
module Kafo
|
2
2
|
module AppOption
|
3
3
|
class Definition < Clamp::Option::Definition
|
4
|
-
|
5
4
|
def initialize(switches, type, description, options = {})
|
6
5
|
@advanced = options.fetch(:advanced, false)
|
7
6
|
super(switches, type, description, options)
|
@@ -10,7 +9,6 @@ module Kafo
|
|
10
9
|
def advanced?
|
11
10
|
@advanced
|
12
11
|
end
|
13
|
-
|
14
12
|
end
|
15
13
|
end
|
16
14
|
end
|
data/lib/kafo/color_scheme.rb
CHANGED
@@ -7,7 +7,7 @@ module Kafo
|
|
7
7
|
::ENV['TERM'] && !`which tput 2> /dev/null`.empty? && `tput colors`.to_i > 0
|
8
8
|
end
|
9
9
|
|
10
|
-
def initialize(options={})
|
10
|
+
def initialize(options = {})
|
11
11
|
@background = options[:background].nil? ? :dark : options[:background]
|
12
12
|
@colors = options[:colors].nil? ? self.class.colors_possible? : options[:colors]
|
13
13
|
end
|
data/lib/kafo/configuration.rb
CHANGED
@@ -170,7 +170,7 @@ module Kafo
|
|
170
170
|
save_configuration(app)
|
171
171
|
end
|
172
172
|
|
173
|
-
def migrate_configuration(from_config, options={})
|
173
|
+
def migrate_configuration(from_config, options = {})
|
174
174
|
keys_to_skip = options.fetch(:skip, [])
|
175
175
|
keys = [:log_dir, :log_name, :log_level, :no_prefix,
|
176
176
|
:colors, :color_of_background, :custom, :verbose_log_level]
|
data/lib/kafo/kafo_configure.rb
CHANGED
@@ -365,9 +365,9 @@ module Kafo
|
|
365
365
|
params.sort.each do |param|
|
366
366
|
doc = param.doc.nil? ? 'UNDOCUMENTED' : param.doc.join("\n")
|
367
367
|
app_option parametrize(param), '', doc + " (current: #{param.value_to_s})",
|
368
|
-
|
368
|
+
:multivalued => param.multivalued?
|
369
369
|
app_option parametrize(param, 'reset-'), :flag,
|
370
|
-
|
370
|
+
"Reset #{param.name} to the default value (#{param.default_to_s})"
|
371
371
|
end
|
372
372
|
end
|
373
373
|
|
data/lib/kafo/param.rb
CHANGED
@@ -123,12 +123,12 @@ module Kafo
|
|
123
123
|
@type.multivalued?
|
124
124
|
end
|
125
125
|
|
126
|
-
def <=>
|
126
|
+
def <=>(other)
|
127
127
|
unless @module.configuration.app[:no_prefix]
|
128
|
-
r = self.module_name <=>
|
128
|
+
r = self.module_name <=> other.module_name
|
129
129
|
return r unless r == 0
|
130
130
|
end
|
131
|
-
self.name <=>
|
131
|
+
self.name <=> other.name
|
132
132
|
end
|
133
133
|
|
134
134
|
def visible?(context = [])
|
data/lib/kafo/puppet_module.rb
CHANGED
@@ -96,16 +96,16 @@ module Kafo
|
|
96
96
|
Hash[params.map { |param| [param.name, param.value] }]
|
97
97
|
end
|
98
98
|
|
99
|
-
def <=>
|
99
|
+
def <=>(other)
|
100
100
|
@configuration.app[:low_priority_modules].each do |module_name|
|
101
|
-
return 1 if self.name.include?(module_name) && !
|
102
|
-
return -1 if !self.name.include?(module_name) &&
|
103
|
-
if self.name.include?(module_name) &&
|
104
|
-
return self.name.sub(/.*#{module_name}/, '') <=>
|
101
|
+
return 1 if self.name.include?(module_name) && !other.name.include?(module_name)
|
102
|
+
return -1 if !self.name.include?(module_name) && other.name.include?(module_name)
|
103
|
+
if self.name.include?(module_name) && other.name.include?(module_name)
|
104
|
+
return self.name.sub(/.*#{module_name}/, '') <=> other.name.sub(/.*#{module_name}/, '')
|
105
105
|
end
|
106
106
|
end
|
107
107
|
|
108
|
-
self.name <=>
|
108
|
+
self.name <=> other.name
|
109
109
|
end
|
110
110
|
|
111
111
|
private
|
@@ -6,7 +6,7 @@ module Kafo
|
|
6
6
|
class ScenarioManager
|
7
7
|
attr_reader :config_dir, :last_scenario_link, :previous_scenario
|
8
8
|
|
9
|
-
def initialize(config, last_scenario_link_name='last_scenario.yaml')
|
9
|
+
def initialize(config, last_scenario_link_name = 'last_scenario.yaml')
|
10
10
|
@logger = Logger.new('scenario_manager')
|
11
11
|
@config_dir = File.file?(config) ? File.dirname(config) : config
|
12
12
|
@last_scenario_link = File.join(config_dir, last_scenario_link_name)
|
@@ -31,7 +31,7 @@ module Kafo
|
|
31
31
|
end
|
32
32
|
|
33
33
|
def list_available_scenarios
|
34
|
-
say ::HighLine.color("Available scenarios", :
|
34
|
+
say ::HighLine.color("Available scenarios", :info)
|
35
35
|
available_scenarios.each do |config_file, content|
|
36
36
|
scenario = File.basename(config_file, '.yaml')
|
37
37
|
use = (File.expand_path(config_file) == @previous_scenario ? 'INSTALLED' : "use: --scenario #{scenario}")
|
@@ -77,7 +77,7 @@ module Kafo
|
|
77
77
|
!!(defined?(CONFIG_DIR) && CONFIG_DIR)
|
78
78
|
end
|
79
79
|
|
80
|
-
def scenario_from_args(arg_name='--scenario|-S')
|
80
|
+
def scenario_from_args(arg_name = '--scenario|-S')
|
81
81
|
# try scenario provided in the args via -S or --scenario
|
82
82
|
ARGV.each_with_index do |arg, index|
|
83
83
|
parsed = arg.match(/^(#{arg_name})($|=(?<scenario>\S+))/)
|
@@ -111,7 +111,7 @@ module Kafo
|
|
111
111
|
end
|
112
112
|
|
113
113
|
def show_scenario_diff(prev_scenario, new_scenario)
|
114
|
-
say ::HighLine.color("Scenarios are being compared, that may take a while...", :
|
114
|
+
say ::HighLine.color("Scenarios are being compared, that may take a while...", :info)
|
115
115
|
prev_conf = load_and_setup_configuration(prev_scenario)
|
116
116
|
new_conf = load_and_setup_configuration(new_scenario)
|
117
117
|
print_scenario_diff(prev_conf, new_conf)
|
data/lib/kafo/store.rb
CHANGED
data/lib/kafo/string_helper.rb
CHANGED
data/lib/kafo/version.rb
CHANGED
data/lib/kafo/wizard.rb
CHANGED
@@ -68,7 +68,7 @@ END
|
|
68
68
|
|
69
69
|
def display_hash
|
70
70
|
data = Hash[@config.modules.map { |mod| [mod.name, mod.enabled? ? mod.params_hash : false] }]
|
71
|
-
say HighLine.color(YAML.dump(data), :
|
71
|
+
say HighLine.color(YAML.dump(data), :info)
|
72
72
|
end
|
73
73
|
|
74
74
|
def configure_module(mod)
|
@@ -79,7 +79,7 @@ END
|
|
79
79
|
menu.prompt = 'Choose an option from the menu... '
|
80
80
|
menu.select_by = :index
|
81
81
|
|
82
|
-
menu.choice("Enable/disable #{mod.name} module, current value: #{HighLine.color(mod.enabled?.to_s, :
|
82
|
+
menu.choice("Enable/disable #{mod.name} module, current value: #{HighLine.color(mod.enabled?.to_s, :info)}") { turn_module(mod) }
|
83
83
|
if mod.enabled?
|
84
84
|
render_params(mod.primary_parameter_group.params, menu)
|
85
85
|
|
@@ -114,7 +114,7 @@ END
|
|
114
114
|
def render_params(params, menu)
|
115
115
|
params.each do |param|
|
116
116
|
if param.visible?(@kafo.params)
|
117
|
-
menu.choice "Set #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :
|
117
|
+
menu.choice "Set #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :info)}" do
|
118
118
|
configure(param)
|
119
119
|
end
|
120
120
|
end
|
@@ -141,13 +141,13 @@ END
|
|
141
141
|
end
|
142
142
|
|
143
143
|
def configure_single(param)
|
144
|
-
say "\ncurrent value: #{HighLine.color(param.value_to_s, :
|
144
|
+
say "\ncurrent value: #{HighLine.color(param.value_to_s, :info)}"
|
145
145
|
ask("new value:")
|
146
146
|
end
|
147
147
|
|
148
148
|
def configure_multi(param)
|
149
|
-
say HighLine.color('every line is a separate value, blank line to quit, for hash use key:value syntax', :
|
150
|
-
say "\ncurrent value: #{HighLine.color(param.value_to_s, :
|
149
|
+
say HighLine.color('every line is a separate value, blank line to quit, for hash use key:value syntax', :info)
|
150
|
+
say "\ncurrent value: #{HighLine.color(param.value_to_s, :info)} %>"
|
151
151
|
ask("new value:") do |q|
|
152
152
|
q.gather = ""
|
153
153
|
end
|
@@ -164,7 +164,7 @@ END
|
|
164
164
|
say "\n" + HighLine.color("Resetting parameters of module #{mod.name}", :headline)
|
165
165
|
choose do |menu|
|
166
166
|
mod.params.each do |param|
|
167
|
-
menu.choice "Reset #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :
|
167
|
+
menu.choice "Reset #{HighLine.color(param.name, :important)}, current value: #{HighLine.color(param.value_to_s, :info)}, default value: #{HighLine.color(param.default_to_s, :info)}" do
|
168
168
|
reset(param)
|
169
169
|
end if param.visible?(@kafo.params)
|
170
170
|
end
|
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.2
|
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
|
+
date: 2020-12-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|