Released 6.0.0-alpha.1.

Author: bsutton

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 6.0.0-alpha.1
+- moved to the alpha version of dcli 4.x
+
 # 5.3.2
 - upgraded dcli to fix a null check.
 

bin/dswitch.dart

@@ -19,7 +19,7 @@ import 'package:path/path.dart';
 
 late final CommandRunner<void> runner;
 Future<void> main(List<String> args) async {
-  firstRun();
+  await firstRun();
   runner = buildCommandRunner();
   try {
     await doit(args);

bin/dswitch_install.dart

@@ -5,7 +5,7 @@
  * Written by Brett Sutton <[email protected]>, Jan 2022
  */
 
-import 'dart:io';
+import 'dart:io' as io;
 
 import 'package:args/args.dart';
 import 'package:dcli/dcli.dart';
@@ -18,14 +18,14 @@ import 'package:dswitch/src/settings.dart';
 import 'package:path/path.dart';
 import 'package:pubspec_manager/pubspec_manager.dart';
 
-void main(List<String> args) {
+void main(List<String> args) async {
   final argParser = ArgParser()
     ..addFlag('verbose',
         abbr: 'v', negatable: false, help: 'Dump verbose logging information')
     ..addOption('stage2', help: 'Stage 2', hide: true)
     ..addOption('home', help: 'Users home directory.', hide: true);
   try {
-    run(args, argParser);
+    await run(args, argParser);
   } on ExitException catch (e) {
     String message;
     if (e.code == 0) {
@@ -40,7 +40,7 @@ void main(List<String> args) {
   }
 }
 
-void run(List<String> args, ArgParser argParser) {
+Future<void> run(List<String> args, ArgParser argParser) async {
   final ArgResults parsed;
   try {
     parsed = argParser.parse(args);
@@ -52,11 +52,11 @@ void run(List<String> args, ArgParser argParser) {
 
   if (!parsed.wasParsed('stage2')) {
     runStage1();
-    installDart();
+    await installDart();
   } else {
     final pathToDSwitch = parsed['stage2'] as String;
     final pathToHome = parsed['home'] as String;
-    runStage2(pathToDSwitch, pathToHome: pathToHome);
+    await runStage2(pathToDSwitch, pathToHome: pathToHome);
 
     throw ExitException(0, 'Stage2 Completed successfully', showUsage: false);
   }
@@ -66,7 +66,7 @@ void run(List<String> args, ArgParser argParser) {
 
 void runStage1() {
   if (!Shell.current.isPrivilegedUser) {
-    if (Platform.isWindows) {
+    if (io.Platform.isWindows) {
       throw ExitException(
           1, 'Please run dswitch_install with Administrative privileges.',
           showUsage: false);
@@ -119,7 +119,7 @@ void runStage1() {
     //     join(compileDir, '${script.basename}2${extension(script.basename)}');
     // copy(script.pathToExe, duplicate, overwrite: true);
 
-    if (!Platform.isWindows) {
+    if (!io.Platform.isWindows) {
       print(green('Please provide your sudo password so we can install '
           'dswitch into your PATH'));
     }
@@ -156,7 +156,8 @@ void hackPubspecForDev(String pathToDSwitch, String compileDir) {
 }
 
 /// In stage 2 we are running from a compiled exe as a privilged user.
-void runStage2(String pathToDSwitch, {required String pathToHome}) {
+Future<void> runStage2(String pathToDSwitch,
+    {required String pathToHome}) async {
   final target = pathToInstallDir;
 
   if (!exists(pathToDSwitch)) {
@@ -176,7 +177,7 @@ void runStage2(String pathToDSwitch, {required String pathToHome}) {
   // that dswtich can check its running the current
   // version each time it starts.
   Shell.current.releasePrivileges();
-  updateVersionNo(pathToHome);
+  await updateVersionNo(pathToHome);
   print('');
 }
 
@@ -200,7 +201,7 @@ void removeOldDSwitch() {
 
 String get pathToInstallDir {
   String target;
-  if (Platform.isWindows) {
+  if (io.Platform.isWindows) {
     target = join(
         env['USERPROFILE']!, 'AppData', 'Local', 'Microsoft', 'WindowsApps');
   } else {
@@ -209,7 +210,7 @@ String get pathToInstallDir {
   return target;
 }
 
-void installDart() {
+Future<void> installDart() async {
   Channel? active;
 
   /// Check we have an installed and active version of art.
@@ -222,8 +223,8 @@ void installDart() {
 
   /// if we don't have an active version then install and make it active.
   if (active == null) {
-    Channel('stable')
-      ..installLatestVersion()
-      ..use();
+    final channel = Channel('stable');
+    await channel.installLatestVersion();
+    channel.use();
   }
 }

lib/src/channel.dart

@@ -43,16 +43,16 @@ class Channel {
     }
   }
 
-  void installLatestVersion() {
+  Future<void> installLatestVersion() async {
     if (isDownloaded()) {
       print(orange('Channel is already installed and the current version is: '
           '$currentVersion'));
     } else {
-      final releases = Release.fetchReleases(name);
+      final releases = await Release.fetchReleases(name);
       final version = releases[0].version.toString();
       print('Installing $name ($version) ...');
-      download(version);
-      currentVersion = version;
+      await download(version);
+      await setCurrentVersion(version);
       _createChannelSymlink();
       print('Install of $name channel complete.');
     }
@@ -65,9 +65,9 @@ class Channel {
     _createChannelSymlink();
   }
 
-  void pin(String version) {
-    currentVersion = version;
-    pinned = true;
+  Future<void> pin(String version) async {
+    await setCurrentVersion(version);
+    await setPinned(pinned: true);
 
     /// If we are the active channel then we need to update the active link.
     if (isActive) {
@@ -76,9 +76,9 @@ class Channel {
     _createChannelSymlink();
   }
 
-  void unpin() {
-    currentVersion = latestVersion;
-    pinned = false;
+  Future<void> unpin() async {
+    await setCurrentVersion(latestVersion);
+    await setPinned(pinned: false);
 
     /// If we are the active channel then we need to update the active link.
     if (isActive) {
@@ -155,14 +155,14 @@ class Channel {
   /// been downloaded.
   bool isDownloaded() => isVersionCached(currentVersion);
 
-  void download(String version) {
-    DownloadVersion(name, version, _pathToVersion(version)).download();
+  Future<void> download(String version) async {
+    await DownloadVersion(name, version, _pathToVersion(version)).download();
   }
 
   /// Downloads the list of versions available for this channel
   /// and returns the must recent version.
-  String fetchLatestVersion() {
-    final releases = Release.fetchReleases(name);
+  Future<String> fetchLatestVersion() async {
+    final releases = await Release.fetchReleases(name);
     return releases[0].version.toString();
   }
 
@@ -174,10 +174,9 @@ class Channel {
     return _version ??= latestVersion;
   }
 
-  set currentVersion(String version) {
+  Future<void> setCurrentVersion(String version) async {
     _settings['currentVersion'] = version;
-    // ignore: discarded_futures
-    waitForEx(_settings.save());
+    await _settings.save();
   }
 
   /// the most recent version we have downloaded.
@@ -192,10 +191,10 @@ class Channel {
   /// If true then this channel is currently pinned.
   bool get pinned => _settings['pinned'] as bool? ?? false;
 
-  set pinned(bool pinned) {
+  Future<void> setPinned({required bool pinned}) async {
     _settings['pinned'] = pinned;
     // ignore: discarded_futures
-    waitForEx(_settings.save());
+    await _settings.save();
   }
 
   static String channelPath(String channel) =>
@@ -217,8 +216,8 @@ class Channel {
   /// Shows the user a menu with the 20 most recent version for the channel.
   ///
   /// Returns the version the user selected.
-  Release selectToInstall() {
-    final releases = Release.fetchReleases(name);
+  Future<Release> selectToInstall() async {
+    final releases = await Release.fetchReleases(name);
 
     final release = menu<Release>('Select Version to install:',
         options: releases,
@@ -242,21 +241,21 @@ class Channel {
   bool isVersionCached(String version) =>
       cachedVersions().any((element) => basename(element) == version);
 
-  void upgrade() {
+  Future<void> upgrade() async {
     if (isPinned) {
       printerr(
           red('The $name is pinned. Unpin the channel first and try again'));
     } else {
-      final version = fetchLatestVersion();
+      final version = await fetchLatestVersion();
 
       if (version == currentVersion) {
         print('You are already on the latest version ($version) for the '
             '$name channel');
       } else {
         print('Downloading $version...');
-        download(version);
+        await download(version);
 
-        currentVersion = version;
+        await setCurrentVersion(version);
 
         if (isActive) {
           /// if we are the active channel then calling swithTo

lib/src/commands/channel/install.dart

@@ -29,10 +29,10 @@ If you pass the --select switch then a menu is displayed with the version availa
   String get name => 'install';
 
   @override
-  void run() {
+  Future<void> run() async {
     checkIsFullyInstalled();
     if (argResults!.wasParsed('select')) {
-      select();
+      await select();
     } else {
       if (argResults!.rest.isNotEmpty) {
         if (argResults!.rest.length != 1) {
@@ -45,38 +45,38 @@ If you pass the --select switch then a menu is displayed with the version availa
         }
 
         final version = argResults!.rest[0];
-        installVersion(version);
+        await installVersion(version);
       } else {
-        installLatestVersion(channel);
+        await installLatestVersion(channel);
       }
     }
   }
 
-  void installLatestVersion(String channel) {
-    Channel(channel).installLatestVersion();
+  Future<void> installLatestVersion(String channel) async {
+    await Channel(channel).installLatestVersion();
   }
 
-  void select() {
+  Future<void> select() async {
     final ch = Channel(channel);
 
-    final selected = ch.selectToInstall();
+    final selected = await ch.selectToInstall();
 
     if (ch.isVersionCached(selected.version.toString())) {
       print(blue('The selected version is already installed.'));
     } else {
-      ch.download(selected.version.toString());
+      await ch.download(selected.version.toString());
     }
     print('Install of $channel channel complete.');
   }
 
-  void installVersion(String version) {
+  Future<void> installVersion(String version) async {
     print('Installing $channel version $version...');
     final ch = Channel(channel);
     if (ch.isVersionCached(version)) {
       throw ExitException(1, 'The selected version is already installed.',
           showUsage: false);
     }
-    ch.download(version);
+    await ch.download(version);
     print('Install of $channel channel complete. ');
   }
 }

lib/src/commands/channel/list.dart

@@ -28,19 +28,20 @@ class ListCommand extends Command<void> {
   String get name => 'list';
 
   @override
-  void run() {
+  Future<void> run() async {
     final showArchives = argResults!.wasParsed('archive');
 
-    listForChannel(channel, showArchives: showArchives);
+    await listForChannel(channel, showArchives: showArchives);
   }
 
-  static void listForChannel(String channel, {required bool showArchives}) {
+  static Future<void> listForChannel(String channel,
+      {required bool showArchives}) async {
     final ch = Channel(channel);
 
     print('');
     print(green('Channel $channel'));
     if (showArchives) {
-      final releases = Release.fetchReleases(channel);
+      final releases = await Release.fetchReleases(channel);
 
       print('Available to download:');
 

lib/src/commands/channel/pin.dart

@@ -31,7 +31,7 @@ Selects the given version for the $channel channel and makes it the active versi
   String get name => 'pin';
 
   @override
-  void run() {
+  Future<void> run() async {
     checkIsFullyInstalled();
     String version;
 
@@ -49,23 +49,24 @@ Selects the given version for the $channel channel and makes it the active versi
 
       version = argResults!.rest[0];
     } else {
-      version = ch.selectToInstall().version.toString();
+      final release = await ch.selectToInstall();
+      version = release.version.toString();
     }
 
     final force = argResults!['force'] as bool;
 
     if (!ch.isVersionCached(version)) {
       printerr(red("\nVersion $version isn't installed.\n"));
       if (force || confirm('Install $version')) {
-        installVersion(version);
+        await installVersion(version);
       } else {
         throw ExitException(
             0, 'To install $version Use: dswitch $channel install $version\n',
             showUsage: false);
       }
     }
 
-    ch.pin(version);
+    await ch.pin(version);
     print(green('Channel $channel is now pinned to $version'));
 
     if (!ch.isActive) {
@@ -81,8 +82,8 @@ Selects the given version for the $channel channel and makes it the active versi
     // }
   }
 
-  void installVersion(String version) {
+  Future<void> installVersion(String version) async {
     print('Installing $channel version $version...');
-    Channel(channel).download(version);
+    await Channel(channel).download(version);
   }
 }