From d8b1b0076347589ac7d03532cd7c336f4fc99d3d Mon Sep 17 00:00:00 2001 From: Bryan Oltman Date: Fri, 25 Oct 2024 14:07:25 -0400 Subject: [PATCH] refactor(shorebird_cli): move logging utilities to their own directory (#2580) --- packages/shorebird_cli/bin/shorebird.dart | 2 +- .../shorebird_cli_integration_test.dart | 2 +- .../lib/src/artifact_builder.dart | 2 +- .../lib/src/artifact_manager.dart | 2 +- packages/shorebird_cli/lib/src/auth/auth.dart | 2 +- packages/shorebird_cli/lib/src/cache.dart | 2 +- .../lib/src/code_push_client_wrapper.dart | 2 +- .../commands/cache/clean_cache_command.dart | 2 +- .../lib/src/commands/doctor_command.dart | 2 +- .../flutter_versions_list_command.dart | 2 +- .../lib/src/commands/init_command.dart | 2 +- .../lib/src/commands/login_ci_command.dart | 2 +- .../lib/src/commands/login_command.dart | 2 +- .../lib/src/commands/logout_command.dart | 2 +- .../lib/src/commands/patch/aar_patcher.dart | 2 +- .../src/commands/patch/android_patcher.dart | 2 +- .../commands/patch/ios_framework_patcher.dart | 2 +- .../lib/src/commands/patch/ios_patcher.dart | 2 +- .../lib/src/commands/patch/patch_command.dart | 2 +- .../src/commands/patches/promote_command.dart | 2 +- .../lib/src/commands/preview_command.dart | 2 +- .../src/commands/release/aar_releaser.dart | 2 +- .../commands/release/android_releaser.dart | 2 +- .../release/ios_framework_releaser.dart | 2 +- .../src/commands/release/ios_releaser.dart | 2 +- .../src/commands/release/release_command.dart | 2 +- .../lib/src/commands/run_command.dart | 2 +- .../lib/src/commands/upgrade_command.dart | 2 +- packages/shorebird_cli/lib/src/doctor.dart | 2 +- .../lib/src/executables/aot_tools.dart | 2 +- .../src/executables/devicectl/devicectl.dart | 2 +- .../lib/src/executables/idevicesyslog.dart | 2 +- .../lib/src/executables/ios_deploy.dart | 2 +- .../lib/src/extensions/arg_results.dart | 2 +- .../lib/src/extensions/file.dart | 2 +- .../lib/src/http_client/logging_client.dart | 2 +- .../lib/src/logging/logging.dart | 2 + .../logging_stdout.dart} | 70 +------------- .../lib/src/logging/shorebird_logger.dart | 69 +++++++++++++ .../lib/src/network_checker.dart | 2 +- .../lib/src/patch_diff_checker.dart | 2 +- .../lib/src/shorebird_android_artifacts.dart | 2 +- .../lib/src/shorebird_cli_command_runner.dart | 2 +- .../lib/src/shorebird_flutter.dart | 2 +- .../lib/src/shorebird_process.dart | 2 +- .../lib/src/shorebird_validator.dart | 2 +- .../test/src/artifact_builder_test.dart | 2 +- .../test/src/artifact_manager_test.dart | 2 +- .../test/src/auth/auth_test.dart | 2 +- .../shorebird_cli/test/src/cache_test.dart | 2 +- .../src/code_push_client_wrapper_test.dart | 2 +- .../cache/clean_cache_command_test.dart | 2 +- .../src/commands/doctor_command_test.dart | 2 +- .../flutter_versions_list_command_test.dart | 2 +- .../test/src/commands/init_command_test.dart | 2 +- .../src/commands/login_ci_command_test.dart | 2 +- .../test/src/commands/login_command_test.dart | 2 +- .../src/commands/logout_command_test.dart | 2 +- .../src/commands/patch/aar_patcher_test.dart | 2 +- .../commands/patch/android_patcher_test.dart | 2 +- .../patch/ios_framework_patcher_test.dart | 2 +- .../src/commands/patch/ios_patcher_test.dart | 2 +- .../commands/patch/patch_command_test.dart | 2 +- .../patches/promote_command_test.dart | 2 +- .../src/commands/preview_command_test.dart | 2 +- .../commands/release/aar_releaser_test.dart | 2 +- .../release/android_releaser_test.dart | 2 +- .../release/ios_framework_releaser_test.dart | 2 +- .../commands/release/ios_releaser_test.dart | 2 +- .../release/release_command_test.dart | 2 +- .../test/src/commands/run_command_test.dart | 2 +- .../src/commands/upgrade_command_test.dart | 2 +- .../shorebird_cli/test/src/doctor_test.dart | 2 +- .../test/src/executables/aot_tools_test.dart | 2 +- .../executables/devicectl/devicectl_test.dart | 2 +- .../src/executables/idevicesyslog_test.dart | 2 +- .../test/src/executables/ios_deploy_test.dart | 2 +- .../src/executables/shorebird_tools_test.dart | 2 +- .../src/http_client/logging_client_test.dart | 2 +- .../logging_stdout_test.dart} | 93 +----------------- .../src/logging/shorebird_logger_test.dart | 96 +++++++++++++++++++ packages/shorebird_cli/test/src/mocks.dart | 2 +- .../test/src/network_checker_test.dart | 2 +- .../test/src/patch_diff_checker_test.dart | 2 +- .../src/shorebird_android_artifacts_test.dart | 2 +- .../shorebird_cli_command_runner_test.dart | 2 +- .../test/src/shorebird_flutter_test.dart | 2 +- .../test/src/shorebird_process_test.dart | 2 +- .../test/src/shorebird_validator_test.dart | 2 +- 89 files changed, 256 insertions(+), 242 deletions(-) create mode 100644 packages/shorebird_cli/lib/src/logging/logging.dart rename packages/shorebird_cli/lib/src/{logger.dart => logging/logging_stdout.dart} (55%) create mode 100644 packages/shorebird_cli/lib/src/logging/shorebird_logger.dart rename packages/shorebird_cli/test/src/{logger_test.dart => logging/logging_stdout_test.dart} (68%) create mode 100644 packages/shorebird_cli/test/src/logging/shorebird_logger_test.dart diff --git a/packages/shorebird_cli/bin/shorebird.dart b/packages/shorebird_cli/bin/shorebird.dart index cb40927d..6f23209e 100644 --- a/packages/shorebird_cli/bin/shorebird.dart +++ b/packages/shorebird_cli/bin/shorebird.dart @@ -14,7 +14,7 @@ import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/engine_config.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/network_checker.dart'; import 'package:shorebird_cli/src/os/os.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; diff --git a/packages/shorebird_cli/integration_test/shorebird_cli_integration_test.dart b/packages/shorebird_cli/integration_test/shorebird_cli_integration_test.dart index ea6f226b..17b5e2c4 100644 --- a/packages/shorebird_cli/integration_test/shorebird_cli_integration_test.dart +++ b/packages/shorebird_cli/integration_test/shorebird_cli_integration_test.dart @@ -9,7 +9,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_code_push_client/shorebird_code_push_client.dart'; diff --git a/packages/shorebird_cli/lib/src/artifact_builder.dart b/packages/shorebird_cli/lib/src/artifact_builder.dart index 4c88cb15..cedf86df 100644 --- a/packages/shorebird_cli/lib/src/artifact_builder.dart +++ b/packages/shorebird_cli/lib/src/artifact_builder.dart @@ -5,7 +5,7 @@ import 'dart:io'; import 'package:mason_logger/mason_logger.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/extensions/shorebird_process_result.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/shorebird_android_artifacts.dart'; diff --git a/packages/shorebird_cli/lib/src/artifact_manager.dart b/packages/shorebird_cli/lib/src/artifact_manager.dart index 69e87cb4..8bbb9327 100644 --- a/packages/shorebird_cli/lib/src/artifact_manager.dart +++ b/packages/shorebird_cli/lib/src/artifact_manager.dart @@ -11,7 +11,7 @@ import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:stream_transform/stream_transform.dart'; diff --git a/packages/shorebird_cli/lib/src/auth/auth.dart b/packages/shorebird_cli/lib/src/auth/auth.dart index 53032200..03312dbc 100644 --- a/packages/shorebird_cli/lib/src/auth/auth.dart +++ b/packages/shorebird_cli/lib/src/auth/auth.dart @@ -15,7 +15,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/ci_token.dart'; import 'package:shorebird_cli/src/auth/endpoints/endpoints.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_cli_command_runner.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; diff --git a/packages/shorebird_cli/lib/src/cache.dart b/packages/shorebird_cli/lib/src/cache.dart index db76f947..b3fe8ec5 100644 --- a/packages/shorebird_cli/lib/src/cache.dart +++ b/packages/shorebird_cli/lib/src/cache.dart @@ -10,7 +10,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/artifact_manager.dart'; import 'package:shorebird_cli/src/checksum_checker.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_artifacts.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart b/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart index 8247fb90..bcf45b63 100644 --- a/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart +++ b/packages/shorebird_cli/lib/src/code_push_client_wrapper.dart @@ -17,7 +17,7 @@ import 'package:shorebird_cli/src/archive/directory_archive.dart'; import 'package:shorebird_cli/src/artifact_manager.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/deployment_track.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_flutter.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/cache/clean_cache_command.dart b/packages/shorebird_cli/lib/src/commands/cache/clean_cache_command.dart index 2fce419d..147298db 100644 --- a/packages/shorebird_cli/lib/src/commands/cache/clean_cache_command.dart +++ b/packages/shorebird_cli/lib/src/commands/cache/clean_cache_command.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:mason_logger/mason_logger.dart'; import 'package:shorebird_cli/src/cache.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/doctor_command.dart b/packages/shorebird_cli/lib/src/commands/doctor_command.dart index 46f233a4..974a6589 100644 --- a/packages/shorebird_cli/lib/src/commands/doctor_command.dart +++ b/packages/shorebird_cli/lib/src/commands/doctor_command.dart @@ -5,7 +5,7 @@ import 'package:shorebird_cli/src/android_sdk.dart'; import 'package:shorebird_cli/src/android_studio.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/network_checker.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/flutter/versions/flutter_versions_list_command.dart b/packages/shorebird_cli/lib/src/commands/flutter/versions/flutter_versions_list_command.dart index 75e66eaf..a9b6d53d 100644 --- a/packages/shorebird_cli/lib/src/commands/flutter/versions/flutter_versions_list_command.dart +++ b/packages/shorebird_cli/lib/src/commands/flutter/versions/flutter_versions_list_command.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:mason_logger/mason_logger.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_cli/src/shorebird_flutter.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/init_command.dart b/packages/shorebird_cli/lib/src/commands/init_command.dart index 28239b5e..b38296ce 100644 --- a/packages/shorebird_cli/lib/src/commands/init_command.dart +++ b/packages/shorebird_cli/lib/src/commands/init_command.dart @@ -5,7 +5,7 @@ import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform/ios.dart'; import 'package:shorebird_cli/src/pubspec_editor.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/login_ci_command.dart b/packages/shorebird_cli/lib/src/commands/login_ci_command.dart index 77ef048b..87e390b0 100644 --- a/packages/shorebird_cli/lib/src/commands/login_ci_command.dart +++ b/packages/shorebird_cli/lib/src/commands/login_ci_command.dart @@ -2,7 +2,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_code_push_protocol/shorebird_code_push_protocol.dart' as api; diff --git a/packages/shorebird_cli/lib/src/commands/login_command.dart b/packages/shorebird_cli/lib/src/commands/login_command.dart index a0318087..a649ef5d 100644 --- a/packages/shorebird_cli/lib/src/commands/login_command.dart +++ b/packages/shorebird_cli/lib/src/commands/login_command.dart @@ -1,6 +1,6 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_code_push_protocol/shorebird_code_push_protocol.dart' as api; diff --git a/packages/shorebird_cli/lib/src/commands/logout_command.dart b/packages/shorebird_cli/lib/src/commands/logout_command.dart index 2938e796..8e2188c8 100644 --- a/packages/shorebird_cli/lib/src/commands/logout_command.dart +++ b/packages/shorebird_cli/lib/src/commands/logout_command.dart @@ -1,6 +1,6 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; /// {@template logout_command} diff --git a/packages/shorebird_cli/lib/src/commands/patch/aar_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/aar_patcher.dart index 723bdaf3..12fe2d7e 100644 --- a/packages/shorebird_cli/lib/src/commands/patch/aar_patcher.dart +++ b/packages/shorebird_cli/lib/src/commands/patch/aar_patcher.dart @@ -11,7 +11,7 @@ import 'package:shorebird_cli/src/artifact_manager.dart'; import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/commands/patch/patch.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/release_type.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/patch/android_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/android_patcher.dart index 2291a2d3..9f83d15b 100644 --- a/packages/shorebird_cli/lib/src/commands/patch/android_patcher.dart +++ b/packages/shorebird_cli/lib/src/commands/patch/android_patcher.dart @@ -12,7 +12,7 @@ import 'package:shorebird_cli/src/commands/patch/patcher.dart'; import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/release_type.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/patch/ios_framework_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/ios_framework_patcher.dart index a1d5ad22..ebe58321 100644 --- a/packages/shorebird_cli/lib/src/commands/patch/ios_framework_patcher.dart +++ b/packages/shorebird_cli/lib/src/commands/patch/ios_framework_patcher.dart @@ -15,7 +15,7 @@ import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/aot_tools.dart'; import 'package:shorebird_cli/src/executables/xcodebuild.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/patch/ios_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/ios_patcher.dart index 50c35fa4..3b4f6fdf 100644 --- a/packages/shorebird_cli/lib/src/commands/patch/ios_patcher.dart +++ b/packages/shorebird_cli/lib/src/commands/patch/ios_patcher.dart @@ -19,7 +19,7 @@ import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/patch/patch_command.dart b/packages/shorebird_cli/lib/src/commands/patch/patch_command.dart index 52d26bac..7bb82706 100644 --- a/packages/shorebird_cli/lib/src/commands/patch/patch_command.dart +++ b/packages/shorebird_cli/lib/src/commands/patch/patch_command.dart @@ -15,7 +15,7 @@ import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/deployment_track.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; import 'package:shorebird_cli/src/formatters/formatters.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/patches/promote_command.dart b/packages/shorebird_cli/lib/src/commands/patches/promote_command.dart index 812c515e..92114461 100644 --- a/packages/shorebird_cli/lib/src/commands/patches/promote_command.dart +++ b/packages/shorebird_cli/lib/src/commands/patches/promote_command.dart @@ -4,7 +4,7 @@ import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/deployment_track.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/preview_command.dart b/packages/shorebird_cli/lib/src/commands/preview_command.dart index b2fb5d5f..b2ad969c 100644 --- a/packages/shorebird_cli/lib/src/commands/preview_command.dart +++ b/packages/shorebird_cli/lib/src/commands/preview_command.dart @@ -16,7 +16,7 @@ import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/deployment_track.dart'; import 'package:shorebird_cli/src/executables/devicectl/apple_device.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart index c5befc08..75f31b4c 100644 --- a/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/aar_releaser.dart @@ -8,7 +8,7 @@ import 'package:shorebird_cli/src/artifact_builder.dart'; import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/commands/release/releaser.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/release_type.dart'; import 'package:shorebird_cli/src/shorebird_android_artifacts.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart index 0747261b..ea264437 100644 --- a/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/android_releaser.dart @@ -7,7 +7,7 @@ import 'package:shorebird_cli/src/commands/release/release.dart'; import 'package:shorebird_cli/src/commands/release/releaser.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/release_type.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart index dd751612..6f7c0516 100644 --- a/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/ios_framework_releaser.dart @@ -11,7 +11,7 @@ import 'package:shorebird_cli/src/commands/release/releaser.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/xcodebuild.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/platform/ios.dart'; import 'package:shorebird_cli/src/release_type.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart b/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart index 2d97ebd7..fa50b422 100644 --- a/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart +++ b/packages/shorebird_cli/lib/src/commands/release/ios_releaser.dart @@ -12,7 +12,7 @@ import 'package:shorebird_cli/src/commands/release/releaser.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/xcodebuild.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/platform/ios.dart'; import 'package:shorebird_cli/src/release_type.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/release/release_command.dart b/packages/shorebird_cli/lib/src/commands/release/release_command.dart index 8effe0bd..f7f44a5c 100644 --- a/packages/shorebird_cli/lib/src/commands/release/release_command.dart +++ b/packages/shorebird_cli/lib/src/commands/release/release_command.dart @@ -9,7 +9,7 @@ import 'package:shorebird_cli/src/commands/release/release.dart'; import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/extensions/arg_results.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/run_command.dart b/packages/shorebird_cli/lib/src/commands/run_command.dart index e241b988..1c0f49f0 100644 --- a/packages/shorebird_cli/lib/src/commands/run_command.dart +++ b/packages/shorebird_cli/lib/src/commands/run_command.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:shorebird_cli/src/doctor.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:shorebird_cli/src/shorebird_validator.dart'; diff --git a/packages/shorebird_cli/lib/src/commands/upgrade_command.dart b/packages/shorebird_cli/lib/src/commands/upgrade_command.dart index 151226e2..7760aa4a 100644 --- a/packages/shorebird_cli/lib/src/commands/upgrade_command.dart +++ b/packages/shorebird_cli/lib/src/commands/upgrade_command.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:args/command_runner.dart'; import 'package:mason_logger/mason_logger.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_cli/src/shorebird_version.dart'; diff --git a/packages/shorebird_cli/lib/src/doctor.dart b/packages/shorebird_cli/lib/src/doctor.dart index cd587bbc..5159cffb 100644 --- a/packages/shorebird_cli/lib/src/doctor.dart +++ b/packages/shorebird_cli/lib/src/doctor.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:mason_logger/mason_logger.dart'; import 'package:scoped_deps/scoped_deps.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/validators/validators.dart'; /// A reference to a [Doctor] instance. diff --git a/packages/shorebird_cli/lib/src/executables/aot_tools.dart b/packages/shorebird_cli/lib/src/executables/aot_tools.dart index 231d915f..21eac40c 100644 --- a/packages/shorebird_cli/lib/src/executables/aot_tools.dart +++ b/packages/shorebird_cli/lib/src/executables/aot_tools.dart @@ -9,7 +9,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/cache.dart'; import 'package:shorebird_cli/src/engine_config.dart'; import 'package:shorebird_cli/src/extensions/version.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_artifacts.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; diff --git a/packages/shorebird_cli/lib/src/executables/devicectl/devicectl.dart b/packages/shorebird_cli/lib/src/executables/devicectl/devicectl.dart index a6268b24..bd2b0679 100644 --- a/packages/shorebird_cli/lib/src/executables/devicectl/devicectl.dart +++ b/packages/shorebird_cli/lib/src/executables/devicectl/devicectl.dart @@ -11,7 +11,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/devicectl/apple_device.dart'; import 'package:shorebird_cli/src/executables/devicectl/nserror.dart'; import 'package:shorebird_cli/src/executables/idevicesyslog.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:shorebird_code_push_client/shorebird_code_push_client.dart'; diff --git a/packages/shorebird_cli/lib/src/executables/idevicesyslog.dart b/packages/shorebird_cli/lib/src/executables/idevicesyslog.dart index aa8b01b5..9419188c 100644 --- a/packages/shorebird_cli/lib/src/executables/idevicesyslog.dart +++ b/packages/shorebird_cli/lib/src/executables/idevicesyslog.dart @@ -5,7 +5,7 @@ import 'package:meta/meta.dart'; import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/devicectl/apple_device.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; diff --git a/packages/shorebird_cli/lib/src/executables/ios_deploy.dart b/packages/shorebird_cli/lib/src/executables/ios_deploy.dart index 2f71d6b9..2a11166d 100644 --- a/packages/shorebird_cli/lib/src/executables/ios_deploy.dart +++ b/packages/shorebird_cli/lib/src/executables/ios_deploy.dart @@ -8,7 +8,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:meta/meta.dart'; import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; diff --git a/packages/shorebird_cli/lib/src/extensions/arg_results.dart b/packages/shorebird_cli/lib/src/extensions/arg_results.dart index bafe962a..2e696bd9 100644 --- a/packages/shorebird_cli/lib/src/extensions/arg_results.dart +++ b/packages/shorebird_cli/lib/src/extensions/arg_results.dart @@ -7,7 +7,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:shorebird_cli/src/code_signer.dart'; import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/extensions/file.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/release_type.dart'; import 'package:shorebird_cli/src/third_party/flutter_tools/lib/flutter_tools.dart'; diff --git a/packages/shorebird_cli/lib/src/extensions/file.dart b/packages/shorebird_cli/lib/src/extensions/file.dart index 82595a92..701d703c 100644 --- a/packages/shorebird_cli/lib/src/extensions/file.dart +++ b/packages/shorebird_cli/lib/src/extensions/file.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:mason_logger/mason_logger.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/third_party/flutter_tools/lib/flutter_tools.dart'; /// Extension methods for validating [File]s. diff --git a/packages/shorebird_cli/lib/src/http_client/logging_client.dart b/packages/shorebird_cli/lib/src/http_client/logging_client.dart index 0ddb1cf2..9b14831a 100644 --- a/packages/shorebird_cli/lib/src/http_client/logging_client.dart +++ b/packages/shorebird_cli/lib/src/http_client/logging_client.dart @@ -1,5 +1,5 @@ import 'package:http/http.dart' as http; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; /// An http client that logs request at the verbose level. class LoggingClient extends http.BaseClient { diff --git a/packages/shorebird_cli/lib/src/logging/logging.dart b/packages/shorebird_cli/lib/src/logging/logging.dart new file mode 100644 index 00000000..e9711e82 --- /dev/null +++ b/packages/shorebird_cli/lib/src/logging/logging.dart @@ -0,0 +1,2 @@ +export 'logging_stdout.dart'; +export 'shorebird_logger.dart'; diff --git a/packages/shorebird_cli/lib/src/logger.dart b/packages/shorebird_cli/lib/src/logging/logging_stdout.dart similarity index 55% rename from packages/shorebird_cli/lib/src/logger.dart rename to packages/shorebird_cli/lib/src/logging/logging_stdout.dart index 16bf51ad..e159ac90 100644 --- a/packages/shorebird_cli/lib/src/logger.dart +++ b/packages/shorebird_cli/lib/src/logging/logging_stdout.dart @@ -1,54 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:mason_logger/mason_logger.dart'; -import 'package:path/path.dart' as p; -import 'package:scoped_deps/scoped_deps.dart'; -import 'package:shorebird_cli/src/extensions/string.dart'; -import 'package:shorebird_cli/src/shorebird_env.dart'; - -/// A reference to a [Logger] instance. -final loggerRef = create(ShorebirdLogger.new); - -/// The [Logger] instance available in the current zone. -ShorebirdLogger get logger => read(loggerRef); - -const _logFileName = 'shorebird.log'; - -/// Where logs are written for the current Shorebird CLI run. A new file will -/// be created for every run of the Shorebird CLI, and will have the name -/// `timestamp_shorebird.log`. -final File currentRunLogFile = (() { - // TODO(bryanoltman): use package:clock to test for the correct timestamp - final timestamp = DateTime.now().millisecondsSinceEpoch; - final file = File( - p.join( - shorebirdEnv.logsDirectory.path, - '${timestamp}_$_logFileName', - ), - ); - - if (!file.existsSync()) { - file.createSync(recursive: true); - } - - return file; -})(); - -/// Writes the given [message] to the [logFile] on its own line, prefixed with -/// the current timestamp. -void _writeToLogFile(Object? message, {required File logFile}) { - if (message == null) { - return; - } - - final timestampString = DateTime.now().toIso8601String(); - final messageString = message.toString().removeAnsiEscapes(); - logFile.writeAsStringSync( - '$timestampString $messageString\n', - mode: FileMode.append, - ); -} +import 'package:shorebird_cli/src/logging/logging.dart'; /// {@template logging_stdout} /// A [Stdout] implementation that logs output to a file after forwarding @@ -157,25 +110,6 @@ class LoggingStdout implements Stdout { } void _writeLog(Object? object) { - _writeToLogFile(object, logFile: logFile); - } -} - -/// {@template shorebird_logger} -/// A [Logger] that -/// {@endtemplate} -class ShorebirdLogger extends Logger { - /// {@macro shorebird_logger} - ShorebirdLogger({super.level}); - - @override - void detail(String? message, {LogStyle? style}) { - super.detail(message, style: style); - if (level.index > Level.debug.index) { - // We only need to write the message to the log file if this will not - // be written to stdout. If it is written to stdout, [LoggingStdout] will - // written to the log file. - _writeToLogFile(message ?? '', logFile: currentRunLogFile); - } + writeToLogFile(object, logFile: logFile); } } diff --git a/packages/shorebird_cli/lib/src/logging/shorebird_logger.dart b/packages/shorebird_cli/lib/src/logging/shorebird_logger.dart new file mode 100644 index 00000000..548c9999 --- /dev/null +++ b/packages/shorebird_cli/lib/src/logging/shorebird_logger.dart @@ -0,0 +1,69 @@ +import 'dart:io'; + +import 'package:mason_logger/mason_logger.dart'; +import 'package:path/path.dart' as p; +import 'package:scoped_deps/scoped_deps.dart'; +import 'package:shorebird_cli/src/extensions/string.dart'; +import 'package:shorebird_cli/src/shorebird_env.dart'; + +/// A reference to a [Logger] instance. +final loggerRef = create(ShorebirdLogger.new); + +/// The [Logger] instance available in the current zone. +ShorebirdLogger get logger => read(loggerRef); + +const _logFileName = 'shorebird.log'; + +/// Where logs are written for the current Shorebird CLI run. A new file will +/// be created for every run of the Shorebird CLI, and will have the name +/// `timestamp_shorebird.log`. +final File currentRunLogFile = (() { + // TODO(bryanoltman): use package:clock to test for the correct timestamp + final timestamp = DateTime.now().millisecondsSinceEpoch; + final file = File( + p.join( + shorebirdEnv.logsDirectory.path, + '${timestamp}_$_logFileName', + ), + ); + + if (!file.existsSync()) { + file.createSync(recursive: true); + } + + return file; +})(); + +/// {@template shorebird_logger} +/// A [Logger] that +/// {@endtemplate} +class ShorebirdLogger extends Logger { + /// {@macro shorebird_logger} + ShorebirdLogger({super.level}); + + @override + void detail(String? message, {LogStyle? style}) { + super.detail(message, style: style); + if (level.index > Level.debug.index) { + // We only need to write the message to the log file if this will not + // be written to stdout. If it is written to stdout, [LoggingStdout] will + // written to the log file. + writeToLogFile(message ?? '', logFile: currentRunLogFile); + } + } +} + +/// Writes the given [message] to the [logFile] on its own line, prefixed with +/// the current timestamp. +void writeToLogFile(Object? message, {required File logFile}) { + if (message == null) { + return; + } + + final timestampString = DateTime.now().toIso8601String(); + final messageString = message.toString().removeAnsiEscapes(); + logFile.writeAsStringSync( + '$timestampString $messageString\n', + mode: FileMode.append, + ); +} diff --git a/packages/shorebird_cli/lib/src/network_checker.dart b/packages/shorebird_cli/lib/src/network_checker.dart index e9071666..f511b9b3 100644 --- a/packages/shorebird_cli/lib/src/network_checker.dart +++ b/packages/shorebird_cli/lib/src/network_checker.dart @@ -10,7 +10,7 @@ import 'package:shorebird_cli/src/artifact_manager.dart'; import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/formatters/formatters.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; /// A reference to a [NetworkChecker] instance. final networkCheckerRef = create(NetworkChecker.new); diff --git a/packages/shorebird_cli/lib/src/patch_diff_checker.dart b/packages/shorebird_cli/lib/src/patch_diff_checker.dart index 937f3f2c..0b3669a4 100644 --- a/packages/shorebird_cli/lib/src/patch_diff_checker.dart +++ b/packages/shorebird_cli/lib/src/patch_diff_checker.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:mason_logger/mason_logger.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/archive_analysis/archive_differ.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_documentation.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/lib/src/shorebird_android_artifacts.dart b/packages/shorebird_cli/lib/src/shorebird_android_artifacts.dart index c36652f1..5a632520 100644 --- a/packages/shorebird_cli/lib/src/shorebird_android_artifacts.dart +++ b/packages/shorebird_cli/lib/src/shorebird_android_artifacts.dart @@ -7,7 +7,7 @@ import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/cache.dart'; import 'package:shorebird_cli/src/executables/bundletool.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/lib/src/shorebird_cli_command_runner.dart b/packages/shorebird_cli/lib/src/shorebird_cli_command_runner.dart index ec872a81..cc20f492 100644 --- a/packages/shorebird_cli/lib/src/shorebird_cli_command_runner.dart +++ b/packages/shorebird_cli/lib/src/shorebird_cli_command_runner.dart @@ -9,7 +9,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/commands/commands.dart'; import 'package:shorebird_cli/src/engine_config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_artifacts.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/lib/src/shorebird_flutter.dart b/packages/shorebird_cli/lib/src/shorebird_flutter.dart index d68deb41..c815f0b1 100644 --- a/packages/shorebird_cli/lib/src/shorebird_flutter.dart +++ b/packages/shorebird_cli/lib/src/shorebird_flutter.dart @@ -8,7 +8,7 @@ import 'package:pub_semver/pub_semver.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; import 'package:shorebird_cli/src/extensions/version.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; diff --git a/packages/shorebird_cli/lib/src/shorebird_process.dart b/packages/shorebird_cli/lib/src/shorebird_process.dart index 4e8953bd..9d5f01fb 100644 --- a/packages/shorebird_cli/lib/src/shorebird_process.dart +++ b/packages/shorebird_cli/lib/src/shorebird_process.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:meta/meta.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/engine_config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; /// A reference to a [ShorebirdProcess] instance. diff --git a/packages/shorebird_cli/lib/src/shorebird_validator.dart b/packages/shorebird_cli/lib/src/shorebird_validator.dart index 0b3acdc3..1a9b4631 100644 --- a/packages/shorebird_cli/lib/src/shorebird_validator.dart +++ b/packages/shorebird_cli/lib/src/shorebird_validator.dart @@ -4,7 +4,7 @@ import 'package:collection/collection.dart'; import 'package:mason_logger/mason_logger.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/validators/validators.dart'; diff --git a/packages/shorebird_cli/test/src/artifact_builder_test.dart b/packages/shorebird_cli/test/src/artifact_builder_test.dart index f7f276df..b407ae9f 100644 --- a/packages/shorebird_cli/test/src/artifact_builder_test.dart +++ b/packages/shorebird_cli/test/src/artifact_builder_test.dart @@ -5,7 +5,7 @@ import 'package:mocktail/mocktail.dart'; import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/artifact_builder.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/shorebird_android_artifacts.dart'; diff --git a/packages/shorebird_cli/test/src/artifact_manager_test.dart b/packages/shorebird_cli/test/src/artifact_manager_test.dart index 9e3e784d..bd4ee227 100644 --- a/packages/shorebird_cli/test/src/artifact_manager_test.dart +++ b/packages/shorebird_cli/test/src/artifact_manager_test.dart @@ -10,7 +10,7 @@ import 'package:shorebird_cli/src/artifact_manager.dart'; import 'package:shorebird_cli/src/cache.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/auth/auth_test.dart b/packages/shorebird_cli/test/src/auth/auth_test.dart index 68236d14..289b045d 100644 --- a/packages/shorebird_cli/test/src/auth/auth_test.dart +++ b/packages/shorebird_cli/test/src/auth/auth_test.dart @@ -13,7 +13,7 @@ import 'package:platform/platform.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_cli_command_runner.dart'; import 'package:shorebird_code_push_client/shorebird_code_push_client.dart'; diff --git a/packages/shorebird_cli/test/src/cache_test.dart b/packages/shorebird_cli/test/src/cache_test.dart index 2954da5f..f645d623 100644 --- a/packages/shorebird_cli/test/src/cache_test.dart +++ b/packages/shorebird_cli/test/src/cache_test.dart @@ -11,7 +11,7 @@ import 'package:shorebird_cli/src/artifact_manager.dart'; import 'package:shorebird_cli/src/cache.dart'; import 'package:shorebird_cli/src/checksum_checker.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; diff --git a/packages/shorebird_cli/test/src/code_push_client_wrapper_test.dart b/packages/shorebird_cli/test/src/code_push_client_wrapper_test.dart index 48e0d22b..dd7bbd3a 100644 --- a/packages/shorebird_cli/test/src/code_push_client_wrapper_test.dart +++ b/packages/shorebird_cli/test/src/code_push_client_wrapper_test.dart @@ -10,7 +10,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/deployment_track.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/test/src/commands/cache/clean_cache_command_test.dart b/packages/shorebird_cli/test/src/commands/cache/clean_cache_command_test.dart index b9a30d4d..66bfd65b 100644 --- a/packages/shorebird_cli/test/src/commands/cache/clean_cache_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/cache/clean_cache_command_test.dart @@ -6,7 +6,7 @@ import 'package:platform/platform.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/cache.dart'; import 'package:shorebird_cli/src/commands/commands.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/commands/doctor_command_test.dart b/packages/shorebird_cli/test/src/commands/doctor_command_test.dart index 60bad3eb..69ebf687 100644 --- a/packages/shorebird_cli/test/src/commands/doctor_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/doctor_command_test.dart @@ -9,7 +9,7 @@ import 'package:shorebird_cli/src/android_studio.dart'; import 'package:shorebird_cli/src/commands/commands.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/network_checker.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_flutter.dart'; diff --git a/packages/shorebird_cli/test/src/commands/flutter/versions/flutter_versions_list_command_test.dart b/packages/shorebird_cli/test/src/commands/flutter/versions/flutter_versions_list_command_test.dart index 467c1285..c2f6f643 100644 --- a/packages/shorebird_cli/test/src/commands/flutter/versions/flutter_versions_list_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/flutter/versions/flutter_versions_list_command_test.dart @@ -4,7 +4,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:mocktail/mocktail.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/commands/commands.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_flutter.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/commands/init_command_test.dart b/packages/shorebird_cli/test/src/commands/init_command_test.dart index e08d4db7..409d310d 100644 --- a/packages/shorebird_cli/test/src/commands/init_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/init_command_test.dart @@ -12,7 +12,7 @@ import 'package:shorebird_cli/src/commands/init_command.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/platform/ios.dart'; import 'package:shorebird_cli/src/pubspec_editor.dart'; diff --git a/packages/shorebird_cli/test/src/commands/login_ci_command_test.dart b/packages/shorebird_cli/test/src/commands/login_ci_command_test.dart index 8f0abf23..32144126 100644 --- a/packages/shorebird_cli/test/src/commands/login_ci_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/login_ci_command_test.dart @@ -5,7 +5,7 @@ import 'package:mocktail/mocktail.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/commands/commands.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_code_push_protocol/shorebird_code_push_protocol.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/commands/login_command_test.dart b/packages/shorebird_cli/test/src/commands/login_command_test.dart index 4ae65f91..6f0e156e 100644 --- a/packages/shorebird_cli/test/src/commands/login_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/login_command_test.dart @@ -8,7 +8,7 @@ import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/commands/login_command.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_code_push_protocol/shorebird_code_push_protocol.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/commands/logout_command_test.dart b/packages/shorebird_cli/test/src/commands/logout_command_test.dart index 57f9a9b5..35ecba2e 100644 --- a/packages/shorebird_cli/test/src/commands/logout_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/logout_command_test.dart @@ -4,7 +4,7 @@ import 'package:mocktail/mocktail.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/commands/logout_command.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:test/test.dart'; import '../mocks.dart'; diff --git a/packages/shorebird_cli/test/src/commands/patch/aar_patcher_test.dart b/packages/shorebird_cli/test/src/commands/patch/aar_patcher_test.dart index 41976756..24682f6f 100644 --- a/packages/shorebird_cli/test/src/commands/patch/aar_patcher_test.dart +++ b/packages/shorebird_cli/test/src/commands/patch/aar_patcher_test.dart @@ -12,7 +12,7 @@ import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/commands/patch/patch.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/engine_config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform.dart'; diff --git a/packages/shorebird_cli/test/src/commands/patch/android_patcher_test.dart b/packages/shorebird_cli/test/src/commands/patch/android_patcher_test.dart index 6721417b..a5c65069 100644 --- a/packages/shorebird_cli/test/src/commands/patch/android_patcher_test.dart +++ b/packages/shorebird_cli/test/src/commands/patch/android_patcher_test.dart @@ -16,7 +16,7 @@ import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/engine_config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; diff --git a/packages/shorebird_cli/test/src/commands/patch/ios_framework_patcher_test.dart b/packages/shorebird_cli/test/src/commands/patch/ios_framework_patcher_test.dart index 0fd81cea..39a65bbc 100644 --- a/packages/shorebird_cli/test/src/commands/patch/ios_framework_patcher_test.dart +++ b/packages/shorebird_cli/test/src/commands/patch/ios_framework_patcher_test.dart @@ -17,7 +17,7 @@ import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/engine_config.dart'; import 'package:shorebird_cli/src/executables/aot_tools.dart'; import 'package:shorebird_cli/src/executables/xcodebuild.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; diff --git a/packages/shorebird_cli/test/src/commands/patch/ios_patcher_test.dart b/packages/shorebird_cli/test/src/commands/patch/ios_patcher_test.dart index e1fae2dd..bcb561ed 100644 --- a/packages/shorebird_cli/test/src/commands/patch/ios_patcher_test.dart +++ b/packages/shorebird_cli/test/src/commands/patch/ios_patcher_test.dart @@ -21,7 +21,7 @@ import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/engine_config.dart'; import 'package:shorebird_cli/src/executables/aot_tools.dart'; import 'package:shorebird_cli/src/executables/xcodebuild.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; diff --git a/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart b/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart index e4926521..97f18f43 100644 --- a/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart @@ -15,7 +15,7 @@ import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/deployment_track.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; diff --git a/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart b/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart index 7acd6ab9..ba81b658 100644 --- a/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/patches/promote_command_test.dart @@ -6,7 +6,7 @@ import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/commands/patches/patches.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/deployment_track.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_code_push_protocol/shorebird_code_push_protocol.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/commands/preview_command_test.dart b/packages/shorebird_cli/test/src/commands/preview_command_test.dart index e2bf7b32..ff815683 100644 --- a/packages/shorebird_cli/test/src/commands/preview_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/preview_command_test.dart @@ -19,7 +19,7 @@ import 'package:shorebird_cli/src/deployment_track.dart'; import 'package:shorebird_cli/src/executables/devicectl/apple_device.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_validator.dart'; diff --git a/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart index f767336f..ace19710 100644 --- a/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/aar_releaser_test.dart @@ -9,7 +9,7 @@ import 'package:shorebird_cli/src/artifact_builder.dart'; import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/commands/release/aar_releaser.dart'; import 'package:shorebird_cli/src/engine_config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; diff --git a/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart index a4c94f4c..d29caaf0 100644 --- a/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/android_releaser_test.dart @@ -13,7 +13,7 @@ import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/engine_config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/platform/platform.dart'; diff --git a/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart index 973fc947..f97dfa29 100644 --- a/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/ios_framework_releaser_test.dart @@ -14,7 +14,7 @@ import 'package:shorebird_cli/src/commands/release/ios_framework_releaser.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/platform/ios.dart'; diff --git a/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart b/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart index 409a9956..3724f9a4 100644 --- a/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/ios_releaser_test.dart @@ -18,7 +18,7 @@ import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/config/config.dart'; import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/executables/xcodebuild.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/os/operating_system_interface.dart'; import 'package:shorebird_cli/src/platform/ios.dart'; diff --git a/packages/shorebird_cli/test/src/commands/release/release_command_test.dart b/packages/shorebird_cli/test/src/commands/release/release_command_test.dart index 376beb45..6c01e467 100644 --- a/packages/shorebird_cli/test/src/commands/release/release_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/release/release_command_test.dart @@ -10,7 +10,7 @@ import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/commands/release/release.dart'; import 'package:shorebird_cli/src/common_arguments.dart'; import 'package:shorebird_cli/src/config/config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/metadata/metadata.dart'; import 'package:shorebird_cli/src/release_type.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; diff --git a/packages/shorebird_cli/test/src/commands/run_command_test.dart b/packages/shorebird_cli/test/src/commands/run_command_test.dart index 11e33f6a..20bc8af4 100644 --- a/packages/shorebird_cli/test/src/commands/run_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/run_command_test.dart @@ -8,7 +8,7 @@ import 'package:mocktail/mocktail.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/commands/run_command.dart'; import 'package:shorebird_cli/src/doctor.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:shorebird_cli/src/shorebird_validator.dart'; import 'package:shorebird_cli/src/validators/validators.dart'; diff --git a/packages/shorebird_cli/test/src/commands/upgrade_command_test.dart b/packages/shorebird_cli/test/src/commands/upgrade_command_test.dart index eb9738d7..cb54984c 100644 --- a/packages/shorebird_cli/test/src/commands/upgrade_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/upgrade_command_test.dart @@ -4,7 +4,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:mocktail/mocktail.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/commands/commands.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_version.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/doctor_test.dart b/packages/shorebird_cli/test/src/doctor_test.dart index 6bacb0ce..41eb6039 100644 --- a/packages/shorebird_cli/test/src/doctor_test.dart +++ b/packages/shorebird_cli/test/src/doctor_test.dart @@ -2,7 +2,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:mocktail/mocktail.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/doctor.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/validators/validators.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/executables/aot_tools_test.dart b/packages/shorebird_cli/test/src/executables/aot_tools_test.dart index 9b1615a7..3fe4f158 100644 --- a/packages/shorebird_cli/test/src/executables/aot_tools_test.dart +++ b/packages/shorebird_cli/test/src/executables/aot_tools_test.dart @@ -6,7 +6,7 @@ import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/cache.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_artifacts.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; diff --git a/packages/shorebird_cli/test/src/executables/devicectl/devicectl_test.dart b/packages/shorebird_cli/test/src/executables/devicectl/devicectl_test.dart index 92df7662..aac12e97 100644 --- a/packages/shorebird_cli/test/src/executables/devicectl/devicectl_test.dart +++ b/packages/shorebird_cli/test/src/executables/devicectl/devicectl_test.dart @@ -6,7 +6,7 @@ import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/devicectl/apple_device.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/executables/idevicesyslog_test.dart b/packages/shorebird_cli/test/src/executables/idevicesyslog_test.dart index c463f54a..b1588cc6 100644 --- a/packages/shorebird_cli/test/src/executables/idevicesyslog_test.dart +++ b/packages/shorebird_cli/test/src/executables/idevicesyslog_test.dart @@ -6,7 +6,7 @@ import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/devicectl/apple_device.dart'; import 'package:shorebird_cli/src/executables/idevicesyslog.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/executables/ios_deploy_test.dart b/packages/shorebird_cli/test/src/executables/ios_deploy_test.dart index 27ad7560..0e76ff34 100644 --- a/packages/shorebird_cli/test/src/executables/ios_deploy_test.dart +++ b/packages/shorebird_cli/test/src/executables/ios_deploy_test.dart @@ -8,7 +8,7 @@ import 'package:path/path.dart' as p; import 'package:platform/platform.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; diff --git a/packages/shorebird_cli/test/src/executables/shorebird_tools_test.dart b/packages/shorebird_cli/test/src/executables/shorebird_tools_test.dart index c4d30649..a0d69f60 100644 --- a/packages/shorebird_cli/test/src/executables/shorebird_tools_test.dart +++ b/packages/shorebird_cli/test/src/executables/shorebird_tools_test.dart @@ -4,7 +4,7 @@ import 'package:mocktail/mocktail.dart'; import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/http_client/logging_client_test.dart b/packages/shorebird_cli/test/src/http_client/logging_client_test.dart index 61a6f28b..39eda0a4 100644 --- a/packages/shorebird_cli/test/src/http_client/logging_client_test.dart +++ b/packages/shorebird_cli/test/src/http_client/logging_client_test.dart @@ -4,7 +4,7 @@ import 'package:http/http.dart' as http; import 'package:mocktail/mocktail.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:test/test.dart'; import '../fakes.dart'; diff --git a/packages/shorebird_cli/test/src/logger_test.dart b/packages/shorebird_cli/test/src/logging/logging_stdout_test.dart similarity index 68% rename from packages/shorebird_cli/test/src/logger_test.dart rename to packages/shorebird_cli/test/src/logging/logging_stdout_test.dart index 7d7949ae..7ff108ac 100644 --- a/packages/shorebird_cli/test/src/logger_test.dart +++ b/packages/shorebird_cli/test/src/logging/logging_stdout_test.dart @@ -1,44 +1,15 @@ import 'dart:convert'; import 'dart:io'; -import 'package:mason_logger/mason_logger.dart'; import 'package:mocktail/mocktail.dart'; import 'package:path/path.dart' as p; -import 'package:scoped_deps/scoped_deps.dart'; -import 'package:shorebird_cli/src/logger.dart'; -import 'package:shorebird_cli/src/shorebird_env.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:test/test.dart'; -import 'fakes.dart'; -import 'mocks.dart'; +import '../fakes.dart'; +import '../mocks.dart'; void main() { - group('currentRunLogFile', () { - late ShorebirdEnv shorebirdEnv; - late Directory logsDirectory; - - R runWithOverrides(R Function() body) { - return runScoped( - body, - values: { - shorebirdEnvRef.overrideWith(() => shorebirdEnv), - }, - ); - } - - setUp(() { - logsDirectory = Directory.systemTemp.createTempSync('shorebird_logs'); - shorebirdEnv = MockShorebirdEnv(); - when(() => shorebirdEnv.logsDirectory).thenReturn(logsDirectory); - }); - - test('creates a log file in the logs directory', () { - final file = runWithOverrides(() => currentRunLogFile); - expect(file.existsSync(), isTrue); - expect(file.path, startsWith(logsDirectory.path)); - }); - }); - group(LoggingStdout, () { final utf8Encoding = Encoding.getByName('utf-8')!; late File logFile; @@ -182,62 +153,4 @@ void main() { expect(logFile.readAsStringSync(), contains('\x00')); }); }); - - group(ShorebirdLogger, () { - late ShorebirdEnv shorebirdEnv; - late ShorebirdLogger logger; - - R runWithOverrides(R Function() body) { - return runScoped( - body, - values: { - shorebirdEnvRef.overrideWith(() => shorebirdEnv), - }, - ); - } - - setUp(() { - shorebirdEnv = MockShorebirdEnv(); - when(() => shorebirdEnv.logsDirectory).thenReturn( - Directory.systemTemp.createTempSync(), - ); - logger = ShorebirdLogger(); - }); - - group('detail', () { - group('when log level is debug or higher', () { - setUp(() { - logger.level = Level.debug; - }); - - test('does not write message to log file', () { - const message = 'my detail message'; - logger.detail(message); - expect( - // Replacing this with a tear-off influences - // ignore: unnecessary_lambdas - runWithOverrides(() => currentRunLogFile.readAsStringSync()), - isNot(contains(message)), - ); - }); - }); - - group('when log level is lower than debug', () { - setUp(() { - logger.level = Level.info; - }); - - test('writes message to log file', () { - const message = 'my detail message'; - logger.detail(message); - expect( - // Replacing this with a tear-off influences - // ignore: unnecessary_lambdas - runWithOverrides(() => currentRunLogFile.readAsStringSync()), - contains(message), - ); - }); - }); - }); - }); } diff --git a/packages/shorebird_cli/test/src/logging/shorebird_logger_test.dart b/packages/shorebird_cli/test/src/logging/shorebird_logger_test.dart new file mode 100644 index 00000000..f8c90d43 --- /dev/null +++ b/packages/shorebird_cli/test/src/logging/shorebird_logger_test.dart @@ -0,0 +1,96 @@ +import 'dart:io'; + +import 'package:mason_logger/mason_logger.dart'; +import 'package:mocktail/mocktail.dart'; +import 'package:scoped_deps/scoped_deps.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; +import 'package:shorebird_cli/src/shorebird_env.dart'; +import 'package:test/test.dart'; + +import '../mocks.dart'; + +void main() { + group('currentRunLogFile', () { + late ShorebirdEnv shorebirdEnv; + late Directory logsDirectory; + + R runWithOverrides(R Function() body) { + return runScoped( + body, + values: { + shorebirdEnvRef.overrideWith(() => shorebirdEnv), + }, + ); + } + + setUp(() { + logsDirectory = Directory.systemTemp.createTempSync('shorebird_logs'); + shorebirdEnv = MockShorebirdEnv(); + when(() => shorebirdEnv.logsDirectory).thenReturn(logsDirectory); + }); + + test('creates a log file in the logs directory', () { + final file = runWithOverrides(() => currentRunLogFile); + expect(file.existsSync(), isTrue); + expect(file.path, startsWith(logsDirectory.path)); + }); + }); + + group(ShorebirdLogger, () { + late ShorebirdEnv shorebirdEnv; + late ShorebirdLogger logger; + + R runWithOverrides(R Function() body) { + return runScoped( + body, + values: { + shorebirdEnvRef.overrideWith(() => shorebirdEnv), + }, + ); + } + + setUp(() { + shorebirdEnv = MockShorebirdEnv(); + when(() => shorebirdEnv.logsDirectory).thenReturn( + Directory.systemTemp.createTempSync(), + ); + logger = ShorebirdLogger(); + }); + + group('detail', () { + group('when log level is debug or higher', () { + setUp(() { + logger.level = Level.debug; + }); + + test('does not write message to log file', () { + const message = 'my detail message'; + logger.detail(message); + expect( + // Replacing this with a tear-off influences + // ignore: unnecessary_lambdas + runWithOverrides(() => currentRunLogFile.readAsStringSync()), + isNot(contains(message)), + ); + }); + }); + + group('when log level is lower than debug', () { + setUp(() { + logger.level = Level.info; + }); + + test('writes message to log file', () { + const message = 'my detail message'; + logger.detail(message); + expect( + // Replacing this with a tear-off influences + // ignore: unnecessary_lambdas + runWithOverrides(() => currentRunLogFile.readAsStringSync()), + contains(message), + ); + }); + }); + }); + }); +} diff --git a/packages/shorebird_cli/test/src/mocks.dart b/packages/shorebird_cli/test/src/mocks.dart index 9d8bcb8c..07fb7c00 100644 --- a/packages/shorebird_cli/test/src/mocks.dart +++ b/packages/shorebird_cli/test/src/mocks.dart @@ -25,7 +25,7 @@ import 'package:shorebird_cli/src/doctor.dart'; import 'package:shorebird_cli/src/engine_config.dart'; import 'package:shorebird_cli/src/executables/devicectl/apple_device.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/network_checker.dart'; import 'package:shorebird_cli/src/os/os.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; diff --git a/packages/shorebird_cli/test/src/network_checker_test.dart b/packages/shorebird_cli/test/src/network_checker_test.dart index 39da5b60..45bd63b5 100644 --- a/packages/shorebird_cli/test/src/network_checker_test.dart +++ b/packages/shorebird_cli/test/src/network_checker_test.dart @@ -9,7 +9,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/artifact_manager.dart'; import 'package:shorebird_cli/src/code_push_client_wrapper.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/network_checker.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/patch_diff_checker_test.dart b/packages/shorebird_cli/test/src/patch_diff_checker_test.dart index 81e1d48d..b0d7d06e 100644 --- a/packages/shorebird_cli/test/src/patch_diff_checker_test.dart +++ b/packages/shorebird_cli/test/src/patch_diff_checker_test.dart @@ -7,7 +7,7 @@ import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/archive_analysis/archive_analysis.dart'; import 'package:shorebird_cli/src/archive_analysis/archive_differ.dart'; import 'package:shorebird_cli/src/http_client/http_client.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/patch_diff_checker.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart b/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart index 17f75178..e94bfddd 100644 --- a/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart +++ b/packages/shorebird_cli/test/src/shorebird_android_artifacts_test.dart @@ -7,7 +7,7 @@ import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/cache.dart'; import 'package:shorebird_cli/src/executables/bundletool.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_android_artifacts.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/shorebird_cli_command_runner_test.dart b/packages/shorebird_cli/test/src/shorebird_cli_command_runner_test.dart index 4c126bd9..a9987851 100644 --- a/packages/shorebird_cli/test/src/shorebird_cli_command_runner_test.dart +++ b/packages/shorebird_cli/test/src/shorebird_cli_command_runner_test.dart @@ -5,7 +5,7 @@ import 'package:mason_logger/mason_logger.dart'; import 'package:mocktail/mocktail.dart'; import 'package:platform/platform.dart'; import 'package:scoped_deps/scoped_deps.dart'; -import 'package:shorebird_cli/src/logger.dart' hide logger; +import 'package:shorebird_cli/src/logging/logging.dart' hide logger; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_cli_command_runner.dart'; import 'package:shorebird_cli/src/shorebird_command.dart'; diff --git a/packages/shorebird_cli/test/src/shorebird_flutter_test.dart b/packages/shorebird_cli/test/src/shorebird_flutter_test.dart index c5af1a69..d07fc51e 100644 --- a/packages/shorebird_cli/test/src/shorebird_flutter_test.dart +++ b/packages/shorebird_cli/test/src/shorebird_flutter_test.dart @@ -8,7 +8,7 @@ import 'package:platform/platform.dart'; import 'package:pub_semver/pub_semver.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/executables/executables.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_flutter.dart'; diff --git a/packages/shorebird_cli/test/src/shorebird_process_test.dart b/packages/shorebird_cli/test/src/shorebird_process_test.dart index 73daeae1..1c8579d1 100644 --- a/packages/shorebird_cli/test/src/shorebird_process_test.dart +++ b/packages/shorebird_cli/test/src/shorebird_process_test.dart @@ -6,7 +6,7 @@ import 'package:mocktail/mocktail.dart'; import 'package:path/path.dart' as p; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/engine_config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_process.dart'; import 'package:test/test.dart'; diff --git a/packages/shorebird_cli/test/src/shorebird_validator_test.dart b/packages/shorebird_cli/test/src/shorebird_validator_test.dart index 933240f6..daf650bf 100644 --- a/packages/shorebird_cli/test/src/shorebird_validator_test.dart +++ b/packages/shorebird_cli/test/src/shorebird_validator_test.dart @@ -4,7 +4,7 @@ import 'package:platform/platform.dart'; import 'package:scoped_deps/scoped_deps.dart'; import 'package:shorebird_cli/src/auth/auth.dart'; import 'package:shorebird_cli/src/config/config.dart'; -import 'package:shorebird_cli/src/logger.dart'; +import 'package:shorebird_cli/src/logging/logging.dart'; import 'package:shorebird_cli/src/platform.dart'; import 'package:shorebird_cli/src/shorebird_env.dart'; import 'package:shorebird_cli/src/shorebird_validator.dart';