wip unit tests.

Author: bsutton

.vscode/launch.json

@@ -74,11 +74,11 @@
         },
 
         {
-            "name": "onepub private",
+            "name": "onepub pub private",
             "type": "dart",
             "request": "launch",
             "program": "bin/onepub.dart",
-            "args": ["private"],
+            "args": ["pub", "private"],
             "console": "terminal"
         },
 
@@ -120,11 +120,11 @@
 
 
         {
-            "name": "onepub private ",
+            "name": "onepub pub private ",
             "type": "dart",
             "request": "launch",
             "program": "/home/bsutton/git/onepub/onepub/bin/onepub.dart",
-            "args": ["private"],
+            "args": ["pub", "private"],
             "cwd": "/home/bsutton/git/dvault",
             "console": "terminal"
         },

a.yaml

@@ -0,0 +1,2 @@
+# SettingsYaml settings file
+onepubToken: "5f867e4e-7d69-4673-aa73-1702e826935e"

abc.yaml

@@ -0,0 +1,2 @@
+# SettingsYaml settings file
+onepubToken: "b1e91051-2df1-4f73-b2eb-2b1d3c4a71d6"

analysis_options.yaml

@@ -1,2 +1 @@
-
-#include: package:lint_hard/all.yaml
+# include: package:lint_hard/all.yaml

lib/src/commands/export.dart

@@ -18,11 +18,13 @@ class ExportCommand extends Command<int> {
   ///
   ExportCommand() {
     argParser
-      ..addFlag('file', abbr: 'f', help: 'Save the OnePub token to a file.')
+      ..addFlag('file', abbr: 'f', defaultsTo: false, help: '''
+Save the OnePub token to a file.
+Pass in a filename or leave blank to use the default filename.''')
       ..addOption('user',
           abbr: 'u',
-          help: 'Export the token of a CICD member.',
-          valueHelp: 'email address of a CI/CD Member');
+          help: 'Export the token of a CICD member rather than your token.',
+          valueHelp: 'email address of a CI/CD OnePub Member');
   }
 
   @override
