From c63fff38124cdb0c7015b367518dcd061de88fc4 Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Sat, 25 Jul 2020 14:16:14 -0300
Subject: [PATCH 1/7] Allow to suppress automatic creation of --no-boolean
 flags

---
 lib/thor/parser/option.rb  | 11 +++++++----
 spec/parser/option_spec.rb | 12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/thor/parser/option.rb b/lib/thor/parser/option.rb
index 6a6761b6e..deac367f7 100644
--- a/lib/thor/parser/option.rb
+++ b/lib/thor/parser/option.rb
@@ -13,6 +13,7 @@ def initialize(name, options = {})
       @group          = options[:group].to_s.capitalize if options[:group]
       @aliases        = Array(options[:aliases])
       @hide           = options[:hide]
+      @inverse        = options[:inverse]
     end
 
     # This parse quick options given as method_options. It makes several
@@ -88,10 +89,7 @@ def usage(padding = 0)
       end
 
       sample = "[#{sample}]".dup unless required?
-
-      if boolean?
-        sample << ", [#{dasherize('no-' + human_name)}]" unless (name == "force") || name.start_with?("no-")
-      end
+      sample << ", [#{dasherize('no-' + human_name)}]" if inverse?
 
       if aliases.empty?
         (" " * padding) << sample
@@ -100,6 +98,11 @@ def usage(padding = 0)
       end
     end
 
+    def inverse?
+      return false if (name == "force") || name.start_with?("no-")
+      boolean? && @inverse.nil? || @inverse.eql?(true)
+    end
+
     VALID_TYPES.each do |type|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{type}?
diff --git a/spec/parser/option_spec.rb b/spec/parser/option_spec.rb
index 5884c21a6..6a5b84eec 100644
--- a/spec/parser/option_spec.rb
+++ b/spec/parser/option_spec.rb
@@ -119,6 +119,18 @@ def option(name, options = {})
     expect(option("--foo").switch_name).to eq("--foo")
   end
 
+  it "suppresses the creation of a --no-option when explicitly requested" do
+    expect(option("bar", type: :boolean, :inverse => false).usage).to_not include("[--no-bar]")
+  end
+
+  it "creates the inversion flag by default" do
+    expect(option("bar", type: :boolean).usage).to include("[--no-bar]")
+  end
+
+  it "creates the inversion flag when requested" do
+    expect(option("bar", type: :boolean, :inverse => true).usage).to include("[--no-bar]")
+  end
+
   it "returns the human name" do
     expect(option("foo").human_name).to eq("foo")
     expect(option("--foo").human_name).to eq("foo")

From 6f25cc6151a68c87075faf229e16452fdc91fe89 Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Sat, 25 Jul 2020 14:20:21 -0300
Subject: [PATCH 2/7] Add documentation for new inverse option

---
 lib/thor.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/thor.rb b/lib/thor.rb
index c84de3088..289d5b2c4 100644
--- a/lib/thor.rb
+++ b/lib/thor.rb
@@ -151,6 +151,7 @@ def method_options(options = nil)
     # :type     - The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
     # :banner   - String to show on usage notes.
     # :hide     - If you want to hide this option from the help.
+    # :inverse  - Set to false if you want to suppress --no-<option> to be generated for booleans.
     #
     def method_option(name, options = {})
       scope = if options[:for]

From 15dd942eb6ae10d7ef80f0033372f7415cfcccc2 Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Tue, 1 Jun 2021 14:02:24 -0300
Subject: [PATCH 3/7] Allow to override the inverse name

---
 lib/thor/parser/option.rb  | 34 +++++++++++++++++++++-------------
 spec/parser/option_spec.rb |  4 ++++
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/thor/parser/option.rb b/lib/thor/parser/option.rb
index deac367f7..c91e708b3 100644
--- a/lib/thor/parser/option.rb
+++ b/lib/thor/parser/option.rb
@@ -82,14 +82,7 @@ def human_name
     end
 
     def usage(padding = 0)
-      sample = if banner && !banner.to_s.empty?
-        "#{switch_name}=#{banner}".dup
-      else
-        switch_name
-      end
-
-      sample = "[#{sample}]".dup unless required?
-      sample << ", [#{dasherize('no-' + human_name)}]" if inverse?
+      sample = [ sample_banner, inverse_sample ].compact.join(", ")
 
       if aliases.empty?
         (" " * padding) << sample
@@ -98,11 +91,6 @@ def usage(padding = 0)
       end
     end
 
-    def inverse?
-      return false if (name == "force") || name.start_with?("no-")
-      boolean? && @inverse.nil? || @inverse.eql?(true)
-    end
-
     VALID_TYPES.each do |type|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{type}?
@@ -113,6 +101,26 @@ def #{type}?
 
   protected
 
+    def sample_banner
+      sample_banner = if banner && !banner.to_s.empty?
+                        "#{switch_name}=#{banner}".dup
+                      else
+                        switch_name
+                      end
+      required? ? sample_banner : "[#{sample_banner}]"
+    end
+
+    def inverse_sample
+      return unless boolean? && name !~ /^(force|no-.*)$/
+
+      case @inverse
+      when Symbol, String
+        "[#{dasherize(@inverse.to_s)}]"
+      when nil, true
+        "[#{dasherize('no-' + human_name)}]"
+      end
+    end
+
     def validate!
       raise ArgumentError, "An option cannot be boolean and required." if boolean? && required?
       validate_default_type!
