removed our dendency of the main dcli library due to problems with wa…

…itfor no longer being supported indart. change the # bin/env from dcli to dart.
onepub-dev · Mar 1, 2024 · 091dcec · 091dcec
1 parent 37789f2
commit 091dcec
Show file tree

Hide file tree

Showing 56 changed files with 1,040 additions and 377 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,108 +5,131 @@
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["doctor"]
+            "args": [
+                "doctor"
+            ]
         },
         {
             "name": "onepub team create",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["team", "create", "one"]
-        }
-        ,
+            "args": [
+                "team",
+                "create",
+                "one"
+            ]
+        },
         {
             "name": "onepub login",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["login"],
+            "args": [
+                "login"
+            ],
             "console": "terminal"
         },
         {
             "name": "onepub logout",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["logout"]
-        }
-        ,
+            "args": [
+                "logout"
+            ]
+        },
         {
             "name": "onepub doctor",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["doctor"]
-        }
-        ,
+            "args": [
+                "doctor"
+            ]
+        },
         {
             "name": "onepub export",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["export"]
-        }
-        ,
+            "args": [
+                "export"
+            ]
+        },
         {
             "name": "onepub export to file",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["export", "--file"]
-        }
-
-        ,
+            "args": [
+                "export",
+                "--file"
+            ]
+        },
         {
             "name": "onepub export CI/CD User",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["export", "--user", "[email protected]"]
-        }
-        ,
+            "args": [
+                "export",
+                "--user",
+                "[email protected]"
+            ]
+        },
         {
             "name": "onepub import",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["import"],
-            "env": {"ONEPUB_TOKEN" : "ABCDE"}
+            "args": [
+                "import"
+            ],
+            "env": {
+                "ONEPUB_TOKEN": "ABCDE"
+            }
         },
-
         {
             "name": "onepub pub private",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["pub", "private"],
+            "args": [
+                "pub",
+                "private"
+            ],
             "console": "terminal"
         },
-
         {
             "name": "opub login",
             "type": "dart",
             "request": "launch",
             "program": "bin/opub.dart",
-            "args": ["login"],
+            "args": [
+                "login"
+            ],
             "console": "terminal"
         },
-
         {
             "name": "opub publish",
             "type": "dart",
             "request": "launch",
             "program": "/home/bsutton/git/onepub/onepub/bin/opub.dart",
-            "args": ["publish"],
+            "args": [
+                "publish"
+            ],
             "console": "terminal",
             "cwd": "/home/bsutton/git/dcli/dcli_core"
         },
-
         {
             "name": "opub get",
             "type": "dart",
             "request": "launch",
             "program": "bin/opub.dart",
-            "args": ["get"],
+            "args": [
+                "get"
+            ],
             "console": "terminal"
         },
         {
@@ -115,28 +138,45 @@
             "request": "launch",
             "program": "/home/bsutton/git/onepub/onepub/bin/onepub.dart",
             "cwd": "/home/bsutton/git/setversion",
-            "args": ["pub", "global","activate","setversion"],
+            "args": [
+                "pub",
+                "global",
+                "activate",
+                "setversion"
+            ],
             "console": "terminal"
         },
-
-
         {
             "name": "onepub pub private ",
             "type": "dart",
             "request": "launch",
             "program": "/home/bsutton/git/onepub/onepub/bin/onepub.dart",
-            "args": ["pub", "private"],
+            "args": [
+                "pub",
+                "private"
+            ],
             "cwd": "/home/bsutton/git/dvault",
             "console": "terminal"
         },
-
         {
             "name": "test ct auth",
             "type": "dart",
             "request": "launch",
             "program": "/home/bsutton/git/onepub/onepub/tool/critical_test/pre_hook/auth.dart",
             "console": "terminal"
         },
-
+        {
+            "name": "onepub pub add ",
+            "type": "dart",
+            "request": "launch",
+            "program": "/home/bsutton/git/onepub/onepub/bin/onepub.dart",
+            "args": [
+                "pub",
+                "add",
+                "dcli"
+            ],
+            "cwd": "/home/bsutton/git/issues/token",
+            "console": "terminal"
+        },
     ]
-}
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
-# 4.0.0-beta.1
-- support for dart 3.x
+# 4.1.0-beta.1
+- support for dart 3.2.x
 
 # 3.1.0-beta.1
 - moved some dependencies into the dev_dependencies section to help

