appl 1.12 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 840b8916d8f8d5b79f0f87bdee61772a9f6e00bffa3cc3c69aeaad93b7b950fe
-  data.tar.gz: 570c63f80082520339691d6fe3c1aad68a953e7eee90866b21dfe50c9705af80
+  metadata.gz: 9e3306b330c4d69ef88e6b75511d7b0ab1e030f990aac1800305dcfa4afd0f65
+  data.tar.gz: eff477635d40b6ff9c443b0fe1256107c85d31bf6aa7c0a2088f26ffa239111c
 SHA512:
-  metadata.gz: d634ae0936e200f45b741a8ed2dce2900c7ad548993e08da923104b1f95612c0a2e94b72482d41a5041b754f68a6231a8e101986771052ee24818d5273d475e8
-  data.tar.gz: 0ed10689b122791eef9c7f8468881a8449740e0858209f5d0867241b67b64f1ef4f26db7703c7586a3f06371075b66a6f577f2056effcf5907b7862dc6b2628f
+  metadata.gz: 6ae84d8de622e2e2b4763ef8fbda40b9210edd326d48358707364f4a4c99b0fbee05c1ed1dc5b31d83d3f7429e74922a81af5eb22de7572a1a3c6ad7bec99925
+  data.tar.gz: ab2ea5f6b9f7850bd62e741201cc10bdaa1c1c6be549c0a45fa435bb7ee55779fabfade33a0801fd931d7313d0b90f3a991b1ec38ee6749db19562ee6969afe2

data/lib/appl.rb

@@ -5,7 +5,7 @@
 
 class Application
 
-  APPL_VERSION = "1.12".freeze
+  APPL_VERSION = "1.13".freeze
 
   OPTIONS_ENV = nil
 
@@ -13,14 +13,16 @@ class Application
   UNKNOWN = "Unknown option: `%s'."
   UNPROCA = "Warning: unprocessed arguments: %s"
 
+  ALIASES = [].freeze
+
   W_OPTS = 10
   W_ARGS = 16
 
   class OptionError < StandardError ; end
   class Done        < Exception     ; end
 
-  def initialize args = nil
-    @args = args||self.class.cmdline_arguments
+  def initialize name = nil, args = nil
+    @name, @args = name, args
     self.class.each_option { |opt,desc,arg,dfl,act|
       begin
         send act, dfl if dfl
@@ -92,7 +94,8 @@ class Application
     private
 
     def execute args = nil
-      i = new args
+      n = File.basename $0
+      i = new n, args||cmdline_arguments
       i.execute
     rescue Done
       0
@@ -214,12 +217,19 @@ class Application
       self
     end
 
-    def applname
-      self::NAME
+    def all_names
+      [ self::NAME, *self::ALIASES].join "|"
     end
 
     def help
-      puts "#{applname}  --  #{self::SUMMARY}"
+      n = []
+      s = self
+      begin
+        l = s.all_names
+        n.unshift l
+        s = s.root
+      end while s != root
+      puts "#{n.join ' '}  --  #{self::SUMMARY}"
       puts
       puts self::DESCRIPTION
       puts
@@ -231,7 +241,7 @@ class Application
     end
 
     def version
-      puts "#{applname} #{self::VERSION}  --  #{self::SUMMARY}"
+      puts "#{self::NAME} #{self::VERSION}  --  #{self::SUMMARY}"
       puts self::COPYRIGHT if const_defined? :COPYRIGHT
       puts "License: #{self::LICENSE}" if const_defined? :LICENSE
       a = []

data/lib/applfan.rb

@@ -5,9 +5,7 @@
 require "appl"
 
 
-ApplicationFan = Class.new Application
-
-class ApplicationFan
+class ApplicationFan < Application
 
   AVAILCMDS = "Available commands (say -h after one for help)"
   NOCOMMAND = "No command given. Say -h for a list."
@@ -22,7 +20,7 @@ class ApplicationFan
     attr_accessor :commands
 
     def find_command name
-      @commands.find { |c| c::NAME == name }
+      @commands.find { |c| c::NAME == name or c::ALIASES.include? name }
     end
 
 
@@ -35,7 +33,7 @@ class ApplicationFan
         puts self::AVAILCMDS
         puts
         @commands.each { |c|
-          puts "  %-*s  %s" % [ self::W_CMDS, c::NAME, c::SUMMARY]
+          puts "  %-*s  %s" % [ self::W_CMDS, c.all_names, c::SUMMARY]
         }
       end
     end
@@ -52,10 +50,7 @@ class ApplicationFan
               super c
             end
             define_singleton_method :root do
-              sub
-            end
-            define_singleton_method :applname do
-              "#{root::NAME} #{self::NAME}"
+              sub.root
             end
           end
         )
@@ -70,7 +65,7 @@ class ApplicationFan
     c or raise CommandError, self.class::NOCOMMAND
     cmd = self.class.find_command c
     cmd or raise CommandError, self.class::UNKNWNCMD % c
-    sub = cmd.new @args.slice! 0, @args.length
+    sub = cmd.new c, (@args.slice! 0, @args.length)
     yield sub if block_given?
     sub.execute
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appl
 version: !ruby/object:Gem::Version
-  version: '1.12'
+  version: '1.13'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies: []
 description: |
   A base class for command line applications doing options parsing