[gentoo-commits] proj/perl-overlay:master commit in: scripts/, scripts/lib/

["Kent Fredric" <kentfredric@gmail.com>]

commit:     a77d38585dc75d783976b84656939c357d4d6308
Author:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Sat Feb 25 22:09:03 2012 +0000
Commit:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
CommitDate: Sat Feb 25 22:09:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=a77d3858

[scripts] enhanced metacpan requests:

find_dist_all now supports filtering to report only the "latest" release
of a dist.  ( --latest )

Also supports sorting by status=latest first ( --sort-latest )
module_log.pl can now resort to the simple non-nested query which
doesn't do server-side "authorised" based reduction via (
    --method=simple )

\x02

---
 scripts/lib/metacpan.pm |  115 +++++++++++++++++++++++++++--------------------
 scripts/module_log.pl   |    9 +++-
 2 files changed, 73 insertions(+), 51 deletions(-)

diff --git a/scripts/lib/metacpan.pm b/scripts/lib/metacpan.pm
index e732cae..ccc267a 100644
--- a/scripts/lib/metacpan.pm
+++ b/scripts/lib/metacpan.pm
@@ -35,7 +35,19 @@ sub mcpan {
       );
     }
     if ( defined $ENV{WWW_MECH_DEBUG} ) {
-      $mech->add_handler( "request_send", sub { warn shift->dump; return } );
+      require Data::Dump;
+      $mech->add_handler(
+        "request_send",
+        sub {
+          if ( $ENV{WWW_MECH_DEBUG} > 1 ) {
+            warn shift->as_string;
+          }
+          else {
+            warn shift->dump;
+          }
+          return;
+        }
+      );
       $mech->add_handler(
         "response_done",
         sub {
@@ -67,6 +79,15 @@ sub mcpan {
 #    # You can optionally do this to modify the query before it is performed.
 # };
 #
+# $opts{latest} = 1  # return only latest versions of dists
+#
+# $opts{method} = 'simple' # non-nested query ( introduces bad results )
+# $opts{method} = 'nested' # works like notrim but serverside
+#
+# $opts{version} = 1 # return version information
+#
+# $opts{'sort-latest'} = 1 # sort by status == latest first.
+#
 # Array items are each a subset of a 'file' entry which contains information
 # about the distribution that file was in.
 #
@@ -79,7 +100,6 @@ sub mcpan {
 sub find_dist_all {
   my ( $class, $module, $opts ) = @_;
 
-  #  my @unwanted_terms = ( { terms => { 'file.distribution' => [qw( libwww-perl HTTP-Message )] } } );
   my $fields = [
     'status',  'date',           'author',           'maturity',     'indexed',      'documentation',
     'id',      '_source.module', 'authorized',       'release_id',   'version',      'name',
@@ -87,62 +107,59 @@ sub find_dist_all {
     'sloc',    'abstract',       'slop',             'mime',         'directory',
   ];
 
-  my $simple_filter = {
-    bool => {
-      must => [
-        { term => { 'file.module.authorized' => 1 } },
-        { term => { 'file.module.indexed'    => 1 } },
-        { term => { 'file.module.name'       => $module } },
-        { term => { 'directory'              => 0 } },
-      ]
-    }
-  };
-
   my $q = {
-    sort => { 'file.date' => 'desc' },
+
+    script_fields => { 'latest' => { script => q{ doc[ 'status' ].value == 'latest' } } },
+    sort          => [
+      (
+        $opts->{'sort-latest'}
+        ? (
+          {
+            '_script' => {
+              script => q{ doc['status'].value == 'latest' ? 1 : 0 },
+              type   => 'number',
+              order  => 'desc',
+            }
+          }
+          )
+        : ()
+      ),
+      { 'file.date' => 'desc' },
+    ],
     size => 9999,
   };
 
-  if ( not defined $opts->{method} or $opts->{method} eq 'nested' ) {
+  if ( not defined $opts->{method}
+    or $opts->{method} eq 'nested' )
+  {
+    my $module_rules = [
+      { term => { 'module.authorized' => 1 } },
+      { term => { 'module.indexed'    => 1 } },
+      { term => { 'module.name'       => $module } },
+    ];
+    my $nest = {
+      path  => 'module',
+      query => { constant_score => { filter => { bool => { must => $module_rules, } } } },
+      size  => 5,
+    };
     $q->{query} = {
       constant_score => {
-        query => {
-          nested => {
-            path  => 'module',
-            query => {
-              constant_score => {
-                filter => {
-                  bool => {
-                    must => [
-                      { term => { 'module.authorized' => 1 } },
-                      { term => { 'module.indexed'    => 1 } },
-                      { term => { 'module.name'       => $module } },
-                    ]
-                  }
-                }
-              }
-            },
-            size => 5,
-          }
-        }
+        query =>
+          { bool => { must => [ ( $opts->{latest} ? { term => { 'status' => 'latest' } } : () ), { nested => $nest }, ], } }
       }
     };
   }
   else {
-    $q->{query} = {
-      constant_score => {
-        filter => {
-          bool => {
-            must => [
-              { term => { 'file.module.authorized' => 1 } },
-              { term => { 'file.module.indexed'    => 1 } },
-              { term => { 'file.module.name'       => $module } },
-              { term => { 'directory'              => 0 } },
-            ]
-          }
-        }
-      }
-    };
+
+    my $document_rules = [
+      { term => { 'file.module.authorized' => 1 } },
+      { term => { 'file.module.indexed'    => 1 } },
+      { term => { 'file.module.name'       => $module } },
+      { term => { 'directory'              => 0 } },
+      ( $opts->{latest} ? { term => { 'status' => 'latest' } } : () ),
+    ];
+
+    $q->{query} = { constant_score => { filter => { bool => { must => $document_rules } } } };
   }
 
   if ( $opts->{version} ) {
@@ -215,7 +232,7 @@ sub _skip_result {
 sub find_release {
   my ( $class, $author, $distrelease, $opts ) = @_;
   my @terms = ( { term => { author => $author } }, { term => { name => $distrelease } }, );
-  my $filter = { filter => { and => [ @terms ] } };
+  my $filter = { filter => { and => [@terms] } };
   my $q = {
     explain => 1,
     query   => { constant_score => $filter },

diff --git a/scripts/module_log.pl b/scripts/module_log.pl
index ef1c592..92f976b 100755
--- a/scripts/module_log.pl
+++ b/scripts/module_log.pl
@@ -15,14 +15,19 @@ my $flags;
 my $singleflags;
 
 @ARGV = grep { defined } map {
-  $_ =~ /^--(\w+)/
+  $_ =~ /^--(.+)/
     ? do { $flags->{$1}++; undef }
     : do {
-    $_ =~ /^-(\w+)/
+    $_ =~ /^-(.+)/
       ? do { $singleflags->{$1}++; undef }
       : do { $_ }
     }
 } @ARGV;
+for my $f ( keys %{$flags} ) {
+  if ( $f =~ /^([^=]+)=(.*$)/ ) {
+    $flags->{$1} = $2;
+  }
+}
 
 if ( $flags->{help} or $singleflags->{h} ) { print help(); exit 0; }