cl 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68ba1674ee398202a474abb83387fb296847aad
-  data.tar.gz: 3f410b5991158c25bc3ec7688fd9a86c56b7e11f
+  metadata.gz: 95105c27487a964f369771303967d5d2be384e8d
+  data.tar.gz: 400c2ed33af51c48e0e3375e165e1c4ff2b25e8e
 SHA512:
-  metadata.gz: 26fac7251c6eead9ed449d3f5c1dfb61794eb1f6c7e008f069ac973afd912d84d93b75abaa84ca20f6f69d6642cc00694be28469b36ce8ce0a1f3d044ecb9c3d
-  data.tar.gz: 993d729a5b9fd4ae131d257601a93b57483ac6f6ba12e46409cffeda230e2a8573b1b9c22edc93392e6c7224de94f979962479fdb23d4b27df32796d84e2b685
+  metadata.gz: 3ab78eec6052ea36c538ba031ff5b386bee83a0155d69435b2f85a1e4ff6c3277a284833dddb93d959e267b0a381c62a5b68686220964487c502caefd0c5971d
+  data.tar.gz: 2000822998fa8f6d2b1ffccb49cd806b608bed3f73931835b04d47aa3afc08bac4f28c7859dec4a76eeb7ded0f954e29439f3c7c6ce5cdf502cb8fb3a53c2893

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## 0.1.x
+## 1.0.1 (2019-08-11)
+
+### Added
+
+* Add `opt '--one STR', upcase: true`
+
+## 1.0.0 (2019-08-10)
 
 ### Added
 
@@ -19,7 +25,6 @@
 * Add `opt '--one STR', format: /.+/`
 * Add `opt '--one STR', enum: ['one', /\w+/]`
 * Add `opt '--one STR', downcase: true`
-* Add `opt '--one STR', upcase: true`
 * Add `opt '--one STR', internal: true`, hide internal options from help output
 * Add `opt '--one STR', example: 'foo'`
 * Add `opt '--one STR', negate: %w(skip)`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl (1.0.0)
+    cl (1.0.1)
       regstry (~> 1.0.3)
 
 GEM

data/lib/cl/dsl.rb

@@ -102,6 +102,7 @@ class Cl
       #   @option opts [Object] :default default value for the option
       #   @option opts [String or Symbol] :deprecated deprecation message for the option, or if given a Symbol, deprecated alias name
       #   @option opts [Boolean] :downcase whether to downcase the option value
+      #   @option opts [Boolean] :upcase whether to upcase the option value
       #   @option opts [Array<Object>] :enum list of acceptable option values
       #   @option opts [String] :example example(s) for the option, shown in help output
       #   @option opts [Regexp] :format acceptable option value format

data/lib/cl/opts.rb

@@ -17,13 +17,14 @@ class Cl
 
     def apply(cmd, opts)
       return opts if opts[:help]
+      orig = opts.dup
       cmd.deprecations = deprecations(cmd, opts)
-      opts = with_defaults(cmd, opts)
+      opts = defaults(cmd, opts)
       opts = downcase(opts)
       opts = upcase(opts)
       opts = cast(opts)
       opts = taint(opts)
-      validate(cmd, self, opts)
+      validate(cmd, self, opts, orig)
       opts
     end
 
@@ -71,7 +72,7 @@ class Cl
         defs.map(&:deprecated).to_h
       end
 
-      def with_defaults(cmd, opts)
+      def defaults(cmd, opts)
         select(&:default?).inject(opts) do |opts, opt|
           next opts if opts.key?(opt.name)
           value = opt.default

data/lib/cl/opts/validate.rb

@@ -3,15 +3,15 @@ require 'cl/helper'
 class Cl
   class Opts
     module Validate
-      def validate(cmd, opts, values)
+      def validate(cmd, opts, values, orig)
         Validate.constants.each do |name|
           next if name == :Validator
           const = Validate.const_get(name)
-          const.new(cmd, opts, values).apply
+          const.new(cmd, opts, values, orig).apply
         end
       end
 
-      class Validator < Struct.new(:cmd, :opts, :values)
+      class Validator < Struct.new(:cmd, :opts, :values, :orig)
         include Regex
         def compact(hash, *keys)
           hash.reject { |_, value| value.nil? }.to_h
@@ -62,7 +62,7 @@ class Cl
         end
 
         def requires
-          opts.select(&:requires?).select { |opt| values.key?(opt.name) }
+          opts.select(&:requires?).select { |opt| orig.key?(opt.name) }
         end
       end
 

data/lib/cl/version.rb

@@ -1,3 +1,3 @@
 class Cl
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regstry