diff --git a/bin/onepub.dart b/bin/onepub.dart
@@ -1,4 +1,4 @@
-#! /usr/bin/env dcli
+#! /usr/bin/env dart
 
 /* Copyright (C) OnePub IP Pty Ltd - All Rights Reserved
  * licensed under the GPL v2.

diff --git a/bin/opub.dart b/bin/opub.dart
@@ -1,4 +1,4 @@
-#! /usr/bin/env dcli
+#! /usr/bin/env dart
 /* Copyright (C) OnePub IP Pty Ltd - All Rights Reserved
  * licensed under the GPL v2.
  * Written by Brett Sutton <[email protected]>, Jan 2022

diff --git a/lib/src/api/member.dart b/lib/src/api/member.dart
@@ -29,7 +29,7 @@ class Member {
 
     final tokenStore = OnePubTokenStore();
 
-    final token = tokenStore.getToken(onepubApiUrl.toString());
+    final token = await tokenStore.getToken(onepubApiUrl.toString());
     if (token != null) {
       final member = await API().fetchMember(token);
       return member.roles.contains(RoleEnum.SystemAdministrator.name);

diff --git a/lib/src/commands/doctor.dart b/lib/src/commands/doctor.dart
@@ -7,13 +7,17 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:args/command_runner.dart';
-import 'package:dcli/dcli.dart';
+import 'package:dcli_core/dcli_core.dart';
+import 'package:dcli_input/dcli_input.dart';
+import 'package:dcli_terminal/dcli_terminal.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:strings/strings.dart';
 
 import '../api/api.dart';
 import '../onepub_settings.dart';
 import '../util/one_pub_token_store.dart';
+import '../util/printerr.dart';
+import '../util/pub_cache.dart';
 import '../version/version.g.dart';
 
 ///
@@ -34,7 +38,7 @@ class DoctorCommand extends Command<int> {
     _printEnvironment();
     _printShell();
 
-    tokenStatus();
+    await tokenStatus();
     await _status();
     return 0;
   }
@@ -84,22 +88,22 @@ class DoctorCommand extends Command<int> {
     print(blue('Shell Settings'));
     _colprint([r'$SHELL:', env['SHELL'] ?? '']);
 
-    final shell = Shell.current;
-    _colprint(['Detected:', shell.name]);
-
-    if (shell.hasStartScript) {
-      final startScriptPath = shell.pathToStartScript;
-      _colprint(['Start script:', privatePath(startScriptPath ?? 'not found')]);
-    } else {
-      _colprint(['Start script:', 'not supported by shell']);
-    }
+    // TODO(bsutton): restore once dcli resolves waitfor issue.
+    // final shell = Shell.current;
+    // _colprint(['Detected:', shell.name]);
+    // if (shell.hasStartScript) {
+    //   final startScriptPath = shell.pathToStartScript;
+    //   _colprint(['Start script:', privatePath(startScriptPath ?? 'not found')]);
+    // } else {
+    //   _colprint(['Start script:', 'not supported by shell']);
+    // }
   }
 
   Future<void> _status() async {
     print('');
     print(blue('Status'));
     final settings = OnePubSettings.use();
-    if (OnePubTokenStore().isLoggedIn(settings.onepubApiUrl)) {
+    if (await OnePubTokenStore().isLoggedIn(settings.onepubApiUrl)) {
       _colprint(['Logged In:', 'true']);
       _colprint(['Active Member:', settings.operatorEmail]);
       _colprint(['Organisation:', settings.organisationName]);
@@ -109,7 +113,7 @@ You are not logged into OnePub.
 run: onepub login'''));
     }
     try {
-      echo('checking status...  ');
+      await echo('checking status...  ');
 
       final status = await API().status();
 
@@ -138,20 +142,20 @@ run: onepub login'''));
   }
 }
 
-void tokenStatus() {
+Future<void> tokenStatus() async {
   print(blue('\nRepository tokens'));
 
   final store = OnePubTokenStore();
 
   var hasOnePubToken = false;
-  for (final credential in store.credentials) {
+  for (final credential in await store.credentials) {
     if (credential.url.host == 'onepub.dev' ||
         credential.url.host == 'beta.onepub.dev') {
       hasOnePubToken = true;
     }
   }
 
-  if (!store.isLoggedIn(OnePubSettings.use().onepubApiUrl)) {
+  if (!await store.isLoggedIn(OnePubSettings.use().onepubApiUrl)) {
     print(red('Not logged into OnePub.'));
     if (hasOnePubToken) {
       print('''
@@ -162,16 +166,16 @@ as listed below.
     }
   }
 
-  for (final credential in store.credentials) {
+  for (final credential in await store.credentials) {
     print(credential.url);
   }
 }
 
 void _printPlatform() {
   print(blue('Platform'));
 
-  _colprint(['Dart version:', DartSdk().version]);
-  _colprint(['Dart path:', DartSdk().pathToDartExe]);
+  _colprint(['Dart version:', Platform.version]);
+  _colprint(['Dart path:', Platform.executable]);
   print('');
 
   _colprint(['OS:', Platform.operatingSystem]);

diff --git a/lib/src/commands/export.dart b/lib/src/commands/export.dart
@@ -3,7 +3,8 @@
  * Written by Brett Sutton <[email protected]>, Jan 2022
  */
 import 'package:args/command_runner.dart';
-import 'package:dcli/dcli.dart';
+import 'package:dcli_core/dcli_core.dart';
+import 'package:dcli_terminal/dcli_terminal.dart';
 import 'package:validators2/validators2.dart';
 
 import '../api/api.dart';
@@ -47,7 +48,7 @@ Pass in a filename or leave blank to use the default filename.''')
     final file = argResults!['file'] as bool;
     final user = argResults!['user'] as String?;
 
-    if (!OnePubTokenStore().isLoggedIn(OnePubSettings.use().onepubApiUrl)) {
+    if (!await OnePubTokenStore().isLoggedIn(OnePubSettings.use().onepubApiUrl)) {
       throw ExitException(exitCode: 1, message: '''
 You must be logged in to run this command.
 run: onepub login
@@ -72,7 +73,7 @@ run: onepub login
         throw ExitException(exitCode: 1, message: response.errorMessage!);
       }
     } else {
-      onepubToken = OnePubTokenStore().load();
+      onepubToken = await OnePubTokenStore().load();
     }
     print(orange('Exporting OnePub token for '
         '${OnePubSettings.use().organisationName}.'));