cl 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08d5d5b99924ab415b3374aa08821148e70f1181'
-  data.tar.gz: 42d69b175b38e6f19c26dae4001283973266ab86
+  metadata.gz: 54b800fbadeb907af1b519de5fdcf782e368c493
+  data.tar.gz: f7901ca63ad3a15cad81831c932dac59be139fc8
 SHA512:
-  metadata.gz: 22e5ee9fa16e17b14104d7edd9a98afd87c4a0d09506dd9bf135c55a692b89731e42f52541f2d359f8281351e1193dab544431ed7d909f4d9b3efc27eafe0289
-  data.tar.gz: 9a67c76aa4c3afe578fc219fa73569c2efe86d73cc702684a5a7c3be871f59654604435b24fcc5407beb88e65c4a9778e6c39c00a54a33128b3bd51d956b4a0f
+  metadata.gz: d25a93f2eb87df5d1146a86375d1f804f469eadfb22af140ae52df1a531f1ace7a4381f49705f38d82e1bfe69016e14f6e2f5db4f9c151e3881f8c0464d9264f
+  data.tar.gz: 56f2c95bccd01fa76d4502a9c2d22fabfc1612cc9c01f0502b67691d4927c64b08d58d6ff98f1318aa315c4078bf624cfc45be4f33735f6476641075b2acb868

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cl (0.1.16)
+    cl (0.1.17)
       regstry (~> 1.0.3)
 
 GEM

data/lib/cl/opt.rb

@@ -15,7 +15,7 @@ class Cl
 
     def initialize(*)
       super
-      noize(strs) if type == :flag && default.is_a?(TrueClass)
+      noize!(strs) if type == :flag
     end
 
     def define(const)
@@ -64,7 +64,6 @@ class Cl
     def deprecated
       return [name, opts[:deprecated]] unless opts[:deprecated].is_a?(Symbol)
       [opts[:deprecated], name] if opts[:deprecated]
-      # [name, opts[:deprecated]] if opts[:deprecated]
     end
 
     def downcase?
@@ -183,10 +182,10 @@ class Cl
       end
     end
 
-    def noize(strs)
+    def noize!(strs)
       strs = strs.select { |str| str.start_with?('--') }
       strs = strs.reject { |str| str.include?('[no-]') }
-      strs.each { |str| str.replace(str.sub('--', '--[no-]')) }
+      strs.each { |str| str.replace(str.sub('--', '--[no-]')) unless str == '--help' }
     end
   end
 end

data/lib/cl/parser.rb

@@ -9,7 +9,7 @@ class Cl
 
       super do
         opts.each do |opt|
-          on(*underscore!(opt.strs)) do |value|
+          on(*dasherize(opt.strs)) do |value|
             set(opt, value)
           end
 
@@ -21,7 +21,7 @@ class Cl
         end
       end
 
-      underscore!(args)
+      dasherize!(args)
       parse!(args)
     end
 
@@ -37,16 +37,12 @@ class Cl
       instance_exec(*args, &opt.block)
     end
 
-    # OptionParser has started accepting dasherized options in 2.4.
-    # We want to support them on any Ruby >= 2.0 version, so we'll
-    # need to normalize things ourselves.
-
-    PATTERN = /^(-{1,2})(\[?no-\]?)?(.*)$/
+    def dasherize(strs)
+      strs.map { |str| str.gsub('_', '-') }
+    end
 
-    def underscore!(strs)
-      return strs if RUBY_VERSION >= '2.4'
-      strs.each { |str| str.gsub!(PATTERN) { "#{$1}#{$2}#{$3.tr('-', '_')}" } }
-      strs.each { |str| str.gsub!(/^--no_/, '--no-') } # ruby < 2.4
+    def dasherize!(strs)
+      strs.replace(dasherize(strs))
     end
   end
 end

data/lib/cl/version.rb

@@ -1,3 +1,3 @@
 class Cl
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cl
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regstry