shellopts 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e8933ca7084aea3e51858cd679eec2a6b34b2fc7ae9a55ccce131947ccc7375
-  data.tar.gz: 125309b75338e9205fb05c5c556fca54cbc1cc77ef890a4ca2d6992c69eff302
+  metadata.gz: e6c52f313fee54283e1d5e704dd8b75a96239db6cff70584eefe747cf56270c1
+  data.tar.gz: 67b50b7b3a993bf77533246c9634ce7850d765891381244fedf2b1ecf3f6bc76
 SHA512:
-  metadata.gz: 123b17ded3c4943267612959f3b8ab56a37249e38ea9c338c577ad254ebc1c7c9c305ca9a7a3ee2661d9474e905ddd193c5da8e7a5adc3e711c236349095a636
-  data.tar.gz: a3115c875274fccf6628d4c839e3eac36804157f7c56e90b599e8201c1bf8f1070b5b92b7e22cbe2c6615e20b81f4de8b81233227aaccdb873f1016e129d99ae
+  metadata.gz: 3cf5cd91d92bce24b1d04a3a526d6f43f8fe761f760319bf60191e2e638c3301fdbf9c63aa9f465aa8755cd18aa56293f0ae68e01870d6a877928bc1c0eebf5c
+  data.tar.gz: 0e1fa649cff6a072d676a33dab6a3cbb038cb6799b59088f7ebff1144e6983843fe16658c80fa75308f057caf24e5b232aea15c92f80290d0969d868e653159e

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

@@ -5,6 +5,11 @@ module ShellOpts
   # 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)
@@ -21,7 +26,7 @@ module ShellOpts
     # #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
@@ -59,8 +64,10 @@ module ShellOpts
     end
 
   private
-    def inoa(message = nil) 
-      raise ShellOpts::Error, 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/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)

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 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.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-03 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