Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(hosted-url): activation of package on self-hosted url #46

Merged
merged 6 commits into from
Aug 7, 2023
Merged

fix(hosted-url): activation of package on self-hosted url #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52cbfed
chore(pub_updater): update pubspec.yaml to support Dart SDK version 2…
zoocityboy May 22, 2023
f794102
chore(pubspec.yaml): revert version to 0.3.0
zoocityboy May 22, 2023
6e82700
Merge pull request #1 from zoocityboy/fix-update-with-custom-base-url
zoocityboy May 22, 2023
a23dfff
fix(parameters): change parameters
zoocityboy May 23, 2023
ba8c110
Merge pull request #2 from zoocityboy/fix-update-with-custom-base-url
zoocityboy May 23, 2023
c379616
Merge branch 'main' into main
zoocityboy Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions lib/src/pub_updater.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class PackageInfoRequestFailure implements Exception {}
class PackageInfoNotFoundFailure implements Exception {}

/// The pub.dev base url for querying package versions
const _defaultBaseUrl = 'https://pub.dev/api/packages/';
const _defaultBaseUrl = 'https://pub.dev';

/// The pub.dev api query path for querying packages
const _pubPackagesPath = '/api/packages/';

/// {@template pub_update}
/// A Dart package which enables checking whether a package is up to date.
Expand Down Expand Up @@ -69,12 +72,18 @@ class PubUpdater {
'activate',
packageName,
if (versionConstraint != null) versionConstraint,
if (_baseUrl != _defaultBaseUrl) ...[
'--hosted-url',
_baseUrl,
'--source',
'hosted'
]
Comment on lines +75 to +80
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a nit, but technically we dont need this if statement right? It will work either way

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically you're right, we don't need this if statement. but, do we need to override the default value with the same value? but as you wrote, it'll work either way. i can create yet another PR and remove this if statement :)

],
);
}

Future<PackageInfo> _getPackageInfo(String packageName) async {
final uri = Uri.parse('$_baseUrl$packageName');
final uri = Uri.parse('$_baseUrl$_pubPackagesPath$packageName');
final response = await _get(uri);

if (response.statusCode != HttpStatus.ok) throw PackageInfoRequestFailure();
Expand Down
49 changes: 46 additions & 3 deletions test/pub_update_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@ const command = [
'activate',
'very_good_cli',
];
const commandWithCustomBaseUrl = [
'dart',
'pub',
'global',
'activate',
'very_good_cli',
'--hosted-url',
customBaseUrl,
'--source',
'hosted',
];
const commandWithConstraint = [
'dart',
'pub',
Expand All @@ -32,8 +43,20 @@ const commandWithConstraint = [
'very_good_cli',
'>=0.4.0',
];
const commandWithConstraintAndCustomBaseUrl = [
'dart',
'pub',
'global',
'activate',
'very_good_cli',
'>=0.4.0',
'--hosted-url',
customBaseUrl,
'--source',
'hosted',
];

const customBaseUrl = 'https://custom-domain.com/api/packages/';
const customBaseUrl = 'https://custom-domain.com';

void main() {
group('PubUpdater', () {
Expand Down Expand Up @@ -102,7 +125,7 @@ void main() {

verify(
() => client.get(
Uri.parse('${customBaseUrl}very_good_cli'),
Uri.parse('$customBaseUrl/api/packages/very_good_cli'),
),
).called(1);
});
Expand Down Expand Up @@ -229,7 +252,7 @@ void main() {

verify(
() => client.get(
Uri.parse('${customBaseUrl}very_good_cli'),
Uri.parse('$customBaseUrl/api/packages/very_good_cli'),
),
).called(1);
});
Expand Down Expand Up @@ -268,6 +291,14 @@ void main() {
);
verify(() => processManager.run(command)).called(1);
});
test('makes correct call to process.run with customBaseUrl', () async {
pubUpdater = PubUpdater(client, customBaseUrl);
await pubUpdater.update(
packageName: 'very_good_cli',
processManager: processManager,
);
verify(() => processManager.run(commandWithCustomBaseUrl)).called(1);
});

test('makes correct call to process.run with version constraint',
() async {
Expand All @@ -278,6 +309,18 @@ void main() {
);
verify(() => processManager.run(commandWithConstraint)).called(1);
});

test('makes correct call to process.run with version constraint',
() async {
pubUpdater = PubUpdater(client, customBaseUrl);
await pubUpdater.update(
packageName: 'very_good_cli',
processManager: processManager,
versionConstraint: '>=0.4.0',
);
verify(() => processManager.run(commandWithConstraintAndCustomBaseUrl))
.called(1);
});
});
});
}