rubocop 0.31.0 → 0.35.0

data/config/disabled.yml

@@ -22,6 +22,30 @@ Style/InlineComment:
   Description: 'Avoid inline comments.'
   Enabled: false
 
+Style/FirstArrayElementLineBreak:
+  Description: >-
+                 Checks for a line break before the first element in a
+                 multi-line array.
+  Enabled: false
+
+Style/FirstHashElementLineBreak:
+  Description: >-
+                 Checks for a line break before the first element in a
+                 multi-line hash.
+  Enabled: false
+
+Style/FirstMethodArgumentLineBreak:
+  Description: >-
+                 Checks for a line break before the first argument in a
+                 multi-line method call.
+  Enabled: false
+
+Style/FirstMethodParameterLineBreak:
+  Description: >-
+                 Checks for a line break before the first parameter in a
+                 multi-line method parameter definition.
+  Enabled: false
+
 Style/MethodCalledOnDoEndBlock:
   Description: 'Avoid chaining a method call on a do...end block.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
@@ -38,17 +62,34 @@ Style/MissingElse:
   EnforcedStyle: both
   SupportedStyles:
     # if - warn when an if expression is missing an else branch
-    # case - warn when a case expression is misisng an else branch
+    # case - warn when a case expression is missing an else branch
     # both - warn when an if or case expression is missing an else branch
     - if
     - case
     - both
 
+Style/MutableConstant:
+  Description: 'Do not assign mutable objects to constants.'
+  Enabled: false
+
+Style/OptionHash:
+  Description: "Don't use option hashes when you can use keyword arguments."
+  Enabled: false
+
+Style/Send:
+  Description: 'Prefer `Object#__send__` or `Object#public_send` to `send`, as `send` may overlap with existing methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#prefer-public-send'
+  Enabled: false
+
+Style/StringMethods:
+  Description: 'Checks if configured preferred methods are used over non-preferred.'
+  Enabled: false
+
 Style/SymbolArray:
   Description: 'Use %i or %I for arrays of symbols.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-i'
   Enabled: false
 
-Style/ExtraSpacing:
-  Description: 'Do not use unnecessary spacing.'
-  Enabled: false
+Lint/LiteralInInterpolation:
+  Description: 'Avoid interpolating literals in strings'
+  AutoCorrect: false

data/config/enabled.yml

@@ -120,7 +120,7 @@ Style/ClassCheck:
 
 Style/ClassMethods:
   Description: 'Use self when defining module/class methods.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#def-self-singletons'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#def-self-class-methods'
   Enabled: true
 
 Style/ClassVars:
@@ -171,6 +171,9 @@ Style/DeprecatedHashMethods:
 Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
   Enabled: true
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
 
 Style/DotPosition:
   Description: 'Checks the position of the dot in multi-line method calls.'
@@ -243,11 +246,20 @@ Style/EvenOdd:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#predicate-methods'
   Enabled: true
 
+Style/ExtraSpacing:
+  Description: 'Do not use unnecessary spacing.'
+  Enabled: true
+
 Style/FileName:
   Description: 'Use snake_case for source file names.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-files'
   Enabled: true
 
+Style/InitialIndentation:
+  Description: >-
+    Checks the indentation of the first non-blank non-comment line in a file.
+  Enabled: true
+
 Style/FirstParameterIndentation:
   Description: 'Checks the indentation of the first parameter in a method call.'
   Enabled: true
@@ -270,6 +282,7 @@ Style/FormatString:
 Style/GlobalVars:
   Description: 'Do not introduce global variables.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#instance-vars'
+  Reference: 'http://www.zenspider.com/Languages/Ruby/QuickRef.html'
   Enabled: true
 
 Style/GuardClause:
@@ -402,6 +415,10 @@ Style/NegatedWhile:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#until-for-negatives'
   Enabled: true
 
+Style/NestedModifier:
+  Description: 'Avoid using nested modifiers.'
+  Enabled: true
+
 Style/NestedTernaryOperator:
   Description: 'Use one expression per branch in a ternary operator.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-ternary'
