eac_cli 0.11.1 → 0.12.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/eac_cli/definition.rb +34 -39
- data/lib/eac_cli/definition/alternative.rb +83 -0
- data/lib/eac_cli/docopt/doc_builder.rb +18 -40
- data/lib/eac_cli/docopt/doc_builder/alternative.rb +50 -0
- data/lib/eac_cli/parser.rb +21 -3
- data/lib/eac_cli/parser/alternative.rb +88 -0
- data/lib/eac_cli/parser/alternative/argv.rb +17 -0
- data/lib/eac_cli/parser/alternative/double_dash.rb +24 -0
- data/lib/eac_cli/parser/alternative/options.rb +58 -0
- data/lib/eac_cli/parser/alternative/positionals.rb +30 -0
- data/lib/eac_cli/runner.rb +1 -1
- data/lib/eac_cli/runner_with/help.rb +1 -1
- data/lib/eac_cli/version.rb +1 -1
- metadata +9 -5
- data/lib/eac_cli/parser/options_collection.rb +0 -68
- data/lib/eac_cli/parser/parse_result.rb +0 -38
- data/lib/eac_cli/parser/positional_collection.rb +0 -77
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 22f7790dfca37c3414a3552155806d47808bdee4b6eb6630a07b2eb8b928db59
|
4
|
+
data.tar.gz: 8b6826e7f1f7d4980516ad8d53d2b681890b326f513df49f6394c3f2115f3b64
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 61d6bf83f3e147b7fd9761f6369347c91c208599eacf7ca0a5762e671e86a7eea30758b6101c639a4775acb376988e0ecd3d8dd31d1950fcebeaabc1b8275360
|
7
|
+
data.tar.gz: 66777c73453633a5af6fe8048818d7e07428dd958676b2d9a1cdc800c286910a73140e3a0526cb0ef5e87102a227be0873fcd14146405c33b73e644351e0070f
|
data/lib/eac_cli/definition.rb
CHANGED
@@ -9,36 +9,30 @@ module EacCli
|
|
9
9
|
class Definition
|
10
10
|
require_sub __FILE__
|
11
11
|
|
12
|
+
MAIN_ALTERNATIVE_KEY = :main
|
12
13
|
SUBCOMMAND_NAME_ARG = 'subcommand'
|
13
14
|
SUBCOMMAND_ARGS_ARG = 'subcommand_args'
|
14
15
|
|
15
16
|
attr_accessor :description
|
16
|
-
attr_accessor :options_argument
|
17
17
|
|
18
18
|
def initialize
|
19
19
|
self.description = '-- NO DESCRIPTION SET --'
|
20
|
-
|
20
|
+
alternatives_set[MAIN_ALTERNATIVE_KEY] = main_alternative
|
21
21
|
end
|
22
22
|
|
23
23
|
def alt(&block)
|
24
|
-
r = ::EacCli::Definition.new
|
24
|
+
r = ::EacCli::Definition::Alternative.new
|
25
25
|
r.instance_eval(&block)
|
26
|
-
|
26
|
+
alternatives_set[new_alternative_key] = r
|
27
27
|
r
|
28
28
|
end
|
29
29
|
|
30
30
|
def alternatives
|
31
|
-
|
31
|
+
alternatives_set.values
|
32
32
|
end
|
33
33
|
|
34
|
-
def
|
35
|
-
|
36
|
-
short, long, description, option_options
|
37
|
-
)
|
38
|
-
end
|
39
|
-
|
40
|
-
def bool_opt(short, long, description, option_options = {})
|
41
|
-
options << ::EacCli::Definition::BooleanOption.new(short, long, description, option_options)
|
34
|
+
def alternative(key)
|
35
|
+
alternatives_set.fetch(key)
|
42
36
|
end
|
43
37
|
|
44
38
|
def desc(description)
|
@@ -49,42 +43,31 @@ module EacCli
|
|
49
43
|
@help_formatter ||= ::EacCli::Definition::HelpFormatter.new(self)
|
50
44
|
end
|
51
45
|
|
52
|
-
def
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
46
|
+
def main_alternative
|
47
|
+
@main_alternative ||= begin
|
48
|
+
r = ::EacCli::Definition::Alternative.new
|
49
|
+
r.options_argument(true)
|
50
|
+
r
|
51
|
+
end
|
58
52
|
end
|
59
53
|
|
60
|
-
def
|
61
|
-
|
62
|
-
raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
|
63
|
-
|
64
|
-
pos_set << new_pos_arg
|
54
|
+
def options_arg(options_argument)
|
55
|
+
self.options_argument = options_argument
|
65
56
|
end
|
66
57
|
|
67
|
-
def
|
68
|
-
|
58
|
+
def options_argument
|
59
|
+
main_alternative.options_argument?
|
69
60
|
end
|
70
61
|
|
71
|
-
def
|
72
|
-
|
73
|
-
return false unless last
|
74
|
-
return true if last.repeat?
|
75
|
-
return true if last.optional? && new_pos_arg.required?
|
76
|
-
|
77
|
-
false
|
62
|
+
def options_argument=(enable)
|
63
|
+
main_alternative.options_argument(enable)
|
78
64
|
end
|
79
65
|
|
80
|
-
|
81
|
-
|
82
|
-
pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
|
83
|
-
optional: true, repeat: true)
|
84
|
-
end
|
66
|
+
delegate :arg_opt, :bool_opt, :options, :pos_arg,
|
67
|
+
:positional, :subcommands, to: :main_alternative
|
85
68
|
|
86
69
|
def subcommands?
|
87
|
-
|
70
|
+
alternatives.any?(&:subcommands?)
|
88
71
|
end
|
89
72
|
|
90
73
|
def options_first(enable = true)
|
@@ -97,6 +80,18 @@ module EacCli
|
|
97
80
|
|
98
81
|
private
|
99
82
|
|
83
|
+
def alternatives_set
|
84
|
+
@alternatives_set ||= ::ActiveSupport::HashWithIndifferentAccess.new
|
85
|
+
end
|
86
|
+
|
87
|
+
def new_alternative_key
|
88
|
+
@last_key ||= 0
|
89
|
+
loop do
|
90
|
+
@last_key += 1
|
91
|
+
break @last_key unless alternatives_set.key?(@last_key)
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
100
95
|
def pos_set
|
101
96
|
@pos_set ||= []
|
102
97
|
end
|
@@ -0,0 +1,83 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_cli/definition/argument_option'
|
4
|
+
require 'eac_cli/definition/boolean_option'
|
5
|
+
require 'eac_cli/definition/positional_argument'
|
6
|
+
|
7
|
+
module EacCli
|
8
|
+
class Definition
|
9
|
+
class Alternative
|
10
|
+
SUBCOMMAND_NAME_ARG = :subcommand
|
11
|
+
SUBCOMMAND_ARGS_ARG = :subcommand_args
|
12
|
+
|
13
|
+
def arg_opt(short, long, description, option_options = {})
|
14
|
+
options_set << ::EacCli::Definition::ArgumentOption.new(
|
15
|
+
short, long, description, option_options
|
16
|
+
)
|
17
|
+
end
|
18
|
+
|
19
|
+
def bool_opt(short, long, description, option_options = {})
|
20
|
+
options_set << ::EacCli::Definition::BooleanOption.new(short, long, description,
|
21
|
+
option_options)
|
22
|
+
end
|
23
|
+
|
24
|
+
def options
|
25
|
+
options_set.to_a
|
26
|
+
end
|
27
|
+
|
28
|
+
def options_argument?
|
29
|
+
@options_argument ? true : false
|
30
|
+
end
|
31
|
+
|
32
|
+
def options_argument(enable)
|
33
|
+
@options_argument = enable
|
34
|
+
|
35
|
+
self
|
36
|
+
end
|
37
|
+
|
38
|
+
def pos_arg(name, arg_options = {})
|
39
|
+
new_pos_arg = ::EacCli::Definition::PositionalArgument.new(name, arg_options)
|
40
|
+
check_positional_blocked(new_pos_arg)
|
41
|
+
pos_set << new_pos_arg
|
42
|
+
end
|
43
|
+
|
44
|
+
def positional
|
45
|
+
pos_set.to_a
|
46
|
+
end
|
47
|
+
|
48
|
+
def positional_arguments_blocked?(new_pos_arg)
|
49
|
+
last = pos_set.last
|
50
|
+
return false unless last
|
51
|
+
return true if subcommands?
|
52
|
+
return true if last.repeat?
|
53
|
+
return true if last.optional? && new_pos_arg.if_present(&:required?)
|
54
|
+
|
55
|
+
false
|
56
|
+
end
|
57
|
+
|
58
|
+
def subcommands
|
59
|
+
pos_arg(SUBCOMMAND_NAME_ARG, subcommand: true)
|
60
|
+
pos_set << ::EacCli::Definition::PositionalArgument.new(SUBCOMMAND_ARGS_ARG,
|
61
|
+
optional: true, repeat: true)
|
62
|
+
end
|
63
|
+
|
64
|
+
def subcommands?
|
65
|
+
pos_set.any?(&:subcommand?)
|
66
|
+
end
|
67
|
+
|
68
|
+
private
|
69
|
+
|
70
|
+
def check_positional_blocked(new_pos_arg)
|
71
|
+
raise 'Positional arguments are blocked' if positional_arguments_blocked?(new_pos_arg)
|
72
|
+
end
|
73
|
+
|
74
|
+
def pos_set
|
75
|
+
@pos_set ||= []
|
76
|
+
end
|
77
|
+
|
78
|
+
def options_set
|
79
|
+
@options_set ||= []
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
@@ -6,71 +6,49 @@ require 'eac_ruby_utils/console/docopt_runner'
|
|
6
6
|
module EacCli
|
7
7
|
module Docopt
|
8
8
|
class DocBuilder
|
9
|
+
require_sub __FILE__
|
9
10
|
common_constructor :definition
|
10
11
|
|
11
12
|
SEP = ' '
|
12
13
|
IDENT = SEP * 2
|
13
14
|
OPTION_DESC_SEP = IDENT * 2
|
14
15
|
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
r += '...' if positional.repeat?
|
21
|
-
r = "[#{r}]" if positional.optional?
|
22
|
-
r
|
16
|
+
class << self
|
17
|
+
def option_long(option)
|
18
|
+
b = option.long
|
19
|
+
b += '=<value>' if option.argument?
|
20
|
+
b
|
23
21
|
end
|
24
22
|
end
|
25
23
|
|
26
|
-
def option_argument(option)
|
27
|
-
option_long(option)
|
28
|
-
end
|
29
|
-
|
30
24
|
def option_definition(option)
|
31
|
-
option.short + SEP + option_long(option) + OPTION_DESC_SEP + option.description
|
32
|
-
end
|
33
|
-
|
34
|
-
def option_long(option)
|
35
|
-
b = option.long
|
36
|
-
b += '=<value>' if option.argument?
|
37
|
-
b
|
25
|
+
option.short + SEP + self.class.option_long(option) + OPTION_DESC_SEP + option.description
|
38
26
|
end
|
39
27
|
|
40
28
|
def section(header, include_header = true)
|
41
29
|
b = include_header ? "#{header.humanize}:\n" : ''
|
42
30
|
b += send("self_#{header}") + "\n"
|
43
31
|
definition.alternatives.each do |alternative|
|
44
|
-
b +=
|
32
|
+
b += IDENT + ::EacCli::Docopt::DocBuilder::Alternative.new(alternative).to_s + "\n"
|
45
33
|
end
|
46
34
|
b
|
47
35
|
end
|
48
36
|
|
49
|
-
def
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
def self_usage
|
54
|
-
IDENT + self_usage_arguments.join(SEP)
|
55
|
-
end
|
56
|
-
|
57
|
-
def self_usage_arguments
|
58
|
-
[::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
|
59
|
-
definition.options_argument.if_present([]) { |_v| ['[options]'] } +
|
60
|
-
self_usage_arguments_options +
|
61
|
-
self_usage_arguments_positional
|
62
|
-
end
|
63
|
-
|
64
|
-
def self_usage_arguments_options
|
65
|
-
definition.options.select(&:show_on_usage?).map { |option| option_argument(option) }
|
37
|
+
def options_section
|
38
|
+
"Options:\n" +
|
39
|
+
definition.alternatives.flat_map(&:options)
|
40
|
+
.map { |option| IDENT + option_definition(option) + "\n" }.join
|
66
41
|
end
|
67
42
|
|
68
|
-
def
|
69
|
-
|
43
|
+
def usage_section
|
44
|
+
"Usage:\n" +
|
45
|
+
definition.alternatives.map do |alternative|
|
46
|
+
IDENT + ::EacCli::Docopt::DocBuilder::Alternative.new(alternative).to_s + "\n"
|
47
|
+
end.join
|
70
48
|
end
|
71
49
|
|
72
50
|
def to_s
|
73
|
-
"#{definition.description}\n\n#{
|
51
|
+
"#{definition.description}\n\n#{usage_section}\n#{options_section}\n"
|
74
52
|
end
|
75
53
|
end
|
76
54
|
end
|
@@ -0,0 +1,50 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
require 'eac_ruby_utils/console/docopt_runner'
|
5
|
+
|
6
|
+
module EacCli
|
7
|
+
module Docopt
|
8
|
+
class DocBuilder
|
9
|
+
class Alternative
|
10
|
+
common_constructor :alternative
|
11
|
+
|
12
|
+
def to_s
|
13
|
+
(
|
14
|
+
[::EacRubyUtils::Console::DocoptRunner::PROGRAM_MACRO] +
|
15
|
+
alternative.options_argument?.if_present([]) { |_v| ['[options]'] } +
|
16
|
+
options +
|
17
|
+
positionals
|
18
|
+
).join(::EacCli::Docopt::DocBuilder::SEP)
|
19
|
+
end
|
20
|
+
|
21
|
+
def options
|
22
|
+
alternative.options.select(&:show_on_usage?).map do |option|
|
23
|
+
::EacCli::Docopt::DocBuilder.option_long(option)
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
def option_argument(option)
|
28
|
+
b = option.long
|
29
|
+
b += '=<value>' if option.argument?
|
30
|
+
b
|
31
|
+
end
|
32
|
+
|
33
|
+
def positionals
|
34
|
+
alternative.positional.map { |p| positional(p) }
|
35
|
+
end
|
36
|
+
|
37
|
+
def positional(positional)
|
38
|
+
if positional.subcommand?
|
39
|
+
::EacRubyUtils::Console::DocoptRunner::SUBCOMMANDS_MACRO
|
40
|
+
else
|
41
|
+
r = "<#{positional.name}>"
|
42
|
+
r += '...' if positional.repeat?
|
43
|
+
r = "[#{r}]" if positional.optional?
|
44
|
+
r
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
data/lib/eac_cli/parser.rb
CHANGED
@@ -5,10 +5,28 @@ require 'eac_ruby_utils/core_ext'
|
|
5
5
|
module EacCli
|
6
6
|
class Parser
|
7
7
|
require_sub __FILE__
|
8
|
-
|
8
|
+
enable_simple_cache
|
9
|
+
common_constructor :definition, :argv
|
9
10
|
|
10
|
-
|
11
|
-
|
11
|
+
private
|
12
|
+
|
13
|
+
def parsed_uncached
|
14
|
+
raise 'Definition has no alternatives' if alternatives.empty?
|
15
|
+
|
16
|
+
alternatives.each do |alt_parser|
|
17
|
+
return alt_parser.parsed unless alt_parser.error?
|
18
|
+
end
|
19
|
+
|
20
|
+
raise first_error
|
21
|
+
end
|
22
|
+
|
23
|
+
def alternatives_uncached
|
24
|
+
definition.alternatives
|
25
|
+
.map { |alternative| ::EacCli::Parser::Alternative.new(alternative, argv) }
|
26
|
+
end
|
27
|
+
|
28
|
+
def first_error_uncached
|
29
|
+
alternatives.lazy.select(&:error?).map(&:error).first
|
12
30
|
end
|
13
31
|
end
|
14
32
|
end
|
@@ -0,0 +1,88 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_cli/parser/collector'
|
4
|
+
require 'eac_cli/parser/error'
|
5
|
+
require 'eac_ruby_utils/core_ext'
|
6
|
+
|
7
|
+
module EacCli
|
8
|
+
class Parser
|
9
|
+
class Alternative
|
10
|
+
require_sub __FILE__, include_modules: true
|
11
|
+
enable_listable
|
12
|
+
lists.add_symbol :phase, :any, :option_argument, :positional
|
13
|
+
attr_reader :error
|
14
|
+
|
15
|
+
common_constructor :alternative, :argv do
|
16
|
+
alternative.assert_argument(::EacCli::Definition::Alternative, :alternative)
|
17
|
+
self.phase = PHASE_ANY
|
18
|
+
collect
|
19
|
+
end
|
20
|
+
|
21
|
+
def error?
|
22
|
+
error.present?
|
23
|
+
end
|
24
|
+
|
25
|
+
def parsed
|
26
|
+
@parsed ||= collector.to_data.freeze
|
27
|
+
end
|
28
|
+
|
29
|
+
private
|
30
|
+
|
31
|
+
attr_accessor :phase
|
32
|
+
|
33
|
+
def any_collect_argv_value
|
34
|
+
if argv_current_option?
|
35
|
+
option_collect_argv_value
|
36
|
+
else
|
37
|
+
positional_collect_argv_value
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
def collector
|
42
|
+
@collector ||= ::EacCli::Parser::Collector.new(alternative)
|
43
|
+
end
|
44
|
+
|
45
|
+
def collect
|
46
|
+
loop do
|
47
|
+
break unless argv_pending?
|
48
|
+
|
49
|
+
collect_argv_value
|
50
|
+
end
|
51
|
+
validate
|
52
|
+
rescue ::EacCli::Parser::Error => e
|
53
|
+
@error = e
|
54
|
+
end
|
55
|
+
|
56
|
+
def collect_argv_value
|
57
|
+
send("#{phase}_collect_argv_value")
|
58
|
+
argv_enum.next
|
59
|
+
end
|
60
|
+
|
61
|
+
def collect_option_argv_value
|
62
|
+
alternative.options.each do |option|
|
63
|
+
end
|
64
|
+
|
65
|
+
raise ::EacCli::Parser::Error.new(
|
66
|
+
alternative, argv, "Invalid option: #{argv_enum.current}"
|
67
|
+
)
|
68
|
+
end
|
69
|
+
|
70
|
+
def raise_error(message)
|
71
|
+
raise ::EacCli::Parser::Error.new(alternative, argv, message)
|
72
|
+
end
|
73
|
+
|
74
|
+
def validate
|
75
|
+
(alternative.options + alternative.positional).each do |option|
|
76
|
+
validate_option(option)
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
def validate_option(option)
|
81
|
+
return unless option.required?
|
82
|
+
return if collector.supplied?(option)
|
83
|
+
|
84
|
+
raise_error("Required option/positional #{option} not supplied")
|
85
|
+
end
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module EacCli
|
4
|
+
class Parser
|
5
|
+
class Alternative
|
6
|
+
module DoubleDash
|
7
|
+
DOUBLE_DASH = '--'
|
8
|
+
|
9
|
+
private
|
10
|
+
|
11
|
+
attr_accessor :double_dash
|
12
|
+
|
13
|
+
def argv_current_double_dash?
|
14
|
+
argv_enum.peek == DOUBLE_DASH && !double_dash
|
15
|
+
end
|
16
|
+
|
17
|
+
def double_dash_collect_argv_value
|
18
|
+
self.phase = PHASE_POSITIONAL
|
19
|
+
self.double_dash = true
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module EacCli
|
4
|
+
class Parser
|
5
|
+
class Alternative
|
6
|
+
module Options
|
7
|
+
DOUBLE_DASH = '--'
|
8
|
+
|
9
|
+
private
|
10
|
+
|
11
|
+
attr_accessor :argument_option, :double_dash
|
12
|
+
|
13
|
+
def argument_option_collect_argv(option)
|
14
|
+
self.argument_option = option
|
15
|
+
self.phase = PHASE_OPTION_ARGUMENT
|
16
|
+
end
|
17
|
+
|
18
|
+
def argv_current_option?
|
19
|
+
phase == PHASE_ANY && argv_enum.peek.start_with?('-')
|
20
|
+
end
|
21
|
+
|
22
|
+
def argv_current_double_dash?
|
23
|
+
argv_enum.peek == DOUBLE_DASH && !double_dash
|
24
|
+
end
|
25
|
+
|
26
|
+
def boolean_option_collect_argv(option)
|
27
|
+
collector.collect(option, true)
|
28
|
+
end
|
29
|
+
|
30
|
+
def option_argument_collect_argv_value
|
31
|
+
collector.collect(argument_option, argv_enum.peek)
|
32
|
+
self.argument_option = nil
|
33
|
+
self.phase = PHASE_ANY
|
34
|
+
end
|
35
|
+
|
36
|
+
def option_collect_argv_value
|
37
|
+
return double_dash_collect_argv_value if argv_current_double_dash?
|
38
|
+
|
39
|
+
alternative.options.any? do |option|
|
40
|
+
next false unless [option.short, option.long].include?(argv_enum.peek)
|
41
|
+
|
42
|
+
if option.argument?
|
43
|
+
argument_option_collect_argv(option)
|
44
|
+
else
|
45
|
+
boolean_option_collect_argv(option)
|
46
|
+
end
|
47
|
+
|
48
|
+
true
|
49
|
+
end || raise_argv_current_invalid_option
|
50
|
+
end
|
51
|
+
|
52
|
+
def raise_argv_current_invalid_option
|
53
|
+
raise_error "Invalid option: \"#{argv_enum.peek}\""
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module EacCli
|
4
|
+
class Parser
|
5
|
+
class Alternative
|
6
|
+
module Positionals
|
7
|
+
private
|
8
|
+
|
9
|
+
def positional_collect_argv_value
|
10
|
+
positional_check
|
11
|
+
collector.collect(positional_enum.peek, argv_enum.peek)
|
12
|
+
positional_next
|
13
|
+
end
|
14
|
+
|
15
|
+
def positional_enum
|
16
|
+
@positional_enum ||= alternative.positional.each
|
17
|
+
end
|
18
|
+
|
19
|
+
def positional_check
|
20
|
+
raise_error("Invalid positional: #{argv_enum.peek}") if positional_enum.stopped?
|
21
|
+
end
|
22
|
+
|
23
|
+
def positional_next
|
24
|
+
self.phase = PHASE_POSITIONAL if positional_enum.peek.subcommand?
|
25
|
+
positional_enum.next unless positional_enum.peek.repeat?
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
data/lib/eac_cli/runner.rb
CHANGED
data/lib/eac_cli/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: eac_cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.12.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Esquilo Azul Company
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-11-
|
11
|
+
date: 2020-11-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: eac_ruby_utils
|
@@ -55,19 +55,23 @@ files:
|
|
55
55
|
- lib/eac_cli/core_ext.rb
|
56
56
|
- lib/eac_cli/default_runner.rb
|
57
57
|
- lib/eac_cli/definition.rb
|
58
|
+
- lib/eac_cli/definition/alternative.rb
|
58
59
|
- lib/eac_cli/definition/argument_option.rb
|
59
60
|
- lib/eac_cli/definition/base_option.rb
|
60
61
|
- lib/eac_cli/definition/boolean_option.rb
|
61
62
|
- lib/eac_cli/definition/help_formatter.rb
|
62
63
|
- lib/eac_cli/definition/positional_argument.rb
|
63
64
|
- lib/eac_cli/docopt/doc_builder.rb
|
65
|
+
- lib/eac_cli/docopt/doc_builder/alternative.rb
|
64
66
|
- lib/eac_cli/docopt/runner_extension.rb
|
65
67
|
- lib/eac_cli/parser.rb
|
68
|
+
- lib/eac_cli/parser/alternative.rb
|
69
|
+
- lib/eac_cli/parser/alternative/argv.rb
|
70
|
+
- lib/eac_cli/parser/alternative/double_dash.rb
|
71
|
+
- lib/eac_cli/parser/alternative/options.rb
|
72
|
+
- lib/eac_cli/parser/alternative/positionals.rb
|
66
73
|
- lib/eac_cli/parser/collector.rb
|
67
74
|
- lib/eac_cli/parser/error.rb
|
68
|
-
- lib/eac_cli/parser/options_collection.rb
|
69
|
-
- lib/eac_cli/parser/parse_result.rb
|
70
|
-
- lib/eac_cli/parser/positional_collection.rb
|
71
75
|
- lib/eac_cli/patches.rb
|
72
76
|
- lib/eac_cli/patches/object.rb
|
73
77
|
- lib/eac_cli/patches/object/runner_with.rb
|
@@ -1,68 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'eac_ruby_utils/core_ext'
|
4
|
-
require 'optparse'
|
5
|
-
|
6
|
-
module EacCli
|
7
|
-
class Parser
|
8
|
-
class OptionsCollection
|
9
|
-
enable_simple_cache
|
10
|
-
common_constructor(:definition, :argv, :collector) { collect }
|
11
|
-
attr_reader :arguments
|
12
|
-
|
13
|
-
def options_first?
|
14
|
-
definition.options_first? || definition.subcommands?
|
15
|
-
end
|
16
|
-
|
17
|
-
private
|
18
|
-
|
19
|
-
def check_required_options
|
20
|
-
definition.options.each do |option|
|
21
|
-
next unless option.required?
|
22
|
-
next if collector.supplied?(option)
|
23
|
-
|
24
|
-
raise ::EacCli::Parser::Error.new(
|
25
|
-
definition, argv, "Option \"#{option}\" is required and a value was not supplied"
|
26
|
-
)
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
def collect
|
31
|
-
build_banner
|
32
|
-
build_options
|
33
|
-
parse_argv
|
34
|
-
check_required_options
|
35
|
-
end
|
36
|
-
|
37
|
-
def option_parser_uncached
|
38
|
-
::OptionParser.new
|
39
|
-
end
|
40
|
-
|
41
|
-
def parse_argv
|
42
|
-
@arguments = options_first? ? option_parser.order(argv) : option_parser.parse(argv)
|
43
|
-
rescue ::OptionParser::InvalidOption => e
|
44
|
-
raise ::EacCli::Parser::Error.new(definition, argv, e.message)
|
45
|
-
end
|
46
|
-
|
47
|
-
def build_banner
|
48
|
-
option_parser.banner = definition.help_formatter.to_banner
|
49
|
-
end
|
50
|
-
|
51
|
-
def build_options
|
52
|
-
definition.options.each do |option|
|
53
|
-
build_option(option)
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
def build_option(option)
|
58
|
-
option_parser.on(
|
59
|
-
*[::EacCli::Definition::HelpFormatter.option_short(option),
|
60
|
-
::EacCli::Definition::HelpFormatter.option_long(option),
|
61
|
-
option.description].reject(&:blank?)
|
62
|
-
) do |value|
|
63
|
-
collector.collect(option, value)
|
64
|
-
end
|
65
|
-
end
|
66
|
-
end
|
67
|
-
end
|
68
|
-
end
|
@@ -1,38 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'eac_cli/parser/error'
|
4
|
-
require 'eac_ruby_utils/core_ext'
|
5
|
-
|
6
|
-
module EacCli
|
7
|
-
class Parser
|
8
|
-
class ParseResult
|
9
|
-
common_constructor :definition, :argv
|
10
|
-
|
11
|
-
def result
|
12
|
-
result_or_error = parse(definition)
|
13
|
-
return result_or_error unless result_or_error.is_a?(::Exception)
|
14
|
-
|
15
|
-
definition.alternatives.each do |alternative|
|
16
|
-
alt_result_or_error = parse(alternative)
|
17
|
-
return alt_result_or_error unless alt_result_or_error.is_a?(::Exception)
|
18
|
-
end
|
19
|
-
|
20
|
-
raise result_or_error
|
21
|
-
end
|
22
|
-
|
23
|
-
private
|
24
|
-
|
25
|
-
def parse(definition)
|
26
|
-
::EacCli::Parser::Collector.to_data(definition) do |collector|
|
27
|
-
::EacCli::Parser::PositionalCollection.new(
|
28
|
-
definition,
|
29
|
-
::EacCli::Parser::OptionsCollection.new(definition, argv, collector).arguments,
|
30
|
-
collector
|
31
|
-
)
|
32
|
-
end
|
33
|
-
rescue ::EacCli::Parser::Error => e
|
34
|
-
e
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
@@ -1,77 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'eac_ruby_utils/core_ext'
|
4
|
-
require 'eac_cli/parser/error'
|
5
|
-
|
6
|
-
module EacCli
|
7
|
-
class Parser
|
8
|
-
class PositionalCollection
|
9
|
-
common_constructor(:definition, :argv, :collector) { collect }
|
10
|
-
|
11
|
-
private
|
12
|
-
|
13
|
-
def argv_enum
|
14
|
-
@argv_enum ||= argv.each
|
15
|
-
end
|
16
|
-
|
17
|
-
def argv_pending?
|
18
|
-
argv_enum.ongoing?
|
19
|
-
end
|
20
|
-
|
21
|
-
def argv_pending_check
|
22
|
-
return unless argv_pending?
|
23
|
-
return unless positional_enum.stopped?
|
24
|
-
|
25
|
-
raise ::EacCli::Parser::Error.new(
|
26
|
-
definition, argv, "No positional left for argv \"#{argv_enum.current}\""
|
27
|
-
)
|
28
|
-
end
|
29
|
-
|
30
|
-
def collected
|
31
|
-
@collected ||= ::Set.new
|
32
|
-
end
|
33
|
-
|
34
|
-
def collect
|
35
|
-
loop do
|
36
|
-
break unless enums('pending?').any?
|
37
|
-
|
38
|
-
enums('pending_check')
|
39
|
-
collect_argv_value
|
40
|
-
end
|
41
|
-
end
|
42
|
-
|
43
|
-
def collect_argv_value
|
44
|
-
collector.collect(*enums('enum', &:peek))
|
45
|
-
collected << positional_enum.peek
|
46
|
-
positional_enum.next unless positional_enum.peek.repeat?
|
47
|
-
argv_enum.next
|
48
|
-
end
|
49
|
-
|
50
|
-
def enums(method_suffix, &block)
|
51
|
-
%w[positional argv].map do |method_prefix|
|
52
|
-
v = send("#{method_prefix}_#{method_suffix}")
|
53
|
-
block ? block.call(v) : v
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
def positional_enum
|
58
|
-
@positional_enum ||= definition.positional.each
|
59
|
-
end
|
60
|
-
|
61
|
-
def positional_pending?
|
62
|
-
!(positional_enum.stopped? || positional_enum.current.optional? ||
|
63
|
-
collected.include?(positional_enum.current))
|
64
|
-
end
|
65
|
-
|
66
|
-
def positional_pending_check
|
67
|
-
return unless positional_pending?
|
68
|
-
return unless argv_enum.stopped?
|
69
|
-
|
70
|
-
raise ::EacCli::Parser::Error.new(
|
71
|
-
definition, argv, 'No value for required positional ' \
|
72
|
-
"\"#{positional_enum.current.identifier}\""
|
73
|
-
)
|
74
|
-
end
|
75
|
-
end
|
76
|
-
end
|
77
|
-
end
|