ehbrs-tools 0.20.0 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ehbrs/patches/object/template.rb +2 -2
- data/lib/ehbrs/runner/cooking_book/build.rb +20 -2
- data/lib/ehbrs/runner/fs/used_space.rb +1 -1
- data/lib/ehbrs/runner/videos/probe.rb +2 -2
- data/lib/ehbrs/tools/version.rb +1 -1
- data/lib/ehbrs/videos/convert_job.rb +1 -1
- data/lib/ehbrs/videos/series/rename/line_result.rb +1 -1
- data/lib/ehbrs/videos/unsupported/check_support.rb +2 -1
- data/lib/ehbrs/videos/unsupported/search.rb +1 -1
- data/lib/ehbrs/videos/unsupported/track.rb +1 -1
- data/vendor/aranha-selenium/lib/aranha/selenium/driver_factory/base.rb +8 -0
- data/vendor/aranha-selenium/lib/aranha/selenium/driver_factory/chrome.rb +10 -5
- data/vendor/aranha-selenium/lib/aranha/selenium/driver_factory/firefox.rb +25 -11
- data/vendor/aranha-selenium/lib/aranha/selenium/version.rb +1 -1
- data/vendor/eac_cli/eac_cli.gemspec +5 -2
- data/vendor/eac_cli/lib/eac_cli/default_runner.rb +1 -1
- data/vendor/eac_cli/lib/eac_cli/definition/base_option.rb +5 -1
- data/vendor/eac_cli/lib/eac_cli/definition/help_formatter.rb +2 -2
- data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder.rb +4 -2
- data/vendor/eac_cli/lib/eac_cli/docopt/doc_builder/alternative.rb +3 -3
- data/vendor/eac_cli/lib/eac_cli/docopt/runner_extension.rb +2 -2
- data/vendor/eac_cli/lib/eac_cli/docopt_runner.rb +43 -0
- data/vendor/eac_cli/lib/eac_cli/docopt_runner/_class_methods.rb +16 -0
- data/vendor/eac_cli/lib/eac_cli/docopt_runner/_doc.rb +23 -0
- data/vendor/eac_cli/lib/eac_cli/docopt_runner/_settings.rb +17 -0
- data/vendor/eac_cli/lib/eac_cli/docopt_runner/_subcommands.rb +152 -0
- data/vendor/eac_cli/lib/eac_cli/old_configs.rb +36 -0
- data/vendor/eac_cli/lib/eac_cli/old_configs/entry_reader.rb +80 -0
- data/vendor/eac_cli/lib/eac_cli/old_configs/password_entry_reader.rb +16 -0
- data/vendor/eac_cli/lib/eac_cli/old_configs/read_entry_options.rb +44 -0
- data/vendor/eac_cli/lib/eac_cli/old_configs/store_passwords_entry_reader.rb +25 -0
- data/vendor/eac_cli/lib/eac_cli/parser/alternative/short_options.rb +4 -2
- data/vendor/eac_cli/lib/eac_cli/patches/module.rb +4 -0
- data/vendor/eac_cli/lib/eac_cli/patches/module/speaker.rb +10 -0
- data/vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb +1 -1
- data/vendor/eac_cli/lib/eac_cli/runner/context.rb +2 -1
- data/vendor/eac_cli/lib/eac_cli/runner/instance_methods.rb +8 -1
- data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands.rb +5 -1
- data/vendor/eac_cli/lib/eac_cli/runner_with/subcommands/definition_concern.rb +10 -0
- data/vendor/eac_cli/lib/eac_cli/speaker.rb +131 -0
- data/vendor/eac_cli/lib/eac_cli/speaker/_class_methods.rb +37 -0
- data/vendor/eac_cli/lib/eac_cli/speaker/_constants.rb +12 -0
- data/vendor/eac_cli/lib/eac_cli/speaker/list.rb +61 -0
- data/vendor/eac_cli/lib/eac_cli/speaker/node.rb +24 -0
- data/vendor/eac_cli/lib/eac_cli/version.rb +1 -1
- data/vendor/eac_cli/spec/lib/eac_cli/docopt/runner_extension_spec.rb +1 -1
- data/vendor/{eac_ruby_utils/spec/lib/eac_ruby_utils/console → eac_cli/spec/lib/eac_cli}/docopt_runner_spec.rb +5 -5
- data/vendor/{eac_ruby_utils/spec/lib/eac_ruby_utils/console/configs_spec.rb → eac_cli/spec/lib/eac_cli/old_configs_spec.rb} +2 -2
- data/vendor/eac_cli/spec/lib/eac_cli/runner_spec.rb +1 -1
- data/vendor/{eac_ruby_utils/spec/lib/eac_ruby_utils/console → eac_cli/spec/lib/eac_cli}/speaker_spec.rb +2 -2
- data/vendor/eac_cli/spec/lib/module/speaker_spec.rb +13 -0
- data/vendor/eac_cli/spec/rubocop_spec.rb +1 -5
- data/vendor/eac_cli/spec/spec_helper.rb +3 -0
- data/vendor/eac_docker/eac_docker.gemspec +3 -2
- data/vendor/eac_docker/lib/eac_docker/images/templatized.rb +1 -0
- data/vendor/eac_docker/lib/eac_docker/version.rb +1 -1
- data/vendor/eac_docker/spec/lib/eac_docker/images/templatized_spec.rb +2 -1
- data/vendor/eac_docker/spec/rubocop_spec.rb +1 -5
- data/vendor/eac_docker/spec/spec_helper.rb +3 -0
- data/vendor/eac_ruby_base0/eac_ruby_base0.gemspec +4 -4
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/core_ext.rb +4 -0
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/jobs_runner.rb +2 -2
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner.rb +3 -5
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmation.rb +36 -0
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/input.rb +36 -0
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/output.rb +58 -0
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/version.rb +1 -1
- data/vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/confirmation_spec.rb +42 -0
- data/vendor/eac_ruby_base0/spec/lib/eac_ruby_base0/runner_with/output_spec.rb +81 -0
- data/vendor/eac_ruby_base0/spec/rubocop_spec.rb +1 -5
- data/vendor/eac_ruby_base0/spec/spec_helper.rb +3 -0
- data/vendor/eac_ruby_utils/eac_ruby_utils.gemspec +2 -3
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb +10 -5
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb +6 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/logs.rb +63 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/inflector.rb +9 -1
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/listable/list.rb +3 -2
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/kernel/nyi.rb +4 -2
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/common_concern.rb +0 -1
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/regexp/to_parser.rb +10 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/string/inflector.rb +4 -2
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/regexp_parser.rb +34 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec/conditional.rb +1 -4
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb +10 -29
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider/setting_value.rb +69 -0
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb +18 -5
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/settings_provider_spec.rb +8 -0
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/simple_cache_spec.rb +9 -0
- data/vendor/eac_ruby_utils/spec/rubocop_check_spec.rb +1 -5
- data/vendor/eac_ruby_utils/spec/spec_helper.rb +3 -0
- data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/videos/convert_job.rb +1 -1
- data/vendor/ehbrs_ruby_utils/lib/ehbrs_ruby_utils/web_utils/videos/files_list.rb +1 -1
- metadata +51 -58
- data/vendor/eac_cli/lib/eac_cli/runner_with/output_file.rb +0 -30
- data/vendor/eac_cli/spec/lib/eac_cli/runner_with/output_file_spec.rb +0 -53
- data/vendor/eac_ruby_base0/lib/eac_ruby_base0/runner_with/confirmable.rb +0 -21
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/configs.rb +0 -74
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/base.rb +0 -43
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/configs/file.rb +0 -47
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console.rb +0 -5
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs.rb +0 -38
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/entry_reader.rb +0 -81
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/password_entry_reader.rb +0 -18
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/read_entry_options.rb +0 -46
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/configs/store_passwords_entry_reader.rb +0 -27
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner.rb +0 -45
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_class_methods.rb +0 -18
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_doc.rb +0 -25
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_settings.rb +0 -19
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/docopt_runner/_subcommands.rb +0 -154
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/speaker.rb +0 -133
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_class_methods.rb +0 -39
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/_constants.rb +0 -14
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/list.rb +0 -63
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/console/speaker/node.rb +0 -26
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/console_speaker.rb +0 -10
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/module/template.rb +0 -10
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb +0 -9
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb +0 -56
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/entry_key_error.rb +0 -8
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/node.rb +0 -67
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash/path_search.rb +0 -39
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates.rb +0 -9
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/directory.rb +0 -110
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/file.rb +0 -50
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/searcher.rb +0 -55
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_not_found_error.rb +0 -7
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers.rb +0 -25
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/base.rb +0 -23
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/entries_reader.rb +0 -25
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/generic.rb +0 -25
- data/vendor/eac_ruby_utils/lib/eac_ruby_utils/templates/variable_providers/hash.rb +0 -29
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/configs_spec.rb +0 -46
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/module/console_speaker_spec.rb +0 -13
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/object/template_spec.rb +0 -23
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/paths_hash_spec.rb +0 -88
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec.rb +0 -35
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/expected_content +0 -2
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/file_spec_files/source.template +0 -2
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec.rb +0 -30
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file1.template +0 -1
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path1/subdir1/file2 +0 -1
- data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/templates/searcher_spec_files/path2/subdir1/file3.template +0 -1
@@ -0,0 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module EacCli
|
4
|
+
class DocoptRunner
|
5
|
+
DOCOPT_ERROR_EXIT_CODE = 0xC0
|
6
|
+
|
7
|
+
class << self
|
8
|
+
def run(options = {})
|
9
|
+
create(options).send(:run)
|
10
|
+
rescue Docopt::Exit => e
|
11
|
+
STDERR.write(e.message + "\n")
|
12
|
+
::Kernel.exit(DOCOPT_ERROR_EXIT_CODE)
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module EacCli
|
4
|
+
class DocoptRunner
|
5
|
+
PROGRAM_MACRO = '__PROGRAM__'
|
6
|
+
|
7
|
+
def source_doc
|
8
|
+
setting_value(:doc)
|
9
|
+
end
|
10
|
+
|
11
|
+
def target_doc
|
12
|
+
source_doc.gsub(PROGRAM_MACRO, target_program_name).strip + "\n"
|
13
|
+
end
|
14
|
+
|
15
|
+
def source_program_name
|
16
|
+
setting_value(:program_name, false)
|
17
|
+
end
|
18
|
+
|
19
|
+
def target_program_name
|
20
|
+
[source_program_name, ENV['PROGRAM_NAME'], $PROGRAM_NAME].find(&:present?)
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/settings_provider'
|
4
|
+
|
5
|
+
module EacCli
|
6
|
+
class DocoptRunner
|
7
|
+
include ::EacRubyUtils::SettingsProvider
|
8
|
+
|
9
|
+
attr_reader :settings
|
10
|
+
|
11
|
+
private
|
12
|
+
|
13
|
+
def setting_value(key, required = true)
|
14
|
+
super(key, required: required, order: %w[method settings_object constant])
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,152 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'active_support/core_ext/string/inflections'
|
4
|
+
require 'shellwords'
|
5
|
+
|
6
|
+
module EacCli
|
7
|
+
class DocoptRunner
|
8
|
+
SUBCOMMAND_ARG = '<subcommand>'
|
9
|
+
SUBCOMMAND_ARGS_ARG = '<subcommand-args>'
|
10
|
+
SUBCOMMANDS_MACRO = '__SUBCOMMANDS__'
|
11
|
+
|
12
|
+
def subcommands?
|
13
|
+
source_doc.include?(SUBCOMMANDS_MACRO)
|
14
|
+
end
|
15
|
+
|
16
|
+
def check_subcommands
|
17
|
+
return unless subcommands?
|
18
|
+
|
19
|
+
singleton_class.include(SubcommandsSupport)
|
20
|
+
check_subcommands_arg
|
21
|
+
return if singleton_class.method_defined?(:run)
|
22
|
+
|
23
|
+
singleton_class.send(:alias_method, :run, :run_with_subcommand)
|
24
|
+
end
|
25
|
+
|
26
|
+
module SubcommandsSupport
|
27
|
+
EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME = :extra_available_subcommands
|
28
|
+
|
29
|
+
def check_subcommands_arg
|
30
|
+
if subcommand_arg_as_list?
|
31
|
+
singleton_class.include(SubcommandsSupport::SubcommandArgAsList)
|
32
|
+
else
|
33
|
+
singleton_class.include(SubcommandsSupport::SubcommandArgAsArg)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def run_with_subcommand
|
38
|
+
if subcommand_name
|
39
|
+
check_valid_subcommand
|
40
|
+
subcommand_run
|
41
|
+
else
|
42
|
+
run_without_subcommand
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
def subcommand
|
47
|
+
@subcommand ||= subcommand_class_name(subcommand_name).constantize.create(
|
48
|
+
argv: subcommand_args,
|
49
|
+
program_name: subcommand_program,
|
50
|
+
parent: self
|
51
|
+
)
|
52
|
+
end
|
53
|
+
|
54
|
+
def subcommand_run
|
55
|
+
if !subcommand.is_a?(::EacCli::DocoptRunner) &&
|
56
|
+
subcommand.respond_to?(:run_run)
|
57
|
+
subcommand.run_run
|
58
|
+
else
|
59
|
+
subcommand.run
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
63
|
+
def target_doc
|
64
|
+
super.gsub(SUBCOMMANDS_MACRO,
|
65
|
+
"#{target_doc_subcommand_arg} [#{SUBCOMMAND_ARGS_ARG}...]") +
|
66
|
+
"\n" + subcommands_target_doc
|
67
|
+
end
|
68
|
+
|
69
|
+
def docopt_options
|
70
|
+
super.merge(options_first: true)
|
71
|
+
end
|
72
|
+
|
73
|
+
def subcommand_class_name(subcommand)
|
74
|
+
"#{self.class.name}::#{subcommand.underscore.camelize}"
|
75
|
+
end
|
76
|
+
|
77
|
+
def subcommand_arg_as_list?
|
78
|
+
setting_value(:subcommand_arg_as_list, false) || false
|
79
|
+
end
|
80
|
+
|
81
|
+
def subcommand_args
|
82
|
+
options.fetch(SUBCOMMAND_ARGS_ARG)
|
83
|
+
end
|
84
|
+
|
85
|
+
def subcommand_program
|
86
|
+
subcommand_name
|
87
|
+
end
|
88
|
+
|
89
|
+
def available_subcommands
|
90
|
+
r = ::Set.new(setting_value(:subcommands, false) || auto_available_subcommands)
|
91
|
+
if respond_to?(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME, true)
|
92
|
+
r += send(EXTRA_AVAILABLE_SUBCOMMANDS_METHOD_NAME)
|
93
|
+
end
|
94
|
+
r.sort
|
95
|
+
end
|
96
|
+
|
97
|
+
def auto_available_subcommands
|
98
|
+
self.class.constants
|
99
|
+
.map { |name| self.class.const_get(name) }
|
100
|
+
.select { |c| c.instance_of? Class }
|
101
|
+
.select { |c| c < ::EacCli::DocoptRunner }
|
102
|
+
.map { |c| c.name.demodulize.underscore.dasherize }
|
103
|
+
end
|
104
|
+
|
105
|
+
def run_without_subcommand
|
106
|
+
"Method #{__method__} should be overrided in #{self.class.name}"
|
107
|
+
end
|
108
|
+
|
109
|
+
protected
|
110
|
+
|
111
|
+
def check_valid_subcommand
|
112
|
+
return if available_subcommands.include?(subcommand_name)
|
113
|
+
|
114
|
+
raise ::Docopt::Exit, "\"#{subcommand_name}\" is not a valid subcommand" \
|
115
|
+
" (Valid: #{available_subcommands.join(', ')})"
|
116
|
+
end
|
117
|
+
|
118
|
+
module SubcommandArgAsArg
|
119
|
+
def target_doc_subcommand_arg
|
120
|
+
SUBCOMMAND_ARG
|
121
|
+
end
|
122
|
+
|
123
|
+
def subcommand_name
|
124
|
+
options.fetch(SUBCOMMAND_ARG)
|
125
|
+
end
|
126
|
+
|
127
|
+
def subcommands_target_doc
|
128
|
+
available_subcommands.inject("Subcommands:\n") do |a, e|
|
129
|
+
a + " #{e}\n"
|
130
|
+
end
|
131
|
+
end
|
132
|
+
end
|
133
|
+
|
134
|
+
module SubcommandArgAsList
|
135
|
+
def target_doc_subcommand_arg
|
136
|
+
'(' + available_subcommands.join('|') + ')'
|
137
|
+
end
|
138
|
+
|
139
|
+
def subcommand_name
|
140
|
+
available_subcommands.each do |subcommand|
|
141
|
+
return subcommand if options.fetch(subcommand)
|
142
|
+
end
|
143
|
+
nil
|
144
|
+
end
|
145
|
+
|
146
|
+
def subcommands_target_doc
|
147
|
+
"\n"
|
148
|
+
end
|
149
|
+
end
|
150
|
+
end
|
151
|
+
end
|
152
|
+
end
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
require 'eac_cli/patches/module/speaker'
|
5
|
+
|
6
|
+
module EacCli
|
7
|
+
class OldConfigs
|
8
|
+
require_sub __FILE__
|
9
|
+
enable_speaker
|
10
|
+
|
11
|
+
class << self
|
12
|
+
def entry_key_to_envvar_name(entry_key)
|
13
|
+
::EacCli::OldConfigs::EntryReader.entry_key_to_envvar_name(entry_key)
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
attr_reader :configs
|
18
|
+
|
19
|
+
def initialize(configs_key, options = {})
|
20
|
+
options.assert_argument(::Hash, 'options')
|
21
|
+
@configs = ::EacConfig::OldConfigs.new(configs_key, options.merge(autosave: true))
|
22
|
+
end
|
23
|
+
|
24
|
+
def read_password(entry_key, options = {})
|
25
|
+
::EacCli::OldConfigs::PasswordEntryReader.new(self, entry_key, options).read
|
26
|
+
end
|
27
|
+
|
28
|
+
def read_entry(entry_key, options = {})
|
29
|
+
::EacCli::OldConfigs::EntryReader.new(self, entry_key, options).read
|
30
|
+
end
|
31
|
+
|
32
|
+
def store_passwords?
|
33
|
+
::EacCli::OldConfigs::StorePasswordsEntryReader.new(self) == 'yes'
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
@@ -0,0 +1,80 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_cli/old_configs/read_entry_options'
|
4
|
+
require 'eac_config/paths_hash'
|
5
|
+
require 'eac_ruby_utils/core_ext'
|
6
|
+
|
7
|
+
module EacCli
|
8
|
+
class OldConfigs
|
9
|
+
class EntryReader
|
10
|
+
enable_speaker
|
11
|
+
|
12
|
+
class << self
|
13
|
+
def entry_key_to_envvar_name(entry_key)
|
14
|
+
path = if entry_key.is_a?(::Array)
|
15
|
+
entry_key
|
16
|
+
else
|
17
|
+
::EacConfig::PathsHash.parse_entry_key(entry_key)
|
18
|
+
end
|
19
|
+
path.join('_').gsub(/[^a-z0-9_]/i, '').gsub(/\A_+/, '').gsub(/_+\z/, '')
|
20
|
+
.gsub(/_{2,}/, '_').upcase
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
common_constructor :console_configs, :entry_key, :options do
|
25
|
+
self.options = ::EacCli::OldConfigs::ReadEntryOptions.new(options)
|
26
|
+
end
|
27
|
+
|
28
|
+
def read
|
29
|
+
%w[envvars storage console].each do |suffix|
|
30
|
+
value = send("read_from_#{suffix}")
|
31
|
+
return value if value.present?
|
32
|
+
end
|
33
|
+
return nil unless options[:required]
|
34
|
+
|
35
|
+
raise "No value found for entry \"#{entry_key}\""
|
36
|
+
end
|
37
|
+
|
38
|
+
def read_from_storage
|
39
|
+
console_configs.configs.read_entry(entry_key)
|
40
|
+
end
|
41
|
+
|
42
|
+
def read_from_envvars
|
43
|
+
return if options[:noenv]
|
44
|
+
|
45
|
+
env_entry_key = self.class.entry_key_to_envvar_name(entry_key)
|
46
|
+
return unless ENV.key?(env_entry_key)
|
47
|
+
|
48
|
+
ENV.fetch(env_entry_key).if_present(::EacRubyUtils::BlankNotBlank.instance)
|
49
|
+
end
|
50
|
+
|
51
|
+
def read_from_console
|
52
|
+
return if options[:noinput]
|
53
|
+
|
54
|
+
options[:before_input].if_present(&:call)
|
55
|
+
entry_value = looped_entry_value_from_input
|
56
|
+
console_configs.configs.write_entry(entry_key, entry_value) if options[:store]
|
57
|
+
entry_value
|
58
|
+
end
|
59
|
+
|
60
|
+
private
|
61
|
+
|
62
|
+
def looped_entry_value_from_input
|
63
|
+
loop do
|
64
|
+
entry_value = entry_value_from_input(entry_key, options)
|
65
|
+
next if entry_value.blank?
|
66
|
+
next if options[:validator] && !options[:validator].call(entry_value)
|
67
|
+
|
68
|
+
return entry_value
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
def entry_value_from_input(entry_key, options)
|
73
|
+
entry_value = request_input("Value for entry \"#{entry_key}\"",
|
74
|
+
options.request_input_options)
|
75
|
+
warn('Entered value is blank') if entry_value.blank?
|
76
|
+
entry_value
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
@@ -0,0 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_cli/old_configs/entry_reader'
|
4
|
+
|
5
|
+
module EacCli
|
6
|
+
class OldConfigs
|
7
|
+
class PasswordEntryReader < ::EacCli::OldConfigs::EntryReader
|
8
|
+
ENTRY_KEY = 'core.store_passwords'
|
9
|
+
|
10
|
+
def initialize(console_configs, entry_key, options = {})
|
11
|
+
super(console_configs, entry_key, options.merge(noecho: true,
|
12
|
+
store: console_configs.store_passwords?))
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
|
5
|
+
module EacCli
|
6
|
+
class OldConfigs
|
7
|
+
class ReadEntryOptions
|
8
|
+
enable_simple_cache
|
9
|
+
common_constructor :options do
|
10
|
+
self.options = options.to_h.symbolize_keys
|
11
|
+
.assert_valid_keys(DEFAULT_VALUES.keys).freeze
|
12
|
+
end
|
13
|
+
|
14
|
+
DEFAULT_VALUES = {
|
15
|
+
before_input: nil, bool: false, list: false, noecho: false, noenv: false, noinput: false,
|
16
|
+
required: true, store: true, validator: nil
|
17
|
+
}.freeze
|
18
|
+
|
19
|
+
delegate :to_h, to: :options
|
20
|
+
|
21
|
+
def [](key)
|
22
|
+
values.fetch(key.to_sym)
|
23
|
+
end
|
24
|
+
|
25
|
+
def request_input_options
|
26
|
+
values.slice(:bool, :list, :noecho)
|
27
|
+
end
|
28
|
+
|
29
|
+
private
|
30
|
+
|
31
|
+
def values_uncached
|
32
|
+
consumer = options.to_options_consumer
|
33
|
+
r = {}
|
34
|
+
DEFAULT_VALUES.each do |key, default_value|
|
35
|
+
value = consumer.consume(key)
|
36
|
+
value = default_value if value.nil?
|
37
|
+
r[key] = value
|
38
|
+
end
|
39
|
+
consumer.validate
|
40
|
+
r
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_cli/old_configs/entry_reader'
|
4
|
+
|
5
|
+
module EacCli
|
6
|
+
class OldConfigs
|
7
|
+
class StorePasswordsEntryReader < ::EacCli::OldConfigs::EntryReader
|
8
|
+
ENTRY_KEY = 'core.store_passwords'
|
9
|
+
|
10
|
+
def initialize(console_configs)
|
11
|
+
super(console_configs, ENTRY_KEY,
|
12
|
+
before_input: -> { banner },
|
13
|
+
validator: ->(entry_value) { %w[yes no].include?(entry_value) }
|
14
|
+
)
|
15
|
+
end
|
16
|
+
|
17
|
+
def banner
|
18
|
+
infom 'Do you wanna to store passwords?'
|
19
|
+
infom 'Warning: the passwords will be store in clear text in ' \
|
20
|
+
"\"#{console_configs.configs.storage_path}\""
|
21
|
+
infom 'Enter "yes" or "no"'
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
@@ -14,7 +14,9 @@ module EacCli
|
|
14
14
|
end
|
15
15
|
|
16
16
|
def find_short_option(char)
|
17
|
-
alternative.options.find
|
17
|
+
alternative.options.find do |option|
|
18
|
+
short_without_prefix(option.short).if_present(false) { |v| v == char }
|
19
|
+
end
|
18
20
|
end
|
19
21
|
|
20
22
|
def short_option_collect_argv_value
|
@@ -37,7 +39,7 @@ module EacCli
|
|
37
39
|
end
|
38
40
|
|
39
41
|
def short_without_prefix(short)
|
40
|
-
short.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
|
42
|
+
short.to_s.gsub(/\A#{::Regexp.quote(SHORT_OPTION_PREFIX)}/, '')
|
41
43
|
end
|
42
44
|
end
|
43
45
|
end
|