shellopts 2.0.3 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3b7401560ce40fd21fcbc1e1c666464f2b01a4da8a93a4ec32010aa480bb8aa
-  data.tar.gz: f998e1ab794ab4e1b711d72e7d4e6820304ab6733bc9ae9d1fa137ab4323c633
+  metadata.gz: 52971494b88f77b6b66a95e8409de7cbebcbf030588089c395424b7e86f5e372
+  data.tar.gz: e00e482a0db690c2b7bd0861589a5179a67d7cec9b285ebcc1d2b5a7b6f73ff7
 SHA512:
-  metadata.gz: a9b7856eb14fa2166bbc80dcace1724ee1a6499e93ce63f4971bdc9c4b27df4e5b26bc9d147a728de059d6e25d4e561a24aff39e2add47ca9a29aa5ad186b88f
-  data.tar.gz: 2cf14edab9a3cbb43ed3991596574e372af6527736031bd04626fb202cdf739b46565cee5c19cc67e46573c570651b7290852728958b075eeabe0df4f5197b0b
+  metadata.gz: 2206c1e56c4239472bf5b697854fc4d7ba06bd9dedfe4eb2f86c2e115f4ddd52f66e9b4f47cbba41b1b4eafb08b8666b2115df7f70d769465dcb3e4a344d322a
+  data.tar.gz: f9bc90bdba87159a2821afb3c719ba4c4fbc7077601266d9e61c5f83273924bc23e9fa2208bf727855fc99b6acac09a97ec3dc58be179f649c9ed6dbb4fcc259

data/lib/shellopts/formatter.rb

@@ -38,16 +38,17 @@ module ShellOpts
       using Ext::Array::Wrap
 
       def puts_usage(bol: false)
+        width = [Formatter.rest, Formatter::USAGE_MAX_WIDTH].min
         if descrs.size == 0
           print (lead = Formatter.command_prefix || "")
           indent(lead.size, ' ', bol: bol && lead == "") { 
-            puts render(:multi, Formatter::USAGE_MAX_WIDTH) 
+            puts render(:multi, width) 
           }
         else
           lead = Formatter.command_prefix || ""
           descrs.each { |descr|
             print lead
-            puts render(:single, Formatter::USAGE_MAX_WIDTH, args: [descr.text]) 
+            puts render(:single, width, args: [descr.text]) 
           } 
         end
       end
@@ -199,8 +200,8 @@ module ShellOpts
     # Number of characters between columns in brief output
     BRIEF_COL_SEP = 2
 
-    # Maximum width of first column in brief option and command lists
-    BRIEF_COL1_MIN_WIDTH = 6
+    # Minimum width of first column in brief option and command lists
+    BRIEF_COL1_MIN_WIDTH = 20
 
     # Maximum width of first column in brief option and command lists
     BRIEF_COL1_MAX_WIDTH = 40

data/lib/shellopts/parser.rb

@@ -122,6 +122,22 @@ module ShellOpts
       def self.parse(token)
         super(nil, token)
       end
+
+      def add_stdopts
+        option_token = Token.new(:option, 1, 1, "--version")
+        brief_token = Token.new(:brief, 1, 1, "Write version number and exit")
+        group = OptionGroup.new(self, option_token)
+        option = Option.parse(group, option_token)
+        brief = Brief.parse(group, brief_token)
+
+        option_token = Token.new(:option, 1, 1, "-h,help")
+        brief_token = Token.new(:brief, 1, 1, "Write help text and exit")
+        paragraph_token = Token.new(:text, 1, 1, "-h prints a brief help text, --help prints a longer man-style description of the command")
+        group = OptionGroup.new(self, option_token)
+        option = Option.parse(group, option_token)
+        brief = Brief.parse(group, brief_token)
+        paragraph = Paragraph.parse(group, paragraph_token)
+      end
     end
 
     class ArgSpec
@@ -146,6 +162,14 @@ module ShellOpts
       @nodes = {}
     end
 
+#   def add_stdopts
+#     version_token = Token.new(:option, 1, 1, "--version")
+#     version_brief = Token.new(:brief, 1, 1, "Gryf gryf")
+#     group = Grammar::OptionGroup.new(@program, version_token)
+#     option = Grammar::Option.parse(group, version_token)
+#     brief = Grammr::Brief.parse(option, version_brief)
+#   end
+
     def parse()
       @program = Grammar::Program.parse(@tokens.shift)
       oneline = @tokens.first.lineno == @tokens.last.lineno

data/lib/shellopts/program.rb

@@ -4,30 +4,33 @@
 module ShellOpts
   # Command represents a program or a subcommand. It is derived from
   # BasicObject to have only a minimum of inherited member methods.
-  # Additional methods defined in Command use the  '__<identifier>__' naming
-  # convention that doesn't collide with option or subcommand names but
-  # they're rarely used in application code
   #
   # The names of the inherited methods can't be used as options or
   # command namess. They are: instance_eval, instance_exec method_missing,
   # singleton_method_added, singleton_method_removed, and
-  # singleton_method_undefined
+  # singleton_method_undefined.
+  #
+  # Additional methods defined in Command use the  '__<identifier>__' naming
+  # convention that doesn't collide with option or subcommand names but
+  # they're rarely used in application code
   #
   # Command also defines #subcommand and #subcommand! but they can be
   # overshadowed by an option or command declaration. Their values can
   # still be accessed using the dashed name, though
   #
-  # Options and subcommands can be accessed using #[]
+  # Option and Command objects can be accessed using #[]. #key? is also defined
   #
   # The following methods are created dynamically for each declared option
   # with an attribute name
   #
-  #   def <identifier>(default = nil) self["<identifier>"] || default end
-  #   def <identifier>=(value) self["<identifier>"] = value end
-  #   def <identifier>?() self.key?("<identifier>") end
+  #   <identifier>(default = nil)
+  #   <identifier>=(value)
+  #   <identifier>?()
+  #
+  # The default value is used if the option or its value is missing
   #
   # Options without an an attribute can still be accessed using #[] or trough
-  # #__options__ or #__options_list__):
+  # #__option_values__, #__option_hash, or #__options_list__
   #
   # Each subcommand has a single method:
   #
@@ -42,9 +45,9 @@ module ShellOpts
 
     # These names can't be used as option or command names
     RESERVED_OPTION_NAMES = %w(
-        is_a
-        instance_eval instance_exec method_missing singleton_method_added
-        singleton_method_removed singleton_method_undefined)
+        is_a instance_eval instance_exec method_missing singleton_method_added
+        singleton_method_removed singleton_method_undefined
+    )
 
     # These methods can be overridden by an option (the value is not used -
     # this is just for informational purposes)
@@ -59,43 +62,25 @@ module ShellOpts
       object
     end
 
-    # Return command object or option argument value if present, otherwise nil
+    # Return command or option object if present, otherwise nil. Returns a
+    # possibly empty array of option objects if the option is repeatable
     #
     # The key is the name or identifier of the object or any any option
     # alias. Eg.  :f, '-f', :file, or '--file' are all usable as option keys
     # and :cmd!  or 'cmd' as command keys
     #
-    # For options, the returned value is the argument given by the user
-    # optionally converted to Integer or Float or nil if the option doesn't
-    # take arguments. If the option takes an argument and it is repeatable
-    # the value is an array of the arguments. Repeatable options without
-    # arguments have the number of occurences as the value
-    #
     def [](key)
       case object = __grammar__[key]
         when ::ShellOpts::Grammar::Command
           object.ident == __subcommand__!.__ident__ ? __subcommand__! : nil
         when ::ShellOpts::Grammar::Option
-          __options__[object.ident]
-        else
-          nil
-      end
-    end
-
-    # Assign a value to an existing option. This can be used to implement
-    # default values. #[]= doesn't currently check the type of the given
-    # value so take care. Note that the corresponding option(s) in
-    # #__option_list__ is not updated
-    def []=(key, value)
-      case object = __grammar__[key]
-        when ::ShellOpts::Grammar::Command
-          ::Kernel.raise ArgumentError, "#{key.inspect} is not an option"
-        when ::ShellOpts::Grammar::Option
-          object.argument? || object.repeatable? or
-              ::Kernel.raise ArgumentError, "#{key.inspect} is not assignable"
-          __options__[object.ident] = value
+          if object.repeatable?
+            __option_hash__[object.ident] || []
+          else
+            __option_hash__[object.ident]
+          end
         else
-          ::Kernel.raise ArgumentError, "Unknown option or command: #{key.inspect}"
+          ::Kernel.raise ::ArgumentError, "Unknown command or option: '#{key}'"
       end
     end
 
@@ -103,11 +88,11 @@ module ShellOpts
     def key?(key)
       case object = __grammar__[key]
         when ::ShellOpts::Grammar::Command
-          object.ident == __subcommand__!.ident ? __subcommand__! : nil
+          object.ident == __subcommand__
         when ::ShellOpts::Grammar::Option
-          __options__.key?(object.ident)
+          __option_hash__.key?(object.ident)
         else
-          nil
+          ::Kernel.raise ::ArgumentError, "Unknown command or option: '#{key}'"
       end
     end
       
