appl 1.16 → 1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0053236723f1d22dd2981fb2c6cfbab33bb83035dc62c8c276f2c772e8512bd6
-  data.tar.gz: 24ab877ef793b0f658a79eb7adcf4fb347f5d806aa4388eb9d6bf663b75e52c1
+  metadata.gz: 910d3c31e9ccea4a482121b2a580b2a764d18603057f4f55ded3de0da4f6570f
+  data.tar.gz: 1266cccb0ea094c1d560947456006064f6eb4f26561b706f9aeff18c47e23119
 SHA512:
-  metadata.gz: 418680b99d4da05b2ae5f240bf13d106fc3b87f8cf215a4dc635d282b9ecebd54d3719993e38da66f979ca4760252e80f5767250cc5cb8f0750eeac8726197db
-  data.tar.gz: b07caffaadea381cb93cb7626f7dfd2ebedc56cfdd401c7ecc3982f02194f4d648eac663acc0d73afa090790c76db7babfd1a38ddc30fe15a7f72dd2acaa2d84
+  metadata.gz: 43612b15a512ec95b6b8915d72e85d3673417f21b164d08767d4d2bb33210c633b8b24c90c0e6b7b711ee96fad27f07715b6bb636846f6d605269d329417099e
+  data.tar.gz: 628aa7d1fb71c47c4be0403b921ba3461eae58f231a057cc70acf3b1aefab94b82e9a00375958d46b7207d13d2059bc1e08d0799d3e37a3d5a342b2c4d232ab7

data/lib/appl.rb

@@ -5,7 +5,7 @@
 
 class Application
 
-  APPL_VERSION = "1.16".freeze
+  APPL_VERSION = "1.18".freeze
 
   OPTIONS_ENV = nil
 
@@ -25,7 +25,13 @@ class Application
     @name, @args = name, args
     self.class.each_option { |opt,desc,arg,dfl,act|
       begin
-        send act, dfl if dfl
+        if dfl then
+          if arg then
+            send act, dfl
+          else
+            send act
+          end
+        end
       rescue NoMethodError
         raise OptionError, "Option action `#{act}' is not defined."
       end
@@ -88,6 +94,10 @@ class Application
 
   class <<self
 
+    def is_cmd?
+      const_defined? :NAME
+    end
+
     def run args = nil
       e = execute args
       exit e
@@ -129,7 +139,9 @@ class Application
       desc = param.pop
       arg = param.shift
       if arg then
-        if param.empty? then
+        if arg == true then
+          arg, dfl = nil, true
+        elsif param.empty? then
           arg, dfl = arg.split /:/, 2
           if dfl =~ /\A:/ then
             dfl = $'.to_sym
@@ -208,9 +220,8 @@ class Application
     def show_options
       options_desc do |opt,arg,dfl,desc|
         opt = opt.length == 1 ? "-#{opt}" : "--#{opt}"
-        arg &&= "#{arg}"
-        dfl &&= "[#{dfl}]"
-        arg << dfl if arg && dfl
+        arg = "#{arg}"
+        arg << "[#{dfl}]" if dfl
         l = "  %-*s  %-*s  %s" % [ root::W_OPTS, opt, root::W_ARGS, arg, desc]
         l.rstrip!
         puts l

data/lib/applfan.rb

@@ -20,7 +20,10 @@ class ApplicationFan < Application
     attr_accessor :commands
 
     def find_command name
-      @commands.find { |c| c::NAME == name or c::ALIASES.include? name }
+      @commands.find { |c|
+        next unless c.is_cmd?
+        c::NAME == name or c::ALIASES.include? name
+      }
     end
 
 
@@ -33,6 +36,7 @@ class ApplicationFan < Application
         puts self::AVAILCMDS
         puts
         @commands.each { |c|
+          next unless c.is_cmd?
           puts "  %-*s  %s" % [ self::W_CMDS, c.all_names, c::SUMMARY]
         }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appl
 version: !ruby/object:Gem::Version
-  version: '1.16'
+  version: '1.18'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-24 00:00:00.000000000 Z
+date: 2024-12-28 00:00:00.000000000 Z
 dependencies: []
 description: |
   A base class for command line applications doing options parsing
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Just Ruby
-rubygems_version: 3.4.22
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Easy option parsing