optsparser_generator 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34d0e9d9c686112d280e48678c47bebe3e93124c
-  data.tar.gz: 4a554ca800ff0d1b4d4c003c079d54577361ebd0
+  metadata.gz: caf6bbbedfb031d8944f78dff4553980f6bc6aff
+  data.tar.gz: 6fe7b11fac905fb0195991db3aae0b750211fa01
 SHA512:
-  metadata.gz: 5e3b54cc0c0a677b095cef1dbe3cc29e3d55bcdb3eb87115f49584bce3e6eed3d7898eda65984da27c035b4503ed5eff650e8e92f32a1218f0a996acf4af47b9
-  data.tar.gz: 1208e834c3cbaa8611b9798c001cf598b84388bb6cb52a1c5edeb8267b6d10f1425171e2fa68fdd010e0495ab40bc55e04d68d433d92d7a2c289a87cb603a014
+  metadata.gz: 7f1984e4fb69456115593811882d94451a41969a41e1c6f6e3755b57ed60ab5f75b7beb2ac94d815d0e93a28df985d71cd9a403df1740124d4290e3659e601d4
+  data.tar.gz: 1e99ec057c9ccbc5011e9af2ee4c2edea4180038e97eac8ee276f0d5a5b05696726237bba58afcdefbaab1186436a71ac1319dced17c32245f274797cdd70a57

data/lib/optsparser_generator.rb

@@ -37,19 +37,18 @@ module OptionParserGenerator
         trigger = key.to_s.tr('_', '-')
         next if trigger.end_with?('--help', '--values', '--short', '--class')
 
-        help = "#{defaults[key.to_s << '__help']} (Default: #{val})"
-        values = defaults[key.to_s << '__values'] || []
-        short = defaults[key.to_s << '__short'] || ''
+        help = "#{defaults["#{key}__help"]} (Default: #{val})"
+        values = defaults["#{key}__values"] || []
+        short = defaults["#{key}__short"] || ''
         arguments = []
         arguments << help unless help.empty?
         arguments << "-#{short}" unless short.empty?
-        case defaults[key.to_s << '__class'] || val
+        case val
         when FalseClass, TrueClass
           if trigger.start_with?('no-')
             trigger[0..2] = ''
-            if defaults.each_pair.map { |v| v.first.to_s }.include?(trigger)
-              raise OptionCollision, "on #{trigger}" unless options[:ignore_collisions]
-              next
+            if defaults.each_pair.map { |v| v.first.to_s }.include?(trigger) && !options[:ignore_collisions]
+              raise OptionCollision, "on #{key}"
             end
           end
           opts.on("--[no-]#{trigger}", *arguments) do |b|
@@ -62,7 +61,7 @@ module OptionParserGenerator
               end
           end
         else
-          arguments << defaults[key.to_s << '__class'] || val.class
+          arguments.push defaults["#{key}__class"] || (val.class.equal?(Fixnum) ? Integer : val.class)
           arguments << values if values.any?
           opts.on("--#{trigger}=ARG", *arguments) do |str|
             out = opts.instance_variable_get(:@out)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optsparser_generator
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - Marvin Zerulla