cl 1.0.0 → 1.0.1

data/lib/cl/opts.rb

@@ -1,8 +1,9 @@
 require 'cl/opt'
+require 'cl/opts/validate'
 
 class Cl
   class Opts
-    include Enumerable, Regex
+    include Enumerable, Validate
 
     def define(const, *args, &block)
       opts = args.last.is_a?(Hash) ? args.pop : {}
@@ -19,9 +20,10 @@ class Cl
       cmd.deprecations = deprecations(cmd, opts)
       opts = with_defaults(cmd, opts)
       opts = downcase(opts)
+      opts = upcase(opts)
       opts = cast(opts)
       opts = taint(opts)
-      validate(cmd, opts)
+      validate(cmd, self, opts)
       opts
     end
 
@@ -69,93 +71,6 @@ class Cl
         defs.map(&:deprecated).to_h
       end
 
-      def validate(cmd, opts)
-        validate_requireds(cmd, opts)
-        validate_required(opts)
-        validate_requires(opts)
-        validate_range(opts)
-        validate_format(opts)
-        validate_enum(opts)
-      end
-
-      def validate_requireds(cmd, opts)
-        opts = missing_requireds(cmd, opts)
-        raise RequiredsOpts.new(opts) if opts.any?
-      end
-
-      def validate_required(opts)
-        opts = missing_required(opts)
-        # make sure we do not accept unnamed required options
-        raise RequiredOpts.new(opts.map(&:name)) if opts.any?
-      end
-
-      def validate_requires(opts)
-        opts = missing_requires(opts)
-        raise RequiresOpts.new(invert(opts)) if opts.any?
-      end
-
-      def validate_range(opts)
-        opts = out_of_range(opts)
-        raise OutOfRange.new(opts) if opts.any?
-      end
-
-      def validate_format(opts)
-        opts = invalid_format(opts)
-        raise InvalidFormat.new(opts) if opts.any?
-      end
-
-      def validate_enum(opts)
-        opts = unknown_values(opts)
-        raise UnknownValues.new(opts) if opts.any?
-      end
-
-      def missing_requireds(cmd, opts)
-        opts = cmd.class.required.map do |alts|
-          alts if alts.none? { |alt| Array(alt).all? { |key| opts.key?(key) } }
-        end.compact
-      end
-
-      def missing_required(opts)
-        select(&:required?).select { |opt| !opts.key?(opt.name) }
-      end
-
-      def missing_requires(opts)
-        select(&:requires?).map do |opt|
-          next unless opts.key?(opt.name)
-          missing = opt.requires.select { |key| !opts.key?(key) }
-          [opt.name, missing] if missing.any?
-        end.compact
-      end
-
-      def out_of_range(opts)
-        self.opts.map do |opt|
-          next unless value = opts[opt.name]
-          range = only(opt.opts, :min, :max)
-          [opt.name, compact(range)] if out_of_range?(range, value)
-        end.compact
-      end
-
-      def out_of_range?(range, value)
-        min, max = range.values_at(:min, :max)
-        min && value < min || max && value > max
-      end
-
-      def invalid_format(opts)
-        select(&:format?).map do |opt|
-          value = opts[opt.name]
-          [opt.name, opt.format] if value && !opt.formatted?(value)
-        end.compact
-      end
-
-      def unknown_values(opts)
-        select(&:enum?).map do |opt|
-          value = opts[opt.name]
-          next unless value && !opt.known?(value)
-          known = opt.enum.map { |str| format_regex(str) }
-          [opt.name, value, known]
-        end.compact
-      end
-
       def with_defaults(cmd, opts)
         select(&:default?).inject(opts) do |opts, opt|
           next opts if opts.key?(opt.name)
@@ -176,6 +91,13 @@ class Cl
         end
       end
 
+      def upcase(opts)
+        select(&:upcase?).inject(opts) do |opts, opt|
+          next opts unless value = opts[opt.name]
+          opts.merge(opt.name => value.to_s.upcase)
+        end
+      end
+
       def cast(opts)
         opts.map do |key, value|
           [key, self[key] ? self[key].cast(value) : value]
@@ -187,17 +109,5 @@ class Cl
           [key, self[key] && self[key].secret? ? value.taint : value]
         end.to_h
       end
-
-      def compact(hash, *keys)
-        hash.reject { |_, value| value.nil? }.to_h
-      end
-
-      def only(hash, *keys)
-        hash.select { |key, _| keys.include?(key) }.to_h
-      end
-
-      def invert(hash)
-        hash.map { |key, obj| Array(obj).map { |obj| [obj, key] } }.flatten(1).to_h
-      end
   end
 end

data/lib/cl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sven Fuchs
@@ -45,6 +45,45 @@ files:
 - MIT_LICENSE.md
 - NOTES.md
 - README.md
+- examples/README.md
+- examples/_src/args/cast.erb.rb
+- examples/_src/args/opts.erb.rb
+- examples/_src/args/required.erb.rb
+- examples/_src/args/splat.erb.rb
+- examples/_src/gem.erb.rb
+- examples/_src/heroku.erb.rb
+- examples/_src/rakeish.erb.rb
+- examples/_src/readme/abstract.erb.rb
+- examples/_src/readme/alias.erb.rb
+- examples/_src/readme/arg.erb.rb
+- examples/_src/readme/arg_array.erb.rb
+- examples/_src/readme/arg_type.erb.rb
+- examples/_src/readme/args_splat.erb.rb
+- examples/_src/readme/array.erb.rb
+- examples/_src/readme/basic.erb.rb
+- examples/_src/readme/default.erb.rb
+- examples/_src/readme/deprecated.erb.rb
+- examples/_src/readme/deprecated_alias.erb.rb
+- examples/_src/readme/description.erb.rb
+- examples/_src/readme/downcase.erb.rb
+- examples/_src/readme/enum.erb.rb
+- examples/_src/readme/example.erb.rb
+- examples/_src/readme/format.erb.rb
+- examples/_src/readme/internal.erb.rb
+- examples/_src/readme/negate.erb.rb
+- examples/_src/readme/note.erb.rb
+- examples/_src/readme/opts.erb.rb
+- examples/_src/readme/opts_block.erb.rb
+- examples/_src/readme/range.erb.rb
+- examples/_src/readme/registry.erb.rb
+- examples/_src/readme/required.erb.rb
+- examples/_src/readme/requireds.erb.rb
+- examples/_src/readme/requires.erb.rb
+- examples/_src/readme/runner.erb.rb
+- examples/_src/readme/runner_custom.erb.rb
+- examples/_src/readme/secret.erb.rb
+- examples/_src/readme/see.erb.rb
+- examples/_src/readme/type.erb.rb
 - examples/args/cast
 - examples/args/opts
 - examples/args/required
@@ -59,59 +98,30 @@ files:
 - examples/readme/arg_type
 - examples/readme/args_splat
 - examples/readme/array
+- examples/readme/basic
 - examples/readme/default
 - examples/readme/deprecated
 - examples/readme/deprecated_alias
+- examples/readme/description
 - examples/readme/downcase
 - examples/readme/enum
 - examples/readme/example
 - examples/readme/format
 - examples/readme/internal
 - examples/readme/negate
-- examples/readme/node
 - examples/readme/note
 - examples/readme/opts
 - examples/readme/opts_block
 - examples/readme/range
+- examples/readme/registry
 - examples/readme/required
 - examples/readme/requireds
 - examples/readme/requires
+- examples/readme/runner
+- examples/readme/runner_custom
 - examples/readme/secret
 - examples/readme/see
 - examples/readme/type
-- examples/src/args/cast.erb.rb
-- examples/src/args/opts.erb.rb
-- examples/src/args/required.erb.rb
-- examples/src/args/splat.erb.rb
-- examples/src/gem.erb.rb
-- examples/src/heroku.erb.rb
-- examples/src/rakeish.erb.rb
-- examples/src/readme/abstract.erb.rb
-- examples/src/readme/alias.erb.rb
-- examples/src/readme/arg.erb.rb
-- examples/src/readme/arg_array.erb.rb
-- examples/src/readme/arg_type.erb.rb
-- examples/src/readme/args_splat.erb.rb
-- examples/src/readme/array.erb.rb
-- examples/src/readme/default.erb.rb
-- examples/src/readme/deprecated.erb.rb
-- examples/src/readme/deprecated_alias.erb.rb
-- examples/src/readme/downcase.erb.rb
-- examples/src/readme/enum.erb.rb
-- examples/src/readme/example.erb.rb
-- examples/src/readme/format.erb.rb
-- examples/src/readme/internal.erb.rb
-- examples/src/readme/negate.erb.rb
-- examples/src/readme/node.erb.rb
-- examples/src/readme/opts.erb.rb
-- examples/src/readme/opts_block.erb.rb
-- examples/src/readme/range.erb.rb
-- examples/src/readme/required.erb.rb
-- examples/src/readme/requireds.erb.rb
-- examples/src/readme/requires.erb.rb
-- examples/src/readme/secret.erb.rb
-- examples/src/readme/see.erb.rb
-- examples/src/readme/type.erb.rb
 - lib/cl.rb
 - lib/cl/arg.rb
 - lib/cl/args.rb
@@ -126,11 +136,13 @@ files:
 - lib/cl/help.rb
 - lib/cl/help/cmd.rb
 - lib/cl/help/cmds.rb
+- lib/cl/help/format.rb
 - lib/cl/help/table.rb
 - lib/cl/help/usage.rb
 - lib/cl/helper.rb
 - lib/cl/opt.rb
 - lib/cl/opts.rb
+- lib/cl/opts/validate.rb
 - lib/cl/parser.rb
 - lib/cl/runner.rb
 - lib/cl/runner/default.rb
@@ -156,7 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Object-oriented OptionParser based CLI support

data/examples/readme/node

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path('lib')
-
-require 'cl'
-
-class Add < Cl::Cmd
-  opt '--to GROUP', note: 'needs to be a group'
-end
-
-Cl.new('owners').run(%w(add --help))
-
-# Output:
-#
-#   Usage: owners add [options]
-#
-#   Options:
-#
-#     --to GROUP      type: string, note: needs to be a group
-#     --help          Get help on this command