shellopts 2.0.0.pre.3 → 2.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b7edfee1092f53f5c5c75d678c69b2fe753ecbcd6caa4876c923dd56dfbf68
-  data.tar.gz: f7dfa30cd0ec280eb3f36e6a4779e01eeea1d14fd904fe2b42d1b7d7d9e40b63
+  metadata.gz: 188e8a420eb3e7ead116f7daffaff32761f12be4efa9d8aa583cfb8050ee4a8b
+  data.tar.gz: 474ae6c949005b53201a7d62a03b53d6f57b263746c2bfeac681a93fb05d880e
 SHA512:
-  metadata.gz: e3d9b271783e3f9c5b42aa2511c36a78814f239e848829fd347ad74fc5289b769da7264defe8af985bce500485d7e9480a240b3f9e261d70943b1ebc69cd671d
-  data.tar.gz: 3f91000787d5fa80570d378604a7cc28ef991585030bd1ce327b88e67dca3e4e647428d48863fc302165bcece5130cc2f140efb05fa478c2ff9443a7197a8b4e
+  metadata.gz: 2734bcdec0f1d3b68a26675eee2dd172b776be45b333917e74f7935912410bbc620ab152610820392b73ffe061e8e38d8c6cb8698faf94387655337de4d38d26
+  data.tar.gz: 7dd0c8dea7d12c259212b72551a769a11cda450df81b17f370cbc242ef5fbee28f2b0ecc739e9b2d4307ee65505e3bc939ebe433797d52b708b30f20a287b454

data/lib/shellopts/args.rb

@@ -11,31 +11,42 @@ module ShellOpts
 
     # 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
-      r = slice!(start, count.abs)
-      r.size == 0 ? nil : (r.size == 1 ? r.first : r)
+    # If the count is one, a simple value is returned instead of an array.  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_or_range, message = nil) 
+      if count_or_range.is_a?(Range)
+        range = count_or_range
+        range.min <= self.size or inoa(message)
+        n_extract = [self.size, range.max].min
+        n_extend = range.max > self.size ? range.max - self.size : 0
+        r = self.shift(n_extract) + Array.new(n_extend)
+      else
+        count = count_or_range
+        self.size >= count.abs or inoa(message)
+        start = count >= 0 ? 0 : size + count
+        r = slice!(start, count.abs)
+        r.size == 0 ? nil : (r.size == 1 ? r.first : r)
+      end
     end
 
     # 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
+    # number, that number of elements will be returned. If the count is one, a
+    # simple value is returned instead of an 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)
+        range = count_or_range
+        range.cover?(self.size) or inoa(message)
         self.shift(self.size)
       else
-        count_or_range == self.size or inoa(message)
+        count = count_or_range
+        count == self.size or inoa(message)
         r = self.shift(count)
         r.size == 0 ? nil : (r.size == 1 ? r.first : r)
       end

data/lib/shellopts/version.rb

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

metadata

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