cl 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05d4a5fcd74cdf55dbf91276fdd200a5041c4aabef97ffa68849ad63b81b8d30
-  data.tar.gz: 143667a25f93a57662f7271353815f9c6d253055aa45510f666fb37880cdda86
+  metadata.gz: dacd4d093f0970d4eb5302ff5f4f8bf4d73c69245f38ec544eb764a30c6a8e46
+  data.tar.gz: 9d11eaa2671ba6ffe6cfdc534bfd0eae620f30e40720f4567d942cfce4c47dca
 SHA512:
-  metadata.gz: b3a7e08f7c2271b0932b424d66dde47d75c758b579f0fae714bfcd42addf7f2d0cd1a4412b156757071e079b14bb32e9fbd70e43b3fb7a056bfd8efa6e0ab554
-  data.tar.gz: 3b32efded8658b8fce630613b3391157c9b295d8861b9000ed6fa679e8e7bb44904f34e474e6783399476c17dc4adbafd1552c050005f9df19f8323f77075247
+  metadata.gz: 745f6a9f4009f75af3d5714436925cd1d8df5a4556e566b2d2edde8f5b86bb56cd064aeab11cde914326a6bde8a7d5e7ed57adea164aa1cfa4e99e8680e3d4a8
+  data.tar.gz: '0097968b0b4cfdf6098cb74b5cf44b797628c3e250559b249ced2baa5c30c16ced5d76536a38cbfe0687e95ca08d197a709b8a7eefa778bda2e8f99ec5e64fd6'

data/Gemfile.lock

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

data/lib/cl/help/cmd.rb

@@ -74,13 +74,18 @@ class Cl
       def opt_strs(opt)
         return opt.strs if !opt.flag? || opt.help?
         opts = [opt.short]
-        opts << negate(opt.long, opt.negate) if opt.long && opt.negate?
+        opts.push(negate?(opt) ? negate(opt) : opt.long)
         opts.compact
       end
 
-      def negate(opt, negations)
-        negations = negations.map { |str| "#{str}-" }.join('|')
-        opt.dup.insert(2, "[#{negations}]")
+      def negate?(opt)
+        negations = opt.negate.map { |str| "#{str}-" }.join('|')
+        opt.long && opt.negate? && opt.long !~ /\[#{negations}\]/
+      end
+
+      def negate(opt)
+        negations = opt.negate.map { |str| "#{str}-" }.join('|')
+        opt.long.dup.insert(2, "[#{negations}]")
       end
 
       def requireds

data/lib/cl/helper/suggest.rb

@@ -1,11 +1,9 @@
 class Cl
   module Suggest
-    include DidYouMean if defined?(DidYouMean)
-
     def suggest(dict, value)
-      return [] unless defined?(DidYouMean)
+      return [] unless defined?(DidYouMean::SpellChecker)
       Array(value).map do |value|
-        SpellChecker.new(dictionary: dict.map(&:to_s)).correct(value.to_s)
+        DidYouMean::SpellChecker.new(dictionary: dict.map(&:to_s)).correct(value.to_s)
       end.flatten
     end
   end

data/lib/cl/opt.rb

@@ -77,7 +77,7 @@ class Cl
     end
 
     def deprecated?(name = nil)
-      name ? deprecated.first == name : !!opts[:deprecated]
+      name ? deprecated? && deprecated.first == name : !!opts[:deprecated]
     end
 
     def deprecated

data/lib/cl/parser.rb

@@ -18,7 +18,6 @@ class Cl
         end
       end
 
-      orig = args.map(&:dup)
       @args = parse!(normalize(opts, args))
     end
 

data/lib/cl/version.rb

@@ -1,3 +1,3 @@
 class Cl
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sven Fuchs