dreck 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92ebc35034ec54b87f763e6d2f080232cc5a4e1
-  data.tar.gz: '00601982073b1ac4bd08e734c38967236773d167'
+  metadata.gz: 79881a5433a29683e6c61380f0a52a29ce443c13
+  data.tar.gz: 04e7ae02e53f85e3b86384e9ef055b0e3262776a
 SHA512:
-  metadata.gz: c86759e00c6a8ad1bdfdfd414ed5bdc14303542994d2a47d813c00b2902e90f4eb8fc5158d7b08d94530037c287d9df86888386b4fe77242d507602bf9392710
-  data.tar.gz: c7a2b7d64a0ddc6ac9fe8b39ff00fac601dde294e4e537fe1d208cfbeb01577bf000a6d5e86487c729ae7d6afd9d0984681e2e519e55db598fc8976f5d61993a
+  metadata.gz: 9a97e85038cc19205c7cc69c7534d9a8e189a72122b4983877f6aa758bf92ea88ad214869eef5d7c51fb54b6be1ad120a2f3f2744c29b7b937b0e950c461790b
+  data.tar.gz: a467df281d0b7e1c7b3c33a0a67482394915a40d623a47148d04b7e6cdba0773df00f4a7a7e53427b5dacd27299ebb1b1557001c96813d0313018dadb7113506

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.7"
+  VERSION = "0.1.0"
 
   # Parse the given arguments and produce a result.
   # @param args [Array<String>] the arguments to parse

data/lib/dreck/exceptions.rb

@@ -10,12 +10,19 @@ module Dreck
   class AbsorptionError < DreckError
     # @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"
-      act = greedy && actual > expected ? expected : actual
-      exp = greedy ? ">=#{actual}" : expected
-      super "#{nmany} arguments given (#{act}, expected #{exp})"
+    def initialize(actual, expected)
+      nmany = actual < expected ? "too few" : "too many"
+      super "#{nmany} arguments given (#{actual}, expected #{expected})"
+    end
+  end
+
+  # Raised during argument absorption if a greedy list was expected but all arguments
+  # have already been absorbed.
+  class GreedyAbsorptionError < DreckError
+    # @param actual [Integer] the actual number of arguments given
+    # @param expected [Integer] the expected number of arguments
+    def initialize(actual, expected)
+      super "too few arguments given (>#{actual}, expected >#{expected})"
     end
   end
 

data/lib/dreck/result.rb

@@ -70,10 +70,10 @@ module Dreck
     def check_absorption!
       count, greedy = count_expected
 
-      return if greedy && @args.size >= count
       return unless strict?
 
-      raise AbsorptionError.new(count, @args.size, greedy) if count != @args.size
+      raise GreedyAbsorptionError.new(count, @args.size) if count >= @args.size && greedy
+      raise AbsorptionError.new(count, @args.size) if count != @args.size && !greedy
     end
 
     # Count the number of arguments expected to be supplied.

metadata

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