diff --git a/spec/parser/option_spec.rb b/spec/parser/option_spec.rb
index 6a5b84eec..41299635f 100644
--- a/spec/parser/option_spec.rb
+++ b/spec/parser/option_spec.rb
@@ -123,6 +123,10 @@ def option(name, options = {})
     expect(option("bar", type: :boolean, :inverse => false).usage).to_not include("[--no-bar]")
   end
 
+  it "allow to override the inverse option" do
+    expect(option("colorful", type: :boolean, :inverse => :monochromatic).usage).to include("[--monochromatic]")
+  end
+
   it "creates the inversion flag by default" do
     expect(option("bar", type: :boolean).usage).to include("[--no-bar]")
   end

From e2bcab47b4feb14eb9c1ac5d1bc16a63b49ea4ed Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Tue, 1 Jun 2021 15:55:01 -0300
Subject: [PATCH 4/7] Improve inverse documentation

---
 lib/thor.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/thor.rb b/lib/thor.rb
index 289d5b2c4..42d22f197 100644
--- a/lib/thor.rb
+++ b/lib/thor.rb
@@ -151,7 +151,8 @@ def method_options(options = nil)
     # :type     - The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
     # :banner   - String to show on usage notes.
     # :hide     - If you want to hide this option from the help.
-    # :inverse  - Set to false if you want to suppress --no-<option> to be generated for booleans.
+    # :inverse  - false if yo don't want an inverse option of your boolean type, String or Symbol
+    #             if you want to override the inverse option name.
     #
     def method_option(name, options = {})
       scope = if options[:for]

From f9c1bdcf512f712d6c2b855114fc2761fe6c4637 Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Tue, 1 Jun 2021 15:55:10 -0300
Subject: [PATCH 5/7] Simplify boolean logic

---
 lib/thor/parser/option.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/thor/parser/option.rb b/lib/thor/parser/option.rb
index c91e708b3..23092462c 100644
--- a/lib/thor/parser/option.rb
+++ b/lib/thor/parser/option.rb
@@ -111,7 +111,7 @@ def sample_banner
     end
 
     def inverse_sample
-      return unless boolean? && name !~ /^(force|no-.*)$/
+      return if !boolean? || name =~ /^(force|no-.*)$/
 
       case @inverse
       when Symbol, String

From 5a93515deb83f8d61d097fdf95cfc4e9235aabfc Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Wed, 2 Jun 2021 21:11:11 -0300
Subject: [PATCH 6/7] Move specs to #usage

---
 spec/parser/option_spec.rb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/spec/parser/option_spec.rb b/spec/parser/option_spec.rb
index 41299635f..6787e177a 100644
--- a/spec/parser/option_spec.rb
+++ b/spec/parser/option_spec.rb
@@ -119,22 +119,6 @@ def option(name, options = {})
     expect(option("--foo").switch_name).to eq("--foo")
   end
 
-  it "suppresses the creation of a --no-option when explicitly requested" do
-    expect(option("bar", type: :boolean, :inverse => false).usage).to_not include("[--no-bar]")
-  end
-
-  it "allow to override the inverse option" do
-    expect(option("colorful", type: :boolean, :inverse => :monochromatic).usage).to include("[--monochromatic]")
-  end
-
-  it "creates the inversion flag by default" do
-    expect(option("bar", type: :boolean).usage).to include("[--no-bar]")
-  end
-
-  it "creates the inversion flag when requested" do
-    expect(option("bar", type: :boolean, :inverse => true).usage).to include("[--no-bar]")
-  end
-
   it "returns the human name" do
     expect(option("foo").human_name).to eq("foo")
     expect(option("--foo").human_name).to eq("foo")
@@ -261,6 +245,22 @@ def option(name, options = {})
       expect(option(:foo, :required => false, :type => :string, :banner => "").usage).to eq("[--foo]")
     end
 
+    it "suppresses the creation of a --no-option when explicitly requested" do
+      expect(option("bar", type: :boolean, :inverse => false).usage).to_not include("[--no-bar]")
+    end
+
+    it "allow to override the inverse option" do
+      expect(option("colorful", type: :boolean, :inverse => :monochromatic).usage).to include("[--monochromatic]")
+    end
+
+    it "creates the inversion flag by default" do
+      expect(option("bar", type: :boolean).usage).to include("[--no-bar]")
+    end
+
+    it "creates the inversion flag when requested" do
+      expect(option("bar", type: :boolean, :inverse => true).usage).to include("[--no-bar]")
+    end
+
     describe "with required values" do
       it "does not show the usage between brackets" do
         expect(parse(:foo, :required).usage).to eq("--foo=FOO")

From d9cf8ef3873641026528b52b352d54c7c09278ba Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Tue, 29 Jun 2021 11:24:58 -0300
Subject: [PATCH 7/7] Update lib/thor.rb

Co-authored-by: Gareth Jones <Jones258@Gmail.com>
---
 lib/thor.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/thor.rb b/lib/thor.rb
index 42d22f197..ccc8d6e64 100644
--- a/lib/thor.rb
+++ b/lib/thor.rb
@@ -151,7 +151,7 @@ def method_options(options = nil)
     # :type     - The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
     # :banner   - String to show on usage notes.
     # :hide     - If you want to hide this option from the help.
-    # :inverse  - false if yo don't want an inverse option of your boolean type, String or Symbol
+    # :inverse  - false if you don't want an inverse option of your boolean type, String or Symbol
     #             if you want to override the inverse option name.
     #
     def method_option(name, options = {})