Merge pull request rubocop#2219 from maxjacobson/fix-partially-loading-safe-yaml

bbatsov · bbatsov · commit cd0826df4601 · 2015-09-07T19:57:14.000+03:00
Fix error when safe yaml is only partially loaded
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * [#2214](https://github.com/bbatsov/rubocop/pull/2214): Fix `File name too long error` when `STDIN` option is provided. ([@mrfoto][])
 * [#2217](https://github.com/bbatsov/rubocop/issues/2217): Allow block arguments in `Style/SymbolProc`. ([@lumeet][])
 * [#2213](https://github.com/bbatsov/rubocop/issues/2213): Write to cache with binary encoding to avoid transcoding exceptions in some locales. ([@jonas054][])
+* [#2218](https://github.com/bbatsov/rubocop/issues/2218): Fix loading config error when safe yaml is only partially loaded. ([@maxjacobson][])
 
 ## 0.34.0 (05/09/2015)
 
diff --git a/lib/rubocop/config_loader.rb b/lib/rubocop/config_loader.rb
@@ -148,7 +148,7 @@ def load_yaml_configuration(absolute_path)
       def yaml_safe_load(yaml_code)
         if YAML.respond_to?(:safe_load) # Ruby 2.1+
           if defined?(SafeYAML)
-            YAML.safe_load(yaml_code, nil, whitelisted_tags: %w(!ruby/regexp))
+            SafeYAML.load(yaml_code, nil, whitelisted_tags: %w(!ruby/regexp))
           else
             YAML.safe_load(yaml_code, [Regexp])
           end
diff --git a/spec/rubocop/config_loader_spec.rb b/spec/rubocop/config_loader_spec.rb
@@ -300,25 +300,25 @@
         ])
       end
 
-      it 'de-serializes Regexp class' do
-        if ::Process.respond_to?(:fork)
-          # To load SafeYAML in different memory space
-          pid = ::Process.fork do
-            # Need to write coverage result under different name
-            if defined?(SimpleCov)
-              SimpleCov.command_name "rspec_#{Process.pid}"
-              SimpleCov.pid = Process.pid
-            end
-
-            require 'safe_yaml'
+      context 'when it is fully required' do
+        it 'de-serializes Regexp class' do
+          in_its_own_process_with('safe_yaml') do
+            configuration = described_class.load_file('.rubocop.yml')
+
+            word_regexp = configuration['Style/WordArray']['WordRegex']
+            expect(word_regexp).to be_a(::Regexp)
+          end
+        end
+      end
+
+      context 'when safe_yaml is required without monkey patching' do
+        it 'de-serializes Regexp class' do
+          in_its_own_process_with('safe_yaml/load') do
             configuration = described_class.load_file('.rubocop.yml')
 
             word_regexp = configuration['Style/WordArray']['WordRegex']
             expect(word_regexp).to be_a(::Regexp)
           end
-          ::Process.wait(pid)
-        else
-          warn 'Process.fork is not available.'
         end
       end
     end
diff --git a/spec/support/host_environment_simulation_helper.rb b/spec/support/host_environment_simulation_helper.rb
@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+# RuboCop can be run in contexts where unexpected other libraries are included,
+# which may interfere with its normal behavior. In order to test those
+# situations, it may be necessary to require another library for the duration
+# of one spec
+module HostEnvironmentSimulatorHelper
+  def in_its_own_process_with(*files, &block)
+    if ::Process.respond_to?(:fork)
+      pid = ::Process.fork do
+        # Need to write coverage result under different name
+        if defined?(SimpleCov)
+          SimpleCov.command_name "rspec_#{Process.pid}"
+          SimpleCov.pid = Process.pid
+        end
+
+        files.each { |file| require file }
+        block.call
+      end
+      ::Process.wait(pid)
+
+      # assert that the block did not fail
+      expect($CHILD_STATUS).to be_success
+    else
+      warn 'Process.fork is not available.'
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include HostEnvironmentSimulatorHelper
+end
