dencli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e0750d87cf5ab625735c828e2933f322833f7be3bd87da4fbf1d2ec0772095d
-  data.tar.gz: dbd621dbf01b044e561a188c3c62bf06b6c0c8f65be6293b3d3543c5417315b8
+  metadata.gz: 291671c467c0e0cd0b75a21d36e1f5b8e2ce03e50b8f6ffe42ffd29a8b6b2bf4
+  data.tar.gz: 78020b860dea0a56909a90b8e421201e52c7ddc8b768b21c073cebdbd273f15f
 SHA512:
-  metadata.gz: 44fc0fc7fcad04526caa0d73aed2a6cdb77cdc1a9773e29b39565fb37ae3dbe82f5b9c58141d6cd207a7e8404b96b45ba90f22b61393991c3daa7e6b938ec5f6
-  data.tar.gz: bdaeea3685e4629eb98720bd8934b20b7da4c85f57a368ce6733284ca0641cb5206e5277c4db48ae6490fb9aaeb06359fd1e4cb8eb01b153fd77366a0bbbb8a7
+  metadata.gz: 2a9eb16a990f3f7570e3c714e61c613b7fd76b3b3f6d635f6681e7fe165318d8e46b8e527439ea6c5203d215b529d66b48f6674f4eb795352fd2acc623658bb7
+  data.tar.gz: e3802537b891dbb74221a723867b5123b74d25c4da3f258536d15cb2723b3f56f10fa9b8dcc6fe992f311dd86dae3ba1f59bcf57bb63ea14a3ddee84340db3db

data/lib/dencli/cmd.rb

@@ -1,33 +1,62 @@
 require_relative '../dencli'
 
 class DenCli::CMD
-	attr_reader :parent, :name, :description, :exe, :completion, :arguments
+	attr_reader :parent, :name, :description, :exe, :completion, :options
 
 	def initialize parent, name, description, exe
 		raise "Proc expected, instead of: #{exe.inspect}"  unless Proc === exe
-		@parent, @name, @description, @exe = parent, name, description, exe
-		@arguments = []
+		@parent, @name, @description, @exe = parent, name, description, lambda( &exe)
+		@options = []
 		completion {|*a| [] }
 	end
 
 	def _full_cmd( post) parent._full_cmd [@name]+post end
 	def full_cmd() _full_cmd [] end
+
+	def parameters() @exe.parameters end
+	def required() @exe.parameters.select{|e|:req == e[0]}.map{|e|e[1]} end
+	def additional() @exe.parameters.select{|e|:opt == e[0]}.map{|e|e[1]} end
+
 	def call( *as)
-		if @arguments.empty?
+		if @options.empty?
 			@exe.call *as
 		else
 			os = {}
 			options = OptionParser.new
 			options.banner = "#{full_cmd.join ' '}"
-			@arguments.each do |(aname, aas, aos, aexe)|
+			@options.each do |(aname, aas, aos, aexe)|
 				os[aname] = aos[aname]  if aos.has_key? :default
 				options.on( *aas) {|val| os[aname] = aexe[val] }
 			end
 			as = options.parse! as
+			if @exe.lambda?
+				pars = required
+				if as.length < pars.length
+					raise DenCli::UsageError, "Missing parameter(s): #{pars[as.length..-1].join " "}"
+				end
+				if parameters.select{|e|:rest == e[0]}.empty?
+					pars = pars + additional
+					if as.length > pars.length
+						raise DenCli::UsageError, "Unused parameter(s): #{as[-pars.length..-1].shelljoin}"
+					end
+				end
+			end
 			@exe.call *as, **os
 		end
 	end
-	def help() "#{parent.full_cmd.join ' '} #{name}\n#{description}" end
+
+	def usage
+		"#{parent.full_cmd.join ' '} #{name} "+
+			@options.map{|(_,(o,_,_,_),_)|"[#{o}] "}.join( '')+
+			(@exe.lambda? ? (
+				required.join( " ")+
+				(additional.empty? ? "" : " [#{additional.join " "}]")
+			) : '...')
+	end
+
+	def help
+		"#{usage}\n#{description}"
+	end
 
 	def complete( *pre, str) @completion.call *pre, str end
 
@@ -36,8 +65,8 @@ class DenCli::CMD
 		self
 	end
 
-	def arg name, *as, **os, &exe
-		@arguments.push [name.to_s.to_sym, as, os, exe || lambda{|*a|a} ]
+	def opt name, *as, **os, &exe
+		@options.push [name.to_s.to_sym, as, os, exe || lambda{|val|val} ]
 		self
 	end
 

data/lib/dencli/sub.rb

@@ -11,12 +11,16 @@ class DenCli::Sub
 	def full_cmd() _full_cmd [] end
 	def []( k) @aliases[k] end
 
+	def usage
+		"#{full_cmd.join ' '} ..."
+	end
+
 	def help n = nil, *a
 		if n.nil?
 			r = "#{full_cmd.join ' '}: #{description}\n\n"
-			m = @subs.map {|k,_| k.length }.max
+			m = @subs.map {|k,c| k.nil? ? 0 : c.usage.length }.max
 			@subs.each do |k, c|
-				r += "  % -#{m}s  %s\n" % [k, c.description]  unless k.nil?
+				r += "  % -#{m}s  %s\n" % [c.usage, c.description]  unless k.nil?
 			end
 			r
 		elsif @aliases.has_key? n

data/lib/dencli/version.rb

@@ -1,3 +1,3 @@
 class DenCli
-	VERSION = '0.3.0'
+	VERSION = '0.3.1'
 end

metadata

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