dreck 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f32193f86f5b00b6d9a76ee3ff5e88108d60b9
-  data.tar.gz: 7a272d6f3e0178929973d3f1fc7cf8d3c8a84240
+  metadata.gz: 9668c3e8314c8998e12acbf57edbcbdd24131b96
+  data.tar.gz: e0df1442d96e40ff4a6c6ed69dfdc2ebd3dbeb57
 SHA512:
-  metadata.gz: 1658a420eebf35e0c52a053aa422b743ca92564c6ad4e85fcd52740175173c9aeaeaa70808d38e83a901ffaec8c3bc8ff731ad64faed81ef4e696cecef0bae4c
-  data.tar.gz: e2dbfdf5b22e7b285d28f8570b8b9c270ccc2cf14639c0e7d202aff6e573d72839009599d1e287caa9d3cb7f8327a808f80a9cba8ead523a8aa6eb23ab474ae4
+  metadata.gz: f02e2a2ad89d1b13822a78a28802572ac750a1a750922d0ba4c00a3a041027bd6cef0ed98f25b360f6a77acb70a610dcf85f402d19aa218831e5d5f20fd08b21
+  data.tar.gz: 74313791854a9b9535823bca0967adf04601e7d5ab584e1f437144e6b1109347f5e9b863e37f7152644239fe8378f8cf8852ce80a8f4fc96260945dffc53860a

data/lib/dreck.rb

@@ -5,7 +5,7 @@ require_relative "dreck/result"
 # The primary namespace for {Dreck}.
 module Dreck
   # {Dreck}'s current version.
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   # Parse the given arguments and produce a result.
   # @param args [Array<String>] the arguments to parse

data/lib/dreck/exceptions.rb

@@ -8,9 +8,13 @@ module Dreck
   # Raised during argument absorption if arguments are either left over
   # or are insufficient to populate the expected results.
   class AbsorptionError < DreckError
-    def initialize(actual, expected)
+    # @param actual [Integer] the actual number of arguments given
+    # @param expected [Integer] the expected number of arguments
+    # @param greedy [Boolean] whether or not a list that absorbs the tail is present
+    def initialize(actual, expected, greedy = false)
       nmany = actual > expected ? "too few" : "too many"
-      super "#{nmany} arguments given (#{actual}, expected #{expected})"
+      exp = greedy ? ">#{actual}" : expected
+      super "#{nmany} arguments given (#{actual}, expected #{exp})"
     end
   end
 

data/lib/dreck/result.rb

@@ -68,10 +68,12 @@ module Dreck
     # @raise [AbsoptionError] if absorption fails and {strict?} is not true
     # @api private
     def check_absorption!
-      count = count_expected
+      count, greedy = count_expected
 
-      return if count.nil?
-      raise AbsorptionError.new(count, @args.size) if count != @args.size && strict?
+      return if greedy && @args.size >= count
+      return unless strict?
+
+      raise AbsorptionError.new(count, @args.size, greedy) if count != @args.size
     end
 
     # Count the number of arguments expected to be supplied.
@@ -79,17 +81,19 @@ module Dreck
     #  of indeterminate size is specified
     # @api private
     def count_expected
-      @expected.inject(0) do |n, exp|
+      count = @expected.inject(0) do |n, exp|
         case exp.first
         when :list
           # if the list is greedy, all arguments have to be absorbed
-          break unless exp[3]
+          return [n, true] unless exp[3]
 
           n + exp[3]
         else
           n + 1
         end
       end
+
+      [count, false]
     end
 
     # Parse a one or more expected arguments of a given type and add them to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dreck
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies: []
 description: Typechecks and coerces non-option arguments.
 email: william@tuffbizz.com