Issues #110 #111

fiasko_bro/__init__.py

@@ -1,3 +1,3 @@
 from .code_validator import CodeValidator, validate_repo
-from .validator_helpers import tokenized_validator
+from .utils.validator_helpers import tokenized_validator
 from .repository_info import LocalRepositoryInfo

fiasko_bro/pre_validation_checks/encoding.py

@@ -1,7 +1,7 @@
 import os
 
 from fiasko_bro.config import VALIDATOR_SETTINGS
-from ..file_helpers import is_in_utf8
+from ..utils.file_helpers import is_in_utf8
 
 
 def are_sources_in_utf(path_to_repo, *args, **kwargs):

fiasko_bro/pre_validation_checks/files_len.py

@@ -0,0 +1,12 @@
+from ..utils import url_helpers
+
+
+def has_no_long_files(solution_repo, max_number_of_lines, *args, **kwargs):
+    for file_path, file_content, _ in solution_repo.get_ast_trees(
+        with_filenames=True,
+        with_file_content=True
+    ):
+        number_of_lines = file_content.count('\n')
+        if number_of_lines > max_number_of_lines:
+            file_name = url_helpers.get_filename_from_path(file_path)
+            return 'file_too_long', file_name

fiasko_bro/pre_validation_checks/repo_size.py

@@ -1,4 +1,4 @@
-from .. import code_helpers
+from ..utils import code_helpers
 
 
 def are_repos_too_large(path_to_repo, max_num_of_py_files, path_to_original_repo=None, *args, **kwargs):

fiasko_bro/repository_info.py

@@ -5,7 +5,7 @@
 import git
 
 from fiasko_bro.config import VALIDATOR_SETTINGS
-from . import file_helpers
+from .utils import file_helpers
 
 
 class LocalRepositoryInfo:

fiasko_bro/utils/__init__.py

@@ -0,0 +1,8 @@
+from .ast_helpers import *
+from .code_helpers import *
+from .configparser_helpers import *
+from .configparser_helpers import *
+from .file_helpers import *
+from .list_helpers import *
+from .url_helpers import *
+from .validator_helpers import *

fiasko_bro/validators/code_inclusion.py

@@ -1,6 +1,4 @@
-from .. import code_helpers
-from .. import url_helpers
-from .. import file_helpers
+from ..utils import code_helpers, url_helpers, file_helpers
 
 
 def is_mccabe_difficulty_ok(solution_repo, max_complexity, *args, **kwargs):

fiasko_bro/validators/comments.py

@@ -1,7 +1,6 @@
 import ast
 
-from .. import ast_helpers
-from .. import url_helpers
+from ..utils import ast_helpers, url_helpers
 
 
 def has_no_extra_dockstrings(solution_repo, whitelists, functions_with_docstrings_percent_limit, *args, **kwargs):

fiasko_bro/validators/files.py

@@ -1,6 +1,6 @@
 import os
 
-from .. import url_helpers
+from ..utils import url_helpers
 
 
 def has_no_long_files(solution_repo, max_number_of_lines, *args, **kwargs):

fiasko_bro/validators/imports.py

@@ -1,5 +1,4 @@
-from .. import ast_helpers
-from .. import url_helpers
+from ..utils import ast_helpers, url_helpers
 
 
 def has_no_star_imports(solution_repo, *args, **kwargs):

fiasko_bro/validators/naming.py

@@ -1,6 +1,6 @@
 import builtins
 
-from .. import ast_helpers
+from ..utils import ast_helpers
 from ..i18n import _
 
 

fiasko_bro/validators/other_languages.py

@@ -1,7 +1,6 @@
 import ast
 
-from .. import ast_helpers
-from .. import url_helpers
+from ..utils import ast_helpers, url_helpers
 
 
 def has_no_return_with_parenthesis(solution_repo, *args, **kwargs):

fiasko_bro/validators/pythonic.py

@@ -1,9 +1,7 @@
 import ast
 
 from .. import ast_nodes_validators
-from .. import ast_helpers
-from .. import code_helpers
-from .. import url_helpers
+from ..utils import ast_helpers, code_helpers, url_helpers
 from ..i18n import _
 
 

fiasko_bro/validators/requirements.py

@@ -1,4 +1,4 @@
-from .. import list_helpers
+from ..utils import list_helpers
 from ..i18n import _
 
 

fiasko_bro/validators/syntax.py

@@ -1,8 +1,6 @@
 import ast
 
-from .. import ast_helpers
-from .. import file_helpers
-from .. import url_helpers
+from ..utils import ast_helpers, file_helpers, url_helpers
 
 
 def has_no_syntax_errors(solution_repo, *args, **kwargs):

tests/test_general_validators/test_are_tabs_used_for_indentation.py

@@ -2,7 +2,7 @@
 
 
 def test_are_tabs_used_for_indentation_fail_for_py_file(test_repo):
-    expected_output = 'tabs_used_for_indents', 'css_with_tabs.css'
+    expected_output = 'tabs_used_for_indents', 'js_with_tabs.js'
     output = validators.are_tabs_used_for_indentation(
         solution_repo=test_repo,
     )