dencli 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6fa7e69d426f92f554f31e17adc226687c6851b53f11750fe2887e856d7e99
-  data.tar.gz: 9e2b3b52bed172e5a3b17f8556bb5bc90a4fa613bc631d6ccf3eff5a7e6bcbdb
+  metadata.gz: 8471e357d36b81e36d1ab99ecdf91ccd0b074e851b3ba8e85d84450943e2b476
+  data.tar.gz: 04ed6b6810e16454b08e33e3006a7688ab4a63ce398a5acb7098918ea767bb58
 SHA512:
-  metadata.gz: 3e8c379293addfafee9b688c1eb02c336616ce1e66522bb98d94966eacf3e5fa1a23f5e7df1de6f731d97700fd44ea1188f0f8e8f30e6729459799254348bf5f
-  data.tar.gz: ae7fe49dd995e7fd186fa7f52c4c9f85f4e35c5b70fc6f3e11a59082cb395ae50bab87e455475241e39048a2c559fe2336a4fad8809434577c117c3565efcaff
+  metadata.gz: 6a753968bd74a46255be188e1f75097d14962df24affdba2581cf01c3aeaefe37fe917dd1bbb7ea658ced37dd2f4f469223f3661d0e02d604cab6790026f08d7
+  data.tar.gz: d5790f9ac588beb6c7fb64a223634cff15ee6b686f549923d265a875533a5ff881ed4c0130895db1216d53906b2c30e8e8fc434326dd8467d1d1745b14207944

data/lib/dencli/cmd.rb

@@ -7,6 +7,12 @@ class DenCli::CMD
 	def initialize parent, name, description, exe
 		raise "Proc expected, instead of: #{exe.inspect}"  unless Proc === exe
 		@parent, @name, @description, @exe = parent, name, description, lambda( &exe)
+		@parameters = @exe.parameters
+		@arguments_required = @exe.parameters.select {|e| :req == e[0] }.map {|e| e[1] }
+		@arguments_additional = @exe.parameters.select {|e| :opt == e[0] }.map {|e| e[1] }
+		@arguments = @exe.parameters.select {|e| :req == e[0] or :opt == e[0] }.map {|e| e[1] }
+		@options_required = @exe.parameters.select {|e| :keyreq == e[0] }.map {|e| e[1] }
+		@options_additional = @exe.parameters.select {|e| :key == e[0] }.map {|e| e[1] }
 		@options = {}
 		completion {|*a| [] }
 	end
@@ -14,14 +20,11 @@ class DenCli::CMD
 	def _full_cmd( post) parent._full_cmd [@name]+post end
 	def full_cmd() _full_cmd [] end
 
-	def parameters() @exe.parameters end
-	def arguments_required() @exe.parameters.select {|e| :req == e[0] }.map {|e| e[1] } end
+	attr_reader :parameters,
+		:arguments_required, :arguments_additional, :arguments,
+		:options_required, :options_additional
 	alias required arguments_required
-	def arguments_additional() @exe.parameters.select {|e| :opt == e[0] }.map {|e| e[1] } end
 	alias additional arguments_additional
-	def arguments() @exe.parameters.select {|e| :req == e[0] or :opt == e[0] }.map {|e| e[1] } end
-	def options_required() @exe.parameters.select {|e| :keyreq == e[0] }.map {|e| e[1] } end
-	def options_additional() @exe.parameters.select {|e| :key == e[0] }.map {|e| e[1] } end
 
 	def complete *pre, str
 		@completion.call *pre, str
@@ -54,7 +57,7 @@ class DenCli::CMD
 			end
 			kr = @options.select {|_, o| o.required? and not os.has_key? o.name }
 			unless kr.empty?
-				raise DenCli::UsageError, "Missing argument(s): #{kr.map {|o| o.long || o.short }.join ', '}"
+				raise DenCli::UsageError, "Missing argument(s): #{kr.map {|_, o| o.long || o.short }.join ', '}"
 			end
 		end
 		@exe.call *as, **os

data/lib/dencli/version.rb

@@ -1,3 +1,3 @@
 class DenCli
-	VERSION = '0.5.1'
+	VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dencli
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Denis Knauf