shellopts 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6c85f64a45ee82fb4abdafd5d36358f8f7a202d9179a670cc86d307813b4a9
-  data.tar.gz: 0a5e262777d044fe3afea501b3d94a8c44f89d4703924c619bfbbf2326e22a95
+  metadata.gz: c3b7401560ce40fd21fcbc1e1c666464f2b01a4da8a93a4ec32010aa480bb8aa
+  data.tar.gz: f998e1ab794ab4e1b711d72e7d4e6820304ab6733bc9ae9d1fa137ab4323c633
 SHA512:
-  metadata.gz: 34d0eb7f8d15ba2726b062c9f16e36bf0b2649690e4b6487e8b68ce442436100a67928eb47d3896961281e78f77f9252f66f407ce2dafd652fae65d85c229c3d
-  data.tar.gz: 9fc0e55ccde0175fea950a4cdd4f4dd385123e2e89c6ecfde8b4a1d0c6502054394322b2c673a96adfaabbbeaeee95d642034a8f545620286c8b795dc6da2436
+  metadata.gz: a9b7856eb14fa2166bbc80dcace1724ee1a6499e93ce63f4971bdc9c4b27df4e5b26bc9d147a728de059d6e25d4e561a24aff39e2add47ca9a29aa5ad186b88f
+  data.tar.gz: 2cf14edab9a3cbb43ed3991596574e372af6527736031bd04626fb202cdf739b46565cee5c19cc67e46573c570651b7290852728958b075eeabe0df4f5197b0b

data/lib/shellopts/args.rb

@@ -3,12 +3,8 @@ 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
+  #
   class Args < Array
-    def initialize(shellopts, *args)
-      @shellopts = shellopts
-      super(*args)
-    end
-
     # Remove and return elements from beginning of the array
     #
     # If +count_or_range+ is a number, that number of elements will be
@@ -19,6 +15,7 @@ module ShellOpts
     #
     # #extract raise a ShellOpts::UserError exception if there's is not enough
     # elements in the array to satisfy the request
+    #
     def extract(count_or_range, message = nil) 
       case count_or_range
         when Range
@@ -44,6 +41,7 @@ module ShellOpts
     #
     # #expect raise a ShellOpts::UserError exception if the array is not emptied 
     # by the operation
+    #
     def expect(count_or_range, message = nil)
       case count_or_range
         when Range
@@ -57,7 +55,7 @@ module ShellOpts
 
   private
     def inoa(message = nil) 
-      raise Error.new(nil), message || "Illegal number of arguments"
+      raise ArgumentError, message || "Illegal number of arguments"
     end
   end
 end

data/lib/shellopts/argument_type.rb

@@ -14,8 +14,8 @@ module ShellOpts
       # safe for concurrent processing
       attr_reader :message
 
-      # Return true if .value is an "instance" of self (not used atm. See
-      # Command#[] and Grammar::Option#value?)
+      # Return true if .value is an "instance" of self. Ie. an Integer object
+      # if type is an IntegerArgument
       def value?(value) true end
 
       # Convert value to Ruby type
@@ -131,7 +131,7 @@ module ShellOpts
     class EnumArgument < ArgumentType
       attr_reader :values
       def initialize(values) @values = values.dup end
-      def match?(name, literal) literal?(literal) or set_message "Illegal value in #{name}: '#{literal}'" end
+      def match?(name, literal) value?(literal) or set_message "Illegal value in #{name}: '#{literal}'" end
       def value?(value) @values.include?(value) end
     end
   end

data/lib/shellopts/interpreter.rb

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

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.0"
+  VERSION = "2.0.3"
 end

data/lib/shellopts.rb

@@ -21,6 +21,7 @@ require 'shellopts/stack.rb'
 require 'shellopts/token.rb'
 require 'shellopts/grammar.rb'
 require 'shellopts/program.rb'
+require 'shellopts/args.rb'
 require 'shellopts/lexer.rb'
 require 'shellopts/argument_type.rb'
 require 'shellopts/parser.rb'
@@ -163,7 +164,7 @@ module ShellOpts
     def self.process(spec, argv, **opts)
       ::ShellOpts.instance = shellopts = ShellOpts.new(**opts)
       shellopts.process(spec, argv)
-      [shellopts.program, shellopts.argv]
+      [shellopts.program, shellopts.args]
     end
 
     # Write short usage and error message to standard error and terminate

data/main

@@ -19,13 +19,13 @@ SPEC = %(
 )
 
 opts, args = ShellOpts.process(SPEC, ARGV)
-puts "opts.alpha?: #{opts.alpha?.inspect}"
+#puts "opts.alpha?: #{opts.alpha?.inspect}"
 #puts "opts.alpha: #{opts.alpha.inspect}"
-puts "opts.beta?: #{opts.beta?.inspect}"
-puts "opts.beta: #{opts.beta.inspect}"
-exit
-ShellOpts::ShellOpts.brief
-exit
+#puts "opts.beta?: #{opts.beta?.inspect}"
+#puts "opts.beta: #{opts.beta.inspect}"
+#exit
+#ShellOpts::ShellOpts.brief
+#exit
 
 
 
@@ -277,11 +277,11 @@ shellopts.compile(SPEC)
 #shellopts.tokens.each(&:dump)
 #exit
 
-#shellopts.usage
+shellopts.usage
 #shellopts.brief
 #shellopts.help
 #shellopts.help("cmd")
-shellopts.help(ARGV.first)
+#shellopts.help(ARGV.first)
 
 #p shellopts.tokens
 

metadata

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