puppet 6.0.10-x86-mingw32 → 6.1.0-x86-mingw32

data/spec/unit/pops/parser/parse_conditionals_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 

data/spec/unit/pops/parser/parse_containers_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 

data/spec/unit/pops/parser/parse_heredoc_spec.rb

@@ -10,7 +10,7 @@ describe "egrammar parsing heredoc" do
   it "parses plain heredoc" do
     expect(dump(parse("@(END)\nThis is\nheredoc text\nEND\n"))).to eq([
       "(@()",
-      "  'This is\nheredoc text\n'",
+      "  (sublocated 'This is\nheredoc text\n')",
       ")"
     ].join("\n"))
   end
@@ -25,7 +25,7 @@ describe "egrammar parsing heredoc" do
     ].join("\n")
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  'This is\nheredoc text\n'",
+      "  (sublocated 'This is\nheredoc text\n')",
       ")"
     ].join("\n"))
   end
@@ -40,7 +40,7 @@ describe "egrammar parsing heredoc" do
     ].join("\n")
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  'This is\nheredoc text'",
+      "  (sublocated 'This is\nheredoc text')",
       ")"
     ].join("\n"))
   end
@@ -53,7 +53,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@(syntax)",
-      "  'Tex\tt\\n'",
+      "  (sublocated 'Tex\tt\\n')",
       ")"
     ].join("\n"))
   end
@@ -66,7 +66,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (cat 'Hello ' (str $name))",
+      "  (sublocated (cat 'Hello ' (str $name)))",
       ")"
     ].join("\n"))
   end
@@ -79,7 +79,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (cat 'Hello \\' (str $name))",
+      "  (sublocated (cat 'Hello \\' (str $name)))",
       ")"
     ].join("\n"))
   end
@@ -92,7 +92,7 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (cat 'Hello \\' (str $name))",
+      "  (sublocated (cat 'Hello \\' (str $name)))",
       ")"
     ].join("\n"))
   end
@@ -107,7 +107,7 @@ describe "egrammar parsing heredoc" do
     parse(src)
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  'First Line Second Line'",
+      "  (sublocated 'First Line Second Line')",
       ")"
     ].join("\n"))
   end
@@ -122,7 +122,7 @@ describe "egrammar parsing heredoc" do
     parse(src)
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  ' First Line  Second Line'",
+      "  (sublocated ' First Line  Second Line')",
       ")"
     ].join("\n"))
   end
@@ -135,12 +135,12 @@ describe "egrammar parsing heredoc" do
     CODE
     expect(dump(parse(src))).to eq([
       "(@()",
-      "  (cat 'Hello ' (str $name) '$%a')",
+      "  (sublocated (cat 'Hello ' (str $name) '$%a'))",
       ")"
     ].join("\n"))
   end
 
-  it "parses interpolated [] expression by looking at the correct preceding char for space when there is no heredoc margin" do
+  it "parses interpolated [] expression by looking at the correct preceding char for space" do
     # NOTE: Important not to use the left margin feature here
     src = <<-CODE
 $xxxxxxx = @("END")
@@ -150,108 +150,12 @@ END
 CODE
     expect(dump(parse(src))).to eq([
       "(= $xxxxxxx (@()",
-      "  (cat (str (slice (slice $facts 'os') 'family')) '",
+      "  (sublocated (cat (str (slice (slice $facts 'os') 'family')) '",
       "XXXXXXX XXX",
-      "')",
+      "'))",
       "))"].join("\n"))
   end
 
