bundler 1.14.6 → 1.15.0.pre.1

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

@@ -3,7 +3,7 @@ class Bundler::Thor
   # errors have their backtrace suppressed and are nicely shown to the user.
   #
   # Errors that are caused by the developer, like declaring a method which
-  # overwrites a thor keyword, it SHOULD NOT raise a Bundler::Thor::Error. This way, we
+  # overwrites a thor keyword, SHOULD NOT raise a Bundler::Thor::Error. This way, we
   # ensure that developer errors are shown with full backtrace.
   class Error < StandardError
   end
@@ -11,11 +11,11 @@ class Bundler::Thor
   # Raised when a command was not found.
   class UndefinedCommandError < Error
   end
-  UndefinedTaskError = UndefinedCommandError # rubocop:disable ConstantName
+  UndefinedTaskError = UndefinedCommandError
 
   class AmbiguousCommandError < Error
   end
-  AmbiguousTaskError = AmbiguousCommandError # rubocop:disable ConstantName
+  AmbiguousTaskError = AmbiguousCommandError
 
   # Raised when a command was found, but not invoked properly.
   class InvocationError < Error

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

@@ -4,7 +4,7 @@ require "bundler/vendor/thor/lib/thor/base"
 # is that it invokes all commands at once. It also include some methods that allows
 # invocations to be done at the class method, which are not available to Bundler::Thor
 # commands.
-class Bundler::Thor::Group # rubocop:disable ClassLength
+class Bundler::Thor::Group
   class << self
     # The description for this Bundler::Thor::Group. If none is provided, but a source root
     # exists, tries to find the USAGE one folder above it, otherwise searches
@@ -53,7 +53,7 @@ class Bundler::Thor::Group # rubocop:disable ClassLength
     # The namespace/class given will have its options showed on the help
     # usage. Check invoke_from_option for more information.
     #
-    def invoke(*names, &block) # rubocop:disable MethodLength
+    def invoke(*names, &block)
       options = names.last.is_a?(Hash) ? names.pop : {}
       verbose = options.fetch(:verbose, true)
 
@@ -62,7 +62,7 @@ class Bundler::Thor::Group # rubocop:disable ClassLength
         invocation_blocks[name] = block if block_given?
 
         class_eval <<-METHOD, __FILE__, __LINE__
-          def _invoke_#{name.to_s.gsub(/\W/, "_")}
+          def _invoke_#{name.to_s.gsub(/\W/, '_')}
             klass, command = self.class.prepare_for_invocation(nil, #{name.inspect})
 
             if klass
@@ -107,21 +107,21 @@ class Bundler::Thor::Group # rubocop:disable ClassLength
     # invoked. The block receives two parameters, an instance of the current
     # class and the klass to be invoked.
     #
-    def invoke_from_option(*names, &block) # rubocop:disable MethodLength
+    def invoke_from_option(*names, &block)
       options = names.last.is_a?(Hash) ? names.pop : {}
       verbose = options.fetch(:verbose, :white)
 
       names.each do |name|
         unless class_options.key?(name)
-          fail ArgumentError, "You have to define the option #{name.inspect} " <<
-                               "before setting invoke_from_option."
+          raise ArgumentError, "You have to define the option #{name.inspect} " \
+                              "before setting invoke_from_option."
         end
 
         invocations[name] = true
         invocation_blocks[name] = block if block_given?
 
         class_eval <<-METHOD, __FILE__, __LINE__
-          def _invoke_from_option_#{name.to_s.gsub(/\W/, "_")}
+          def _invoke_from_option_#{name.to_s.gsub(/\W/, '_')}
             return unless options[#{name.inspect}]
 
             value = options[#{name.inspect}]
@@ -188,7 +188,7 @@ class Bundler::Thor::Group # rubocop:disable ClassLength
         group_options[human_name] ||= []
         group_options[human_name] += klass.class_options.values.select do |class_option|
           base_options[class_option.name.to_sym].nil? && class_option.group.nil? &&
-          !group_options.values.flatten.any? { |i| i.name == class_option.name }
+            !group_options.values.flatten.any? { |i| i.name == class_option.name }
         end
 
         yield klass if block_given?
@@ -204,11 +204,11 @@ class Bundler::Thor::Group # rubocop:disable ClassLength
     end
     alias_method :printable_tasks, :printable_commands
 
-    def handle_argument_error(command, error, args, arity) #:nodoc:
+    def handle_argument_error(command, error, _args, arity) #:nodoc:
       msg = "#{basename} #{command.name} takes #{arity} argument"
       msg << "s" if arity > 1
       msg << ", but it should not."
-      fail error, msg
+      raise error, msg
     end
 
   protected
@@ -267,9 +267,9 @@ protected
       if block
         case block.arity
         when 3
-          block.call(self, klass, command)
+          yield(self, klass, command)
         when 2
-          block.call(self, klass)
+          yield(self, klass)
         when 1
           instance_exec(klass, &block)
         end

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

@@ -108,8 +108,8 @@ class Bundler::Thor
       command, args, opts, config = args
 
       klass, command = _retrieve_class_and_command(name, command)
-      fail "Missing Bundler::Thor class for invoke #{name}" unless klass
-      fail "Expected Bundler::Thor class, got #{klass}" unless klass <= Bundler::Thor::Base
+      raise "Missing Bundler::Thor class for invoke #{name}" unless klass
+      raise "Expected Bundler::Thor class, got #{klass}" unless klass <= Bundler::Thor::Base
 
       args, opts, config = _parse_initialization_options(args, opts, config)
       klass.send(:dispatch, command, args, opts, config) do |instance|
@@ -150,10 +150,9 @@ class Bundler::Thor
     # use the given name and return self as class. Otherwise, call
     # prepare_for_invocation in the current class.
     def _retrieve_class_and_command(name, sent_command = nil) #:nodoc:
-      case
-      when name.nil?
+      if name.nil?
         [self.class, nil]
-      when self.class.all_commands[name.to_s]
+      elsif self.class.all_commands[name.to_s]
         [self.class, name.to_s]
       else
         klass, command = self.class.prepare_for_invocation(nil, name)

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

@@ -10,8 +10,8 @@ class Bundler::Thor
 
       type = options[:type]
 
-      fail ArgumentError, "#{class_name} name can't be nil."                         if name.nil?
-      fail ArgumentError, "Type :#{type} is not valid for #{class_name.downcase}s."  if type && !valid_type?(type)
+      raise ArgumentError, "#{class_name} name can't be nil."                         if name.nil?
+      raise ArgumentError, "Type :#{type} is not valid for #{class_name.downcase}s."  if type && !valid_type?(type)
 
       @name        = name.to_s
       @description = options[:desc]
@@ -44,11 +44,8 @@ class Bundler::Thor
   protected
 
     def validate!
-      if required? && !default.nil?
-        fail ArgumentError, "An argument cannot be required and have default value."
-      elsif @enum && !@enum.is_a?(Array)
-        fail ArgumentError, "An argument cannot have an enum other than an array."
-      end
+      raise ArgumentError, "An argument cannot be required and have default value." if required? && !default.nil?
+      raise ArgumentError, "An argument cannot have an enum other than an array." if @enum && !@enum.is_a?(Array)
     end
 
     def valid_type?(type)

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

@@ -1,6 +1,6 @@
 class Bundler::Thor
   class Arguments #:nodoc: # rubocop:disable ClassLength
-    NUMERIC = /(\d*\.\d+|\d+)/
+    NUMERIC = /[-+]?(\d*\.\d+|\d+)/
 
     # Receives an array of args and returns two arrays, one with arguments
     # and one with switches.
@@ -24,7 +24,8 @@ class Bundler::Thor
     # Takes an array of Bundler::Thor::Argument objects.
     #
     def initialize(arguments = [])
-      @assigns, @non_assigned_required = {}, []
+      @assigns = {}
+      @non_assigned_required = []
       @switches = arguments
 
       arguments.each do |argument|
@@ -49,7 +50,7 @@ class Bundler::Thor
       @assigns
     end
 
-    def remaining # rubocop:disable TrivialAccessors
+    def remaining
       @pile
     end
 
@@ -73,7 +74,7 @@ class Bundler::Thor
     end
 
     def unshift(arg)
-      if arg.kind_of?(Array)
+      if arg.is_a?(Array)
         @pile = arg + @pile
       else
         @pile.unshift(arg)
@@ -99,6 +100,7 @@ class Bundler::Thor
 
       while current_is_value? && peek.include?(":")
         key, value = shift.split(":", 2)
+        raise MalformattedArgumentError, "You can't specify '#{key}' more than once in option '#{name}'; got #{key}:#{hash[key]} and #{key}:#{value}" if hash.include? key
         hash[key] = value
       end
       hash
@@ -128,13 +130,13 @@ class Bundler::Thor
       return shift if peek.is_a?(Numeric)
 
       unless peek =~ NUMERIC && $& == peek
-        fail MalformattedArgumentError, "Expected numeric value for '#{name}'; got #{peek.inspect}"
+        raise MalformattedArgumentError, "Expected numeric value for '#{name}'; got #{peek.inspect}"
       end
 
       value = $&.index(".") ? shift.to_f : shift.to_i
       if @switches.is_a?(Hash) && switch = @switches[name]
         if switch.enum && !switch.enum.include?(value)
-          fail MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
+          raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
         end
       end
       value
@@ -150,9 +152,9 @@ class Bundler::Thor
         nil
       else
         value = shift
-        if @switches.is_a?(Hash) && switch = @switches[name] # rubocop:disable AssignmentInCondition
+        if @switches.is_a?(Hash) && switch = @switches[name]
           if switch.enum && !switch.enum.include?(value)
-            fail MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
+            raise MalformattedArgumentError, "Expected '#{name}' to be one of #{switch.enum.join(', ')}; got #{value}"
           end
         end
         value
@@ -162,14 +164,12 @@ class Bundler::Thor
     # Raises an error if @non_assigned_required array is not empty.
     #
     def check_requirement!
-      unless @non_assigned_required.empty?
-        names = @non_assigned_required.map do |o|
-          o.respond_to?(:switch_name) ? o.switch_name : o.human_name
-        end.join("', '")
-
-        class_name = self.class.name.split("::").last.downcase
-        fail RequiredArgumentMissingError, "No value provided for required #{class_name} '#{names}'"
-      end
+      return if @non_assigned_required.empty?
+      names = @non_assigned_required.map do |o|
+        o.respond_to?(:switch_name) ? o.switch_name : o.human_name
+      end.join("', '")
+      class_name = self.class.name.split("::").last.downcase
+      raise RequiredArgumentMissingError, "No value provided for required #{class_name} '#{names}'"
     end
   end
 end

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

@@ -40,31 +40,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
 
@@ -86,7 +88,7 @@ class Bundler::Thor
       sample = "[#{sample}]" 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 +109,26 @@ 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!
+    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
+
+      # TODO: This should raise an ArgumentError in a future version of Bundler::Thor
+      warn "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/lib/bundler/vendor/thor/lib/thor/parser/options.rb

@@ -14,7 +14,7 @@ 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
@@ -40,7 +40,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 +54,7 @@ class Bundler::Thor
       end
     end
 
-    def remaining # rubocop:disable TrivialAccessors
+    def remaining
       @extra
     end
 
@@ -119,7 +121,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
@@ -207,7 +209,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/lib/bundler/vendor/thor/lib/thor/runner.rb

@@ -11,10 +11,18 @@ 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 +53,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:"
@@ -108,9 +118,9 @@ 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]}"))
+    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]}"
 
@@ -138,9 +148,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 +176,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
@@ -198,10 +202,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 +263,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 +276,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 +306,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]