dreck 0.0.7 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c92ebc35034ec54b87f763e6d2f080232cc5a4e1
-  data.tar.gz: '00601982073b1ac4bd08e734c38967236773d167'
+SHA256:
+  metadata.gz: 51998a10bedf410ff5cd4cb7804f83606b1528b0859ff2854f3dd0736f4044e1
+  data.tar.gz: f684c1fd95269a7c95fb4b8c5a741f434b27e075e7f470f9859bd3f23ebf81a2
 SHA512:
-  metadata.gz: c86759e00c6a8ad1bdfdfd414ed5bdc14303542994d2a47d813c00b2902e90f4eb8fc5158d7b08d94530037c287d9df86888386b4fe77242d507602bf9392710
-  data.tar.gz: c7a2b7d64a0ddc6ac9fe8b39ff00fac601dde294e4e537fe1d208cfbeb01577bf000a6d5e86487c729ae7d6afd9d0984681e2e519e55db598fc8976f5d61993a
+  metadata.gz: c4a03799968c92e09e4e0055fb6038864b8f54c0c8856916a08d7e150da951943dde55e8131f7677be08c52b0ad624ae4f14fcef6465dbe007927d8fc2add533
+  data.tar.gz: 4c1ceadc4ca21f3c4b7c2051c08e8925bde885ff46be348895e6b7752412b6fbe2ae7397e996dcdf945f9f6c119609f8f11f429b0d30dff28f8c4a0742b6c081

data/LICENSE

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+The MIT License (MIT) with restrictions
 
-Copyright (c) 2017 William Woodruff <william @ yossarian.net>
+Copyright (c) 2020 William Woodruff <william @ yossarian.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,30 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+The following terms additionally apply and override any above terms for
+applicable parties:
+
+You may not use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software in a military or law enforcement context,
+defined as follows:
+
+1. A military context is a professional context where the intended application
+of the Software is integration or use with or by military software, tools
+(software or hardware), or personnel. This includes contractors and
+subcontractors as well as research affiliates of any military	organization.
+
+2. A law enforcement context is a professional context where the intended
+application of the Software is integration or use with or by law enforcement
+software, tools (software or hardware), or personnel. This includes
+contractors and subcontractors as well as research affiliates of any law
+enforcement organization.
+
+Entities that sell or license to military or law enforcement organizations
+may use the Software under the original terms, but only in contexts that do
+not assist or supplement the sold or licensed product.
+
+Students and academics who are affiliated with research institutions may use
+the Software under the original terms, but only in contexts that do not assist
+or supplement collaboration or affiliation with any military or law
+enforcement organization.

data/README.md

@@ -1,6 +1,8 @@
 dreck
 =====
 
+![license](https://raster.shields.io/badge/license-MIT%20with%20restrictions-green.png)
+[![Build Status](https://img.shields.io/github/workflow/status/woodruffw/dreck/CI/master)](https://github.com/woodruffw/dreck/actions?query=workflow%3ACI)
 [![Gem Version](https://badge.fury.io/rb/dreck.svg)](https://badge.fury.io/rb/dreck)
 
 A stupid parser for trailing arguments.

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

data/lib/dreck/exceptions.rb

@@ -5,17 +5,29 @@ module Dreck
   class DreckError < RuntimeError
   end
 
+  # Raised during list specification if a non-positive number of arguments
+  # are requested.
+  class BadCountError < DreckError
+  end
+
   # Raised during argument absorption if arguments are either left over
   # or are insufficient to populate the expected results.
   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})"
+    # @param specified [Integer] the number of arguments specified
+    # @param supplied [Integer] the number of arguments supplied
+    def initialize(specified, supplied)
+      nmany = specified < supplied ? "too many" : "too few"
+      super "#{nmany} arguments given (#{supplied}, expected #{specified})"
+    end
+  end
+
+  # Raised during argument absorption if a greedy list was expected but all arguments
+  # have already been absorbed.
+  class GreedyAbsorptionError < DreckError
+    # @param specified [Integer] the number of arguments specified
+    # @param supplied [Integer] the number of arguments supplied
+    def initialize(specified, supplied)
+      super "too few arguments given (#{specified}, expected >#{supplied})"
     end
   end
 

data/lib/dreck/parser.rb

@@ -27,6 +27,7 @@ module Dreck
       # @raise [ParserError] if the string is not a valid path on disk
       def parse_path(path)
         raise ParserError, "#{path}: no such path" unless File.exist?(path)
+
         path
       end
 
@@ -35,6 +36,7 @@ module Dreck
       # @raise [ParserError] if the string is not a valid regular file on disk
       def parse_file(file)
         raise ParserError, "#{file}: no such file" unless File.file?(file)
+
         file
       end
 
@@ -43,6 +45,7 @@ module Dreck
       # @raise [ParserError] if the string is not a valid directory on disk
       def parse_directory(dir)
         raise ParserError, "#{dir}: no such directory" unless File.directory?(dir)
+
         dir
       end
 

data/lib/dreck/result.rb

@@ -43,6 +43,10 @@ module Dreck
     # @param sym [Symbol] the name of the argument in {results}
     # @param count [Integer] the number of arguments in the list
     def list(type, sym, count: nil)
+      if count
+        raise BadCountError unless count.positive?
+      end
+
       @expected << [:list, type, sym, count]
     end
 
@@ -70,10 +74,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.2.3
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies: []
 description: Typechecks and coerces non-option arguments.
 email: william@tuffbizz.com
@@ -25,7 +25,7 @@ files:
 - lib/dreck/result.rb
 homepage: https://github.com/woodruffw/dreck
 licenses:
-- MIT
+- Nonstandard
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -42,8 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: dreck - A stupid parser for trailing arguments.