-  it "parses interpolated [] expression by looking at the correct preceding char for space when there is a heredoc margin" do
-    # NOTE: Important not to use the left margin feature here - the problem in PUP 9303 is triggered by lines and text before
-    # an interpolation containing []. 
-    src = <<-CODE
-# comment
-# comment
-$xxxxxxx = @("END")
-    1
-    2
-    3
-    4
-    5
-    YYYYY${facts['fqdn']}
-    XXXXXXX XXX
-    | END
-CODE
-    expect(dump(parse(src))).to eq([
-      "(= $xxxxxxx (@()",
-      "  (cat '1", "2", "3", "4", "5",
-      "YYYYY' (str (slice $facts 'fqdn')) '",
-      "XXXXXXX XXX",
-      "')",
-      "))"].join("\n"))
-  end
-
-  it "correctly reports an error location in a nested heredoc with margin" do
-    # NOTE: Important not to use the left margin feature here - the problem in PUP 9303 is triggered by lines and text before
-    # an interpolation containing []. 
-    src = <<-CODE
-# comment
-# comment
-$xxxxxxx = @("END")
-  1
-  2
-  3
-  4
-  5
-  YYYYY${facts]}
-  XXXXXXX XXX
-  | END
-CODE
-    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 9, column: 15\)/)
-  end
-
-  it "correctly reports an error location in a heredoc with line endings escaped" do
-    # DO NOT CHANGE INDENTATION OF THIS HEREDOC
-    src = <<-CODE
-    # line one
-    # line two
-    @("END"/L)
-    First Line\\
-    Second Line ${facts]}
-    |- END
-    CODE
-    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 5, column: 24\)/)
-  end
-
-  it "correctly reports an error location in a heredoc with line endings escaped when there is text in the margin" do
-    # DO NOT CHANGE INDENTATION OR SPACING OF THIS HEREDOC
-    src = <<-CODE
-    # line one
-    # line two
-    @("END"/L)
-    First Line\\
-    Second Line
-  x Third Line ${facts]}
-    |- END
-    # line 8
-    # line 9
-    CODE
-    expect{parse(src)}.to raise_error(/Syntax error at '\]' \(line: 6, column: 23\)/)
-  end
-
-  it "correctly reports an error location in a heredoc with line endings escaped when there is text in the margin" do
-    # DO NOT CHANGE INDENTATION OR SPACING OF THIS HEREDOC
-    src = <<-CODE
-    @(END)
-AAA
- BBB
-  CCC
-   DDD
-    EEE
-     FFF
-    |- END
-    CODE
-    expect(dump(parse(src))).to eq([
-      "(@()",
-      "  'AAA", # no left space trimmed
-      " BBB",
-      "  CCC",
-      "   DDD",
-      "EEE", # left space trimmed
-      " FFF'", # indented one because it is one in from margin marker
-      ")"].join("\n"))
-  end
-
   it 'parses multiple heredocs on the same line' do
     src = <<-CODE
     notice({ @(foo) => @(bar) })
@@ -264,9 +168,9 @@ AAA
     expect(dump(parse(src))).to eq([
       '(block',
       '  (invoke notice ({} ((@()',
-      '    \'    hello\'',
+      '    (sublocated \'    hello\')',
       '  ) (@()',
-      '    \'    world\'',
+      '    (sublocated \'    world\')',
       '  ))))',
       '  (invoke notice \'!\')',
       ')'

data/spec/unit/pops/parser/parse_plan_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 require_relative 'parser_rspec_helper'

data/spec/unit/pops/parser/parse_resource_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 

data/spec/unit/pops/parser/parse_site_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 require_relative 'parser_rspec_helper'

data/spec/unit/pops/parser/pn_parser_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 require 'puppet/pops/pn'

data/spec/unit/pops/pn_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 require 'puppet/pops/pn'

data/spec/unit/pops/resource/resource_type_impl_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 require 'puppet/pops'
 require 'puppet_spec/files'

data/spec/unit/pops/serialization/serialization_spec.rb

@@ -424,7 +424,7 @@ module Serialization
     it 'succeeds when deserializer is aware of the referenced type' do
       obj = type.create(32)
       write(obj)
-      expect(loaders.find_loader(nil)).to receive(:load).with(:type, 'mytype').and_return(type)
+      loaders.find_loader(nil).expects(:load).with(:type, 'mytype').returns(type)
       expect(read).to eql(obj)
     end
   end

data/spec/unit/pops/serialization/to_from_hr_spec.rb

@@ -482,7 +482,7 @@ module Serialization
     it 'succeeds when deserializer is aware of the referenced type' do
       obj = type.create(32)
       write(obj)
-      expect(loaders.find_loader(nil)).to receive(:load).with(:type, 'mytype').and_return(type)
+      loaders.find_loader(nil).expects(:load).with(:type, 'mytype').returns(type)
       expect(read).to eql(obj)
     end
   end

data/spec/unit/pops/types/recursion_guard_spec.rb

@@ -61,32 +61,32 @@ describe 'the RecursionGuard' do
   end
 
   it "should not call 'hash' on an added instance" do
-    x = double()
-    expect(x).not_to receive(:hash)
+    x = mock
+    x.expects(:hash).never
     expect(guard.add_that(x)).to eq(RecursionGuard::NO_SELF_RECURSION)
   end
 
   it "should not call '==' on an added instance" do
-    x = double()
-    expect(x).not_to receive(:==)
+    x = mock
+    x.expects(:==).never
     expect(guard.add_that(x)).to eq(RecursionGuard::NO_SELF_RECURSION)
   end
 
   it "should not call 'eq?' on an added instance" do
-    x = double()
-    expect(x).not_to receive(:eq?)
+    x = mock
+    x.expects(:eq?).never
     expect(guard.add_that(x)).to eq(RecursionGuard::NO_SELF_RECURSION)
   end
 
   it "should not call 'eql?' on an added instance" do
-    x = double()
-    expect(x).not_to receive(:eql?)
+    x = mock
+    x.expects(:eql?).never
     expect(guard.add_that(x)).to eq(RecursionGuard::NO_SELF_RECURSION)
   end
 
   it "should not call 'equal?' on an added instance" do
-    x = double()
-    expect(x).not_to receive(:equal?)
+    x = mock
+    x.expects(:equal?).never
     expect(guard.add_that(x)).to eq(RecursionGuard::NO_SELF_RECURSION)
   end
 end

data/spec/unit/pops/types/ruby_generator_spec.rb

@@ -448,7 +448,7 @@ describe 'Puppet Ruby Generator' do
 
       after(:all) do
         # Don't want generated module to leak outside this test
-        PuppetSpec.send(:remove_const, :RubyGenerator) if PuppetSpec.const_defined?(:RubyGenerator)
+        PuppetSpec.send(:remove_const, :RubyGenerator)
       end
 
       it 'the #_pcore_type class method returns a resolved Type' do
@@ -765,7 +765,7 @@ describe 'Puppet Ruby Generator' do
 
       after(:all) do
         # Don't want generated module to leak outside this test
-        PuppetSpec.send(:remove_const, :RubyGenerator) if PuppetSpec.const_defined?(:RubyGenerator)
+        PuppetSpec.send(:remove_const, :RubyGenerator)
       end
 
       it 'the #_pcore_type class method returns a resolved Type' do

data/spec/unit/pops/types/string_converter_spec.rb

@@ -128,10 +128,14 @@ describe 'The string converter' do
          expect(converter.convert("hello\tworld.\r\nSun is brigth today.", string_formats)).to eq('"hello\\tworld.\\r\\nSun is brigth today."')
       end
 
-      it 'singe quoted result for string that is plain ascii without \\, $ or control characters' do
+      it 'single quoted result for string that is plain ascii without \\, $ or control characters' do
         expect(converter.convert('hello world', string_formats)).to eq("'hello world'")
       end
 
+      it 'double quoted result when using %#p if it would otherwise be single quoted' do
+        expect(converter.convert('hello world', '%#p')).to eq('"hello world"')
+      end
+
       it 'quoted 5-byte unicode chars' do
         expect(converter.convert("smile \u{1f603}.", string_formats)).to eq("'smile \u{1F603}.'")
       end

data/spec/unit/pops/types/type_asserter_spec.rb

@@ -24,13 +24,13 @@ describe 'the type asserter' do
   end
 
   it 'does not produce a string unless the assertion fails' do
-    expect(TypeAsserter).not_to receive(:report_type_mismatch)
+    TypeAsserter.expects(:report_type_mismatch).never
     asserter.assert_instance_of(nil, PIntegerType::DEFAULT, 1)
   end
 
   it 'does not format string unless the assertion fails' do
     fmt_string = 'The %s in the %s'
-    expect(fmt_string).not_to receive(:'%')
+    fmt_string.expects(:'%').never
     asserter.assert_instance_of([fmt_string, 'gizmo', 'gadget'], PIntegerType::DEFAULT, 1)
   end
 

data/spec/unit/pops/types/type_calculator_spec.rb

@@ -1726,10 +1726,10 @@ describe 'The type calculator' do
         scope = {}
 
         t = type_alias_t('Tree', 'Hash[String,Variant[String,Tree]]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'tree').and_return(t)
+        loader = mock
+        loader.expects(:load).with(:type, 'tree').returns t
 
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t.resolve(scope)
         expect(calculator.assignable?(t, parser.parse('Hash[String,Variant[String,Hash[String,Variant[String,String]]]]'))).to be_truthy
@@ -1741,11 +1741,11 @@ describe 'The type calculator' do
 
         t1 = type_alias_t('Tree1', 'Hash[String,Variant[String,Tree1]]')
         t2 = type_alias_t('Tree2', 'Hash[String,Variant[String,Tree2]]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'tree1').and_return(t1)
-        expect(loader).to receive(:load).with(:type, 'tree2').and_return(t2)
+        loader = mock
+        loader.expects(:load).with(:type, 'tree1').returns t1
+        loader.expects(:load).with(:type, 'tree2').returns t2
 
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t1.resolve(scope)
         t2.resolve(scope)
@@ -1755,11 +1755,11 @@ describe 'The type calculator' do
       it 'crossing recursive aliases are assignable' do
         t1 = type_alias_t('Tree1', 'Hash[String,Variant[String,Tree2]]')
         t2 = type_alias_t('Tree2', 'Hash[String,Variant[String,Tree1]]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'tree1').and_return(t1)
-        expect(loader).to receive(:load).with(:type, 'tree2').and_return(t2)
+        loader = mock
+        loader.expects(:load).with(:type, 'tree1').returns t1
+        loader.expects(:load).with(:type, 'tree2').returns t2
 
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t1.resolve(loader)
         t2.resolve(loader)
@@ -1770,9 +1770,9 @@ describe 'The type calculator' do
         scope = {}
 
         ta = type_alias_t('PositiveInteger', 'Integer[0,default]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'positiveinteger').and_return(ta)
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        loader = mock
+        loader.expects(:load).with(:type, 'positiveinteger').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t1 = type_t(range_t(0, :default))
         t2 = parser.parse('Type[PositiveInteger]', scope)
@@ -1783,9 +1783,9 @@ describe 'The type calculator' do
         scope = {}
 
         ta = type_alias_t('PositiveIntegerType', 'Type[Integer[0,default]]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'positiveintegertype').and_return(ta)
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        loader = mock
+        loader.expects(:load).with(:type, 'positiveintegertype').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t1 = type_t(range_t(0, :default))
         t2 = parser.parse('PositiveIntegerType', scope)
@@ -1796,9 +1796,9 @@ describe 'The type calculator' do
         scope = {}
 
         ta = type_alias_t('PositiveInteger', 'Integer[0,default]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'positiveinteger').and_return(ta)
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        loader = mock
+        loader.expects(:load).with(:type, 'positiveinteger').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t1 = type_t(type_t(range_t(0, :default)))
         t2 = parser.parse('Type[Type[PositiveInteger]]', scope)
@@ -1809,9 +1809,9 @@ describe 'The type calculator' do
         scope = {}
 
         ta = type_alias_t('PositiveIntegerType', 'Type[Integer[0,default]]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'positiveintegertype').and_return(ta)
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        loader = mock
+        loader.expects(:load).with(:type, 'positiveintegertype').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t1 = type_t(type_t(range_t(0, :default)))
         t2 = parser.parse('Type[PositiveIntegerType]', scope)
@@ -2122,10 +2122,10 @@ describe 'The type calculator' do
 
       it 'should consider x an instance of the aliased type that uses self recursion' do
         t = type_alias_t('Tree', 'Hash[String,Variant[String,Tree]]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'tree').and_return(t)
+        loader = mock
+        loader.expects(:load).with(:type, 'tree').returns t
 
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t.resolve(loader)
         expect(calculator.instance?(t, {'a'=>{'aa'=>{'aaa'=>'aaaa'}}, 'b'=>'bb'})).to be_truthy
@@ -2134,11 +2134,11 @@ describe 'The type calculator' do
       it 'should consider x an instance of the aliased type that uses contains an alias that causes self recursion' do
         t1 = type_alias_t('Tree', 'Hash[String,Variant[String,OtherTree]]')
         t2 = type_alias_t('OtherTree', 'Hash[String,Tree]')
-        loader = double
-        expect(loader).to receive(:load).with(:type, 'tree').and_return(t1)
-        expect(loader).to receive(:load).with(:type, 'othertree').and_return(t2)
+        loader = mock
+        loader.expects(:load).with(:type, 'tree').returns t1
+        loader.expects(:load).with(:type, 'othertree').returns t2
 
-        expect(Adapters::LoaderAdapter).to receive(:loader_for_model_object).at_least(:once).and_return(loader)
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).at_least_once.returns loader
 
         t1.resolve(loader)
         expect(calculator.instance?(t1, {'a'=>{'aa'=>{'aaa'=>'aaaa'}}, 'b'=>'bb'})).to be_truthy