cri 2.15.8 → 2.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8133dfa33226ec959daeea2060f7efc15672e642d6a9afb8c19d9e3fabd550ce
-  data.tar.gz: 5c2c3afb7da1a9ad6adff22b136cd0cea144bb8b8e451bf0b3f50849bac10c90
+  metadata.gz: 4401ab0bc18e9f1603e6de169020202c419a49b25c4afac97e979d60bc866ef3
+  data.tar.gz: eb540e18c8a84d7b8fbfb2b995c538f668455a0d13d90557ea3ac404c66eb17e
 SHA512:
-  metadata.gz: 4ce23dee547462ed7d5a2f5618250019f520663c0bcdd2ce4a83cdf4a69dbfebc90a22cc61368a512a250fe2960a0a452e8c40dc65cd71afdae6f249cfe3095b
-  data.tar.gz: a471a0036ced17f51a6acef3b9e04239c74cfca8a024b76bd97837c9fc19182739165412e31021d1371875cc6fcfcc55c71cdd5983e9c4208d2555160182e418
+  metadata.gz: d2fd32fe7476d4be56325e8911372a41c7048627bac07d7eae5fa847e82a4994c00d244c84ccfd5335c18e957ab49be79eb54746125141106c0d1fc88f62a8b1
+  data.tar.gz: 97d558d0037d6a90ba758e42b0777c2060a91df46b8d773ba04c35f53a5f1d4db3da8372dfd1e24c6cbf2a4960e7607c77f0ed322335d59c0fd68e73f9cb259e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cri (2.15.8)
+    cri (2.15.9)
 
 GEM
   remote: https://rubygems.org/

data/NEWS.md

@@ -1,5 +1,11 @@
 # Cri News
 
+## 2.15.9
+
+Fixes:
+
+* Fixed bug which could cause options from one command appear in other commands (#101, #102)
+
 ## 2.15.8
 
 Fixes:

data/lib/cri/command.rb

@@ -361,7 +361,11 @@ module Cri
     end
 
     def all_opt_defns
-      supercommand ? supercommand.all_opt_defns.merge(option_definitions) : option_definitions
+      if supercommand
+        supercommand.all_opt_defns | option_definitions
+      else
+        option_definitions
+      end
     end
 
     # @return [String] The help text for this command

data/lib/cri/version.rb

@@ -2,5 +2,5 @@
 
 module Cri
   # The current Cri version.
-  VERSION = '2.15.8'
+  VERSION = '2.15.9'
 end

data/test/test_command.rb

@@ -963,5 +963,42 @@ module Cri
       assert_equal ['Animal = cow'], lines(out)
       assert_equal [], lines(err)
     end
+
+    def test_option_definitions_are_not_shared_across_commands
+      root_cmd = Cri::Command.define do
+        name 'root'
+        option :r, :rrr, 'Rrr!', argument: :required
+      end
+
+      subcmd_a = root_cmd.define_command do
+        name 'a'
+        option :a, :aaa, 'Aaa!', argument: :required
+
+        run do |_opts, _args, cmd|
+          puts cmd.all_opt_defns.map(&:long).sort.join(',')
+        end
+      end
+
+      subcmd_b = root_cmd.define_command do
+        name 'b'
+        option :b, :bbb, 'Bbb!', argument: :required
+
+        run do |_opts, _args, cmd|
+          puts cmd.all_opt_defns.map(&:long).sort.join(',')
+        end
+      end
+
+      out, err = capture_io_while do
+        subcmd_a.run(%w[])
+      end
+      assert_equal ['aaa,rrr'], lines(out)
+      assert_equal [], lines(err)
+
+      out, err = capture_io_while do
+        subcmd_b.run(%w[])
+      end
+      assert_equal ['bbb,rrr'], lines(out)
+      assert_equal [], lines(err)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cri
 version: !ruby/object:Gem::Version
-  version: 2.15.8
+  version: 2.15.9
 platform: ruby
 authors:
 - Denis Defreyne