Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/twyn/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ def entry_point() -> None:
default=False,
help="Disable use of the trusted packages cache. Always fetch from the source.",
)
@click.option(
"--no-track",
is_flag=True,
default=False,
help="Do not show the progress bar while processing packages.",
)
def run(
config: str,
dependency_file: Optional[str],
Expand All @@ -84,6 +90,7 @@ def run(
v: bool,
vv: bool,
no_cache: bool,
no_track: bool,
) -> int:
if v and vv:
raise click.UsageError(
Expand Down Expand Up @@ -113,6 +120,7 @@ def run(
selector_method=selector_method,
verbosity=verbosity,
use_cache=not no_cache,
use_track=not no_track,
)
except TwynError as e:
raise CliError(e.message) from e
Expand Down
6 changes: 5 additions & 1 deletion src/twyn/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def check_dependencies(
dependencies: Optional[set[str]] = None,
verbosity: AvailableLoggingLevels = AvailableLoggingLevels.none,
use_cache: bool = True,
use_track: bool = False,
) -> list[TyposquatCheckResult]:
"""Check if dependencies could be typosquats."""
config_file_handler = FileHandler(config_file or DEFAULT_PROJECT_TOML_FILE)
Expand All @@ -52,7 +53,10 @@ def check_dependencies(
normalized_dependencies = normalize_packages(dependencies)

errors: list[TyposquatCheckResult] = []
for dependency in track(normalized_dependencies, description="Processing..."):
dependencies_list = (
track(normalized_dependencies, description="Processing...") if use_track else normalized_dependencies
)
for dependency in dependencies_list:
if dependency in normalized_allowlist_packages:
logger.info("Dependency %s is in the allowlist", dependency)
continue
Expand Down
5 changes: 5 additions & 0 deletions tests/main/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def test_click_arguments_dependency_file(self, mock_check_dependencies):
selector_method="first-letter",
verbosity=AvailableLoggingLevels.debug,
use_cache=True,
use_track=True,
)
]

Expand All @@ -111,6 +112,7 @@ def test_click_arguments_dependency_file_in_different_path(self, mock_check_depe
selector_method=None,
verbosity=AvailableLoggingLevels.none,
use_cache=True,
use_track=True,
)
]

Expand All @@ -132,6 +134,7 @@ def test_click_arguments_single_dependency_cli(self, mock_check_dependencies):
selector_method=None,
verbosity=AvailableLoggingLevels.none,
use_cache=True,
use_track=True,
)
]

Expand Down Expand Up @@ -165,6 +168,7 @@ def test_click_arguments_multiple_dependencies(self, mock_check_dependencies):
selector_method=None,
verbosity=AvailableLoggingLevels.none,
use_cache=True,
use_track=True,
)
]

Expand All @@ -181,6 +185,7 @@ def test_click_arguments_default(self, mock_check_dependencies):
dependencies=None,
verbosity=AvailableLoggingLevels.none,
use_cache=True,
use_track=True,
)
]

Expand Down
20 changes: 20 additions & 0 deletions tests/main/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,23 @@ def test_get_parsed_dependencies_from_file(self, mock_parse: Mock, mock_get_depe
mock_get_dependency_parser.return_value = RequirementsTxtParser()
mock_parse.return_value = {"boto3"}
assert get_parsed_dependencies_from_file() == {"boto3"}

@patch("twyn.main.TopPyPiReference")
@patch("twyn.main.get_parsed_dependencies_from_file")
def test_track_is_disabled_by_default_when_used_as_package(
self, mock_get_parsed_dependencies_from_file, mock_top_pypi_reference
) -> None:
mock_top_pypi_reference.return_value.get_packages.return_value = {"mypackage"}
mock_get_parsed_dependencies_from_file.return_value = {"my-package"}
with patch("twyn.main.track") as m_track:
check_dependencies("all")
assert m_track.call_count == 0

@patch("twyn.main.TopPyPiReference")
@patch("twyn.main.get_parsed_dependencies_from_file")
def test_track_is_shown_when_enabled(self, mock_get_parsed_dependencies_from_file, mock_top_pypi_reference) -> None:
mock_top_pypi_reference.return_value.get_packages.return_value = {"mypackage"}
mock_get_parsed_dependencies_from_file.return_value = {"my-package"}
with patch("twyn.main.track") as m_track:
check_dependencies("all", use_track=True)
assert m_track.call_count == 1