rubygems-update 2.6.14 → 2.7.0

data/bundler/lib/bundler/vendor/thor/lib/thor/parser/option.rb

@@ -5,6 +5,7 @@ class Bundler::Thor
     VALID_TYPES = [:boolean, :numeric, :hash, :array, :string]
 
     def initialize(name, options = {})
+      @check_default_type = options[:check_default_type]
       options[:required] = false unless options.key?(:required)
       super
       @lazy_default = options[:lazy_default]
@@ -40,31 +41,33 @@ class Bundler::Thor
     #
     # By default all options are optional, unless :required is given.
     #
-    def self.parse(key, value) # rubocop:disable MethodLength
+    def self.parse(key, value)
       if key.is_a?(Array)
         name, *aliases = key
       else
-        name, aliases = key, []
+        name = key
+        aliases = []
       end
 
       name    = name.to_s
       default = value
 
       type = case value
-             when Symbol
-               default = nil
-               if VALID_TYPES.include?(value)
-                 value
-               elsif required = (value == :required) # rubocop:disable AssignmentInCondition
-                 :string
-               end
-             when TrueClass, FalseClass
-               :boolean
-             when Numeric
-               :numeric
-             when Hash, Array, String
-               value.class.name.downcase.to_sym
-             end
+      when Symbol
+        default = nil
+        if VALID_TYPES.include?(value)
+          value
+        elsif required = (value == :required) # rubocop:disable AssignmentInCondition
+          :string
+        end
+      when TrueClass, FalseClass
+        :boolean
+      when Numeric
+        :numeric
+      when Hash, Array, String
+        value.class.name.downcase.to_sym
+      end
+
       new(name.to_s, :required => required, :type => type, :default => default, :aliases => aliases)
     end
 
@@ -78,15 +81,15 @@ class Bundler::Thor
 
     def usage(padding = 0)
       sample = if banner && !banner.to_s.empty?
-        "#{switch_name}=#{banner}"
+        "#{switch_name}=#{banner}".dup
       else
         switch_name
       end
 
-      sample = "[#{sample}]" unless required?
+      sample = "[#{sample}]".dup unless required?
 
       if boolean?
-        sample << ", [#{dasherize("no-" + human_name)}]" unless name == "force"
+        sample << ", [#{dasherize('no-' + human_name)}]" unless (name == "force") || name.start_with?("no-")
       end
 
       if aliases.empty?
@@ -107,7 +110,25 @@ class Bundler::Thor
   protected
 
     def validate!
-      fail ArgumentError, "An option cannot be boolean and required." if boolean? && required?
+      raise ArgumentError, "An option cannot be boolean and required." if boolean? && required?
+      validate_default_type! if @check_default_type
+    end
+
+    def validate_default_type!
+      default_type = case @default
+      when nil
+        return
+      when TrueClass, FalseClass
+        required? ? :string : :boolean
+      when Numeric
+        :numeric
+      when Symbol
+        :string
+      when Hash, Array, String
+        @default.class.name.downcase.to_sym
+      end
+
+      raise ArgumentError, "Expected #{@type} default value for '#{switch_name}'; got #{@default.inspect} (#{default_type})" unless default_type == @type
     end
 
     def dasherized?
@@ -119,7 +140,7 @@ class Bundler::Thor
     end
 
     def dasherize(str)
-      (str.length > 1 ? "--" : "-") + str.gsub("_", "-")
+      (str.length > 1 ? "--" : "-") + str.tr("_", "-")
     end
   end
 end

data/bundler/lib/bundler/vendor/thor/lib/thor/parser/options.rb

@@ -14,23 +14,24 @@ class Bundler::Thor
         when true
           "--#{key}"
         when Array
-          "--#{key} #{value.map { |v| v.inspect }.join(' ')}"
+          "--#{key} #{value.map(&:inspect).join(' ')}"
         when Hash
           "--#{key} #{value.map { |k, v| "#{k}:#{v}" }.join(' ')}"
         when nil, false
-          ""
+          nil
         else
           "--#{key} #{value.inspect}"
         end
-      end.join(" ")
+      end.compact.join(" ")
     end
 
     # Takes a hash of Bundler::Thor::Option and a hash with defaults.
     #
     # If +stop_on_unknown+ is true, #parse will stop as soon as it encounters
     # an unknown option or a regular argument.
-    def initialize(hash_options = {}, defaults = {}, stop_on_unknown = false)
+    def initialize(hash_options = {}, defaults = {}, stop_on_unknown = false, disable_required_check = false)
       @stop_on_unknown = stop_on_unknown
+      @disable_required_check = disable_required_check
       options = hash_options.values
       super(options)
 
@@ -40,7 +41,9 @@ class Bundler::Thor
         @non_assigned_required.delete(hash_options[key])
       end
 
-      @shorts, @switches, @extra = {}, {}, []
+      @shorts = {}
+      @switches = {}
+      @extra = []
 
       options.each do |option|
         @switches[option.switch_name] = option
@@ -52,7 +55,7 @@ class Bundler::Thor
       end
     end
 
-    def remaining # rubocop:disable TrivialAccessors
+    def remaining
       @extra
     end
 
@@ -109,7 +112,7 @@ class Bundler::Thor
         end
       end
 
-      check_requirement!
+      check_requirement! unless @disable_required_check
 
       assigns = Bundler::Thor::CoreExt::HashWithIndifferentAccess.new(@assigns)
       assigns.freeze
@@ -119,7 +122,7 @@ class Bundler::Thor
     def check_unknown!
       # an unknown option starts with - or -- and has no more --'s afterward.
       unknown = @extra.select { |str| str =~ /^--?(?:(?!--).)*$/ }
-      fail UnknownArgumentError, "Unknown switches '#{unknown.join(', ')}'" unless unknown.empty?
+      raise UnknownArgumentError, "Unknown switches '#{unknown.join(', ')}'" unless unknown.empty?
     end
 
   protected
@@ -186,7 +189,7 @@ class Bundler::Thor
           shift
           false
         else
-          true
+          !no_or_skip?(switch)
         end
       else
         @switches.key?(switch) || !no_or_skip?(switch)
@@ -207,7 +210,7 @@ class Bundler::Thor
         elsif option.lazy_default
           return option.lazy_default
         else
-          fail MalformattedArgumentError, "No value provided for option '#{switch}'"
+          raise MalformattedArgumentError, "No value provided for option '#{switch}'"
         end
       end
 

data/bundler/lib/bundler/vendor/thor/lib/thor/runner.rb

@@ -2,19 +2,25 @@ require "bundler/vendor/thor/lib/thor"
 require "bundler/vendor/thor/lib/thor/group"
 require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
 
-require "fileutils"
-require "open-uri"
 require "yaml"
-require "digest/md5"
+require "digest"
 require "pathname"
 
 class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLength
   map "-T" => :list, "-i" => :install, "-u" => :update, "-v" => :version
 
+  def self.banner(command, all = false, subcommand = false)
+    "thor " + command.formatted_usage(self, all, subcommand)
+  end
+
+  def self.exit_on_failure?
+    true
+  end
+
   # Override Bundler::Thor#help so it can give information about any class and any method.
   #
   def help(meth = nil)
-    if meth && !self.respond_to?(meth)
+    if meth && !respond_to?(meth)
       initialize_thorfiles(meth)
       klass, command = Bundler::Thor::Util.find_class_and_command_by_namespace(meth)
       self.class.handle_no_command_error(command, false) if klass.nil?
@@ -45,16 +51,18 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
     # command in said directory.
     begin
       if File.directory?(File.expand_path(name))
-        base, package = File.join(name, "main.thor"), :directory
-        contents      = open(base) { |input| input.read }
+        base = File.join(name, "main.thor")
+        package = :directory
+        contents = open(base, &:read)
       else
-        base, package = name, :file
-        contents      = open(name) { |input| input.read }
+        base = name
+        package = :file
+        contents = open(name, &:read)
       end
     rescue OpenURI::HTTPError
       raise Error, "Error opening URI '#{name}'"
     rescue Errno::ENOENT
-      fail Error, "Error opening file '#{name}'"
+      raise Error, "Error opening file '#{name}'"
     end
 
     say "Your Bundler::Thorfile contains:"
@@ -82,7 +90,7 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
     end
 
     thor_yaml[as] = {
-      :filename   => Digest::MD5.hexdigest(name + as),
+      :filename   => Digest(:MD5).hexdigest(name + as),
       :location   => location,
       :namespaces => Bundler::Thor::Util.namespaces_in_content(contents, base)
     }
@@ -94,6 +102,7 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
     if package == :file
       File.open(destination, "w") { |f| f.puts contents }
     else
+      require "fileutils"
       FileUtils.cp_r(name, destination)
     end
 
@@ -108,9 +117,10 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
 
   desc "uninstall NAME", "Uninstall a named Bundler::Thor module"
   def uninstall(name)
-    fail Error, "Can't find module '#{name}'" unless thor_yaml[name]
+    raise Error, "Can't find module '#{name}'" unless thor_yaml[name]
     say "Uninstalling #{name}."
-    FileUtils.rm_rf(File.join(thor_root, "#{thor_yaml[name][:filename]}"))
+    require "fileutils"
+    FileUtils.rm_rf(File.join(thor_root, (thor_yaml[name][:filename]).to_s))
 
     thor_yaml.delete(name)
     save_yaml(thor_yaml)
@@ -120,7 +130,7 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
 
   desc "update NAME", "Update a Bundler::Thor file from its original location"
   def update(name)
-    fail Error, "Can't find module '#{name}'" if !thor_yaml[name] || !thor_yaml[name][:location]
+    raise Error, "Can't find module '#{name}'" if !thor_yaml[name] || !thor_yaml[name][:location]
 
     say "Updating '#{name}' from #{thor_yaml[name][:location]}"
 
@@ -128,6 +138,7 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
     self.options = options.merge("as" => name)
 
     if File.directory? File.expand_path(name)
+      require "fileutils"
       FileUtils.rm_rf(File.join(thor_root, old_filename))
 
       thor_yaml.delete(old_filename)
@@ -138,9 +149,7 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
       filename = install(thor_yaml[name][:location])
     end
 
-    unless filename == old_filename
-      File.delete(File.join(thor_root, old_filename))
-    end
+    File.delete(File.join(thor_root, old_filename)) unless filename == old_filename
   end
 
   desc "installed", "List the installed Bundler::Thor modules and commands"
@@ -168,10 +177,6 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
 
 private
 
-  def self.banner(command, all = false, subcommand = false)
-    "thor " + command.formatted_usage(self, all, subcommand)
-  end
-
   def thor_root
     Bundler::Thor::Util.thor_root
   end
@@ -190,6 +195,7 @@ private
     yaml_file = File.join(thor_root, "thor.yml")
 
     unless File.exist?(yaml_file)
+      require "fileutils"
       FileUtils.mkdir_p(thor_root)
       yaml_file = File.join(thor_root, "thor.yml")
       FileUtils.touch(yaml_file)
@@ -198,10 +204,6 @@ private
     File.open(yaml_file, "w") { |f| f.puts yaml.to_yaml }
   end
 
-  def self.exit_on_failure?
-    true
-  end
-
   # Load the Bundler::Thorfiles. If relevant_to is supplied, looks for specific files
   # in the thor_root instead of loading them all.
   #
@@ -263,11 +265,11 @@ private
   def thorfiles_relevant_to(meth)
     lookup = [meth, meth.split(":")[0...-1].join(":")]
 
-    files = thor_yaml.select do |k, v|
+    files = thor_yaml.select do |_, v|
       v[:namespaces] && !(v[:namespaces] & lookup).empty?
     end
 
-    files.map { |k, v| File.join(thor_root, "#{v[:filename]}") }
+    files.map { |_, v| File.join(thor_root, (v[:filename]).to_s) }
   end
 
   # Display information about the given klasses. If with_module is given,
@@ -276,7 +278,7 @@ private
   def display_klasses(with_modules = false, show_internal = false, klasses = Bundler::Thor::Base.subclasses)
     klasses -= [Bundler::Thor, Bundler::Thor::Runner, Bundler::Thor::Group] unless show_internal
 
-    fail Error, "No Bundler::Thor commands available" if klasses.empty?
+    raise Error, "No Bundler::Thor commands available" if klasses.empty?
     show_modules if with_modules && !thor_yaml.empty?
 
     list = Hash.new { |h, k| h[k] = [] }
@@ -306,8 +308,8 @@ private
   alias_method :display_tasks, :display_commands
 
   def show_modules #:nodoc:
-    info  = []
-    labels = %w[Modules Namespaces]
+    info = []
+    labels = %w(Modules Namespaces)
 
     info << labels
     info << ["-" * labels[0].size, "-" * labels[1].size]

data/bundler/lib/bundler/vendor/thor/lib/thor/shell.rb

@@ -9,7 +9,7 @@ class Bundler::Thor
       # it will use a colored log, otherwise it will use a basic one without color.
       #
       def shell
-        @shell ||= if ENV["THOR_SHELL"] && ENV["THOR_SHELL"].size > 0
+        @shell ||= if ENV["THOR_SHELL"] && !ENV["THOR_SHELL"].empty?
           Bundler::Thor::Shell.const_get(ENV["THOR_SHELL"])
         elsif RbConfig::CONFIG["host_os"] =~ /mswin|mingw/ && !ENV["ANSICON"]
           Bundler::Thor::Shell::Basic

data/bundler/lib/bundler/vendor/thor/lib/thor/shell/basic.rb

@@ -1,16 +1,16 @@
-require "tempfile"
-require "io/console" if RUBY_VERSION > "1.9.2"
-
 class Bundler::Thor
   module Shell
-    class Basic # rubocop:disable ClassLength
+    class Basic
       attr_accessor :base
       attr_reader   :padding
 
       # Initialize base, mute and padding to nil.
       #
       def initialize #:nodoc:
-        @base, @mute, @padding, @always_force = nil, false, 0, false
+        @base = nil
+        @mute = false
+        @padding = 0
+        @always_force = false
       end
 
       # Mute everything that's inside given block
@@ -24,7 +24,7 @@ class Bundler::Thor
 
       # Check if base is muted
       #
-      def mute? # rubocop:disable TrivialAccessors
+      def mute?
         @mute
       end
 
@@ -34,6 +34,15 @@ class Bundler::Thor
         @padding = [0, value].max
       end
 
+      # Sets the output padding while executing a block and resets it.
+      #
+      def indent(count = 1)
+        orig_padding = padding
+        self.padding = padding + count
+        yield
+        self.padding = orig_padding
+      end
+
       # Asks something to the user and receives a response.
       #
       # If asked to limit the correct responses, you can pass in an
@@ -98,7 +107,7 @@ class Bundler::Thor
         status = set_color status, color, true if color
 
         buffer = "#{status}#{spaces}#{message}"
-        buffer << "\n" unless buffer.end_with?("\n")
+        buffer = "#{buffer}\n" unless buffer.end_with?("\n")
 
         stdout.print(buffer)
         stdout.flush
@@ -148,10 +157,12 @@ class Bundler::Thor
       def print_table(array, options = {}) # rubocop:disable MethodLength
         return if array.empty?
 
-        formats, indent, colwidth = [], options[:indent].to_i, options[:colwidth]
+        formats = []
+        indent = options[:indent].to_i
+        colwidth = options[:colwidth]
         options[:truncate] = terminal_width if options[:truncate] == true
 
-        formats << "%-#{colwidth + 2}s" if colwidth
+        formats << "%-#{colwidth + 2}s".dup if colwidth
         start = colwidth ? 1 : 0
 
         colcount = array.max { |a, b| a.size <=> b.size }.size
@@ -161,32 +172,32 @@ class Bundler::Thor
         start.upto(colcount - 1) do |index|
           maxima = array.map { |row| row[index] ? row[index].to_s.size : 0 }.max
           maximas << maxima
-          if index == colcount - 1
-            # Don't output 2 trailing spaces when printing the last column
-            formats << "%-s"
-          else
-            formats << "%-#{maxima + 2}s"
-          end
+          formats << if index == colcount - 1
+                       # Don't output 2 trailing spaces when printing the last column
+                       "%-s".dup
+                     else
+                       "%-#{maxima + 2}s".dup
+                     end
         end
 
         formats[0] = formats[0].insert(0, " " * indent)
         formats << "%s"
 
         array.each do |row|
-          sentence = ""
+          sentence = "".dup
 
           row.each_with_index do |column, index|
             maxima = maximas[index]
 
-            if column.is_a?(Numeric)
+            f = if column.is_a?(Numeric)
               if index == row.size - 1
                 # Don't output 2 trailing spaces when printing the last column
-                f = "%#{maxima}s"
+                "%#{maxima}s"
               else
-                f = "%#{maxima}s  "
+                "%#{maxima}s  "
               end
             else
-              f = formats[index]
+              formats[index]
             end
             sentence << f % column.to_s
           end
@@ -211,7 +222,7 @@ class Bundler::Thor
         paras = message.split("\n\n")
 
         paras.map! do |unwrapped|
-          unwrapped.strip.gsub(/\n/, " ").squeeze(" ").gsub(/.{1,#{width}}(?:\s|\Z)/) { ($& + 5.chr).gsub(/\n\005/, "\n").gsub(/\005/, "\n") }
+          unwrapped.strip.tr("\n", " ").squeeze(" ").gsub(/.{1,#{width}}(?:\s|\Z)/) { ($& + 5.chr).gsub(/\n\005/, "\n").gsub(/\005/, "\n") }
         end
 
         paras.each do |para|
@@ -230,7 +241,7 @@ class Bundler::Thor
       # destination<String>:: the destination file to solve conflicts
       # block<Proc>:: an optional block that returns the value to be used in diff
       #
-      def file_collision(destination) # rubocop:disable MethodLength
+      def file_collision(destination)
         return true if @always_force
         options = block_given? ? "[Ynaqdh]" : "[Ynaqh]"
 
@@ -241,6 +252,9 @@ class Bundler::Thor
           )
 
           case answer
+          when nil
+            say ""
+            return true
           when is?(:yes), is?(:force), ""
             return true
           when is?(:no), is?(:skip)
@@ -249,7 +263,7 @@ class Bundler::Thor
             return @always_force = true
           when is?(:quit)
             say "Aborting..."
-            fail SystemExit
+            raise SystemExit
           when is?(:diff)
             show_diff(destination, yield) if block_given?
             say "Retrying..."
@@ -262,10 +276,10 @@ class Bundler::Thor
       # This code was copied from Rake, available under MIT-LICENSE
       # Copyright (c) 2003, 2004 Jim Weirich
       def terminal_width
-        if ENV["THOR_COLUMNS"]
-          result = ENV["THOR_COLUMNS"].to_i
+        result = if ENV["THOR_COLUMNS"]
+          ENV["THOR_COLUMNS"].to_i
         else
-          result = unix? ? dynamic_width : 80
+          unix? ? dynamic_width : 80
         end
         result < 10 ? 80 : result
       rescue
@@ -284,7 +298,7 @@ class Bundler::Thor
       # Apply color to the given string with optional bold. Disabled in the
       # Bundler::Thor::Shell::Basic class.
       #
-      def set_color(string, *args) #:nodoc:
+      def set_color(string, *) #:nodoc:
         string
       end
 
@@ -336,6 +350,7 @@ class Bundler::Thor
       def show_diff(destination, content) #:nodoc:
         diff_cmd = ENV["THOR_DIFF"] || ENV["RAILS_DIFF"] || "diff -u"
 
+        require "tempfile"
         Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp|
           temp.write content
           temp.rewind
@@ -353,11 +368,11 @@ class Bundler::Thor
       end
 
       def dynamic_width_stty
-        %x(stty size 2>/dev/null).split[1].to_i
+        `stty size 2>/dev/null`.split[1].to_i
       end
 
       def dynamic_width_tput
-        %x(tput cols 2>/dev/null).to_i
+        `tput cols 2>/dev/null`.to_i
       end
 
       def unix?
@@ -370,7 +385,7 @@ class Bundler::Thor
           if chars.length <= width
             chars.join
           else
-            ( chars[0, width - 3].join) + "..."
+            chars[0, width - 3].join + "..."
           end
         end
       end
@@ -381,7 +396,8 @@ class Bundler::Thor
         end
       else
         def as_unicode
-          old, $KCODE = $KCODE, "U"
+          old = $KCODE
+          $KCODE = "U"
           yield
         ensure
           $KCODE = old
@@ -391,12 +407,12 @@ class Bundler::Thor
       def ask_simply(statement, color, options)
         default = options[:default]
         message = [statement, ("(#{default})" if default), nil].uniq.join(" ")
-        message = prepare_message(message, color)
+        message = prepare_message(message, *color)
         result = Bundler::Thor::LineEditor.readline(message, options)
 
         return unless result
 
-        result.strip!
+        result = result.strip
 
         if default && result == ""
           default