shellopts 2.0.0.pre.1 → 2.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e60db3cf5de50dcd106cb0fca007d064e18354278a65207bb167bf8aa63d3433
-  data.tar.gz: 85b0108262357d6e5654e725ab12293f51fd2579beb13fa0d910be2200c32310
+  metadata.gz: 79a36712cf9c41a500726cd042d9932f1c6ed7f7e7a334d5d245e0ad31185c75
+  data.tar.gz: ddeec0f65a4d8e4250cbc9d1332626395c135d0c4e34d879fafcfb89b492699a
 SHA512:
-  metadata.gz: 375fe97651622560d786b288217e1a8581d12bbc497dee55b36848597d9410d393a127e86088cfe4ac8f949270d9f6797d6f135f65492f15bb9d4a84bff1ffbc
-  data.tar.gz: c69a813e4672d87c6a4da69e0e8086d8acfe54c8506cda64ce6dc36dbc12669cc79c29ffd480c6871937d87491139f4e7448fd35a6d6a7d333451addd6c634a6
+  metadata.gz: 2890ba5f277385eb8cc30a9e168d618f3633278cc41066c302ed82d7be46eeefb5a30f41a2471947bc78a0e55e8219cc472887a91b9d753a6687dfda605231e6
+  data.tar.gz: a02ecb6e6613163f2915125ea0cd71cab30c7fd3c11f840a99bad0cb27b6a14dad0b3c806d55f8ab752e4f7921731cab0753c562499b7c88eeb8e5e8400efaab

data/TODO

@@ -1,5 +1,8 @@
 
 TODO
+  o Remove ! from OptionStruct#subcommand return value. We know we're
+    processing commands so there is no need to have a distinct name and it
+    feels a lot more intuitive without it
   o Add validation block to ShellOpts class methods
   o Get rid of key_name. Define #name on Grammar::Node instead
   o Define #name to the string name of the option/command without prefixed '--'

data/lib/shellopts.rb

@@ -40,6 +40,9 @@ PROGRAM = File.basename($PROGRAM_NAME)
 #   hash, args = ShellOpts.as_hash(USAGE, ARGV)
 #   struct, args = ShellOpts.as_struct(USAGE, ARGV)
 #
+# +args+ is a ShellOpts::Argv object containing the the remaning command line
+# arguments. Argv is derived from Array
+#
 # ShellOpts can raise the exception CompilerError is there is an error in the
 # USAGE string. If there is an error in the user supplied command line, #error
 # is called instead and the program terminates with exit code 1. ShellOpts

data/lib/shellopts/args.rb

@@ -0,0 +1,36 @@
+
+module ShellOpts
+  class Args < Array
+    def initialize(shellopts, *args)
+      @shellopts = shellopts
+      super(*args)
+    end
+
+    # Remove and return +count+ elements from the beginning of the array.
+    # Elements are removed from the end of the array if +count+ is less than 0.
+    # Expects at least +count.abs+ elements in the array
+    def extract(count, message = nil) 
+      self.size >= count.abs or inoa(message)
+      start = count >= 0 ? 0 : size + count
+      slice!(start, count.abs)
+    end
+
+    # Shifts +count+ elements from the array. Expects exactly +count+ elements
+    # in the array
+    def expect(count, message = nil) 
+      self.size == count or inoa(message)
+      self
+    end
+
+    # Eats rest of the elements. Expects at least +min+ elements
+    def consume(count, message = nil) 
+      self.size >= count or inoa(message)
+      self
+    end
+
+  private
+    def inoa(message = nil) 
+      @shellopts.messenger.error(message || "Illegal number of arguments") 
+    end
+  end
+end

data/lib/shellopts/shellopts.rb

@@ -1,6 +1,8 @@
 
 require "shellopts"
 
+require "shellopts/args.rb"
+
 # TODO
 #
 # PROCESSING
@@ -78,8 +80,8 @@ module ShellOpts
     # Return a struct representation of the options. See {ShellOpts::OptionStruct}
     def to_struct(use: :key, aliases: {}) @idr.to_struct(use: use, aliases: aliases) end
 
-    # List of remaining non-option command line arguments. Shorthand for +ast&.arguments+
-    def args() @ast&.arguments end
+    # List of remaining non-option command line arguments. Returns a Argv object
+    def args() Args.new(self, ast&.arguments) end
 
     # Iterate options and commands as name/value pairs. Same as +to_a.each+
     def each(&block) to_a.each(&block) end

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module Shellopts
-  VERSION = "2.0.0-1"
+  VERSION = "2.0.0-2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.1
+  version: 2.0.0.pre.2
 platform: ruby
 authors:
 - Claus Rasmussen
@@ -106,6 +106,7 @@ files:
 - doc/stylesheet.css
 - lib/ext/array.rb
 - lib/shellopts.rb
+- lib/shellopts/args.rb
 - lib/shellopts/ast/command.rb
 - lib/shellopts/ast/node.rb
 - lib/shellopts/ast/option.rb