Skip to content

Commit 43265ab

Browse files
committed
Fix invisible trace logging
1 parent 7bfb155 commit 43265ab

File tree

5 files changed

+39
-35
lines changed

5 files changed

+39
-35
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [1.1.0] - 2021-12-25
8+
### Fixed
9+
- Outdated project template.
10+
- Inconsistent extra lines when error occurs.
11+
### Removed
12+
- `build` and `serve` command. Very hard to maintain & build a global package
13+
that uses null-safety itself but contains some unsound-null-safety code.
14+
715
## [1.0.2] - 2021-06-14
816
### Fixed
917
- Fix missing `.gitignore` file (isn't generated when creating).
@@ -19,4 +27,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1927

2028
## [1.0.0] - 2021-05-30
2129
### Added
22-
- Initial version.
30+
- Initial version.

bin/ngdart.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Future<void> main(List<String> args) async {
1010
try {
1111
await runner.run(args);
1212
} on UsageException catch (e) {
13-
error('$e');
13+
error('$e');
1414
exit(64);
1515
} catch (e) {
16-
error('$e');
16+
error('$e');
1717
exit(1);
1818
}
1919
}

lib/src/commands/clean.dart

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import 'dart:io';
33

44
import 'package:args/command_runner.dart';
55
import 'package:cli_util/cli_logging.dart';
6-
import 'package:ngdart/src/util/logger.dart';
6+
7+
import '../util/logger.dart';
78

89
class CleanCommand extends Command<int> {
910
@override
@@ -23,27 +24,23 @@ class CleanCommand extends Command<int> {
2324
final pubspec = File('pubspec.yaml');
2425
final logger = Logger.standard(ansi: Ansi(true));
2526

26-
try {
27-
if (!(await pubspec.exists())) {
28-
throw Exception('pubspec.yaml not found!');
29-
}
30-
if (await buildDir.exists()) {
31-
final progress = logger.progress('Deleting build');
32-
await buildDir.delete(recursive: true);
33-
progress.finish(showTiming: true);
34-
}
35-
if (await toolDir.exists()) {
36-
final progress = logger.progress('Deleting .dart_tools');
37-
await toolDir.delete(recursive: true);
38-
progress.finish(showTiming: true);
39-
}
40-
if (await packages.exists()) {
41-
final progress = logger.progress('Deleting .packages');
42-
await packages.delete();
43-
progress.finish(showTiming: true);
44-
}
45-
} catch (e) {
46-
throw Exception(e);
27+
if (!(await pubspec.exists())) {
28+
throw Exception('pubspec.yaml not found!');
29+
}
30+
if (await buildDir.exists()) {
31+
final progress = logger.progress('Deleting build');
32+
await buildDir.delete(recursive: true);
33+
progress.finish(showTiming: true);
34+
}
35+
if (await toolDir.exists()) {
36+
final progress = logger.progress('Deleting .dart_tools');
37+
await toolDir.delete(recursive: true);
38+
progress.finish(showTiming: true);
39+
}
40+
if (await packages.exists()) {
41+
final progress = logger.progress('Deleting .packages');
42+
await packages.delete();
43+
progress.finish(showTiming: true);
4744
}
4845
success('All clean!');
4946

lib/src/commands/create.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class CreateCommand extends Command<int> {
7070
final projectName =
7171
normalizeProjectName(readArg('Requires a project name'));
7272
// var progress = AppLogger.logger.progress('Creating project');
73-
info('Creating project...');
73+
info('Creating project...');
7474
await createNewProject(argResults!, projectName);
7575
// progress.finish(showTiming: true);
7676
success('Created project "$projectName"');

lib/src/util/logger.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@ import 'package:cli_util/cli_logging.dart';
44
Logger logger = Logger.standard(ansi: Ansi(true));
55

66
void error(String message) {
7-
final AnsiPen pen = AnsiPen()..xterm(160);
8-
logger.stderr('${pen('[Error]')} $message');
7+
final AnsiPen pen = AnsiPen()..xterm(160);
8+
logger.stderr('${pen('[Error]')} $message');
99
}
1010

1111
void info(String message) {
12-
final AnsiPen pen = AnsiPen()..xterm(045);
13-
logger.stdout('${pen('[Info]')} $message');
12+
final AnsiPen pen = AnsiPen()..xterm(045);
13+
logger.stdout('${pen('[Info]')} $message');
1414
}
1515

1616
void success(String message) {
17-
final AnsiPen pen = AnsiPen()..xterm(040);
18-
logger.stdout('${pen('[Success]')} $message');
17+
final AnsiPen pen = AnsiPen()..xterm(040);
18+
logger.stdout('${pen('[Success]')} $message');
1919
}
2020

2121
void trace(String message) {
22-
final AnsiPen pen = AnsiPen()..xterm(045);
23-
// logger.trace('${pen('[Trace]')} $message');
24-
logger.trace(message);
22+
final AnsiPen pen = AnsiPen()..xterm(045);
23+
logger.trace('${pen('[Trace]')} $message');
2524
}

0 commit comments

Comments
 (0)