l43_rmap 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95afae624f3dd5ce13c2761678d547694c5a9e11a80ea7ca23fb8cf94604b53
-  data.tar.gz: d813c9e6dc4186232cdacf3412d14c869cc40ec055a9f240e9a0774bed781fd8
+  metadata.gz: 9bd7417484c513b2d71b9e69d4a9eb88bc452680df0c0084598177116915d6fa
+  data.tar.gz: ceb5ecb1605bcaa3d3e6e2210866321bbfc8500438df7cc3965f207c74cf62d6
 SHA512:
-  metadata.gz: a7d2d9ac1512236a1a3d8f393284392e43bebaf58423842d61cff0f9ccc5b32b59457531d4791c6af26f0868abf02669e590812300f632c99be028852eb8cb73
-  data.tar.gz: 03d07b9bf563eb0ddb6a4cf2545cc66aba27a0d478745761756190d15f338275f62ac3b1533429092e2b8461855b6627a107525dcd89077857d727d5889d2627
+  metadata.gz: 25e4f5a82994057fc6c60a09455845f4f7fa5c8b070b59032bab278763109d984f6494f94abdc0722af595ba918d9c35fc14d080360f262594a99a5e982ac43f
+  data.tar.gz: 4415aa7b21e450d857d5a8e7ff06f14e8bbbcc446f9ba7376afd48eecb4de133cfb9372cd4a30cd82d362741d02a7d85fd8561c720b9fabfdc5bf2ff16d8318b

data/lib/l43_rmap/cli/color.rb

@@ -5,6 +5,7 @@ module L43Rmap
     module Color
       def arg(name) = [:bold, :blue, "<#{name}>", :reset]
       def arg1(name) = [:bold, :blue, name, :reset]
+      def dimmed(str) = [:dim, "(", str, ")", :reset]
 
       def kwd(name) = [" kwd ", :bold, :cyan, name, ":", :reset]
 

data/lib/l43_rmap/cli.rb

@@ -6,6 +6,7 @@ require_relative '../l43_rmap'
 require_relative 'predefined_patterns'
 require_relative 'cli/color'
 require_relative 'cli/help'
+require_relative 'version'
 module L43Rmap
   class Cli
     include L43::SimpleColor
@@ -15,28 +16,14 @@ module L43Rmap
     attr_reader :args, :kwds, :pattern, :runtime
 
     def run(args)
-      parser.parse(args) => :ok, {kwds:, args:}
-      @kwds = kwds
-      @args = args
-      return help if kwds.help
-      return help_pattern if kwds.help_pattern
-      return help_named if kwds.help_named
-      return help_predefined if kwds.help_predefined
-      return help_sexp if kwds.help_sexp
-
-      return unless check_args
-
-      return dry_run if kwds.dry_run
-      replace_pattern_if_predefined
-      return show_parsed if kwds.parse_only
-
-      _compile
-      return compiled if kwds.compile_only
-
-      _run
+      case parser.parse(args)
+      in :ok, {kwds:, args:}
+        correct_args(kwds:, args:)
+      in :error, message
+        puterr(message)
+      end
     end
 
-
     private
     def initialize
       parser
@@ -51,6 +38,7 @@ module L43Rmap
         .flag(:help_predefined, desc: ["Describe ", :bold, :blue, "predefined patterns"], stop: true)
         .flag(:help_sexp, desc: ["Describe ", :bold, :blue, "s-expressions"], stop: true)
         .flag(:randomize, :r, desc: ["Does not write to the ", arg1("output stream"), " immideately but into a buffer, the buffer is then randomized before being printed to ", arg1("output stream")])
+        .flag(:version, :v, desc: ["Just print current version ",dimmed(version_string)], stop: true)
         .section("Options")
         .keyword(:input, :i, desc: ["file to read from, defaults to ", :bold, :cyan, '$stdin'], default: $stdin)
         .keyword(:output, :o, desc: ["file to write to, defaults to ", :bold, :cyan, '$stdout'], default: $stdout)
@@ -87,6 +75,28 @@ module L43Rmap
       :ok
     end
 
+    def correct_args(kwds:, args:)
+      @kwds = kwds
+      @args = args
+      return help if kwds.help
+      return print_version if kwds.version
+      return help_pattern if kwds.help_pattern
+      return help_named if kwds.help_named
+      return help_predefined if kwds.help_predefined
+      return help_sexp if kwds.help_sexp
+
+      return unless check_args
+
+      return dry_run if kwds.dry_run
+      replace_pattern_if_predefined
+      return show_parsed if kwds.parse_only
+
+      _compile
+      return compiled if kwds.compile_only
+
+      _run
+    end
+
     def dry_run
       putcol(:cyan, :bold, {kwds: kwds.to_h}.inspect)
       putcol(:blue, :bold, {args:}.inspect)
@@ -104,6 +114,13 @@ module L43Rmap
     end
 
     def parser =  @__parser__ ||= L43::OptParser.new(with_help: true)
+
+    def print_version
+      putcol(:bold, "rmap: ", :green, version_string)
+      :helped
+    end
+
+    def version_string = "v#{VERSION}"
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

data/lib/l43_rmap/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module L43Rmap
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l43_rmap
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Robert Dober