dencli 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8471e357d36b81e36d1ab99ecdf91ccd0b074e851b3ba8e85d84450943e2b476
-  data.tar.gz: 04ed6b6810e16454b08e33e3006a7688ab4a63ce398a5acb7098918ea767bb58
+  metadata.gz: b51686dc165e8a0fa5dad00dea71e56a4007be3ad050de0e7a73b3f7587baefa
+  data.tar.gz: 97ce2e6f4bb16974e8b1375133fbcbf8be7b1d4f15491935ebcda55557b3784f
 SHA512:
-  metadata.gz: 6a753968bd74a46255be188e1f75097d14962df24affdba2581cf01c3aeaefe37fe917dd1bbb7ea658ced37dd2f4f469223f3661d0e02d604cab6790026f08d7
-  data.tar.gz: d5790f9ac588beb6c7fb64a223634cff15ee6b686f549923d265a875533a5ff881ed4c0130895db1216d53906b2c30e8e8fc434326dd8467d1d1745b14207944
+  metadata.gz: 5a98c654de4a78a1dc07c41a8cd2dffcba9d34b57c03b80784b8d652f155d5a53f54370906ec51404c0b6df45a4e387fb8027b5938539780a50e680b9dfbd123
+  data.tar.gz: 3a0e657604254c35e65ae6c501af0c79fd6887b7cb45b8a4ea1693c6fd666eddf04d5e3b060841bf6b0619c35bfdd6af61e98d9598090c9101f4631d993d84ee

data/bin/example.rb

@@ -6,13 +6,15 @@ require 'dencli'
 
 cli = DenCli.new :example, "This is an example for generate a DenCli-API"
 cli.cmd( :args, "Expects and prints given arguments",
-	&lambda {|a, b, c:, d:, e:|
+	&lambda {|a, b, c:, d:, e:, f:, g:|
 		p a: a, b: b, c: c, d: d, e: e
 	}).
 	opt( :c, '-c=ForC', "Option c").
-	opt( :d, '-d=ForD', "Option d", default: "something").
+	opt( :d, '-dForD', "Option d", default: "something").
 	opt( :e, '-e', "Toggle e", default: false).
-	opt( :f, '--[no-]f', "Toggle f", default: false)
+	opt( :f, '--[no-]f', "Toggle f", default: false).
+	opt( :g, '--long-option=sth', "Long option, no short option", default: "nothing").
+	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:|

data/lib/dencli/cmd.rb

@@ -72,7 +72,7 @@ class DenCli::CMD
 	def _usage output
 		output << full_cmd.join( ' ')
 		@options.each do |_, o|
-			s = "#{o.short||o.long}#{o.val ? ?= : ''}#{o.val}"
+			s = "#{o.short||o.long}#{(!o.short && o.val) ? ?= : ''}#{o.val}"
 			output << (o.required? ? " #{s}" : " [#{s}]")
 		end
 		if @exe.lambda?
@@ -161,9 +161,9 @@ class DenCli::CMD
 				@long, @val = $1, $2 || @val
 			when /\A(--[^=]+)\z/
 				@long, @val = $1, nil
-			when /\A(-[^=-]+)=(.+)\z/
+			when /\A(-[^=-])=?(.+)\z/
 				@short, @val = $1, $2 || @val
-			when /\A(-[^=-]+)\z/
+			when /\A(-[^=-])\z/
 				@short, @val = $1, nil
 			else
 				raise ArgumentError, "Unexpected format for option: #{opt.inspect}"

data/lib/dencli/version.rb

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

metadata

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