shellopts 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c52f313fee54283e1d5e704dd8b75a96239db6cff70584eefe747cf56270c1
-  data.tar.gz: 67b50b7b3a993bf77533246c9634ce7850d765891381244fedf2b1ecf3f6bc76
+  metadata.gz: a9d576d24bd0aec0dd43a2a3645ede04751d80ae22a4c88e8f66ed53bbe7e405
+  data.tar.gz: 9027ac55689a345099f6515e5280808528603dfafe385219e6cce77d1c166d96
 SHA512:
-  metadata.gz: 3cf5cd91d92bce24b1d04a3a526d6f43f8fe761f760319bf60191e2e638c3301fdbf9c63aa9f465aa8755cd18aa56293f0ae68e01870d6a877928bc1c0eebf5c
-  data.tar.gz: 0e1fa649cff6a072d676a33dab6a3cbb038cb6799b59088f7ebff1144e6983843fe16658c80fa75308f057caf24e5b232aea15c92f80290d0969d868e653159e
+  metadata.gz: b44a4d95aa0585dd0ec31abccde4942c98ad712d9e3bdf9f0c0b6ead7333ff4c5b555ec5b45786a6f539388b2460c93d12f3755b2e80cbb81fd269c42a9b4955
+  data.tar.gz: 3c948a743d809df7d22bc142dcfa9aa4e943fed144004c4fbf5d1995c314f4aea3f91b032533222eed953e5344a45c55666339797e5ae2b1be262eea17071cd5

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/parser.rb

@@ -163,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.8"
+  VERSION = "2.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Claus Rasmussen