shellopts 2.0.6 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52971494b88f77b6b66a95e8409de7cbebcbf030588089c395424b7e86f5e372
-  data.tar.gz: e00e482a0db690c2b7bd0861589a5179a67d7cec9b285ebcc1d2b5a7b6f73ff7
+  metadata.gz: a9d576d24bd0aec0dd43a2a3645ede04751d80ae22a4c88e8f66ed53bbe7e405
+  data.tar.gz: 9027ac55689a345099f6515e5280808528603dfafe385219e6cce77d1c166d96
 SHA512:
-  metadata.gz: 2206c1e56c4239472bf5b697854fc4d7ba06bd9dedfe4eb2f86c2e115f4ddd52f66e9b4f47cbba41b1b4eafb08b8666b2115df7f70d769465dcb3e4a344d322a
-  data.tar.gz: f9bc90bdba87159a2821afb3c719ba4c4fbc7077601266d9e61c5f83273924bc23e9fa2208bf727855fc99b6acac09a97ec3dc58be179f649c9ed6dbb4fcc259
+  metadata.gz: b44a4d95aa0585dd0ec31abccde4942c98ad712d9e3bdf9f0c0b6ead7333ff4c5b555ec5b45786a6f539388b2460c93d12f3755b2e80cbb81fd269c42a9b4955
+  data.tar.gz: 3c948a743d809df7d22bc142dcfa9aa4e943fed144004c4fbf5d1995c314f4aea3f91b032533222eed953e5344a45c55666339797e5ae2b1be262eea17071cd5

data/TODO

@@ -1,4 +1,5 @@
 
