shellopts 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a8b18b0a610c14ac4a85f80cd70ff5f85ca7dc868b25615a67a3ad71f737b5
-  data.tar.gz: 2b0442868d8ddf102a5f8ee1b3d3307ecbea17a95512f5164d4a64a9d3fa9ec7
+  metadata.gz: 52971494b88f77b6b66a95e8409de7cbebcbf030588089c395424b7e86f5e372
+  data.tar.gz: e00e482a0db690c2b7bd0861589a5179a67d7cec9b285ebcc1d2b5a7b6f73ff7
 SHA512:
-  metadata.gz: c90ab9e0049ba64e21c2b0fd408b438df84c0265fced52b84d221bdb2b96f92e75624c00ab59526c9caa80f67e2e7d55c5bcf0cb8138b803722b424e08ea9202
-  data.tar.gz: 372e29956c8f3e27f8f5617215cf610403d40a307257c0c63605e94bd39fffaa8bf9cb165e82fe61497fcc8f0519c4298c1bf4480fa26735f5bf5c01e12fe8e2
+  metadata.gz: 2206c1e56c4239472bf5b697854fc4d7ba06bd9dedfe4eb2f86c2e115f4ddd52f66e9b4f47cbba41b1b4eafb08b8666b2115df7f70d769465dcb3e4a344d322a
+  data.tar.gz: f9bc90bdba87159a2821afb3c719ba4c4fbc7077601266d9e61c5f83273924bc23e9fa2208bf727855fc99b6acac09a97ec3dc58be179f649c9ed6dbb4fcc259

data/lib/shellopts/formatter.rb

@@ -200,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/version.rb

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

data/lib/shellopts.rb

@@ -127,16 +127,13 @@ module ShellOpts
     # 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/, "")
         @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
@@ -197,7 +194,7 @@ module ShellOpts
       saved = $stdout
       $stdout = $stderr
       $stderr.puts "#{name}: #{message}"
-      Formatter.usage(program)
+      Formatter.usage(grammar)
       exit 1
     ensure
       $stdout = saved

data/main

@@ -9,7 +9,9 @@ include ShellOpts
 
 VERSION = "1.2.3"
 
-SPEC = "-a"
+SPEC = %(
+  -a @ An option
+)
 opts, args = ShellOpts::process(SPEC, ARGV, version: VERSION)
 #ShellOpts::ShellOpts.help
 

metadata

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