shellopts 2.0.0.pre.2 → 2.0.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79a36712cf9c41a500726cd042d9932f1c6ed7f7e7a334d5d245e0ad31185c75
-  data.tar.gz: ddeec0f65a4d8e4250cbc9d1332626395c135d0c4e34d879fafcfb89b492699a
+  metadata.gz: 34b7edfee1092f53f5c5c75d678c69b2fe753ecbcd6caa4876c923dd56dfbf68
+  data.tar.gz: f7dfa30cd0ec280eb3f36e6a4779e01eeea1d14fd904fe2b42d1b7d7d9e40b63
 SHA512:
-  metadata.gz: 2890ba5f277385eb8cc30a9e168d618f3633278cc41066c302ed82d7be46eeefb5a30f41a2471947bc78a0e55e8219cc472887a91b9d753a6687dfda605231e6
-  data.tar.gz: a02ecb6e6613163f2915125ea0cd71cab30c7fd3c11f840a99bad0cb27b6a14dad0b3c806d55f8ab752e4f7921731cab0753c562499b7c88eeb8e5e8400efaab
+  metadata.gz: e3d9b271783e3f9c5b42aa2511c36a78814f239e848829fd347ad74fc5289b769da7264defe8af985bce500485d7e9480a240b3f9e261d70943b1ebc69cd671d
+  data.tar.gz: 3f91000787d5fa80570d378604a7cc28ef991585030bd1ce327b88e67dca3e4e647428d48863fc302165bcece5130cc2f140efb05fa478c2ff9443a7197a8b4e

data/lib/shellopts/args.rb

@@ -1,31 +1,44 @@
 
 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 call #error() in response to errors
   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
+    # Remove and return elements from beginning of the array. If
+    # +count_or_range+ is a number, that number of elements will be returned.
+    # If the count is negative, the elements will be removed from the end of
+    # the array. If +count_or_range+ is a range, the number of elements
+    # returned will be in that range. The range can't contain negative numbers.
+    # #expect calls #error() if there's is not enough elements in the array to
+    # satisfy the request
     def extract(count, message = nil) 
       self.size >= count.abs or inoa(message)
       start = count >= 0 ? 0 : size + count
-      slice!(start, count.abs)
+      r = slice!(start, count.abs)
+      r.size == 0 ? nil : (r.size == 1 ? r.first : r)
     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
+    # Remove and returns elements from the array. If +count_or_range+ is a
+    # number, that number of elements will be returned. If the count is
+    # negative, the elements will be removed from the end of the array. If
+    # +count_or_range+ is a range, the number of elements returned will be in
+    # that range. The range can't contain negative numbers.  #expect calls
+    # #error() if the array has remaning elemens after removal satisfy the
+    # request
+    def expect(count_or_range, message = nil)
+      if count_or_range.is_a?(Range)
+        count_or_range.cover?(self.size) or inoa(message)
+        self.shift(self.size)
+      else
+        count_or_range == self.size or inoa(message)
+        r = self.shift(count)
+        r.size == 0 ? nil : (r.size == 1 ? r.first : r)
+      end
     end
 
   private

data/lib/shellopts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.2
+  version: 2.0.0.pre.3
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler