thor-plus 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dfe41e5f6475c9cecd7c40a7d1b821c0a3c9aa5
-  data.tar.gz: 3ae375b919909902c286778693db87b98b0c9991
+  metadata.gz: 58295881823689f3350e642f849fb6ad397b95fe
+  data.tar.gz: 248bd3a87c889ac1f43b5e99db1765d84435389d
 SHA512:
-  metadata.gz: af4e05abca2333347f3664485b64bb230bc306bc39fe0c896bd66898c9d576f90734d4436bf4ca3c4902ee1a348ede0bd2139052d36338d80929ed05eb22ed6e
-  data.tar.gz: 8915fb4d9d2e5e0dd75651bca6e3736a7194550aa2d732a87ce6a793dce97a28cc9680b6240e95be733837aded349e11a495a503789943849b719a5b940ce6fa
+  metadata.gz: 24b141e2f026d2317beef2852775840d593163e84310ece4e50301c5d4e0440477aca6943f46a57eacc8db884fb777dfff04e50d6f33cf0c6eb958ff5d43438e
+  data.tar.gz: 697de57d139368376a2701e68c2d4e3be36fa48135858873d9cc51a3089974c59b3efe56c9a3f835603adfd27d5472f79e7ab0ab47d51314058c58d9c2f92f9f

data/lib/thor.rb

@@ -14,8 +14,12 @@ class Thor # rubocop:disable ClassLength
     # name<String>
     # options<Hash>
     #
-    def package_name(name, options = {})
-      @package_name = name.nil? || name == "" ? nil : name
+    def package_name(name = nil, options = {})
+      if name
+        @package_name = name.nil? || name == "" ? nil : name
+      else
+        @package_name ||= basename
+      end
     end
 
     # Sets the default command when thor is executed without an explicit command to be called.
@@ -189,13 +193,13 @@ class Thor # rubocop:disable ClassLength
     # shell<Thor::Shell>
     # command_name<String>
     #
-    def command_help(shell, command_name)
+    def command_help(shell, command_name, subcommand = false)
       meth = normalize_command_name(command_name)
       command = all_commands[meth]
       handle_no_command_error(meth) unless command
 
       shell.say "Usage:"
-      shell.say "  #{banner(command)}"
+      shell.say "  #{banner(command, nil, subcommand)}"
       shell.say
       class_options_help(shell, nil => command.options.values)
       if command.long_description
@@ -219,12 +223,7 @@ class Thor # rubocop:disable ClassLength
       end
       list.sort! { |a, b| a[0] <=> b[0] }
 
-      if defined?(@package_name) && @package_name
-        shell.say "#{@package_name} commands:"
-      else
-        shell.say "Commands:"
-      end
-
+      shell.say "#{package_name} commands:"
       shell.print_table(list, :indent => 2, :truncate => true)
       shell.say
       class_options_help(shell)
@@ -253,6 +252,7 @@ class Thor # rubocop:disable ClassLength
 
     def subcommand(subcommand, subcommand_class)
       subcommands << subcommand.to_s
+      subcommand_class.package_name(self.package_name)
       subcommand_class.subcommand_help subcommand
       subcommand_classes[subcommand.to_s] = subcommand_class
 
@@ -394,7 +394,7 @@ class Thor # rubocop:disable ClassLength
     # the namespace should be displayed as arguments.
     #
     def banner(command, namespace = nil, subcommand = false)
-      "#{basename} #{command.formatted_usage(self, $thor_runner, subcommand)}"
+      "#{package_name} #{command.formatted_usage(self, $thor_runner, subcommand)}"
     end
 
     def baseclass #:nodoc:
@@ -489,6 +489,7 @@ class Thor # rubocop:disable ClassLength
     def subcommand_help(cmd)
       desc "help [COMMAND]", "Describe subcommands or one specific subcommand"
       class_eval "
+        disable_class_options
         def help(command = nil, subcommand = true); super; end
 "
     end
@@ -506,7 +507,7 @@ class Thor # rubocop:disable ClassLength
       if self.class.subcommands.include? command
         self.class.subcommand_classes[command].help(shell, true)
       else
-        self.class.command_help(shell, command)
+        self.class.command_help(shell, command, subcommand)
       end
     else
       self.class.help(shell, subcommand)

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.3.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thor-plus
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Yehuda Katz
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler