Fix #233 conflicts -> Update rubocop

.rubocop.yml

@@ -23,3 +23,11 @@ Lint/AssignmentInCondition:
   Exclude:
     # The pattern makes sense here
     - 'lib/rspec/support/mutex.rb'
+
+# Over time we'd like to get this down, but this is what we're at now.
+Metrics/AbcSize:
+  Max: 22
+
+# Over time we'd like to get this down, but this is what we're at now.
+Metrics/PerceivedComplexity:
+  Max: 9

lib/rspec/support/caller_filter.rb

@@ -69,7 +69,7 @@ def self.first_non_rspec_line(skip_frames=3, increment=5)
           return line.to_s if line
 
           skip_frames += increment
-          increment   *= 2 # The choice of two here is arbitrary.
+          increment *= 2 # The choice of two here is arbitrary.
         end
       end
     else

lib/rspec/support/comparable_version.rb

@@ -10,7 +10,7 @@ def initialize(string)
         @string = string
       end
 
-      def <=>(other)
+      def <=>(other) # rubocop:disable Metrics/AbcSize
         other = self.class.new(other) unless other.is_a?(self.class)
 
         return 0 if string == other.string

lib/rspec/support/method_signature_verifier.rb

@@ -122,7 +122,7 @@ def classify_parameters
             end
           end
 
-          @max_non_kw_args = @min_non_kw_args  + optional_non_kw_args
+          @max_non_kw_args = @min_non_kw_args + optional_non_kw_args
           @allowed_kw_args = @required_kw_args + @optional_kw_args
         end
       else
@@ -285,7 +285,7 @@ def initialize(signature, args=[])
         @arbitrary_kw_args = @unlimited_args = false
       end
 
-      def with_expectation(expectation) # rubocop:disable MethodLength
+      def with_expectation(expectation) # rubocop:disable MethodLength, Metrics/PerceivedComplexity
         return self unless MethodSignatureExpectation === expectation
 
         if expectation.empty?

lib/rspec/support/ruby_features.rb

@@ -7,7 +7,7 @@ module Support
     #
     # Provides query methods for different OS or OS features.
     module OS
-      module_function
+    module_function
 
       def windows?
         !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
@@ -22,7 +22,7 @@ def windows_file_path?
     #
     # Provides query methods for different rubies
     module Ruby
-      module_function
+    module_function
 
       def jruby?
         RUBY_PLATFORM == 'java'
@@ -58,7 +58,7 @@ def truffleruby?
     # Provides query methods for ruby features that differ among
     # implementations.
     module RubyFeatures
-      module_function
+    module_function
 
       if Ruby.jruby?
         # On JRuby 1.7 `--1.8` mode, `Process.respond_to?(:fork)` returns true,

lib/rspec/support/spec/in_sub_process.rb

@@ -7,8 +7,7 @@ module InSubProcess
 
         # Useful as a way to isolate a global change to a subprocess.
 
-        # rubocop:disable MethodLength
-        def in_sub_process(prevent_warnings=true)
+        def in_sub_process(prevent_warnings=true) # rubocop:disable MethodLength, Metrics/AbcSize
           exception_reader, exception_writer = IO.pipe
           result_reader, result_writer = IO.pipe
 
@@ -46,7 +45,6 @@ def in_sub_process(prevent_warnings=true)
           result_reader.close
           result
         end
-        # rubocop:enable MethodLength
         alias :in_sub_process_if_possible :in_sub_process
 
         def marshal_dump_with_unmarshable_object_handling(object)

lib/rspec/support/spec/string_matcher.rb

@@ -4,7 +4,6 @@
 # which also relies on EncodedString. Instead, confirm the
 # strings have the same bytes.
 RSpec::Matchers.define :be_identical_string do |expected|
-
   if String.method_defined?(:encoding)
     match do
       expected_encoding? &&