From 1f67da1577a0bf80c3df6abb3710468a679778a6 Mon Sep 17 00:00:00 2001
From: Felix Angelov <felangelov@gmail.com>
Date: Wed, 22 Sep 2021 17:14:49 -0500
Subject: [PATCH] refactor: simplify template post generation steps

---
 lib/src/templates/template.dart | 111 ++++++++++++++------------------
 test/e2e_test.dart              |   4 +-
 2 files changed, 49 insertions(+), 66 deletions(-)

diff --git a/lib/src/templates/template.dart b/lib/src/templates/template.dart
index a30ab39a..6eadf457 100644
--- a/lib/src/templates/template.dart
+++ b/lib/src/templates/template.dart
@@ -44,22 +44,8 @@ class DartPkgTemplate extends Template {
 
   @override
   Future<void> onGenerateComplete(Logger logger, Directory outputDir) async {
-    final isFlutterInstalled = await Flutter.installed();
-    if (isFlutterInstalled) {
-      final installDependenciesDone = logger.progress(
-        'Running "flutter pub get" in ${outputDir.path}',
-      );
-      await Flutter.pubGet(cwd: outputDir.path);
-      installDependenciesDone();
-    }
-    final isDartInstalled = await Dart.installed();
-    if (isDartInstalled) {
-      final applyFixesDone = logger.progress(
-        'Running "dart fix --apply" in ${outputDir.path}',
-      );
-      await Dart.applyFixes();
-      applyFixesDone();
-    }
+    await _installDartPackages(logger, outputDir);
+    await _applyDartFixes(logger, outputDir);
     _logSummary(logger);
   }
 
@@ -84,22 +70,8 @@ class FlutterPkgTemplate extends Template {
 
   @override
   Future<void> onGenerateComplete(Logger logger, Directory outputDir) async {
-    final isFlutterInstalled = await Flutter.installed();
-    if (isFlutterInstalled) {
-      final installDependenciesDone = logger.progress(
-        'Running "flutter packages get" in ${outputDir.path}',
-      );
-      await Flutter.packagesGet(cwd: outputDir.path);
-      installDependenciesDone();
-    }
-    final isDartInstalled = await Dart.installed();
-    if (isDartInstalled) {
-      final applyFixesDone = logger.progress(
-        'Running "dart fix --apply" in ${outputDir.path}',
-      );
-      await Dart.applyFixes();
-      applyFixesDone();
-    }
+    await _installFlutterPackages(logger, outputDir);
+    await _applyDartFixes(logger, outputDir);
     _logSummary(logger);
   }
 
@@ -125,22 +97,8 @@ class FlutterPluginTemplate extends Template {
 
   @override
   Future<void> onGenerateComplete(Logger logger, Directory outputDir) async {
-    final isFlutterInstalled = await Flutter.installed();
-    if (isFlutterInstalled) {
-      final installDependenciesDone = logger.progress(
-        'Running "flutter packages get" in ${outputDir.path}',
-      );
-      await Flutter.packagesGet(cwd: outputDir.path, recursive: true);
-      installDependenciesDone();
-    }
-    final isDartInstalled = await Dart.installed();
-    if (isDartInstalled) {
-      final applyFixesDone = logger.progress(
-        'Running "dart fix --apply" in ${outputDir.path}',
-      );
-      await Dart.applyFixes();
-      applyFixesDone();
-    }
+    await _installFlutterPackages(logger, outputDir);
+    await _applyDartFixes(logger, outputDir);
     _logSummary(logger);
   }
 
@@ -166,22 +124,8 @@ class CoreTemplate extends Template {
 
   @override
   Future<void> onGenerateComplete(Logger logger, Directory outputDir) async {
-    final isFlutterInstalled = await Flutter.installed();
-    if (isFlutterInstalled) {
-      final installDependenciesDone = logger.progress(
-        'Running "flutter packages get" in ${outputDir.path}',
-      );
-      await Flutter.packagesGet(cwd: outputDir.path);
-      installDependenciesDone();
-    }
-    final isDartInstalled = await Dart.installed();
-    if (isDartInstalled) {
-      final applyFixesDone = logger.progress(
-        'Running "dart fix --apply" in ${outputDir.path}',
-      );
-      await Dart.applyFixes();
-      applyFixesDone();
-    }
+    await _installFlutterPackages(logger, outputDir);
+    await _applyDartFixes(logger, outputDir);
     _logSummary(logger);
   }
 
@@ -205,3 +149,42 @@ class CoreTemplate extends Template {
       );
   }
 }
+
+Future<void> _installDartPackages(
+  Logger logger,
+  Directory outputDir,
+) async {
+  final isFlutterInstalled = await Flutter.installed();
+  if (isFlutterInstalled) {
+    final installDependenciesDone = logger.progress(
+      'Running "flutter pub get" in ${outputDir.path}',
+    );
+    await Flutter.pubGet(cwd: outputDir.path);
+    installDependenciesDone();
+  }
+}
+
+Future<void> _installFlutterPackages(
+  Logger logger,
+  Directory outputDir,
+) async {
+  final isFlutterInstalled = await Flutter.installed();
+  if (isFlutterInstalled) {
+    final installDependenciesDone = logger.progress(
+      'Running "flutter packages get" in ${outputDir.path}',
+    );
+    await Flutter.packagesGet(cwd: outputDir.path);
+    installDependenciesDone();
+  }
+}
+
+Future<void> _applyDartFixes(Logger logger, Directory outputDir) async {
+  final isDartInstalled = await Dart.installed();
+  if (isDartInstalled) {
+    final applyFixesDone = logger.progress(
+      'Running "dart fix --apply" in ${outputDir.path}',
+    );
+    await Dart.applyFixes();
+    applyFixesDone();
+  }
+}
diff --git a/test/e2e_test.dart b/test/e2e_test.dart
index 88e606c2..1fa7be50 100644
--- a/test/e2e_test.dart
+++ b/test/e2e_test.dart
@@ -203,6 +203,6 @@ void main() {
       expect(testCoverageResult.exitCode, equals(ExitCode.success.code));
       expect(testCoverageResult.stderr, isEmpty);
       expect(testCoverageResult.stdout, contains('lines......: 100.0%'));
-    }, timeout: const Timeout(Duration(minutes: 1)));
-  });
+    });
+  }, timeout: const Timeout(Duration(minutes: 2)));
 }