From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SH1HK-0002xR-SI for garchives@archives.gentoo.org; Sun, 08 Apr 2012 23:12:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57897E0AF2; Sun, 8 Apr 2012 23:12:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B147E0AF2 for ; Sun, 8 Apr 2012 23:12:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 424121B40AB for ; Sun, 8 Apr 2012 23:12:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 043A0E542C for ; Sun, 8 Apr 2012 23:12:00 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: <1333926244.2f61ed01847aa30530ce2fe7805245f73ac12c9a.kent@gentoo> Subject: [gentoo-commits] proj/perl-overlay:master commit in: scripts/, scripts/lib/ X-VCS-Repository: proj/perl-overlay X-VCS-Files: scripts/lib/optparse.pm scripts/package_map_all.pl X-VCS-Directories: scripts/ scripts/lib/ X-VCS-Committer: kent X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: 2f61ed01847aa30530ce2fe7805245f73ac12c9a X-VCS-Branch: master Date: Sun, 8 Apr 2012 23:12:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3475b02f-3bf4-49f4-93eb-655c3b8acdbb X-Archives-Hash: d49588321d3e656bd3acbf4a086e59ff commit: 2f61ed01847aa30530ce2fe7805245f73ac12c9a Author: Kent Fredric gmail com> AuthorDate: Sun Apr 8 23:04:04 2012 +0000 Commit: Kent Fredric gmail com> CommitDate: Sun Apr 8 23:04:04 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/perl-overlay.= git;a=3Dcommit;h=3D2f61ed01 [scripts] document/tidy --- scripts/lib/optparse.pm | 23 ++++++++++++++--------- scripts/package_map_all.pl | 42 ++++++++++++++++++++------------------= ---- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/scripts/lib/optparse.pm b/scripts/lib/optparse.pm index a12ccc9..b3c44ec 100644 --- a/scripts/lib/optparse.pm +++ b/scripts/lib/optparse.pm @@ -12,18 +12,24 @@ use Moose; has 'help' =3D> ( isa =3D> 'CodeRef', is =3D> 'rw', required =3D> 1 ); has 'argv' =3D> ( isa =3D> 'ArrayRef', is =3D> 'rw', required =3D> 1 ); =20 -has 'long_opts' =3D> ( isa =3D> 'HashRef', is =3D> 'rw', 'lazy_build' = =3D> 1 , - traits =3D> [qw( Hash )], - handles =3D> {=20 +has 'long_opts' =3D> ( + isa =3D> 'HashRef', + is =3D> 'rw', + 'lazy_build' =3D> 1, + traits =3D> [qw( Hash )], + handles =3D> { has_long_opt =3D> 'exists', - long_opt =3D> 'get', + long_opt =3D> 'get', }, ); -has 'opts' =3D> ( isa =3D> 'HashRef', is =3D> 'rw', lazy_build = =3D> 1,=20 - traits =3D> [qw( Hash )], - handles =3D> {=20 +has 'opts' =3D> ( + isa =3D> 'HashRef', + is =3D> 'rw', + lazy_build =3D> 1, + traits =3D> [qw( Hash )], + handles =3D> { has_opt =3D> 'exists', - opt =3D> 'get', + opt =3D> 'get', }, ); has 'extra_opts' =3D> ( isa =3D> 'ArrayRef', is =3D> 'rw', 'lazy_build' = =3D> 1 ); @@ -33,7 +39,6 @@ sub _build_extra_opts { return [ grep { $_ !~ /^--(.+)/ and $_ !~ /^-(\w+)/ } @{ $self->argv }= ]; } =20 - sub _build_opts { my $self =3D shift; my $hash =3D {}; diff --git a/scripts/package_map_all.pl b/scripts/package_map_all.pl index 62a9c5b..a22355b 100755 --- a/scripts/package_map_all.pl +++ b/scripts/package_map_all.pl @@ -31,7 +31,8 @@ if ( $optparse->has_long_opt('root') ) { my $size =3D 300; =20 my $metadata =3D $root->subdir( 'metadata', 'perl' ); -my $distmap =3D $metadata->subdir('distmap'); +my $distmap =3D $metadata->subdir('distmap'); + #my $distinfo =3D $metadata->subdir('distinfo'); $distinfo->mkpath(); my (@json_files) =3D grep { not $_->is_dir and $_->basename =3D~ /\.json= $/ } $distmap->children(); @@ -54,9 +55,9 @@ my %lookup; } } say "* Found: " . ( scalar keys %lookup ) . " unique distributions"; - my ( @dup ) =3D grep { $lookup{$_} > 1 } keys %lookup; + my (@dup) =3D grep { $lookup{$_} > 1 } keys %lookup; if ( @dup > 0 ) { - say " " . ( scalar @dup ) ." items listed more than once"; + say " " . ( scalar @dup ) . " items listed more than once"; say " > $_" for @dup; } } @@ -64,9 +65,7 @@ my %lookup; my @dists =3D keys %lookup; =20 my $search =3D {}; -$search->{query} =3D { constant_score =3D> { filter =3D> { terms =3D> {=20 - distribution =3D> [ @dists ]=20 -} } } }; +$search->{query} =3D { constant_score =3D> { filter =3D> { terms =3D> { = distribution =3D> [@dists] } } } }; $search->{sort} =3D [ { 'date' =3D> 'desc', }, ]; $search->{size} =3D $size; $search->{fields} =3D [ @@ -91,28 +90,25 @@ $ENV{WWW_MECH_NOCACHE} =3D 1; my $results_string =3D mcpan->ua->request( 'POST', mcpan->base_url . 'release/_search?search_type=3Dscan&scroll=3D30s&siz= e=3D' . $size, - { - content =3D> $encoder->encode( $search ), - } + { content =3D> $encoder->encode($search), } ); =20 say $results_string->{content}; =20 -my $results =3D $decoder->decode( $results_string->{content} ); +my $results =3D $decoder->decode( $results_string->{content} ); my $scroll_id =3D $results->{_scroll_id}; =20 my $total_results =3D $results->{hits}->{total}; =20 say "Found: $total_results releases"; =20 - my $dtree; my $seen =3D 0; =20 -while( 1 ) {=20 - my ( $result, $scroll ) =3D scroll( $scroll_id ); - last unless scalar @{$result->{hits}->{hits}}; - collate_resultset( $result ); +while (1) { + my ( $result, $scroll ) =3D scroll($scroll_id); + last unless scalar @{ $result->{hits}->{hits} }; + collate_resultset($result); $scroll_id =3D $scroll; say "Seen $seen of $total_results"; } @@ -123,23 +119,21 @@ for my $package ( sort keys %{$dtree} ) { } =20 my $fh =3D $metadata->file('distinfo.json')->openw; -$fh->print( $encoder->encode( $dtree )); +$fh->print( $encoder->encode($dtree) ); =20 exit 0; =20 sub scroll { - my ( $id ) =3D @_ ; - my $result =3D mcpan->ua->request( - 'GET', - 'http://api.metacpan.org/_search/scroll/?scroll=3D30s&size=3D' . $si= ze . '&scroll_id=3D' . $id - ); + my ($id) =3D @_; + my $result =3D + mcpan->ua->request( 'GET', 'http://api.metacpan.org/_search/scroll/?= scroll=3D30s&size=3D' . $size . '&scroll_id=3D' . $id ); =20 my $data =3D $decoder->decode( $result->{content} ); return $data, $data->{_scroll_id}; } =20 sub collate_resultset { - my ( $results ) =3D @_; + my ($results) =3D @_; for my $result ( @{ $results->{hits}->{hits} } ) { if ( not $result->{fields} ) { $result->{fields} =3D $result->{_source}; @@ -154,6 +148,7 @@ sub collate_resultset { $fields->{version_canon} =3D $cversion; $fields->{version_gentoo} =3D scalar try { gv( $cversion, { lax =3D>= 1 } ) }; $fields->{archive_canon} =3D $fields->{author} . '/' . $fields->{ar= chive}; + #say $fields->{author} . '/' . $fields->{archive}; $dtree->{$cdistrib} =3D [] unless exists $dtree->{$cdistrib}; push @{ $dtree->{$cdistrib} }, $fields; @@ -176,6 +171,9 @@ USAGE: =20 package_map_all.pl =20 + --root=3D/usr/portage + # Specify the metadata is in /usr/portage/metadata/per= l/distmap/* + # And to emit /usr/portage/metadata/perl/distinfo.json --help Show this message =20 EOF