Skip to content
Snippets Groups Projects
Commit b4510bc5 authored by Alad Wenter's avatar Alad Wenter
Browse files

AUR::Depends: rename methods

* extract() -> recurse()
* get() -> solve()

Partial adaptation from ca8c02dd
parent 87925537
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ use v5.20;
use List::Util qw(first);
use AUR::Json qw(parse_json_aur write_json);
use AUR::Query qw(query_multi);
use AUR::Depends qw(get);
use AUR::Depends qw(solve);
use AUR::Options qw(add_from_stdin);
my $argv0 = 'depends';
......@@ -128,7 +128,7 @@ unless(caller) {
# Retrieve AUR results
# JSON -> hash -> extract depends[] -> repeat until none -> prune
my ($results, $dag, $dag_foreign) = get(\@ARGV, \@types, \&callback_query,
my ($results, $dag, $dag_foreign) = solve(\@ARGV, \@types, \&callback_query,
$opt_verify, $opt_provides, $opt_installed);
# Add `RequiredBy` to results
......
......@@ -6,7 +6,7 @@ use v5.20;
use List::Util qw(first);
use Carp;
use Exporter qw(import);
our @EXPORT_OK = qw(vercmp extract prune graph get);
our @EXPORT_OK = qw(vercmp recurse prune graph solve);
our $VERSION = 'unstable';
# Maximum number of calling the callback
......@@ -18,7 +18,7 @@ AUR::Depends - Resolve dependencies from AUR package information
=head1 SYNOPSIS
use AUR::Depends qw(vercmp extract depends prune graph);
use AUR::Depends qw(vercmp recurse depends prune graph solve);
=head1 DESCRIPTION
......@@ -85,7 +85,7 @@ sub vercmp {
}
}
=head2 extract()
=head2 recurse()
Extracts dependency (C<$pkgdeps>) and provider (C<$pkgmap>)
information from an array of package information hashes, retrieved
......@@ -111,7 +111,7 @@ Parameters:
=cut
sub extract {
sub recurse {
my ($targets, $types, $callback) = @_;
my @depends = @{$targets};
......@@ -339,9 +339,9 @@ sub prune {
return \@removals;
}
=head2 get()
=head2 solve()
High-level function which combines C<depends>, C<prune> and C<graph>.
High-level function which combines C<recurse>, C<prune> and C<graph>.
Parameters:
......@@ -359,11 +359,11 @@ Parameters:
=cut
sub get {
sub solve {
my ($targets, $types, $callback, $opt_verify, $opt_provides, $opt_installed) = @_;
# Retrieve AUR results (JSON -> dict -> extract depends -> repeat until none)
my ($results, $pkgdeps, $pkgmap) = extract($targets, $types, $callback);
my ($results, $pkgdeps, $pkgmap) = recurse($targets, $types, $callback);
# Verify dependency requirements
my ($dag, $dag_foreign) = graph($results, $pkgdeps, $pkgmap,
......
......@@ -7,7 +7,7 @@ use Test::More;
# Check if module can be imported
require_ok "AUR::Depends";
use AUR::Depends qw(vercmp extract prune graph get);
use AUR::Depends qw(vercmp recurse prune graph solve);
ok(vercmp("1.0", "1.0", '='));
ok(vercmp("1.0a", "1.0b", '<'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment