fix

argenta/command/entity.py

@@ -30,10 +30,11 @@ class Command:
         self._command = command
 
     def validate_commands_params(self):
+        print(self._flags)
         if not isinstance(self._command, str):
             raise InvalidCommandInstanceException(self._command)
         if not isinstance(self._description, str):
             raise InvalidDescriptionInstanceException()
-        if not (isinstance(self._flags, Flag) or isinstance(self._flags, FlagsGroup)):
+        if not (isinstance(self._flags, Flag) or not isinstance(self._flags, FlagsGroup)) or not self._flags is None:
             raise InvalidFlagsInstanceException
 

argenta/command/parse_input_command/entity.py

@@ -12,22 +12,39 @@ class ParseInputCommand:
 
     @staticmethod
     def parse(raw_command: str) -> Command:
-        list_of__ = raw_command.split()
-        command = list_of__[0]
-        list_of__.pop(0)
+        list_of_tokens = raw_command.split()
+        command_name = list_of_tokens[0]
+        list_of_tokens.pop(0)
 
         flags = []
-        for k, _ in enumerate(list_of__):
-            if not _.startswith('-') or len( _[:len(_.lstrip('-'))]) > 3:
-                raise InvalidInputFlagsException()
+        current_flag_name = None
+        current_flag_value = None
+        for _ in list_of_tokens:
+            flag_prefix_last_symbol_index = _.rfind('-')
+            if _.startswith('-'):
+                if current_flag_name or len(_) < 2 or len(_[:flag_prefix_last_symbol_index]) > 3:
+                    raise
+                else:
+                    current_flag_name = _
             else:
-                flag_name: str = _.lstrip('-')
-                flag_prefix = _[:len(flag_name)]
+                if not current_flag_name:
+                    raise
+                else:
+                    current_flag_value = _
+            if current_flag_name and current_flag_value:
+                flag_prefix = _[:flag_prefix_last_symbol_index]
+                flag_name = _[flag_prefix_last_symbol_index:]
+
+                flags.append(Flag(flag_name=flag_name, flag_prefix=flag_prefix))
+
+                current_flag_name = None
+                current_flag_value = None
+
+        command = Command(command_name, flags)
+
+        return command
 
-                parse_flag = Flag(flag_name=flag_name,
-                                  flag_prefix=flag_prefix)
 
-                flags.append(parse_flag)
 
         if len(flags) == 0:
             return Command(command=command)