dencli 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51686dc165e8a0fa5dad00dea71e56a4007be3ad050de0e7a73b3f7587baefa
-  data.tar.gz: 97ce2e6f4bb16974e8b1375133fbcbf8be7b1d4f15491935ebcda55557b3784f
+  metadata.gz: 71cb3a66fe8101078796ec7dfb0c793d315416020c76e11f2b312c32f6d3c1b2
+  data.tar.gz: 1675ca2b4f22fc083948bec274aa75c067e41622dc3d65059a9b200a86d21e0e
 SHA512:
-  metadata.gz: 5a98c654de4a78a1dc07c41a8cd2dffcba9d34b57c03b80784b8d652f155d5a53f54370906ec51404c0b6df45a4e387fb8027b5938539780a50e680b9dfbd123
-  data.tar.gz: 3a0e657604254c35e65ae6c501af0c79fd6887b7cb45b8a4ea1693c6fd666eddf04d5e3b060841bf6b0619c35bfdd6af61e98d9598090c9101f4631d993d84ee
+  metadata.gz: 938480ac26fa9cbac07118edfa407b1a59d2e9534b43fdd308bf4e81a96e78a20fc2b3d3143029d6a8b1f516ebbd14af7507ae703e395d46ad4abfdbd3b42844
+  data.tar.gz: af52e24ace634da494e17b5efa06bdc475fa64d9250218d38b1c60ee7d4b9897cfdce6cf6cf54f141acca8ec836140a2ad368ac27ceb0bbd2b1cdf1c3b43598a

data/bin/example.rb

@@ -17,11 +17,11 @@ cli.cmd( :args, "Expects and prints given arguments",
 	opt( :h, '-hsth', "No long option, only short option", default: "nothing")
 
 cli.cmd( :example, "I have an example command") { STDERR.puts "This is an example" }
-cli.cmd( :help, "", aliases: [nil, '-h', '--help'], &lambda {|*args, full:|
+cli.cmd( :help, "An example for help", aliases: [nil, '-h', '--help'], &lambda {|*commands, full:|
 	if full
-		cli.help_full *args, output: STDERR
+		cli.help_full *commands, output: STDERR
 	else
-		cli.help *args, output: STDERR
+		cli.help *commands, output: STDERR
 	end
 }).
 	opt( :full, '-f', '--[no-]full', "Print all commands and sub-commands.", default: false)
@@ -40,7 +40,7 @@ cli.sub( :more, "Sub-Commands are also possible with a new cli") do |sub|
 		opt( :e, '-e', "Toggle e")
 
 	sub.sub( :deeper, "You want to have Sub-Sub-Commands?") do |sub2|
-		sub2.cmd( :help, "", aliases: [nil, '-h', '--help'], &lambda {|*args| sub2.help( *args, output: STDERR) })
+		sub2.cmd( :help, "", aliases: [nil, '-h', '--help'], &lambda {|*commands| sub2.help( *commands, output: STDERR) })
 		sub2.cmd( :last, "The last example", &lambda { STDERR.puts "The last example" })
 
 		sub2.sub( :'sub-commands', "Endless Sub-Sub- ...") do |sub3|

data/lib/dencli/cmd.rb

@@ -76,8 +76,16 @@ class DenCli::CMD
 			output << (o.required? ? " #{s}" : " [#{s}]")
 		end
 		if @exe.lambda?
-			required.each {|s| output << " <#{s}>" }
-			output << " [#{additional.map{|s|"<#{s}>"}.join " "}]"  unless additional.empty?
+			parameters.each do |(type, name)|
+				case type
+				when :req
+					output << " <#{name}>"
+				when :opt
+					output << " [<#{name}>]"
+				when :rest
+					output << " [<#{name}> ...]"
+				end
+			end
 		else
 			output << ' ...'
 		end
@@ -130,7 +138,7 @@ class DenCli::CMD
 		@options.map do |_, o|
 			s, l, v, y = o.short, o.long, o.val, ','
 			if l.nil?
-				s += "=#{v}"  if v
+				s += "#{v}"  if v
 				y = ' '
 			elsif s.nil?
 				l += "=#{v}"  if v

data/lib/dencli/sub.rb

@@ -14,8 +14,19 @@ class DenCli::Sub
 	def full_cmd() _full_cmd [] end
 	def []( k) @aliases[k] end
 
-	def usage
-		"#{full_cmd.join ' '} ..."
+	def usage output: nil
+		output ||= ''
+		_usage output
+		output
+	end
+
+	def _usage output
+		output << full_cmd.join( ' ')
+		if @aliases.has_key? nil
+			output << " [<command> ...]"
+		else
+			output << " <command> [...]"
+		end
 	end
 
 	def help n = nil, *a, output: nil
@@ -46,37 +57,39 @@ class DenCli::Sub
 		output
 	end
 
-	def self._help_commands output, subs
-		m = subs.map {|_name,c| x = c.usage.length; 25 < x ? 0 : x }.max
-		subs.each do |_name, c|
-			if 25 < c.usage.length
-				output << "% -#{m}s\n#{' ' * m} " % [c.usage]
-			else
-				output << "% -#{m}s " % [c.usage]
-			end
-			n = m+2
-			prefix = nil
-			c.description.split /\n/ do |l|
-				c = 0
-				l.split %r< > do |w|
-					if prefix
-						output << prefix
-						prefix = nil
-					end
-					wl = w.length
-					if 75 < c+wl
-						output << "\n#{' ' * n}#{w}"
-						c = n+2+wl
-					else
-						output << " #{w}"
-						c += 1 + wl
+	class <<self
+		def _help_commands output, subs
+			m = subs.map {|_name,c| x = c.usage.length; 25 < x ? 0 : x }.max
+			subs.each do |_name, c|
+				if 25 < c.usage.length
+					output << "% -#{m}s\n#{' ' * m} " % [c.usage]
+				else
+					output << "% -#{m}s " % [c.usage]
+				end
+				n = m+2
+				prefix = nil
+				c.description.split( /\n/).each do |l|
+					c = 0
+					l.split( %r< >).each do |w|
+						if prefix
+							output << prefix
+							prefix = nil
+						end
+						wl = w.length
+						if 75 < c+wl
+							output << "\n#{' ' * n}#{w}"
+							c = n+2+wl
+						else
+							output << " #{w}"
+							c += 1 + wl
+						end
 					end
+					prefix = "\n#{' ' * n}"
 				end
-				prefix = "\n#{' ' * n}"
+				output << "\n"
 			end
-			output << "\n"
+			output
 		end
-		output
 	end
 
 	def goto *a

data/lib/dencli/version.rb

@@ -1,3 +1,3 @@
 class DenCli
-	VERSION = '0.5.3'
+	VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dencli
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Denis Knauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec