diff --git a/example/pkg/command/long.go b/example/pkg/command/long.go index d383b14..a0dcd05 100644 --- a/example/pkg/command/long.go +++ b/example/pkg/command/long.go @@ -6,9 +6,9 @@ import ( "gitoa.ru/go-4devs/console" "gitoa.ru/go-4devs/console/input" - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/option" "gitoa.ru/go-4devs/console/input/validator" + "gitoa.ru/go-4devs/console/input/value/flag" "gitoa.ru/go-4devs/console/output" ) diff --git a/help.go b/help.go index c395255..070c3c8 100644 --- a/help.go +++ b/help.go @@ -8,9 +8,9 @@ import ( "gitoa.ru/go-4devs/console/input" "gitoa.ru/go-4devs/console/input/argument" - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/option" "gitoa.ru/go-4devs/console/input/validator" + "gitoa.ru/go-4devs/console/input/value/flag" "gitoa.ru/go-4devs/console/output" "gitoa.ru/go-4devs/console/output/descriptor" ) diff --git a/input/argument/argument.go b/input/argument/argument.go index 9914073..27a8a21 100644 --- a/input/argument/argument.go +++ b/input/argument/argument.go @@ -1,8 +1,8 @@ package argument import ( - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/value" + "gitoa.ru/go-4devs/console/input/value/flag" ) func New(name, description string, opts ...func(*Argument)) Argument { diff --git a/input/argument/option.go b/input/argument/option.go index 4fc1d57..4422a57 100644 --- a/input/argument/option.go +++ b/input/argument/option.go @@ -1,8 +1,8 @@ package argument import ( - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/value" + "gitoa.ru/go-4devs/console/input/value/flag" ) func Required(a *Argument) { diff --git a/input/option.go b/input/option.go deleted file mode 100644 index de1ab6f..0000000 --- a/input/option.go +++ /dev/null @@ -1 +0,0 @@ -package input diff --git a/input/option/helpers.go b/input/option/helpers.go index 036b17a..458e785 100644 --- a/input/option/helpers.go +++ b/input/option/helpers.go @@ -1,7 +1,7 @@ package option import ( - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) func Bool(name, description string, opts ...func(*Option)) Option { diff --git a/input/option/option.go b/input/option/option.go index d14ffe6..9c66324 100644 --- a/input/option/option.go +++ b/input/option/option.go @@ -1,8 +1,8 @@ package option import ( - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/value" + "gitoa.ru/go-4devs/console/input/value/flag" ) func Required(o *Option) { diff --git a/input/validator/not_blank.go b/input/validator/not_blank.go index 3bb82cd..8d9ee9d 100644 --- a/input/validator/not_blank.go +++ b/input/validator/not_blank.go @@ -1,8 +1,8 @@ package validator import ( - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/value" + "gitoa.ru/go-4devs/console/input/value/flag" ) //nolint: gocyclo diff --git a/input/validator/not_blank_test.go b/input/validator/not_blank_test.go index e22f0f3..3b205a0 100644 --- a/input/validator/not_blank_test.go +++ b/input/validator/not_blank_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/validator" "gitoa.ru/go-4devs/console/input/value" + "gitoa.ru/go-4devs/console/input/value/flag" ) func TestNotBlank(t *testing.T) { diff --git a/input/validator/valid_test.go b/input/validator/valid_test.go index 45fe75a..b1f8b15 100644 --- a/input/validator/valid_test.go +++ b/input/validator/valid_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/validator" "gitoa.ru/go-4devs/console/input/value" + "gitoa.ru/go-4devs/console/input/value/flag" ) func TestValid(t *testing.T) { diff --git a/input/value/any.go b/input/value/any.go index 55f0e22..208bfdc 100644 --- a/input/value/any.go +++ b/input/value/any.go @@ -1,6 +1,6 @@ package value -import "gitoa.ru/go-4devs/console/input/flag" +import "gitoa.ru/go-4devs/console/input/value/flag" type Any struct { empty diff --git a/input/value/bool.go b/input/value/bool.go index e00bc70..108d89b 100644 --- a/input/value/bool.go +++ b/input/value/bool.go @@ -3,7 +3,7 @@ package value import ( "strconv" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Bool struct { diff --git a/input/value/duration.go b/input/value/duration.go index bb94345..c712818 100644 --- a/input/value/duration.go +++ b/input/value/duration.go @@ -3,7 +3,7 @@ package value import ( "time" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Duration struct { diff --git a/input/flag/flag.go b/input/value/flag/flag.go similarity index 100% rename from input/flag/flag.go rename to input/value/flag/flag.go diff --git a/input/flag/flag_string.go b/input/value/flag/flag_string.go similarity index 100% rename from input/flag/flag_string.go rename to input/value/flag/flag_string.go diff --git a/input/value/float64.go b/input/value/float64.go index 6c8d2b0..e9fa6d3 100644 --- a/input/value/float64.go +++ b/input/value/float64.go @@ -3,7 +3,7 @@ package value import ( "strconv" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Float64 struct { diff --git a/input/value/int.go b/input/value/int.go index 2121061..42eb9e2 100644 --- a/input/value/int.go +++ b/input/value/int.go @@ -3,7 +3,7 @@ package value import ( "strconv" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Int struct { diff --git a/input/value/int64.go b/input/value/int64.go index 7f072c4..947cb77 100644 --- a/input/value/int64.go +++ b/input/value/int64.go @@ -3,7 +3,7 @@ package value import ( "strconv" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Int64 struct { diff --git a/input/value/string.go b/input/value/string.go index c6ff557..d54bcc3 100644 --- a/input/value/string.go +++ b/input/value/string.go @@ -1,6 +1,6 @@ package value -import "gitoa.ru/go-4devs/console/input/flag" +import "gitoa.ru/go-4devs/console/input/value/flag" type String struct { empty diff --git a/input/value/time.go b/input/value/time.go index 038f5df..f751a33 100644 --- a/input/value/time.go +++ b/input/value/time.go @@ -3,7 +3,7 @@ package value import ( "time" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Time struct { diff --git a/input/value/uint.go b/input/value/uint.go index 1299ced..1983b0d 100644 --- a/input/value/uint.go +++ b/input/value/uint.go @@ -3,7 +3,7 @@ package value import ( "strconv" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Uint struct { diff --git a/input/value/uint64.go b/input/value/uint64.go index 2f0e298..a78d8cf 100644 --- a/input/value/uint64.go +++ b/input/value/uint64.go @@ -3,7 +3,7 @@ package value import ( "strconv" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Uint64 struct { diff --git a/input/value/value.go b/input/value/value.go index 788ee75..87d7d44 100644 --- a/input/value/value.go +++ b/input/value/value.go @@ -3,7 +3,7 @@ package value import ( "time" - "gitoa.ru/go-4devs/console/input/flag" + "gitoa.ru/go-4devs/console/input/value/flag" ) type Value interface { diff --git a/output/descriptor/txt.go b/output/descriptor/txt.go index c74c3da..f99812e 100644 --- a/output/descriptor/txt.go +++ b/output/descriptor/txt.go @@ -10,8 +10,8 @@ import ( "time" "gitoa.ru/go-4devs/console/input" - "gitoa.ru/go-4devs/console/input/flag" "gitoa.ru/go-4devs/console/input/value" + "gitoa.ru/go-4devs/console/input/value/flag" "gitoa.ru/go-4devs/console/output" )