@@ -446,6 +463,21 @@ Style/OpMethod:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#other-arg'
   Enabled: true
 
+Style/OptionalArguments:
+  Description: >-
+                 Checks for optional arguments that do not appear at the end
+                 of the argument list
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#optional-arguments'
+  Enabled: true
+
+Style/ParallelAssignment:
+  Description: >-
+                  Check for simple usages of parallel assignment.
+                  It will only warn when the number of variables
+                  matches on both sides of the assignment.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parallel-assignment'
+  Enabled: true
+
 Style/ParenthesesAroundCondition:
   Description: >-
                  Don't use parentheses around the condition of an
@@ -492,6 +524,10 @@ Style/RedundantException:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-explicit-runtimeerror'
   Enabled: true
 
+Style/RedundantFreeze:
+  Description: "Checks usages of Object#freeze on immutable objects."
+  Enabled: true
+
 Style/RedundantReturn:
   Description: "Don't use return where it's not required."
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-explicit-return'
@@ -507,6 +543,10 @@ Style/RegexpLiteral:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#percent-r'
   Enabled: true
 
+Style/RescueEnsureAlignment:
+  Description: 'Align rescues and ensures correctly.'
+  Enabled: true
+
 Style/RescueModifier:
   Description: 'Avoid using rescue in its modifier form.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-rescue-modifiers'
@@ -644,11 +684,21 @@ Style/SpaceInsideRangeLiteral:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-space-inside-range-literals'
   Enabled: true
 
+Style/SpaceInsideStringInterpolation:
+  Description: 'Checks for padding/surrounding spaces inside string interpolation.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#string-interpolation'
+  Enabled: true
+
 Style/SpecialGlobalVars:
   Description: 'Avoid Perl-style global variables.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms'
   Enabled: true
 
+Style/StabbyLambdaParentheses:
+  Description: 'Check for the usage of parentheses around stabby lambda arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#stabby-lambda-with-args'
+  Enabled: true
+
 Style/StringLiterals:
   Description: 'Checks if uses of quotes match the configured preference.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-string-literals'
@@ -718,6 +768,7 @@ Style/TrailingUnderscoreVariable:
   Description: >-
                  Checks for the usage of unneeded trailing underscores at the
                  end of parallel variable assignment.
+  AllowNamedUnderscoreVariables: true
   Enabled: true
 
 Style/VariableInterpolation:
@@ -760,6 +811,7 @@ Metrics/AbcSize:
   Description: >-
                  A calculated magnitude based on number of assignments,
                  branches, and conditions.
+  Reference: 'http://c2.com/cgi/wiki?AbcMetric'
   Enabled: true
 
 Metrics/BlockNesting:
@@ -815,7 +867,7 @@ Lint/AmbiguousOperator:
 Lint/AmbiguousRegexpLiteral:
   Description: >-
                  Checks for ambiguous regexp literals in the first argument of
-                 a method invocation without parenthesis.
+                 a method invocation without parentheses.
   Enabled: true
 
 Lint/AssignmentInCondition:
@@ -827,6 +879,10 @@ Lint/BlockAlignment:
   Description: 'Align block ends correctly.'
   Enabled: true
 
+Lint/CircularArgumentReference:
+  Description: "Default values in optional keyword arguments and optional ordinal arguments should not refer back to the name of the argument."
+  Enabled: true
+
 Lint/ConditionPosition:
   Description: >-
                  Checks for condition placed in a confusing position relative to
@@ -850,6 +906,10 @@ Lint/DuplicateMethods:
   Description: 'Check for duplicate methods calls.'
   Enabled: true
 
+Lint/DuplicatedKey:
+  Description: 'Check for duplicate keys in hash literals.'
+  Enabled: true
+
 Lint/EachWithObjectArgument:
   Description: 'Check for immutable argument given to each_with_object.'
   Enabled: true
@@ -883,6 +943,10 @@ Lint/Eval:
   Description: 'The use of eval represents a serious security risk.'
   Enabled: true
 
+Lint/FormatParameterMismatch:
+  Description: 'The number of parameters to format/sprint must match the fields.'
+  Enabled: true
+
 Lint/HandleExceptions:
   Description: "Don't suppress exception."
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
@@ -909,6 +973,11 @@ Lint/Loop:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#loop-with-break'
   Enabled: true
 
+Lint/NestedMethodDefinition:
+  Description: 'Do not use nested method definitions.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-nested-methods'
+  Enabled: true
+
 Lint/NonLocalExitFromIterator:
   Description: 'Do not use return in iterator to cause non-local exit.'
   Enabled: true
@@ -952,6 +1021,13 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: true
 
+Lint/UnneededDisable:
+  Description: >-
+                 Checks for rubocop:disable comments that can be removed.
+                 Note: this cop is not disabled when disabling all cops.
+                 It must be explicitly disabled.
+  Enabled: true
+
 Lint/UnusedBlockArgument:
   Description: 'Checks for unused block arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
@@ -993,6 +1069,12 @@ Lint/Void:
 
 ##################### Performance #############################
 
+Performance/CaseWhenSplat:
+  Description: >-
+                  Place `when` conditions that use splat at the end
+                  of the list of `when` branches.
+  Enabled: true
+
 Performance/Count:
   Description: >-
                   Use `count` instead of `select...size`, `reject...size`,
@@ -1004,6 +1086,11 @@ Performance/Detect:
   Description: >-
                   Use `detect` instead of `select.first`, `find_all.first`,
                   `select.last`, and `find_all.last`.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerabledetect-vs-enumerableselectfirst-code'
+  Enabled: true
+
+Performance/FixedSize:
+  Description: 'Do not compute the size of statically sized objects except in constants'
   Enabled: true
 
 Performance/FlatMap:
@@ -1011,6 +1098,7 @@ Performance/FlatMap:
                   Use `Enumerable#flat_map`
                   instead of `Enumerable#map...Array#flatten(1)`
                   or `Enumberable#collect..Array#flatten(1)`
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablemaparrayflatten-vs-enumerableflat_map-code'
   Enabled: true
   EnabledForFlattenWithoutParams: false
   # If enabled, this cop will warn about usages of
@@ -1018,27 +1106,31 @@ Performance/FlatMap:
   # This can be dangerous since `flat_map` will only flatten 1 level, and
   # `flatten` without any parameters can flatten multiple levels.
 
-Performance/ParallelAssignment:
-  Description: >-
-                  Check for simple usages of parallel assignment.
-                  It will only warn when the number of variables
-                  matches on both sides of the assignment.
-  Enabled: true
-
 Performance/ReverseEach:
   Description: 'Use `reverse_each` instead of `reverse.each`.'
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code'
   Enabled: true
 
 Performance/Sample:
   Description: >-
                   Use `sample` instead of `shuffle.first`,
                   `shuffle.last`, and `shuffle[Fixnum]`.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code'
   Enabled: true
 
 Performance/Size:
   Description: >-
                   Use `size` instead of `count` for counting
                   the number of elements in `Array` and `Hash`.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#arraycount-vs-arraysize-code'
+  Enabled: true
+
+Performance/StringReplacement:
+  Description: >-
+                  Use `tr` instead of `gsub` when you are replacing the same
+                  number of characters. Use `delete` instead of `gsub` when
+                  you are deleting characters.
+  Reference: 'https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code'
   Enabled: true
 
 ##################### Rails ##################################
@@ -1077,6 +1169,10 @@ Rails/Output:
   Description: 'Checks for calls to puts, print, etc.'
   Enabled: true
 
+Rails/PluralizationGrammar:
+  Description: 'Checks for incorrect grammar when using methods like `3.day.ago`.'
+  Enabled: true
+
 Rails/ReadWriteAttribute:
   Description: >-
                  Checks for read_attribute(:attr) and
@@ -1089,6 +1185,8 @@ Rails/ScopeArgs:
 
 Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
+  Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
   Enabled: true
 
 Rails/Validation:

data/lib/rubocop/ast_node.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+require 'astrolabe/node'
+
+module Astrolabe
+  # RuboCop's extensions to Astrolabe::Node (which extends Parser::AST::Node)
+  #
+  # Contribute as much of this as possible to the `astrolabe` gem
+  # If any of it is accepted, it can be deleted from here
+  #
+  class Node
+    # def_matcher can be used to define a pattern-matching method on Node:
+    class << self
+      extend RuboCop::NodePattern::Macros
+
+      # define both Node.method_name(node), and also node.method_name
+      def def_matcher(method_name, pattern_str)
+        singleton_class.def_node_matcher method_name, pattern_str
+        class_eval("def #{method_name}; Node.#{method_name}(self); end")
+      end
+    end
+
+    ## Destructuring
+
+    def_matcher :method_name, '{(send _ $_ ...) (block (send _ $_ ...) ...)}'
+    # Note: for masgn, #asgn_rhs will be an array node
+    def_matcher :asgn_rhs, '[assignment? (... $_)]'
+
+    ## Predicates
+
+    def multiline?
+      expr = loc.expression
+      expr && (expr.first_line != expr.last_line)
+    end
+
+    def single_line?
+      !multiline?
+    end
+
+    def asgn_method_call?
+      method_name != :== && method_name.to_s.end_with?('=')
+    end
+
+    def_matcher :equals_asgn?, '{lvasgn ivasgn cvasgn gvasgn casgn masgn}'
+    def_matcher :shorthand_asgn?, '{op_asgn or_asgn and_asgn}'
+    def_matcher :assignment?, '{equals_asgn? shorthand_asgn? asgn_method_call?}'
+  end
+end

data/lib/rubocop/cli.rb

@@ -24,6 +24,7 @@ module RuboCop
       runner = Runner.new(@options, @config_store)
       trap_interrupt(runner)
       all_passed = runner.run(paths)
+      display_warning_summary(runner.warnings)
       display_error_summary(runner.errors)
 
       all_passed && !runner.aborting? && runner.errors.empty? ? 0 : 1
@@ -53,6 +54,7 @@ module RuboCop
 
       ConfigLoader.debug = @options[:debug]
       ConfigLoader.auto_gen_config = @options[:auto_gen_config]
+      ConfigLoader.exclude_limit = @options[:exclude_limit]
 
       @config_store.options_config = @options[:config] if @options[:config]
 
@@ -99,10 +101,18 @@ module RuboCop
       end
     end
 
+    def display_warning_summary(warnings)
+      return if warnings.empty?
+
+      warn Rainbow("\n#{pluralize(warnings.size, 'warning')}:").yellow
+
+      warnings.each { |warning| warn warning }
+    end
+
     def display_error_summary(errors)
       return if errors.empty?
 
-      warn "\n#{pluralize(errors.size, 'error')} occurred:".color(:red)
+      warn Rainbow("\n#{pluralize(errors.size, 'error')} occurred:").red
 
       errors.each { |error| warn error }
 

data/lib/rubocop/comment_config.rb

@@ -4,6 +4,7 @@ module RuboCop
   # This class parses the special `rubocop:disable` comments in a source
   # and provides a way to check if each cop is enabled at arbitrary line.
   class CommentConfig
+    UNNEEDED_DISABLE = 'Lint/UnneededDisable'
     COMMENT_DIRECTIVE_REGEXP = Regexp.new(
       '\A# rubocop : ((?:dis|en)able)\b ((?:[\w/]+,? )+)'.gsub(' ', '\s*')
     )
@@ -73,7 +74,9 @@ module RuboCop
     end
 
     def all_cop_names
-      @all_cop_names ||= Cop::Cop.all.map(&:cop_name)
+      @all_cop_names ||= Cop::Cop.all.map(&:cop_name).reject do |cop_name|
+        cop_name == UNNEEDED_DISABLE
+      end
     end
 
     def comment_only_line?(line_number)

data/lib/rubocop/config.rb

@@ -14,15 +14,22 @@ module RuboCop
 
     class ValidationError < StandardError; end
 
-    COMMON_PARAMS = %w(Exclude Include Severity AutoCorrect)
+    COMMON_PARAMS = %w(Exclude Include Severity AutoCorrect StyleGuide Details)
 
     attr_reader :loaded_path
 
     def initialize(hash = {}, loaded_path = nil)
       @loaded_path = loaded_path
+      @for_cop = Hash.new do |h, cop|
+        h[cop] = self[Cop::Cop.qualified_cop_name(cop, loaded_path)] || {}
+      end
       super(hash)
     end
 
+    def to_s
+      @to_s ||= __getobj__.to_s
+    end
+
     def make_excludes_absolute
       keys.each do |key|
         validate_section_presence(key)
@@ -68,19 +75,17 @@ module RuboCop
     end
 
     def for_cop(cop)
-      cop = cop.cop_name if cop.respond_to?(:cop_name)
-      @for_cop ||= {}
-      @for_cop[cop] ||= self[Cop::Cop.qualified_cop_name(cop, loaded_path)]
+      @for_cop[cop.respond_to?(:cop_name) ? cop.cop_name : cop]
     end
 
     def cop_enabled?(cop)
-      for_cop(cop).nil? || for_cop(cop)['Enabled']
+      for_cop(cop).empty? || for_cop(cop)['Enabled']
     end
 
     def warn_unless_valid
       validate
     rescue Config::ValidationError => e
-      warn "Warning: #{e.message}".color(:red)
+      warn Rainbow.new.wrap("Warning: #{e.message}").red
     end
 
     def add_missing_namespaces
@@ -147,27 +152,31 @@ module RuboCop
     end
 
     def patterns_to_include
-      self['AllCops']['Include']
+      @patterns_to_include ||= self['AllCops']['Include']
     end
 
     def patterns_to_exclude
-      self['AllCops']['Exclude']
+      @patterns_to_exclude ||= self['AllCops']['Exclude']
     end
 
     def path_relative_to_config(path)
       relative_path(path, base_dir_for_path_parameters)
     end
 
-    # Paths specified in .rubocop.yml files are relative to the directory where
-    # that file is. Paths in other config files are relative to the current
-    # directory. This is so that paths in config/default.yml, for example, are
-    # not relative to RuboCop's config directory since that wouldn't work.
+    # Paths specified in .rubocop.yml and .rubocop_todo.yml files are relative
+    # to the directory where that file is. Paths in other config files are
+    # relative to the current directory. This is so that paths in
+    # config/default.yml, for example, are not relative to RuboCop's config
+    # directory since that wouldn't work.
     def base_dir_for_path_parameters
-      if File.basename(loaded_path) == ConfigLoader::DOTFILE
-        File.expand_path(File.dirname(loaded_path))
-      else
-        Dir.pwd
-      end
+      config_files = [ConfigLoader::DOTFILE, ConfigLoader::AUTO_GENERATED_FILE]
+      @base_dir_for_path_parameters ||=
+        if config_files.include?(File.basename(loaded_path)) &&
+           loaded_path != File.join(Dir.home, ConfigLoader::DOTFILE)
+          File.expand_path(File.dirname(loaded_path))
+        else
+          Dir.pwd
+        end
     end
 
     private

data/lib/rubocop/config_loader.rb

@@ -16,8 +16,9 @@ module RuboCop
     AUTO_GENERATED_FILE = '.rubocop_todo.yml'
 
     class << self
-      attr_accessor :debug, :auto_gen_config
+      attr_accessor :debug, :auto_gen_config, :exclude_limit
       attr_writer :root_level # The upwards search is stopped at this level.
+      attr_writer :default_configuration
 
       alias_method :debug?, :debug
       alias_method :auto_gen_config?, :auto_gen_config
@@ -26,6 +27,7 @@ module RuboCop
         path = File.absolute_path(path)
         hash = load_yaml_configuration(path)
 
+        resolve_inheritance_from_gems(hash, hash.delete('inherit_gem'))
         resolve_inheritance(path, hash)
 
         Array(hash.delete('require')).each { |r| require(r) }
@@ -57,16 +59,21 @@ module RuboCop
       end
 
       def base_configs(path, inherit_from)
-        configs = Array(inherit_from).map do |f|
-          f = File.expand_path(f, File.dirname(path))
-
-          if auto_gen_config?
-            next if f.include?(AUTO_GENERATED_FILE)
-            old_auto_config_file_warning if f.include?('rubocop-todo.yml')
+        configs = Array(inherit_from).compact.map do |f|
+          if f =~ URI.regexp
+            f = RemoteConfig.new(f).file
+            load_file(f)
+          else
+            f = File.expand_path(f, File.dirname(path))
+
+            if auto_gen_config?
+              next if f.include?(AUTO_GENERATED_FILE)
+              old_auto_config_file_warning if f.include?('rubocop-todo.yml')
+            end
+
+            print 'Inheriting ' if debug?
+            load_file(f)
           end
-
-          print 'Inheriting ' if debug?
-          load_file(f)
         end
 
         configs.compact
@@ -100,12 +107,33 @@ module RuboCop
                                    end
       end
 
+      # Merges the given configuration with the default one. If
+      # AllCops:DisabledByDefault is true, it changes the Enabled params so
+      # that only cops from user configuration are enabled.
       def merge_with_default(config, config_file)
-        Config.new(merge(default_configuration, config), config_file)
+        configs =
+          if config.key?('AllCops') && config['AllCops']['DisabledByDefault']
+            disabled_default = transform(default_configuration) do |params|
+              params.merge('Enabled' => false) # Overwrite with false.
+            end
+            enabled_user_config = transform(config) do |params|
+              { 'Enabled' => true }.merge(params) # Set true if not set.
+            end
+            [disabled_default, enabled_user_config]
+          else
+            [default_configuration, config]
+          end
+        Config.new(merge(configs.first, configs.last), config_file)
       end
 
       private
 
+      # Returns a new hash where the parameters of the given config hash have
+      # been replaced by parmeters returned by the given block.
+      def transform(config)
+        Hash[config.map { |cop, params| [cop, yield(params)] }]
+      end
+
       def load_yaml_configuration(absolute_path)
         yaml_code = IO.read(absolute_path)
         # At one time, there was a problem with the psych YAML engine under
@@ -126,7 +154,11 @@ module RuboCop
 
       def yaml_safe_load(yaml_code)
         if YAML.respond_to?(:safe_load) # Ruby 2.1+
-          YAML.safe_load(yaml_code, [Regexp])
+          if defined?(SafeYAML)
+            SafeYAML.load(yaml_code, nil, whitelisted_tags: %w(!ruby/regexp))
+          else
+            YAML.safe_load(yaml_code, [Regexp])
+          end
         else
           YAML.load(yaml_code)
         end
@@ -140,6 +172,21 @@ module RuboCop
         end
       end
 
+      def resolve_inheritance_from_gems(hash, gems)
+        (gems || {}).each_pair do |gem_name, config_path|
+          hash['inherit_from'] = Array(hash['inherit_from'])
+          hash['inherit_from'] << gem_config_path(gem_name, config_path)
+        end
+      end
+
+      def gem_config_path(gem_name, relative_config_path)
+        spec = Gem::Specification.find_by_name(gem_name)
+        return File.join(spec.gem_dir, relative_config_path)
+      rescue Gem::LoadError => e
+        raise Gem::LoadError,
+              "Unable to find gem #{gem_name}; is the gem installed? #{e}"
+      end
+
       def config_files_in_path(target)
         possible_config_files = dirs_to_search(target).map do |dir|
           File.join(dir, DOTFILE)
@@ -157,8 +204,8 @@ module RuboCop
       end
 
       def old_auto_config_file_warning
-        warn 'Attention: rubocop-todo.yml has been renamed to ' \
-             "#{AUTO_GENERATED_FILE}".color(:red)
+        warn Rainbow('Attention: rubocop-todo.yml has been renamed to ' \
+                     "#{AUTO_GENERATED_FILE}").red
         exit(1)
       end
     end