shellopts 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0170d9ce5144afcf716b90a3904250c0afa5d769b7a64f39db0b8084e77b4fb7
-  data.tar.gz: 81495a3802c472c65812594d847c43b0f59849ea0ebe093c74c2fb7d3e822658
+  metadata.gz: a3a8b18b0a610c14ac4a85f80cd70ff5f85ca7dc868b25615a67a3ad71f737b5
+  data.tar.gz: 2b0442868d8ddf102a5f8ee1b3d3307ecbea17a95512f5164d4a64a9d3fa9ec7
 SHA512:
-  metadata.gz: 195801ea89b22920fca88216ed4bd7ac426b3370e482b61547dac085d1c7d9f1bd0a2d0edc7c3368bf126cd5f4da815dd882ee3149cd291549ff631d6302e93a
-  data.tar.gz: 6dcd50871438db9f5b0520e4f670f6df6ad04756685838d309874a9601770ee79a7370ebc11b0469d19a9f2be89868c7cfd12cfe028c0c01719b4d8d0593fc59
+  metadata.gz: c90ab9e0049ba64e21c2b0fd408b438df84c0265fced52b84d221bdb2b96f92e75624c00ab59526c9caa80f67e2e7d55c5bcf0cb8138b803722b424e08ea9202
+  data.tar.gz: 372e29956c8f3e27f8f5617215cf610403d40a307257c0c63605e94bd39fffaa8bf9cb165e82fe61497fcc8f0519c4298c1bf4480fa26735f5bf5c01e12fe8e2

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

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 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,14 +119,17 @@ 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.
     # Returns the grammar
     def compile(spec)
+      if stdopts
+        spec += "\n--version\n  Write version number and exit\n-h,help @ Write help text and exit\n  Write help text. -h prints a brief text, --help prints a longer man-style description of the command"
+      end
       handle_exceptions {
         @oneline = spec.index("\n").nil?
         @spec = spec.sub(/^\s*\n/, "")
@@ -143,6 +149,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
@@ -203,9 +223,10 @@ module ShellOpts
     # Print help for the given subject or the full documentation if +subject+
     # is nil. Clears the screen beforehand if :clear is true
     #
-    def help(subject = nil, clear: false)
+    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 +331,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,31 @@ 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
+SPEC = "-a"
+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 +279,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 +291,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Claus Rasmussen