Add latest option for search

hythm7 · Sep 29, 2023 · 9a261e1 · 9a261e1
1 parent d6370f3
commit 9a261e1
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -128,6 +128,7 @@ Search available distributions
 **options:**
 
 <pre>
+latest           → latest version
 relaxed          → relaxed search
 details          → details of dist
 count < number > → number of dists to be returned
@@ -137,6 +138,7 @@ norelaxed        → no relaxed search
 <b>Examples:</b>
 <pre>
 <b>pakku search dist</b>               # search distributions matching dist (ignored case) on online recman
+<b>pakku search latest dist</b>        # show latest version
 <b>pakku search norelaxed dist</b>     # no relaxed search
 <b>pakku search count 4 dist</b>       # search dist and return the lates 4 versions only
 <b>pakku search details dist</b>       # search dist and list all details

diff --git a/lib/Pakku/Command/Config.rakumod b/lib/Pakku/Command/Config.rakumod
@@ -110,6 +110,7 @@ my class Search {
 
   has Bool  $.details;
   has Bool  $.relaxed;
+  has Bool  $.latest;
   has Int() $.count;
 
 }

diff --git a/lib/Pakku/Command/Help.rakumod b/lib/Pakku/Command/Help.rakumod
@@ -131,10 +131,12 @@ method !search-help ( ) {
   %search<desc>    = 'Search distribution on Recman';
 
   %search<example>.push: 'pakku search           dist';
+  %search<example>.push: 'pakku search latest    dist';
   %search<example>.push: 'pakku search norelaxed dist';
   %search<example>.push: 'pakku search count 5   dist';
   %search<example>.push: 'pakku search details   dist';
 
+  %search<opt>.push: ( 'latest'  => 'latest version' );
   %search<opt>.push: ( 'relaxed' => 'relaxed search' );
   %search<opt>.push: ( 'count'   => 'distributions count' );
   %search<opt>.push: ( 'details' => 'search details' );

diff --git a/lib/Pakku/Command/Search.rakumod b/lib/Pakku/Command/Search.rakumod
@@ -10,6 +10,7 @@ multi method fly (
            :@spec!,
     Int:D  :$count   = 666,
     Bool:D :$relaxed = True,
+    Bool:D :$latest  = False,
     Bool:D :$details = False,
 
   ) {
@@ -20,7 +21,7 @@ multi method fly (
 
   my $promise = start sink @spec
     ==> map( -> $spec { Pakku::Spec.new: $spec                        } )
-    ==> map( -> $spec { self!recman.search( :$spec :$relaxed :$count ).Slip   } )
+    ==> map( -> $spec { self!recman.search( :$spec :$relaxed :$latest :$count ).Slip   } )
     ==> grep( *.defined                                            )
     ==> map( -> $meta { Pakku::Meta.new( $meta ).gist: :$details } )
     ==> map( -> $meta { out $meta unless self!dont } );

diff --git a/lib/Pakku/Grammar/Cmd.rakumod b/lib/Pakku/Grammar/Cmd.rakumod
@@ -227,6 +227,7 @@ grammar Pakku::Grammar::Cmd {
   proto token searchopt { * }
   token searchopt:sym<details>    { <details> }
   token searchopt:sym<relaxed>    { <relaxed> }
+  token searchopt:sym<latest>     { <latest> }
   token searchopt:sym<count>      { <count> <.space>+ <number> }
 
   proto token nukeopt { * }
@@ -430,6 +431,12 @@ grammar Pakku::Grammar::Cmd {
   token relaxed:sym<nr>        { <sym> }
 
 
+  proto token latest { * }
+  token latest:sym<latest>   { <sym> }
+  token latest:sym<l>        { <sym> }
+  token latest:sym<nolatest> { <sym> }
+  token latest:sym<nl>       { <sym> }
+
   proto token count { * }
   token count:sym<count>   { <sym> }
   token count:sym<c>       { <sym> }
@@ -943,6 +950,7 @@ class Pakku::Grammar::CmdActions {
 
   method searchopt:sym<details>    ( $/ ) { make $<details>.made            }
   method searchopt:sym<relaxed>    ( $/ ) { make $<relaxed>.made            }
+  method searchopt:sym<latest>     ( $/ ) { make $<latest>.made            }
   method searchopt:sym<count>      ( $/ ) { make ( count => $<number>.Int ) }
 
   method stateopt:sym<clean>   ( $/ ) { make $<clean>.made   }
@@ -1056,11 +1064,16 @@ class Pakku::Grammar::CmdActions {
   method details:sym<nd>        ( $/ ) { make ( :!details ) }
 
   method relaxed:sym<relaxed>   ( $/ ) { make ( :relaxed  ) }
-  method relaxed:sym<d>         ( $/ ) { make ( :relaxed  ) }
+  method relaxed:sym<r>         ( $/ ) { make ( :relaxed  ) }
   method relaxed:sym<norelaxed> ( $/ ) { make ( :!relaxed ) }
   method relaxed:sym<nr>        ( $/ ) { make ( :!relaxed ) }
 
 
+  method latest:sym<latest>   ( $/ ) { make ( :latest  ) }
+  method latest:sym<l>        ( $/ ) { make ( :latest  ) }
+  method latest:sym<nolatest> ( $/ ) { make ( :!latest ) }
+  method latest:sym<nl>       ( $/ ) { make ( :!latest ) }
+
   method level:sym<nothing> ( $/ ) { make 'nothing' }
   method level:sym<all>     ( $/ ) { make 'all'     }
   method level:sym<debug>   ( $/ ) { make 'debug'   }

diff --git a/lib/Pakku/Recman.rakumod b/lib/Pakku/Recman.rakumod
@@ -34,10 +34,11 @@ method search (
     ::?CLASS:D:
     Pakku::Spec::Raku:D :$spec!,
     Bool:D              :$relaxed!,
+    Bool:D              :$latest!,
     Int:D               :$count!,
 
   ) {
 
-  flat @!recman.map: *.search: :$spec :$relaxed :$count;
+  flat @!recman.map: *.search: :$spec :$relaxed :$latest :$count;
 
 }
diff --git a/lib/Pakku/Recman/HTTP.rakumod b/lib/Pakku/Recman/HTTP.rakumod
@@ -44,6 +44,7 @@ method search (
     ::?CLASS:D:
     :$spec!,
     :$relaxed!,
+    :$latest!,
     :$count!,
 
   ) {
@@ -60,8 +61,9 @@ method search (
   @query.push( 'ver='     ~ url-encode $ver     ) if $ver;
   @query.push( 'auth='    ~ url-encode $auth    ) if $auth;
   @query.push( 'api='     ~ url-encode $api     ) if $api;
-  @query.push( 'count='   ~ url-encode $count   ) if $count;
+  @query.push( 'latest='  ~ url-encode $latest  ) if $latest;
   @query.push( 'relaxed=' ~ url-encode $relaxed ) if $relaxed;
+  @query.push( 'count='   ~ url-encode $count   ) if $count;
 
   my $uri = $!location ~ '/meta/search/' ~ url-encode $name;
 

diff --git a/resources/config.json b/resources/config.json
@@ -84,6 +84,7 @@
     }
   ],
   "search": {
+    "latest": false,
     "details": false
   },
   "test": {