@@ -79,18 +81,25 @@ class ExportCommand extends Command<int> {
         'Exporting OnePub token for ${OnePubSettings().organisationName}.'));
 
     if (file) {
-      final exportFile =
-          TokenExportFile(join(pwd, TokenExportFile.exportFilename))
-            ..onepubToken = onepubToken
-            ..save();
+      var pathToFile = TokenExportFile.exportFilename;
+      if (argResults!.rest.length == 1) {
+        pathToFile = argResults!.rest[0];
+      } else if (argResults!.rest.length != 0) {
+        throw ExitException(
+            exitCode: 1, message: 'You may only pass one argument to --file.');
+      }
+
+      final exportFile = TokenExportFile(pathToFile)
+        ..onepubToken = onepubToken
+        ..save();
 
       print('''
 
-Saved credentials to: ${truepath(exportFile.pathToExportFile)}.
+Saved OnePub token to: ${truepath(exportFile.pathToExportFile)}.
 
-Copy the onepub.token.yaml to your CI/CD environment and run:
+Copy the ${exportFile.pathToExportFile} to your CI/CD environment and run:
     
-    onepub import <path to credentials>
+    onepub import <path to OnePub token file>
 
 ''');
     } else {

lib/src/commands/import.dart

@@ -53,6 +53,12 @@ Use `onepub export` to obtain the OnePub token.
   ///
   Future<void> import() async {
     OnePubSettings.load();
+    if (OnePubTokenStore().isLoggedIn) {
+      throw ExitException(
+          exitCode: -1,
+          message:
+              'You may not import a token when you are logged in to the OnePub CLI.');
+    }
     final file = argResults!['file'] as bool;
     final ask = argResults!['ask'] as bool;
 
@@ -112,6 +118,12 @@ Found: ${argResults!.rest.join(',')}''');
       pathToTokenFile = argResults!.rest[0];
     }
 
+    if (!exists(pathToTokenFile)) {
+      throw ExitException(
+          exitCode: 1,
+          message: "The token file '$pathToTokenFile', does not exist");
+    }
+
     return TokenExportFile.load(pathToTokenFile).onepubToken;
   }
 

lib/src/commands/pub.dart

@@ -6,7 +6,7 @@
 import 'package:args/command_runner.dart';
 import 'package:dcli/dcli.dart';
 
-import 'pub/add_private.dart';
+import 'pub/add_dep.dart';
 import 'pub/global.dart';
 import 'pub/private.dart';
 

lib/src/commands/pub/add_dep.dart

@@ -0,0 +1,57 @@
+// Copyright (c) 2020, the Dart project authors and OnePub IP Pty Ltd
+//
+// Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:dcli/dcli.dart';
+import 'package:onepub/src/pub/command/add.dart';
+
+import '../../exceptions.dart';
+import '../../onepub_settings.dart';
+import '../../util/one_pub_token_store.dart';
+
+/// Handles the `add` pub command. Adds a dependency to `pubspec.yaml` and gets
+/// the package. The user may pass in a git constraint, host url, or path as
+/// requirements. If no such options are passed in, this command will do a
+/// resolution to find the latest version of the package that is compatible with
+/// the other dependencies in `pubspec.yaml`, and then enter that as the lower
+/// bound in a ^x.y.z constraint.
+///
+/// Currently supports only adding one dependency at a time.
+class AddPrivateCommand extends AddCommand {
+  @override
+  String get name => 'add';
+  @override
+  String get description => blue('Add private dependencies to pubspec.yaml.');
+  @override
+  String get argumentsDescription =>
+      '<package>[:<constraint>] [<package2>[:<constraint2>]...] [options]';
+  @override
+  String get docUrl => 'https://dart.dev/tools/pub/cmd/pub-add';
+
+  @override
+  String? get hostUrl {
+    final url = OnePubSettings().onepubHostedUrl().toString();
+    print(url);
+    return url;
+  }
+
+  @override
+  bool get isOffline => false;
+
+  bool get hasHostOptions => hostUrl != null;
+
+  AddPrivateCommand() : super(includeSourceOptions: false);
+
+  @override
+  Future<void> runProtected() async {
+    OnePubSettings.load();
+
+    if (!OnePubTokenStore().isLoggedIn) {
+      throw ExitException(
+          exitCode: 1, message: "You must run 'onepub login' first.");
+    }
+    await super.runProtected();
+  }
+}

lib/src/commands/pub/private.dart

@@ -6,9 +6,12 @@
 import 'dart:io';
 
 import 'package:args/command_runner.dart';
-import 'package:dcli/dcli.dart';
+import 'package:dcli/dcli.dart' hide PubSpec;
+import 'package:pubspec2/pubspec.dart';
+import 'package:scope/scope.dart';
 import 'package:url_builder/url_builder.dart';
 
+import '../../entry_point.dart';
 import '../../exceptions.dart';
 import '../../onepub_paths.dart';
 import '../../onepub_settings.dart';
@@ -18,7 +21,10 @@ import '../../util/send_command.dart';
 ///
 class PrivateCommand extends Command<int> {
   ///
-  PrivateCommand();
+  PrivateCommand() {}
+
+  @override
+  bool get takesArguments => false;
 
   @override
   String get description => '''
@@ -43,7 +49,8 @@ See ${urlJoin(OnePubSettings().onepubWebUrl, 'publish')}''';
           exitCode: 1, message: "You must run 'onepub login' first.");
     }
 
-    final project = DartProject.findProject(pwd);
+    final workingDirectory = Scope.use(unitTestWorkingDirectoryKey);
+    final project = DartProject.findProject(workingDirectory);
     if (project == null) {
       throw ExitException(
           exitCode: 1,
@@ -59,7 +66,7 @@ See ${urlJoin(OnePubSettings().onepubWebUrl, 'publish')}''';
     final currentOrganisationName = OnePubSettings().organisationName;
     final url = OnePubSettings().onepubHostedUrl().toString();
 
-    final pubspec = project.pubSpec.pubspec;
+    final pubspec = await PubSpec.loadFile(project.pathToPubSpec);
     if (pubspec.publishTo != null) {
       if (pubspec.publishTo.toString() == url) {
         print(orange('${pubspec.name} is already a private package.'));

lib/src/entry_point.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:dcli/dcli.dart';
+import 'package:scope/scope.dart';
 
 import 'exceptions.dart';
 import 'my_runner.dart';
@@ -14,8 +15,16 @@ import 'util/log.dart' as ulog;
  * Written by Brett Sutton <[email protected]>, Jan 2022
  */
 
+/// Used by unit tests to alter the working directory a command runs in
+/// as onepub normally assumes it is operating in the pwd.
+ScopeKey<String> unitTestWorkingDirectoryKey =
+    ScopeKey<String>.withDefault(pwd, "WorkingDirectory");
+
 Future<void> entrypoint(
-    List<String> args, CommandSet commandSet, String program) async {
+  List<String> args,
+  CommandSet commandSet,
+  String program,
+) async {
   try {
     MyRunner runner = MyRunner(args, program, _description, commandSet);
     try {