+o Add brackets to optional option arguments: '--all=FILE?' -> '--all[=FILE]'
 o Ignore all text after ' # ' (doesn't conflict with option flag)
 o Command aliases
 o Add user-defined setions

data/lib/shellopts/analyzer.rb

@@ -28,10 +28,13 @@ module ShellOpts
         @options = option_groups.map(&:options).flatten
       end
 
-      # Move options before first command
+      # Move options before first command or before explicit COMMAND section
       def reorder_options
         if commands.any?
-          if i = children.find_index { |child| child.is_a?(Command) }
+          i = children.find_index { |child| 
+            child.is_a?(Command) || child.is_a?(Section) && child.name == "COMMAND"
+          }
+          if i
             options, rest = children[i+1..-1].partition { |child| child.is_a?(OptionGroup) }
             @children = children[0, i] + options + children[i..i] + rest
           end

data/lib/shellopts/args.rb

@@ -2,21 +2,31 @@
 module ShellOpts
   # Specialization of Array for arguments lists. Args extends Array with a
   # #extract and an #expect method to extract elements from the array. The
-  # methods raise a ShellOpts::UserError exception in case of errors
+  # methods raise a ShellOpts::Error exception in case of errors
   #
   class Args < Array
+    def initialize(*args, exception: false)
+      super(*args)
+      @exception = exception
+    end
+
+    # :call-seq:
+    #   extract(count, message = nil)
+    #   extract(range, message = nil)
+    #
     # Remove and return elements from beginning of the array
     #
     # If +count_or_range+ is a number, that number of elements will be
     # returned.  If the count is one, a simple value is returned instead of an
     # array. If the count is negative, the elements will be removed from the
     # end of the array. If +count_or_range+ is a range, the number of elements
-    # returned will be in that range. The range can't contain negative numbers 
+    # returned will be in that range. Note that the range can't contain
+    # negative numbers 
     #
-    # #extract raise a ShellOpts::UserError exception if there's is not enough
+    # #extract raise a ShellOpts::Error exception if there's is not enough
     # elements in the array to satisfy the request
     #
-    def extract(count_or_range, message = nil) 
+    def extract(count_or_range, message = nil)
       case count_or_range
         when Range
           range = count_or_range
@@ -30,16 +40,16 @@ module ShellOpts
           count.abs <= self.size or inoa(message)
           start = count >= 0 ? 0 : size + count
           r = slice!(start, count.abs)
-          r.size <= 0 ? nil : (r.size == 1 ? r.first : r)
+          r.size == 1 ? r.first : r
         else
           raise ArgumentError
       end
     end
 
     # As #extract except it doesn't allow negative counts and that the array is
-    # expect to be emptied by the operation
+    # expected to be emptied by the operation
     #
-    # #expect raise a ShellOpts::UserError exception if the array is not emptied 
+    # #expect raise a ShellOpts::Error exception if the array is not emptied 
     # by the operation
     #
     def expect(count_or_range, message = nil)
@@ -54,8 +64,10 @@ module ShellOpts
     end
 
   private
-    def inoa(message = nil) 
-      raise ArgumentError, message || "Illegal number of arguments"
+    def inoa(message = nil)
+      message ||= "Illegal number of arguments"
+      raise Error, message if @exception
+      ::ShellOpts.error(message)
     end
   end
 end

data/lib/shellopts/formatter.rb

@@ -112,36 +112,33 @@ module ShellOpts
 
         section = {
           Paragraph => "DESCRIPTION",
-          OptionGroup => "OPTIONS",
-          Command => "COMMANDS"
+          OptionGroup => "OPTION",
+          Command => "COMMAND"
         }
 
+        seen_sections = {}
         newline = false # True if a newline should be printed before child 
         indent {
           children.each { |child|
-            if child.is_a?(Section) # Explicit section
-#             p :A
-              puts
-              indent(-1).puts Ansi.bold child.name
-              section.delete_if { |_,v| v == child.name }
+            klass = child.is_a?(Section) ?  section.key(child.name) : child.class
+            if s = section[klass] # Implicit section
+              section.delete(klass)
               section.delete(Paragraph)
-              newline = false
-              next
-            elsif s = section[child.class] # Implicit section
-#             p :B
-              puts  
+              if klass <= OptionGroup
+                s = s + "S" if options.size > 1
+              elsif klass <= Command
+                s = s + "S" if commands.size > 1 || commands.first&.commands&.size != 0
+              end
+              puts
               indent(-1).puts Ansi.bold s
-              section.delete(child.class)
-              section.delete(Paragraph)
               newline = false
-            else # Any other node add a newline
-#             p :C
+              next if child.is_a?(Section)
+            else # Any other node adds a newline
               puts if newline
               newline = true
             end
 
             if child.is_a?(Command)
-#             prefix = child.parent != self ? nil : child.supercommand&.name
               prefix = child.supercommand == self ? nil : child.supercommand&.name
               child.puts_descr(prefix, brief: false, name: :path)
               newline = true

data/lib/shellopts/grammar.rb

@@ -151,6 +151,10 @@ module ShellOpts
     class OptionGroup < Node
       alias_method :command, :parent
 
+      # Duck typing for compatibility with IdrNode (TODO: maybe just make
+      # OptionGroup an IdrNode and be over with it)
+      def name() options.first&.name end
+
       # Array of options in declaration order
       attr_reader :options
 
@@ -352,6 +356,10 @@ module ShellOpts
     end
 
     class Section < Node
+      def initialize(parent, token)
+        constrain token.source, *%w(DESCRIPTION OPTION COMMAND)
+        super
+      end
       def name() token.source end
     end
 

data/lib/shellopts/interpreter.rb

@@ -32,7 +32,7 @@ module ShellOpts
           end
         end
       end
-      [@expr, Args.new(@args + @argv)]
+      [@expr, Args.new(@args + @argv, exception: @exception)]
     end
 
     def self.interpret(grammar, argv, **opts)

data/lib/shellopts/lexer.rb

@@ -45,7 +45,7 @@ module ShellOpts
     # Match ArgDescr words (should be at least two characters long)
     DESCR_RE = /^[^a-z]{2,}$/
 
-    SECTIONS = %w(DESCRIPTION OPTIONS COMMANDS)
+    SECTIONS = %w(DESCRIPTION OPTION OPTIONS COMMAND COMMANDS)
 
     using Ext::Array::ShiftWhile
 
@@ -109,7 +109,7 @@ module ShellOpts
 
         # Sections
         elsif SECTIONS.include?(line.text)
-          @tokens << Token.new(:section, line.lineno, line.charno, line.text)
+          @tokens << Token.new(:section, line.lineno, line.charno, line.text.sub(/S$/, ""))
 
         # Options, commands, usage, arguments, and briefs
         elsif line =~ DECL_RE

data/lib/shellopts/parser.rb

@@ -132,7 +132,8 @@ module ShellOpts
 
         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")
+        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)
@@ -162,14 +163,6 @@ 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/version.rb

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

data/shellopts.gemspec

@@ -1,7 +1,5 @@
 
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "shellopts/version"
+require_relative "lib/shellopts/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "shellopts"
@@ -15,15 +13,18 @@ Gem::Specification.new do |spec|
                           and has built-in help and error messages}
   spec.homepage      = "http://github.com/clrgit/shellopts"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
   end
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "forward_to"
-  spec.add_dependency "constrain"
+  spec.add_dependency "constrain", "~> 0.5.1"
   spec.add_dependency "ruby-terminfo"
   spec.add_dependency "indented_io"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.9
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to
@@ -28,16 +28,16 @@ dependencies:
   name: constrain
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
   requirement: !ruby/object:Gem::Requirement
@@ -132,10 +132,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile

data/.gitignore

@@ -1,30 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/rdoc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-
-# simplecov
-/coverage/
-
-# Ignore Gemfile.lock. See https://stackoverflow.com/questions/4151495/should-gemfile-lock-be-included-in-gitignore
-/Gemfile.lock
-
-# Ignore vim files
-.*.swp
-
-# Ignore t.* files
-t
-t.*
-tt
-tt.*
-s
-s.*
-
-# Ignore temporary directory
-/spec/tmpdir/

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.1