bundler 1.5.1 → 1.5.2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.5.2 (2014-01-10)
+
+Bugfixes:
+
+  - fix integration with Rubygems 1.8.0-1.8.19
+  - handle ENETDOWN exception during network requests
+  - gracefully shut down after interrupt during parallel install (@Who828)
+  - allow Rails to run Thor without debug mode (@rafaelfranca)
+  - set git binstub permissions by umask (@v-yarotsky)
+  - remove parallel install debug log
+
 ## 1.5.1 (2013-12-28)
 
 Bugfixes:
@@ -96,12 +107,25 @@ Bugfixes:
   - allow the same options hash to be passed to multiple gems (#2447)
   - handle missing binaries without an exception (#2019, @luismreis)
 
-## 1.3.6
+## 1.3.6 (8 January 2014)
 
 Bugfixes:
 
-  - set --no-cache when bundle install --local is called (@TimMoore)
   - make gemspec path option preserve relative paths in lock file (@bwillis)
+  - use umask when creating binstubs (#1618, @v-yarotsky)
+  - warn if graphviz is not installed (#2435, @Agis-)
+  - show git errors while loading gemspecs
+  - don't mutate gem method options hash (#2447)
+  - print Thor errors (#2478, @pjvds)
+  - print Rubygems system exit errors (James Cook)
+  - more Pathnames into Strings for MacRuby (@kml)
+  - preserve original gemspec path (@bwillis)
+  - remove warning about deps with :git (#1651, @ixti)
+  - split git files on null (#2634, @jasonmp85)
+  - handle cross-host redirects without SSL (#2686, @grddev)
+  - handle Rubygems 2 security exception (@zzak)
+  - reinstall gems if they are missing with spec present
+  - set binstub permissions using umask (#1618, @v-yarotsky)
 
 ## 1.3.5 (3 April 2013)
 

data/bin/bundle

@@ -15,8 +15,6 @@ $LOAD_PATH.each do |path|
 end
 
 require 'bundler/cli'
-# Force Thor to raise exceptions so we can exit non-zero.
-ENV["THOR_DEBUG"] = "1"
 
 require 'bundler/friendly_errors'
-Bundler.with_friendly_errors { Bundler::CLI.start }
+Bundler.with_friendly_errors { Bundler::CLI.start(ARGV, :debug => true) }

data/bundler.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ronn', '~> 0.7.3'
   spec.add_development_dependency 'rspec', '~> 2.11'
 
-  spec.files       = `git ls-files`.split($/)
+  spec.files       = `git ls-files -z`.split("\x0")
   spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git
   spec.test_files  = spec.files.grep(%r{^spec/})
 

data/lib/bundler/cli.rb

@@ -21,7 +21,7 @@ module Bundler
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message
     ensure
-      options ||= {}
+      self.options ||= {}
       Bundler.ui = UI::Shell.new(options)
       Bundler.ui.level = "debug" if options["verbose"]
     end
@@ -232,8 +232,6 @@ module Bundler
         opts[:system] = true
       end
 
-      opts["no-cache"] ||= opts[:local]
-
       Bundler.settings[:path]     = nil if opts[:system]
       Bundler.settings[:path]     = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path]     = opts["path"] if opts["path"]
@@ -255,7 +253,7 @@ module Bundler
       definition = Bundler.definition
       definition.validate_ruby!
       Installer.install(Bundler.root, definition, opts)
-      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !opts["no-cache"]
+      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
 
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])

data/lib/bundler/fetcher.rb

@@ -226,7 +226,7 @@ module Bundler
   private
 
     HTTP_ERRORS = [
-      Timeout::Error, EOFError, SocketError,
+      Timeout::Error, EOFError, SocketError, Errno::ENETDOWN,
       Errno::EINVAL, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EAGAIN,
       Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
       Net::HTTP::Persistent::Error
@@ -235,17 +235,7 @@ module Bundler
     def fetch(uri, counter = 0)
       raise HTTPError, "Too many redirects" if counter >= @redirect_limit
 
-      begin
-        Bundler.ui.debug "Fetching from: #{uri}"
-        req = Net::HTTP::Get.new uri.request_uri
-        req.basic_auth(uri.user, uri.password) if uri.user
-        response = connection.request(uri, req)
-      rescue OpenSSL::SSL::SSLError
-        raise CertificateFailureError.new(uri)
-      rescue *HTTP_ERRORS
-        raise HTTPError, "Network error while fetching #{uri}"
-      end
-
+      response = request(uri)
       case response
       when Net::HTTPRedirection
         Bundler.ui.debug("HTTP Redirection")
@@ -265,6 +255,17 @@ module Bundler
       end
     end
 
+    def request(uri)
+      Bundler.ui.debug "Fetching from: #{uri}"
+      req = Net::HTTP::Get.new uri.request_uri
+      req.basic_auth(uri.user, uri.password) if uri.user
+      response = connection.request(uri, req)
+    rescue OpenSSL::SSL::SSLError
+      raise CertificateFailureError.new(uri)
+    rescue *HTTP_ERRORS
+      raise HTTPError, "Network error while fetching #{uri}"
+    end
+
     def dependency_api_uri(gem_names = [])
       url = "#{@remote_uri}api/v1/dependencies"
       url << "?gems=#{URI.encode(gem_names.join(","))}" if gem_names.any?

data/lib/bundler/installer.rb

@@ -113,7 +113,6 @@ module Bundler
         Bundler.ui.debug debug_message if debug_message
         spec_info = "#{worker}:  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
         Bundler.ui.debug spec_info
-        logger.info spec_info
       end
 
       if Bundler.settings[:bin] && standalone
@@ -139,7 +138,6 @@ module Bundler
         msg << " #{spec.name} -v '#{spec.version}'` succeeds before bundling."
       end
       Bundler.ui.debug e.backtrace.join("\n")
-      logger.error("#{e.class}: #{e.message}\n#{e.backtrace.join('  \n')}")
       raise Bundler::InstallError, msg
     end
 
@@ -176,7 +174,7 @@ module Bundler
           next
         end
 
-        File.open(binstub_path, 'w', 0755) do |f|
+        File.open(binstub_path, 'w', 0777 & ~File.umask) do |f|
           f.puts ERB.new(template, nil, '-').result(binding)
         end
       end
@@ -198,15 +196,6 @@ module Bundler
 
   private
 
-    def logger
-      # Create a debug installation log limited to 1MB
-      @logger ||= begin
-        require 'logger'
-        Bundler.app_config_path.mkpath
-        Logger.new(Bundler.app_config_path.join("install.log"), 1, 1048576)
-      end
-    end
-
     def can_install_parallely?
       min_rubygems = "2.0.7"
       if Bundler.current_ruby.mri? || Bundler.rubygems.provides?(">= #{min_rubygems}")
@@ -219,25 +208,6 @@ module Bundler
       end
     end
 
-    def check_rubygems_cache_dir
-      require 'digest'
-      cached_gems = Dir["#{Bundler.rubygems.gem_dir}/cache/*.gem"]
-
-      same_size_gems = cached_gems.group_by { |f| File.size(f) }.
-        values.select { |names| names.size > 1 }
-
-      same_hash_gems = same_size_gems.flatten.group_by do |f|
-        Digest::SHA1.hexdigest(File.read(f))
-      end.values.select { |names| names.size > 1 }
-
-      if same_hash_gems.any?
-        Bundler.ui.warn "It looks like some of your gems are corrupted!"
-        same_hash_gems.each { |name| Bundler.ui.warn "  * #{name}" }
-        Bundler.ui.warn "Please report this issue to the Bundler issue tracker " \
-          "on Github, and include the log file at .bundle/install.log. Thanks!"
-      end
-    end
-
     def generate_standalone_bundler_executable_stubs(spec)
       # double-assignment to avoid warnings about variables that will be used by ERB
       bin_path = Bundler.bin_path
@@ -314,8 +284,7 @@ module Bundler
         { :name => spec.name, :post_install => message }
       }
       specs.each do |spec|
-        deps = spec.dependencies.select { |dep| dep.type != :development }
-        if deps.empty?
+        if ready_to_install?(spec, remains)
           worker_pool.enq spec.name
           enqueued[spec.name] = true
         end
@@ -330,17 +299,21 @@ module Bundler
         remains.keys.each do |name|
           next if enqueued[name]
           spec = name2spec[name]
-          deps = spec.dependencies.select { |dep| remains[dep.name] and dep.type != :development }
-          if deps.empty?
+          if ready_to_install?(spec, remains)
             worker_pool.enq name
             enqueued[name] = true
           end
         end
       end
-      check_rubygems_cache_dir
       message
     ensure
       worker_pool && worker_pool.stop
     end
+
+    def ready_to_install?(spec, remains)
+      spec.dependencies.none? do |dep|
+        remains[dep.name] && dep.type != :development && dep.name != spec.name
+      end
+    end
   end
 end

data/lib/bundler/parallel_workers/unix_worker.rb

@@ -80,12 +80,20 @@ module Bundler
       # Kill the forked workers by sending SIGINT to them
       def stop_workers
         @workers.each do |worker|
-          worker.io_r.close
-          worker.io_w.close
-          Process.kill :INT, worker.pid
+          worker.io_r.close unless worker.io_r.closed?
+          worker.io_w.close unless worker.io_w.closed?
+          begin
+            Process.kill :INT, worker.pid
+          rescue Errno::ESRCH
+            nil
+          end
         end
         @workers.each do |worker|
-          Process.waitpid worker.pid
+          begin
+            Process.waitpid worker.pid
+          rescue Errno::ECHILD
+            nil
+          end
         end
       end
     end

data/lib/bundler/parallel_workers/worker.rb

@@ -19,6 +19,7 @@ module Bundler
         @response_queue = Queue.new
         prepare_workers size, func
         prepare_threads size
+        trap("INT") { @threads.each {|i| i.exit }; stop_workers; exit 1 }
       end
 
       # Enque a request to be executed in the worker pool

data/lib/bundler/rubygems_ext.rb

@@ -56,7 +56,7 @@ module Gem
     end
 
     def git_version
-      if @loaded_from && File.exist?(File.join(full_gem_path, ".git"))
+      if loaded_from && File.exist?(File.join(full_gem_path, ".git"))
         sha = Bundler::SharedHelpers.chdir(full_gem_path){ `git rev-parse HEAD`.strip }
         " #{sha[0..6]}"
       end

data/lib/bundler/rubygems_integration.rb

@@ -422,7 +422,7 @@ module Bundler
       end
     end
 
-    # Rubygems ~> 1.8.5
+    # Rubygems 1.8.5-1.8.19
     class Modern < RubygemsIntegration
       def stub_rubygems(specs)
         Gem::Specification.all = specs
@@ -441,11 +441,6 @@ module Bundler
       def find_name(name)
         Gem::Specification.find_all_by_name name
       end
-
-      def build(spec, skip_validation = false)
-        require 'rubygems/builder'
-        Gem::Builder.new(spec).build(skip_validation)
-      end
     end
 
     # Rubygems 1.8.0 to 1.8.4
@@ -460,14 +455,24 @@ module Bundler
       end
     end
 
+    # Rubygems 1.8.20+
+    class MoreModern < Modern
+      # Rubygems 1.8.20 and adds the skip_validation parameter, so that's
+      # when we start passing it through.
+      def build(spec, skip_validation = false)
+        require 'rubygems/builder'
+        Gem::Builder.new(spec).build(skip_validation)
+      end
+    end
+
     # Rubygems 2.0
     class Future < RubygemsIntegration
       def stub_rubygems(specs)
         Gem::Specification.all = specs
 
-        Gem.post_reset {
+        Gem.post_reset do
           Gem::Specification.all = specs
-        }
+        end
       end
 
       def all_specs
@@ -529,6 +534,8 @@ module Bundler
 
   if RubygemsIntegration.provides?(">= 1.99.99")
     @rubygems = RubygemsIntegration::Future.new
+  elsif RubygemsIntegration.provides?('>= 1.8.20')
+    @rubygems = RubygemsIntegration::MoreModern.new
   elsif RubygemsIntegration.provides?('>= 1.8.5')
     @rubygems = RubygemsIntegration::Modern.new
   elsif RubygemsIntegration.provides?('>= 1.8.0')

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = ""
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/lib/bundler/vendor/thor.rb

@@ -1,7 +1,7 @@
 require 'set'
 require 'thor/base'
 
-class Thor
+class Thor # rubocop:disable ClassLength
   class << self
     # Allows for custom "Command" package naming.
     #
@@ -9,7 +9,7 @@ class Thor
     # name<String>
     # options<Hash>
     #
-    def package_name(name, options={})
+    def package_name(name, options = {})
       @package_name = name.nil? || name == '' ? nil : name
     end
 
@@ -18,17 +18,14 @@ class Thor
     # ==== Parameters
     # meth<Symbol>:: name of the default command
     #
-    def default_command(meth=nil)
-      @default_command = case meth
-      when :none
-        'help'
-      when nil
-        @default_command || from_superclass(:default_command, 'help')
+    def default_command(meth = nil)
+      if meth
+        @default_command = meth == :none ? 'help' : meth.to_s
       else
-        meth.to_s
+        @default_command ||= from_superclass(:default_command, 'help')
       end
     end
-    alias default_task default_command
+    alias_method :default_task, :default_command
 
     # Registers another Thor subclass as a command.
     #
@@ -37,7 +34,7 @@ class Thor
     # command<String>:: Subcommand name to use
     # usage<String>:: Short usage for the subcommand
     # description<String>:: Description for the subcommand
-    def register(klass, subcommand_name, usage, description, options={})
+    def register(klass, subcommand_name, usage, description, options = {})
       if klass <= Thor::Group
         desc usage, description, options
         define_method(subcommand_name) { |*args| invoke(klass, args) }
@@ -54,7 +51,7 @@ class Thor
     # description<String>
     # options<String>
     #
-    def desc(usage, description, options={})
+    def desc(usage, description, options = {})
       if options[:for]
         command = find_and_refresh_command(options[:for])
         command.usage = usage             if usage
@@ -69,7 +66,7 @@ class Thor
     # ==== Parameters
     # long description<String>
     #
-    def long_desc(long_description, options={})
+    def long_desc(long_description, options = {})
       if options[:for]
         command = find_and_refresh_command(options[:for])
         command.long_description = long_description if long_description
@@ -91,13 +88,13 @@ class Thor
     # ==== Parameters
     # Hash[String|Array => Symbol]:: Maps the string or the strings in the array to the given command.
     #
-    def map(mappings=nil)
+    def map(mappings = nil)
       @map ||= from_superclass(:map, {})
 
       if mappings
         mappings.each do |key, value|
           if key.respond_to?(:each)
-            key.each {|subkey| @map[subkey] = value}
+            key.each { |subkey| @map[subkey] = value }
           else
             @map[key] = value
           end
@@ -114,13 +111,13 @@ class Thor
     # is the type of the option. Can be :string, :array, :hash, :boolean, :numeric
     # or :required (string). If you give a value, the type of the value is used.
     #
-    def method_options(options=nil)
+    def method_options(options = nil)
       @method_options ||= {}
       build_options(options, @method_options) if options
       @method_options
     end
 
-    alias options method_options
+    alias_method :options, :method_options
 
     # Adds an option to the set of method options. If :for is given as option,
     # it allows you to change the options from a previous defined command.
@@ -148,16 +145,16 @@ class Thor
     # :banner   - String to show on usage notes.
     # :hide     - If you want to hide this option from the help.
     #
-    def method_option(name, options={})
+    def method_option(name, options = {})
       scope = if options[:for]
-        find_and_refresh_command(options[:for]).options
-      else
-        method_options
-      end
+                find_and_refresh_command(options[:for]).options
+              else
+                method_options
+              end
 
       build_option(name, options, scope)
     end
-    alias option method_option
+    alias_method :option, :method_option
 
     # Prints help information for the given command.
     #
@@ -170,18 +167,18 @@ class Thor
       command = all_commands[meth]
       handle_no_command_error(meth) unless command
 
-      shell.say "Usage:"
+      shell.say 'Usage:'
       shell.say "  #{banner(command)}"
       shell.say
       class_options_help(shell, nil => command.options.map { |_, o| o })
       if command.long_description
-        shell.say "Description:"
+        shell.say 'Description:'
         shell.print_wrapped(command.long_description, :indent => 2)
       else
         shell.say command.description
       end
     end
-    alias task_help command_help
+    alias_method :task_help, :command_help
 
     # Prints help information for this class.
     #
@@ -193,12 +190,12 @@ class Thor
       Thor::Util.thor_classes_in(self).each do |klass|
         list += klass.printable_commands(false)
       end
-      list.sort!{ |a,b| a[0] <=> b[0] }
+      list.sort! { |a, b| a[0] <=> b[0] }
 
-      if @package_name
+      if defined?(@package_name) && @package_name
         shell.say "#{@package_name} commands:"
       else
-        shell.say "Commands:"
+        shell.say 'Commands:'
       end
 
       shell.print_table(list, :indent => 2, :truncate => true)
@@ -212,34 +209,35 @@ class Thor
         next if command.hidden?
         item = []
         item << banner(command, false, subcommand)
-        item << (command.description ? "# #{command.description.gsub(/\s+/m,' ')}" : "")
+        item << (command.description ? "# #{command.description.gsub(/\s+/m, ' ')}" : '')
         item
       end.compact
     end
-    alias printable_tasks printable_commands
+    alias_method :printable_tasks, :printable_commands
 
     def subcommands
       @subcommands ||= from_superclass(:subcommands, [])
     end
-    alias subtasks subcommands
+    alias_method :subtasks, :subcommands
 
     def subcommand(subcommand, subcommand_class)
-      self.subcommands << subcommand.to_s
+      subcommands << subcommand.to_s
       subcommand_class.subcommand_help subcommand
 
       define_method(subcommand) do |*args|
         args, opts = Thor::Arguments.split(args)
+        args.unshift("help") if opts.include? "--help" or opts.include? "-h"
         invoke subcommand_class, args, opts, :invoked_via_subcommand => true, :class_options => options
       end
     end
-    alias subtask subcommand
+    alias_method :subtask, :subcommand
 
     # Extend check unknown options to accept a hash of conditions.
     #
     # === Parameters
     # options<Hash>: A hash containing :only and/or :except keys
-    def check_unknown_options!(options={})
-      @check_unknown_options ||= Hash.new
+    def check_unknown_options!(options = {})
+      @check_unknown_options ||= {}
       options.each do |key, value|
         if value
           @check_unknown_options[key] = Array(value)
@@ -309,18 +307,20 @@ class Thor
     # ==== Parameters
     # Symbol ...:: A list of commands that should be affected.
     def stop_on_unknown_option!(*command_names)
-      @stop_on_unknown_option ||= Set.new
-      @stop_on_unknown_option.merge(command_names)
+      stop_on_unknown_option.merge(command_names)
     end
 
     def stop_on_unknown_option?(command) #:nodoc:
-      command && !@stop_on_unknown_option.nil? && @stop_on_unknown_option.include?(command.name.to_sym)
+      command && stop_on_unknown_option.include?(command.name.to_sym)
     end
 
   protected
+    def stop_on_unknown_option #:nodoc:
+      @stop_on_unknown_option ||= Set.new
+    end
 
     # The method responsible for dispatching given the args.
-    def dispatch(meth, given_args, given_opts, config) #:nodoc:
+    def dispatch(meth, given_args, given_opts, config) #:nodoc: # rubocop:disable MethodLength
       # There is an edge case when dispatching from a subcommand.
       # A problem occurs invoking the default command. This case occurs
       # when arguments are passed and a default command is defined, and
@@ -331,7 +331,7 @@ class Thor
       # the command normally. If the first item in given_args is not
       # a command then use the default command. The given_args will be
       # intact later since dup was used.
-      if config[:invoked_via_subcommand] && given_args.size >= 1 && default_command != "help" && given_args.first != default_command
+      if config[:invoked_via_subcommand] && given_args.size >= 1 && default_command != 'help' && given_args.first != default_command
         meth ||= retrieve_command_name(given_args.dup)
         command = all_commands[normalize_command_name(meth)]
         command ||= all_commands[normalize_command_name(default_command)]
@@ -350,7 +350,7 @@ class Thor
         end
       else
         args, opts = given_args, nil
-        command = Thor::DynamicCommand.new(meth)
+        command = dynamic_command_class.new(meth)
       end
 
       opts = given_opts || opts || []
@@ -376,22 +376,30 @@ class Thor
       Thor
     end
 
+    def dynamic_command_class #:nodoc:
+      Thor::DynamicCommand
+    end
+
     def create_command(meth) #:nodoc:
+      @usage ||= nil
+      @desc ||= nil
+      @long_desc ||= nil
+
       if @usage && @desc
         base_class = @hide ? Thor::HiddenCommand : Thor::Command
         commands[meth] = base_class.new(meth, @desc, @long_desc, @usage, method_options)
         @usage, @desc, @long_desc, @method_options, @hide = nil
         true
-      elsif self.all_commands[meth] || meth == "method_missing"
+      elsif all_commands[meth] || meth == 'method_missing'
         true
       else
         puts "[WARNING] Attempted to create command #{meth.inspect} without usage or description. " <<
-             "Call desc if you want this method to be available as command or declare it inside a " <<
+             'Call desc if you want this method to be available as command or declare it inside a ' <<
              "no_commands{} block. Invoked from #{caller[1].inspect}."
         false
       end
     end
-    alias create_task create_command
+    alias_method :create_task, :create_command
 
     def initialize_added #:nodoc:
       class_options.merge!(method_options)
@@ -407,7 +415,7 @@ class Thor
         nil
       end
     end
-    alias retrieve_task_name retrieve_command_name
+    alias_method :retrieve_task_name, :retrieve_command_name
 
     # receives a (possibly nil) command name and returns a name that is in
     # the commands hash. In addition to normalizing aliases, this logic
@@ -421,7 +429,7 @@ class Thor
 
       possibilities = find_command_possibilities(meth)
       if possibilities.size > 1
-        raise AmbiguousTaskError, "Ambiguous command #{meth} matches [#{possibilities.join(', ')}]"
+        fail AmbiguousTaskError, "Ambiguous command #{meth} matches [#{possibilities.join(', ')}]"
       elsif possibilities.size < 1
         meth = meth || default_command
       elsif map[meth]
@@ -430,9 +438,9 @@ class Thor
         meth = possibilities.first
       end
 
-      meth.to_s.gsub('-','_') # treat foo-bar as foo_bar
+      meth.to_s.gsub('-', '_') # treat foo-bar as foo_bar
     end
-    alias normalize_task_name normalize_command_name
+    alias_method :normalize_task_name, :normalize_command_name
 
     # this is the logic that takes the command name passed in by the user
     # and determines whether it is an unambiguous substrings of a command or
@@ -450,23 +458,22 @@ class Thor
         possibilities
       end
     end
-    alias find_task_possibilities find_command_possibilities
+    alias_method :find_task_possibilities, :find_command_possibilities
 
     def subcommand_help(cmd)
-      desc "help [COMMAND]", "Describe subcommands or one specific subcommand"
-      class_eval <<-RUBY
+      desc 'help [COMMAND]', 'Describe subcommands or one specific subcommand'
+      class_eval "
         def help(command = nil, subcommand = true); super; end
-      RUBY
+"
     end
-    alias subtask_help subcommand_help
-
+    alias_method :subtask_help, :subcommand_help
   end
 
   include Thor::Base
 
   map HELP_MAPPINGS => :help
 
-  desc "help [COMMAND]", "Describe available commands or one specific command"
+  desc 'help [COMMAND]', 'Describe available commands or one specific command'
   def help(command = nil, subcommand = false)
     command ? self.class.command_help(shell, command) : self.class.help(shell, subcommand)
   end