Merge pull request #9526 from mhashizume/maint/7.x/check-fixes

Check fixes

.rubocop_todo.yml

@@ -920,7 +920,10 @@ Naming/VariableNumber:
 # SupportedStyles: inline, group
 Style/AccessModifierDeclarations:
   Exclude:
+    - 'lib/puppet/util/command_line/trollop.rb'
     - 'lib/puppet/util/suidmanager.rb'
+    - 'lib/puppet/util/windows/com.rb'
+    - 'lib/puppet/util/windows/monkey_patches/process.rb'
 
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.

lib/puppet/face/facts.rb

@@ -164,7 +164,15 @@
 
       case result
       when Array, Hash
-        Puppet::Util::Json.dump(result, :pretty => true)
+        # JSON < 2.8.0 would pretty print empty arrays and hashes with newlines
+        # Maintain that behavior for our users for now
+        if result.is_a?(Array) && result.empty?
+          "[\n\n]"
+        elsif result.is_a?(Hash) && result.empty?
+          "{\n}"
+        else
+          Puppet::Util::Json.dump(result, :pretty => true)
+        end
       else # one of VALID_TYPES above
         result
       end

spec/unit/application/facts_spec.rb

@@ -91,6 +91,7 @@
 
     {
       "type_hash" => [{'a' => 2}, "{\n  \"a\": 2\n}"],
+      "type_empty_hash" => [{}, "{\n}"],
       "type_array" => [[], "[\n\n]"],
       "type_string" => ["str", "str"],
       "type_int" => [1, "1"],

spec/unit/provider/package/puppetserver_gem_spec.rb

@@ -77,7 +77,13 @@
 
       it "raises if given an invalid URI" do
         resource[:source] = 'h;ttp://rubygems.com'
-        expect { provider.install }.to raise_error(Puppet::Error, /Invalid source '': bad URI\(is not URI\?\)/)
+        # Older versions of URI don't have a space before the opening
+        # parenthesis in the error message, newer versions do
+        if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('3.0.0')
+          expect { provider.install }.to raise_error(Puppet::Error, /Invalid source '': bad URI\(is not URI\?\)/)
+        else
+          expect { provider.install }.to raise_error(Puppet::Error, /Invalid source '': bad URI \(is not URI\?\)/)
+        end
       end
     end
   end