0.0.9

Author: lizmat

Changes

@@ -2,6 +2,10 @@ Revision history for App-Rak
 
 {{$NEXT}}
 
+0.0.9  2022-07-15T23:29:55+02:00
+    - Up dependency on "Edit::Files" to get nvim support
+    - Add support for --pattern, allowing pattern to be saved with --save
+
 0.0.8  2022-07-15T15:59:26+02:00
     - Add dependency on "JSON::Fast"
     - Add support for --save=tag functionality
@@ -24,7 +28,7 @@ Revision history for App-Rak
 
 0.0.5  2022-07-10T15:26:55+02:00
     - No longer follow symlinked directories by default
-    - Bump dependency on Files::Containing to get :follow-symlinks capablity
+    - Bump dependency on Files::Containing to get :follow-symlinks capability
     - Add -S / --follow-symlinks arguments to follow symlinked directories
 
 0.0.4  2022-07-09T14:22:33+02:00

META6.json

@@ -10,7 +10,7 @@
     "highlighter:ver<0.0.9>:auth<zef:lizmat>",
     "Files::Containing:ver<0.0.10>:auth<zef:lizmat>",
     "as-cli-arguments:ver<0.0.3>:auth<zef:lizmat>",
-    "Edit::Files:ver<0.0.2>:auth<zef:lizmat>",
+    "Edit::Files:ver<0.0.3>:auth<zef:lizmat>",
     "JSON::Fast:ver<0.17>:auth<cpan:TIMOTIMO>"
   ],
   "description": "a CLI for searching strings in files",
@@ -31,5 +31,5 @@
   ],
   "test-depends": [
   ],
-  "version": "0.0.8"
+  "version": "0.0.9"
 }

README.md

@@ -35,7 +35,9 @@ POSITIONAL ARGUMENTS
 pattern
 -------
 
-The pattern to search for. This can either be a string, or a regular expression (indicated by a string starting and ending with **/**), or a Callable (indicated by a string starting with **{** and ending with **}**. 
+The pattern to search for. This can either be a string, or a regular expression (indicated by a string starting and ending with **/**), or a Callable (indicated by a string starting with **{** and ending with **}**.
+
+Can also be specified with the `--pattern` named argument, in which case all the positional arguments are considered to be a path specification.
 
 path(s)
 -------
@@ -125,6 +127,11 @@ Indicate whether only the matched pattern should be produced, rather than the li
 
 Indicate the path of the file in which the result of the search should be placed. Defaults to `STDOUT`.
 
+--pattern
+---------
+
+Alternative way to specify the pattern to search for. If (implicitely) specified, will assume the first positional parameter specified is actually a path specification, rather than a pattern. This allows the pattern to be searched for to be saved with `--save`.
+
 --replace-files
 ---------------
 

lib/App/Rak.rakumod

@@ -89,13 +89,15 @@ my sub add-before-after($io, @initially-selected, int $before, int $after) {
     @selected
 }
 
+# Entry point for CLI processing
+my proto sub MAIN(|) is export {*}
+
 # Make sure we can do -V --version
-use CLI::Version:ver<0.0.3>:auth<zef:lizmat>
-  $?DISTRIBUTION,
-  my proto sub MAIN(|) is export {*}
+use CLI::Version:ver<0.0.3>:auth<zef:lizmat> $?DISTRIBUTION, &MAIN;
+
+# Main handler
+my multi sub MAIN(*@specs, *%n) {  # *%_ causes compilation issues
 
-# Processing "save" and "list-tags" requests
-my multi sub MAIN(*%n) {  # *%_ causes compilation issues
     # Saving config
     if %n<save>:delete -> $tag {
         load-config;
@@ -104,6 +106,7 @@ my multi sub MAIN(*%n) {  # *%_ causes compilation issues
         say (%n ?? "Saved" !! "Removed") ~ " configuration for '$tag'";
         exit;
     }
+
     # Show what we have
     elsif %n<list-tags>:delete {
         meh-if-unexpected(%n);
@@ -114,20 +117,15 @@ my multi sub MAIN(*%n) {  # *%_ causes compilation issues
           for %config.sort(*.key.fc);
         exit;
     }
-    meh "Must at least specify a pattern";
-}
-
-# The main processor
-my multi sub MAIN($needle, *@specs, *%n) {  # *%_ causes compilation issues
-    meh "Saving pattern and/or paths not supported" if %n<save>:delete;
 
-    # Running one or more configs
+    # Add saved tags if any
     if %n<with>:delete -> $with {
         my @not-found;
+
         load-config;
         for $with.split(',') -> $tag {
             if %config{$tag} -> %adding {
-                %n{.key} = .value for %adding;
+                %n{.key} = .value unless %n{.key}:exists for %adding;
             }
             else {
                 @not-found.push: $tag;
@@ -136,6 +134,9 @@ my multi sub MAIN($needle, *@specs, *%n) {  # *%_ causes compilation issues
         meh "Attempt to add named arguments from unknown tag(s): @not-found[]" if @not-found;
     }
 
+    my $needle = %n<pattern>:delete // @specs.shift;
+    meh "Must at least specify a pattern" without $needle;
+
     if $needle.starts-with('/') && $needle.ends-with('/') {
         $needle .= EVAL;
     }
@@ -147,7 +148,7 @@ my multi sub MAIN($needle, *@specs, *%n) {  # *%_ causes compilation issues
     }
 
     temp $*OUT;
-    with named-arg %n, <output-file> -> $path {
+    with %n<output-file>:delete -> $path {
         $*OUT = open($path, :w) if $path ne "-";
     }
 
@@ -357,7 +358,10 @@ suggestions are more than welcome!
 
 The pattern to search for.  This can either be a string, or a regular
 expression (indicated by a string starting and ending with B</>), or a
-Callable (indicated by a string starting with B<{> and ending with B<}>.  
+Callable (indicated by a string starting with B<{> and ending with B<}>.
+
+Can also be specified with the C<--pattern> named argument, in which
+case all the positional arguments are considered to be a path specification.
 
 =head2 path(s)
 
@@ -465,6 +469,13 @@ the line in which the pattern was found.  Defaults to C<False>.
 Indicate the path of the file in which the result of the search should
 be placed.  Defaults to C<STDOUT>.
 
+=head2 --pattern
+
+Alternative way to specify the pattern to search for.  If (implicitely)
+specified, will assume the first positional parameter specified is
+actually a path specification, rather than a pattern.  This allows
+the pattern to be searched for to be saved with C<--save>.
+
 =head2 --replace-files
 
 Only makes sense if the specified pattern is a C<Callable>.  Indicates