@@ -153,13 +138,17 @@ module ShellOpts
     # depending on the option's type. Repeated options options without
     # arguments have the number of occurences as the value, with arguments
     # the value is an array of the given values
-    attr_reader :__options__
+    attr_reader :__option_values__
 
     # List of Option objects for the subcommand in the same order as
     # given by the user but note that options are reordered to come after
     # their associated subcommand if float is true. Repeated options are not
     # collapsed
     attr_reader :__option_list__
+
+    # Map from identifier to option object or to a list of option objects if
+    # the option is repeatable
+    attr_reader :__option_hash__
     
     # The subcommand identifier (a Symbol incl. the exclamation mark) or nil
     # if not present. Use #subcommand!, or the dynamically generated
@@ -172,9 +161,10 @@ module ShellOpts
   private
     def __initialize__(grammar)
       @__grammar__ = grammar
-      @__options__ = {}
+      @__option_values__ = {}
       @__option_list__ = [] 
-      @__options__ = {}
+      @__option_hash__ = {}
+      @__option_values__ = {}
       @__subcommand__ = nil
 
       __define_option_methods__
@@ -182,36 +172,34 @@ module ShellOpts
 
     def __define_option_methods__
       @__grammar__.options.each { |opt|
-        next if opt.attr.nil?
         if opt.argument? || opt.repeatable?
           if opt.optional?
             self.instance_eval %(
               def #{opt.attr}(default = nil)
-                if @__options__.key?(:#{opt.attr}) 
-                  @__options__[:#{opt.attr}] || default
+                if @__option_values__.key?(:#{opt.attr}) 
+                  @__option_values__[:#{opt.attr}]
                 else
-                  nil
+                  default
                 end
               end
             )
-          elsif !opt.argument?
+          elsif !opt.argument? # Repeatable w/o argument
             self.instance_eval %(
-              def #{opt.attr}(default = nil) 
-                if @__options__.key?(:#{opt.attr})
-                  value = @__options__[:#{opt.attr}] 
-                  value == 0 ? default : value
+              def #{opt.attr}(default = []) 
+                if @__option_values__.key?(:#{opt.attr})
+                  @__option_values__[:#{opt.attr}]
                 else
-                  nil
+                  default
                 end
               end
             )
           else
-            self.instance_eval("def #{opt.attr}() @__options__[:#{opt.attr}] end")
+            self.instance_eval("def #{opt.attr}() @__option_values__[:#{opt.attr}] end")
           end
-          self.instance_eval("def #{opt.attr}=(value) @__options__[:#{opt.attr}] = value end")
-          @__options__[opt.attr] = 0 if !opt.argument?
+          self.instance_eval("def #{opt.attr}=(value) @__option_values__[:#{opt.attr}] = value end")
+          @__option_values__[opt.attr] = 0 if !opt.argument?
         end
-        self.instance_eval("def #{opt.attr}?() @__options__.key?(:#{opt.attr}) end")
+        self.instance_eval("def #{opt.attr}?() @__option_values__.key?(:#{opt.attr}) end")
       }
 
       @__grammar__.commands.each { |cmd|
@@ -228,14 +216,15 @@ module ShellOpts
       ident = option.grammar.ident
       @__option_list__ << option
       if option.repeatable?
+        (@__option_hash__[ident] ||= []) << option
         if option.argument?
-          (@__options__[ident] ||= []) << option.argument
+          (@__option_values__[ident] ||= []) << option.argument
         else
-          @__options__[ident] ||= 0
-          @__options__[ident] += 1
+          @__option_values__[ident] = (@__option_values__[ident] || 0) + 1
         end
       else
-        @__options__[ident] = option.argument
+        @__option_hash__[ident] = option
+        @__option_values__[ident] = option.argument
       end
     end
 
@@ -254,7 +243,7 @@ module ShellOpts
 
   # Option models an option as given by the user on the subcommand line.
   # Compiled options (and possibly aggregated) options are stored in the
-  # Command#__options__ array
+  # Command#__option_values__ array
   class Option
     # Associated Grammar::Option object
     attr_reader :grammar

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.3"
+  VERSION = "2.0.6"
 end

data/lib/shellopts.rb

@@ -102,6 +102,9 @@ module ShellOpts
     attr_accessor :stdopts
     attr_accessor :msgopts
 
+    # Version of client program. This is only used if +stdopts+ is true
+    attr_reader :version
+
     # Interpreter flags
     attr_accessor :float
 
@@ -116,9 +119,9 @@ module ShellOpts
     attr_reader :tokens
     alias_method :ast, :grammar # Oops - defined earlier FIXME
 
-    def initialize(name: nil, stdopts: true, msgopts: false, float: true, exception: false)
+    def initialize(name: nil, stdopts: true, version: nil, msgopts: false, float: true, exception: false)
       @name = name || File.basename($PROGRAM_NAME)
-      @stdopts, @msgopts, @float, @exception = stdopts, msgopts, float, exception
+      @stdopts, @version, @msgopts, @float, @exception = stdopts, version, msgopts, float, exception
     end
 
     # Compile source and return grammar object. Also sets #spec and #grammar.
@@ -130,7 +133,7 @@ module ShellOpts
         @file = find_caller_file
         @tokens = Lexer.lex(name, @spec, @oneline)
         ast = Parser.parse(tokens)
-        # TODO: Add standard and message options and their handlers
+        ast.add_stdopts if stdopts
         @grammar = Analyzer.analyze(ast)
       }
       self
@@ -143,6 +146,20 @@ module ShellOpts
       handle_exceptions { 
         @argv = argv.dup
         @program, @args = Interpreter.interpret(grammar, argv, float: float, exception: exception)
+        if stdopts
+          if @program.version?
+            version or raise ArgumentError, "Version not specified"
+            puts version 
+            exit
+          elsif @program.help?
+            if @program[:help].name == "-h"
+              ShellOpts.brief
+            else
+              ShellOpts.help
+            end
+            exit
+          end
+        end
       }
       self
     end
@@ -177,7 +194,7 @@ module ShellOpts
       saved = $stdout
       $stdout = $stderr
       $stderr.puts "#{name}: #{message}"
-      Formatter.usage(program)
+      Formatter.usage(grammar)
       exit 1
     ensure
       $stdout = saved
@@ -201,11 +218,12 @@ module ShellOpts
     def brief() Formatter.brief(@grammar) end
 
     # Print help for the given subject or the full documentation if +subject+
-    # is nil 
+    # is nil. Clears the screen beforehand if :clear is true
     #
-    def help(subject = nil)
+    def help(subject = nil, clear: true)
       node = (subject ? @grammar[subject] : @grammar) or
           raise ArgumentError, "No such command: '#{subject&.sub(".", " ")}'"
+      print '' if clear
       Formatter.help(node)
     end
 
@@ -310,6 +328,7 @@ module ShellOpts
   def self.instance?() !@instance.nil? end
   def self.instance() @instance or raise Error, "ShellOpts is not initialized" end
   def self.instance=(instance) @instance = instance end
+  def self.shellopts() instance end
 
   forward_self_to :instance, :error, :failure
 

data/main

@@ -7,18 +7,33 @@ require 'shellopts'
 
 include ShellOpts
 
+VERSION = "1.2.3"
 
 SPEC = %(
-  -a,alpha        @ Brief comment for -a and --alpha options
-      Longer and more elaborate description of the --alpha option
+  -a @ An option
+)
+opts, args = ShellOpts::process(SPEC, ARGV, version: VERSION)
+#ShellOpts::ShellOpts.help
 
-  -b,beta=ARG
-      @ Alternative style of brief comment
 
-      Longer and more elaborate description of the --beta option
-)
 
-opts, args = ShellOpts.process(SPEC, ARGV)
+
+
+
+__END__
+
+
+#SPEC = %(
+# -a,alpha        @ Brief comment for -a and --alpha options
+#     Longer and more elaborate description of the --alpha option
+#
+# -b,beta=ARG
+#     @ Alternative style of brief comment
+#
+#     Longer and more elaborate description of the --beta option
+#)
+#
+#opts, args = ShellOpts.process(SPEC, ARGV)
 #puts "opts.alpha?: #{opts.alpha?.inspect}"
 #puts "opts.alpha: #{opts.alpha.inspect}"
 #puts "opts.beta?: #{opts.beta?.inspect}"
@@ -266,8 +281,9 @@ SPEC4 = %(
 
 SPEC5 = "cmd! cmd!"
 
-shellopts = ShellOpts::ShellOpts.new(exception: false)
+shellopts = ShellOpts::ShellOpts.new(exception: true)
 #shellopts.compile("cmd! cmd!")
+
 shellopts.compile(SPEC)
 #shellopts.compile(SPEC2)
 #shellopts.compile(SPEC3)
@@ -277,9 +293,9 @@ shellopts.compile(SPEC)
 #shellopts.tokens.each(&:dump)
 #exit
 
-shellopts.usage
+#shellopts.usage
 #shellopts.brief
-#shellopts.help
+shellopts.help
 #shellopts.help("cmd")
 #shellopts.help(ARGV.first)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.6
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Parse command line options and arguments