puppet 3.7.2 → 3.7.3

data/ext/build_defaults.yaml

@@ -16,10 +16,10 @@ build_gem: TRUE
 build_dmg: TRUE
 build_msi:
   puppet_for_the_win:
-    ref: 'f4f74b1c8d8792089d1d3328b01f5ff075771eb0'
+    ref: '4eb71b5b063f611eb447d561d51481831a66b5dd'
     repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
   facter:
-    ref: 'refs/tags/2.2.0'
+    ref: 'refs/tags/2.3.0'
     repo: 'git://github.com/puppetlabs/facter.git'
   hiera:
     ref: 'refs/tags/1.3.4'

data/lib/puppet/application.rb

@@ -359,10 +359,10 @@ class Application
     # has not been made from the command line.
     #
     configured_environment_name = Puppet[:environment]
-    if self.class.run_mode.name != :agent
-      configured_environment = Puppet.lookup(:environments).get!(configured_environment_name)
-    else
+    if self.class.run_mode.name == :agent
       configured_environment = Puppet::Node::Environment.remote(configured_environment_name)
+    else
+      configured_environment = Puppet.lookup(:environments).get!(configured_environment_name)
     end
     configured_environment = configured_environment.override_from_commandline(Puppet.settings)
 

data/lib/puppet/environments.rb

@@ -316,9 +316,30 @@ module Puppet::Environments
   class Cached < Combined
     INFINITY = 1.0 / 0.0
 
+    class DefaultCacheExpirationService
+      def created(env)
+      end
+
+      def expired?(env_name)
+        false
+      end
+
+      def evicted(env_name)
+      end
+    end
+
+    def self.cache_expiration_service=(service)
+      @cache_expiration_service = service
+    end
+
+    def self.cache_expiration_service
+      @cache_expiration_service || DefaultCacheExpirationService.new
+    end
+
     def initialize(*loaders)
       super
       @cache = {}
+      @cache_expiration_service = Puppet::Environments::Cached.cache_expiration_service
     end
 
     def get(name)
@@ -355,6 +376,7 @@ module Puppet::Environments
     # Creates a suitable cache entry given the time to live for one environment
     #
     def entry(env)
+      @cache_expiration_service.created(env)
       ttl = (conf = get_conf(env.name)) ? conf.environment_timeout : Puppet.settings.value(:environment_timeout)
       case ttl
       when 0
@@ -369,8 +391,9 @@ module Puppet::Environments
     # Evicts the entry if it has expired
     # Also clears caches in Settings that may prevent the entry from being updated
     def evict_if_expired(name)
-      if (result = @cache[name]) && result.expired?
+      if (result = @cache[name]) && (result.expired? || @cache_expiration_service.expired?(name))
         @cache.delete(name)
+        @cache_expiration_service.evicted(name)
 
         Puppet.settings.clear_environment_settings(name)
       end

data/lib/puppet/indirector/resource/ral.rb

@@ -36,7 +36,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     res = request.instance
     ral_res = res.to_ral
 
-    catalog = Puppet::Resource::Catalog.new
+    catalog = Puppet::Resource::Catalog.new(nil, request.environment)
     catalog.add_resource ral_res
     transaction = catalog.apply
 

data/lib/puppet/pops/parser/lexer2.rb

@@ -329,7 +329,7 @@ class Puppet::Pops::Parser::Lexer2
       emit(TOKEN_COMMA, before)
 
     when '['
-      if (before == 0 || scn.string[before-1,1] =~ /[[:blank:]\r\n]+/)
+      if (before == 0 || scn.string[locator.char_offset(before)-1,1] =~ /[[:blank:]\r\n]+/)
         emit(TOKEN_LISTSTART, before)
       else
         emit(TOKEN_LBRACK, before)

data/lib/puppet/pops/parser/parser_support.rb

@@ -46,13 +46,25 @@ class Puppet::Pops::Parser::Parser
     [namespace, name].join('::').sub(/^::/, '')
   end
 
-  # Raises a Parse error.
-  def error(value, message, options = {})
+  # Raises a Parse error with location information. Information about file is always obtained from the
+  # lexer. Line and position is produced if the given semantic is a Positioned object and have been given an offset.
+  #
+  def error(semantic, message)
+    semantic = semantic.current() if semantic.is_a?(Puppet::Pops::Model::Factory)
+    # Adapt the model so it is possible to get location information.
+    # The model may not have been added to the source tree, so give it the lexer's locator
+    # directly instead of searching for the root Program where the locator is normally stored.
+    #
+    if semantic.is_a?(Puppet::Pops::Model::Positioned)
+      adapter = Puppet::Pops::Adapters::SourcePosAdapter.adapt(semantic)
+      adapter.locator = @lexer.locator
+    else
+      adapter = nil
+    end
     except = Puppet::ParseError.new(message)
-    except.line = options[:line] || value[:line]
-    except.file = options[:file] || value[:file]
-    except.pos = options[:pos]   || value[:pos]
-
+    except.file = @lexer.locator.file
+    except.line = adapter.line if adapter
+    except.pos = adapter.pos if adapter
     raise except
   end
 
@@ -114,10 +126,9 @@ class Puppet::Pops::Parser::Parser
   end
 
   # Parses a String of pp DSL code.
-  # @todo make it possible to pass a given origin
   #
-  def parse_string(code)
-    @lexer.string = code
+  def parse_string(code, path = '')
+    @lexer.lex_string(code, path)
     _parse()
   end
 

data/lib/puppet/pops/utils.rb

@@ -14,6 +14,26 @@ module Puppet::Pops::Utils
     end
   end
 
+  # Convert a match from Puppet::Pops::Patterns::NUMERIC to floating point value if
+  # possible
+  def self.match_to_fp(match)
+    if match[5].to_s.length > 0
+      # Use default radix (default is decimal == 10) for floats
+      # Do not convert a value that is 0 raised to 10^somevalue to float - the value is always 0
+      # i.e. 0000.0e1, 0e1, 0.0000e1
+      if Integer(match[4]) == 0 && match[5] =~ /\A\.?0*[eE].*\z/
+        nil
+      else
+        fp_value = Float(match[2])
+        if fp_value != Puppet::Pops::Types::TypeCalculator::TheInfinity
+          match[1] == '-' ? -fp_value : fp_value
+        else
+          nil
+        end
+      end
+    end
+  end
+
   # To Numeric with radix, or nil if not a number.
   # If the value is already Numeric it is returned verbatim with a radix of 10.
   # @param o [String, Number] a string containing a number in octal, hex, integer (decimal) or floating point form
@@ -29,8 +49,8 @@ module Puppet::Pops::Utils
         if !match
           nil
         elsif match[5].to_s.length > 0
-          # Use default radix (default is decimal == 10) for floats
-          match[1] == '-' ? [-Float(match[2]), 10] : [Float(match[2]), 10]
+          fp_value = match_to_fp(match)
+          fp_value.nil? ? nil : [fp_value, 10]
         else
           # Set radix (default is decimal == 10)
           radix = 10
@@ -68,7 +88,7 @@ module Puppet::Pops::Utils
         if !match
           nil
         elsif match[5].to_s.length > 0
-          match[1] == '-' ? -Float(match[2]) : Float(match[2])
+          match_to_fp(match)
         else
           match[1] == '-' ? -Integer(match[2]) : Integer(match[2])
         end

data/lib/puppet/resource.rb

@@ -357,8 +357,8 @@ class Puppet::Resource
 
   def missing_arguments
     resource_type.arguments.select do |param, default|
-      param = param.to_sym
-      parameters[param].nil? || parameters[param].value == :undef
+      the_param = parameters[param.to_sym]
+      the_param.nil? || the_param.value.nil? || the_param.value == :undef
     end
   end
   private :missing_arguments

data/lib/puppet/settings.rb

@@ -576,8 +576,9 @@ class Puppet::Settings
     end
 
     # Call any hooks we should be calling.
+    value_sets = value_sets_for(env, preferred_run_mode)
     @config.values.select(&:has_hook?).each do |setting|
-      value_sets_for(env, self.preferred_run_mode).each do |source|
+      value_sets.each do |source|
         if source.include?(setting.name)
           # We still have to use value to retrieve the value, since
           # we want the fully interpolated value, not $vardir/lib or whatever.
@@ -587,7 +588,11 @@ class Puppet::Settings
           if setting.call_hook_on_initialize?
             @hooks_to_call_on_application_initialization << setting
           else
-            setting.handle(self.value(setting.name, env))
+            setting.handle(ChainedValues.new(
+              preferred_run_mode,
+              env,
+              value_sets,
+              @config).interpolate(setting.name))
           end
           break
         end

data/lib/puppet/type/file.rb

@@ -671,7 +671,7 @@ Puppet::Type.newtype(:file) do
       :recurselimit => self[:recurselimit],
       :ignore => self[:ignore],
       :checksum_type => (self[:source] || self[:content]) ? self[:checksum] : :none,
-      :environment => catalog.environment
+      :environment => catalog.environment_instance
     )
   end
 

data/lib/puppet/type/file/source.rb

@@ -95,7 +95,7 @@ module Puppet
       metadata && metadata.checksum
     end
 
-    # Look up (if necessary) and return remote content.
+    # Look up (if necessary) and return local content.
     def content
       return @content if @content
       raise Puppet::DevError, "No source for content was stored with the metadata" unless metadata.source
@@ -170,7 +170,7 @@ module Puppet
       value.each do |source|
         begin
           options = {
-            :environment          => resource.catalog.environment,
+            :environment          => resource.catalog.environment_instance,
             :links                => resource[:links],
             :source_permissions   => resource[:source_permissions]
           }

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.7.2'
+  PUPPETVERSION = '3.7.3'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/integration/environments/setting_hooks_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "setting hooks" do
+  let(:confdir) { Puppet[:confdir] }
+  let(:environmentpath) { File.expand_path("envdir", confdir) }
+
+  describe "reproducing PUP-3500" do
+    let(:productiondir) { File.join(environmentpath, "production") }
+
+    before(:each) do
+      FileUtils.mkdir_p(productiondir)
+    end
+
+    it "accesses correct directory environment settings after intializing a setting with an on_write hook" do
+      expect(Puppet.settings.setting(:certname).call_hook).to eq(:on_write_only) 
+
+      File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+        f.puts("environmentpath=#{environmentpath}")
+        f.puts("certname=something")
+      end
+
+      Puppet.initialize_settings
+      production_env = Puppet.lookup(:environments).get(:production)
+      expect(Puppet.settings.value(:manifest, production_env)).to eq("#{productiondir}/manifests")
+    end
+  end
+end

data/spec/integration/parser/resource_expressions_spec.rb

@@ -206,6 +206,19 @@ describe "Puppet resource expressions" do
         "@@notify { example: } realize(Notify[example])" => "defined(Notify[example])",
         "@@notify { exported: message => set } notify { real: message => Notify[exported][message] }" => "Notify[real][message] == 'set'")
     end
+
+    context "explicit undefs" do
+      # PUP-3505
+      produces("
+        $x = 10
+        define foo($x = undef) {
+          notify { example:
+            message => \"'$x'\"
+          }
+        }
+        foo {'blah': x => undef }
+      " => "Notify[example][message] == \"''\"")
+    end
   end
 
   describe "current parser" do

data/spec/integration/type/file_spec.rb

@@ -70,6 +70,12 @@ describe Puppet::Type.type(:file), :uses_checksums => true do
     end
   end
 
+  around :each do |example|
+    Puppet.override(:environments => Puppet::Environments::Static.new) do
+      example.run
+    end
+  end
+
   before do
     # stub this to not try to create state.yaml
     Puppet::Util::Storage.stubs(:store)

data/spec/unit/environments_spec.rb

@@ -360,6 +360,59 @@ config_version=$vardir/random/scripts
           end
         end
       end
+
+      context "custom cache expiration service" do
+        let(:envs_created) { Set.new }
+        let(:envs_expired) { Set.new }
+        let(:envs_evicted) { Set.new }
+
+        it "should support registering a custom cache expiration service" do
+
+          class CustomExpirationService
+            def initialize(envs_created, envs_expired, envs_evicted)
+              @envs_created = envs_created
+              @envs_expired = envs_expired
+              @envs_evicted = envs_evicted
+            end
+
+            def created(env)
+              @envs_created << env.name
+            end
+            def expired?(env_name)
+              @envs_expired << env_name
+              true
+            end
+            def evicted(env_name)
+              @envs_evicted << env_name
+            end
+          end
+
+          Puppet[:environment_timeout] = "unlimited"
+          directory_tree = FS::MemoryFile.a_directory(File.expand_path("envdir"), [
+              FS::MemoryFile.a_directory("static1", [
+                  FS::MemoryFile.a_missing_file("environment.conf"),
+              ]),
+          ])
+
+          loader_from(:filesystem => [directory_tree],
+                      :directory => directory_tree) do |loader|
+            begin
+              orig_svc = Puppet::Environments::Cached.cache_expiration_service
+              Puppet::Environments::Cached.cache_expiration_service =
+                  CustomExpirationService.new(envs_created, envs_expired, envs_evicted)
+              cached = Puppet::Environments::Cached.new(loader)
+              cached.get(:static1)
+              cached.get(:static1)
+
+              expect(envs_created.include?(:static1)).to eq(true)
+              expect(envs_expired.include?(:static1)).to eq(true)
+              expect(envs_evicted.include?(:static1)).to eq(true)
+            ensure
+              Puppet::Environments::Cached.cache_expiration_service = orig_svc
+            end
+          end
+        end
+      end
     end
   end
 

data/spec/unit/indirector/catalog/static_compiler_spec.rb

@@ -139,7 +139,8 @@ describe Puppet::Resource::Catalog::StaticCompiler do
     options[:request] ||= request
 
     # Build a catalog suitable for the static compiler to operate on
-    catalog = Puppet::Resource::Catalog.new("#{options[:request].key}", Puppet::Node::Environment.remote(:testing))
+    environment = Puppet::Node::Environment.remote(:testing)
+    catalog = Puppet::Resource::Catalog.new("#{options[:request].key}", environment)
 
     # Mock out the fileserver, otherwise converting the catalog to a
     fake_fileserver_metadata = fileserver_metadata(options)
@@ -150,7 +151,7 @@ describe Puppet::Resource::Catalog::StaticCompiler do
       indirection.stubs(:find).with do |uri, opts|
         expect(uri).to eq options[:source].sub('puppet:///','')
         expect(opts[:links]).to eq :manage
-        expect(opts[:environment]).to eq "testing"
+        expect(opts[:environment]).to eq environment
       end.returns(fake_fileserver_metadata)
 
     # I want a resource that all the file resources require and another

data/spec/unit/indirector/resource/ral_spec.rb

@@ -119,29 +119,15 @@ describe "Puppet::Resource::Ral" do
   end
 
   describe "save" do
-    before do
-      @rebuilt_res = stub 'rebuilt instance'
-      @ral_res     = stub 'ral resource', :to_resource => @rebuilt_res
-      @instance    = stub 'instance', :to_ral => @ral_res
-      @request     = stub 'request',  :key => "user/", :instance => @instance
-      @catalog     = stub 'catalog'
-      @report      = stub 'report'
-      @transaction = stub 'transaction', :report => @report
-
-      Puppet::Resource::Catalog.stubs(:new).returns(@catalog)
-      @catalog.stubs(:apply).returns(@transaction)
-      @catalog.stubs(:add_resource)
-    end
+    it "returns a report covering the application of the given resource to the system" do
+      resource = Puppet::Resource.new(:notify, "the title")
+      ral = Puppet::Resource::Ral.new
 
-    it "should apply a new catalog with a ral object in it" do
-      Puppet::Resource::Catalog.expects(:new).returns(@catalog)
-      @catalog.expects(:add_resource).with(@ral_res)
-      @catalog.expects(:apply).returns(@transaction)
-      Puppet::Resource::Ral.new.save(@request).should
-    end
+      applied_resource, report = ral.save(Puppet::Indirector::Request.new(:ral, :save, 'testing', resource, :environment => Puppet::Node::Environment.remote(:testing)))
 
-    it "should return a regular resource that used to be the ral resource" do
-      Puppet::Resource::Ral.new.save(@request).should == [@rebuilt_res, @report]
+      expect(applied_resource.title).to eq("the title")
+      expect(report.environment).to eq("testing")
+      expect(report.resource_statuses["Notify[the title]"].changed).to eq(true)
     end
   end
 end

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

@@ -351,16 +351,32 @@ describe 'Lexer2' do
     end
   end
 
-  it 'should support unicode characters' do
-    code = <<-CODE
-    "x\\u2713y"
-    CODE
-    if Puppet::Pops::Parser::Locator::RUBYVER < Puppet::Pops::Parser::Locator::RUBY_1_9_3
-      # Ruby 1.8.7 reports the multibyte char as several octal characters
-      tokens_scanned_from(code).should match_tokens2([:STRING, "x\342\234\223y"])
-    else
-      # >= Ruby 1.9.3 reports \u
-      tokens_scanned_from(code).should match_tokens2([:STRING, "x\u2713y"])
+  context 'when dealing with multi byte characters' do
+    it 'should support unicode characters' do
+      code = <<-CODE
+      "x\\u2713y"
+      CODE
+      if Puppet::Pops::Parser::Locator::RUBYVER < Puppet::Pops::Parser::Locator::RUBY_1_9_3
+        # Ruby 1.8.7 reports the multibyte char as several octal characters
+        tokens_scanned_from(code).should match_tokens2([:STRING, "x\342\234\223y"])
+      else
+        # >= Ruby 1.9.3 reports \u
+        tokens_scanned_from(code).should match_tokens2([:STRING, "x\u2713y"])
+      end
+    end
+
+    it 'should not select LISTSTART token when preceded by multibyte chars' do
+      # This test is sensitive to the number of multibyte characters and position of the expressions
+      # within the string - it is designed to fail if the position is calculated on the byte offset of the '['
+      # instead of the char offset.
+      #
+      code = "$a = '\u00f6\u00fc\u00fc\u00fc\u00fc\u00e4\u00e4\u00f6\u00e4'\nnotify {'x': message => B['dkda'] }\n"
+      tokens_scanned_from(code).should match_tokens2(
+        :VARIABLE, :EQUALS, :STRING,
+        [:NAME, 'notify'], :LBRACE,
+        [:STRING, 'x'], :COLON, 
+        :NAME, :FARROW, :CLASSREF, :LBRACK, :STRING, :RBRACK,
+        :RBRACE)
     end
   end
 

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

@@ -30,4 +30,18 @@ describe Puppet::Pops::Parser::Parser do
     expect(adapter.offset).to eq(10)
     expect(adapter.length).to eq(0)
   end
+
+  it "should raise an error with position information when error is raised from within parser" do
+    parser = Puppet::Pops::Parser::Parser.new()
+    the_error = nil
+    begin
+      parser.parse_string("File [1] { }", 'fakefile.pp')
+    rescue Puppet::ParseError => e
+      the_error = e
+    end
+    expect(the_error).to be_a(Puppet::ParseError)
+    expect(the_error.file).to eq('fakefile.pp')
+    expect(the_error.line).to eq(1)
+    expect(the_error.pos).to eq(6)
+  end
 end

data/spec/unit/pops/utils_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require 'puppet/pops'
+
+describe 'pops utils' do
+  context 'when converting strings to numbers' do
+    it 'should convert "0" to 0' do
+      expect(Puppet::Pops::Utils.to_n("0")).to eq(0)
+    end
+
+    it 'should convert "0" to 0 with radix' do
+      expect(Puppet::Pops::Utils.to_n_with_radix("0")).to eq([0, 10])
+    end
+
+    it 'should convert "0.0" to 0.0' do
+      expect(Puppet::Pops::Utils.to_n("0.0")).to eq(0.0)
+    end
+
+    it 'should convert "0.0" to 0.0 with radix' do
+      expect(Puppet::Pops::Utils.to_n_with_radix("0.0")).to eq([0.0, 10])
+    end
+
+    it 'should convert "0.01e1" to 0.01e1' do
+      expect(Puppet::Pops::Utils.to_n("0.01e1")).to eq(0.01e1)
+      expect(Puppet::Pops::Utils.to_n("0.01E1")).to eq(0.01e1)
+    end
+
+    it 'should convert "0.01e1" to 0.01e1 with radix' do
+      expect(Puppet::Pops::Utils.to_n_with_radix("0.01e1")).to eq([0.01e1, 10])
+      expect(Puppet::Pops::Utils.to_n_with_radix("0.01E1")).to eq([0.01e1, 10])
+    end
+
+    it 'should not convert "0e1" to floating point' do
+      expect(Puppet::Pops::Utils.to_n("0e1")).to be_nil
+      expect(Puppet::Pops::Utils.to_n("0E1")).to be_nil
+    end
+
+    it 'should not convert "0e1" to floating point with radix' do
+      expect(Puppet::Pops::Utils.to_n_with_radix("0e1")).to be_nil
+      expect(Puppet::Pops::Utils.to_n_with_radix("0E1")).to be_nil
+    end
+
+    it 'should not convert "0.0e1" to floating point' do
+      expect(Puppet::Pops::Utils.to_n("0.0e1")).to be_nil
+      expect(Puppet::Pops::Utils.to_n("0.0E1")).to be_nil
+    end
+
+    it 'should not convert "0.0e1" to floating point with radix' do
+      expect(Puppet::Pops::Utils.to_n_with_radix("0.0e1")).to be_nil
+      expect(Puppet::Pops::Utils.to_n_with_radix("0.0E1")).to be_nil
+    end
+
+    it 'should not convert "000000.0000e1" to floating point' do
+      expect(Puppet::Pops::Utils.to_n("000000.0000e1")).to be_nil
+      expect(Puppet::Pops::Utils.to_n("000000.0000E1")).to be_nil
+    end
+
+    it 'should not convert "000000.0000e1" to floating point with radix' do
+      expect(Puppet::Pops::Utils.to_n_with_radix("000000.0000e1")).to be_nil
+      expect(Puppet::Pops::Utils.to_n_with_radix("000000.0000E1")).to be_nil
+    end
+
+    it 'should not convert infinite values to floating point' do
+      expect(Puppet::Pops::Utils.to_n("4e999")).to be_nil
+    end
+
+    it 'should not convert infinite values to floating point with_radix' do
+      expect(Puppet::Pops::Utils.to_n_with_radix("4e999")).to be_nil
+    end
+  end
+end

data/spec/unit/type/file/source_spec.rb

@@ -6,10 +6,16 @@ source = Puppet::Type.type(:file).attrclass(:source)
 describe Puppet::Type.type(:file).attrclass(:source) do
   include PuppetSpec::Files
 
+  around :each do |example|
+    Puppet.override(:environments => Puppet::Environments::Static.new) do
+      example.run
+    end
+  end
+
   before do
     # Wow that's a messy interface to the resource.
-    @environment = "myenv"
-    @resource = stub 'resource', :[]= => nil, :property => nil, :catalog => stub("catalog", :dependent_data_expired? => false, :environment => @environment), :line => 0, :file => ''
+    @environment = Puppet::Node::Environment.remote("myenv")
+    @resource = stub 'resource', :[]= => nil, :property => nil, :catalog => Puppet::Resource::Catalog.new(nil, @environment), :line => 0, :file => ''
     @foobar = make_absolute("/foo/bar baz")
     @feebooz = make_absolute("/fee/booz baz")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1765,6 +1765,7 @@ files:
 - spec/fixtures/java.tgz
 - spec/integration/environments/default_manifest_spec.rb
 - spec/integration/environments/settings_interpolation_spec.rb
+- spec/integration/environments/setting_hooks_spec.rb
 - spec/integration/file_bucket/file_spec.rb
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
@@ -2352,6 +2353,7 @@ files:
 - spec/unit/pops/parser/parse_resource_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
+- spec/unit/pops/utils_spec.rb
 - spec/unit/pops/binder/bindings_checker_spec.rb
 - spec/unit/pops/binder/bindings_composer_spec.rb
 - spec/unit/pops/binder/injector_spec.rb
@@ -2846,6 +2848,7 @@ test_files:
 - spec/fixtures/java.tgz
 - spec/integration/environments/default_manifest_spec.rb
 - spec/integration/environments/settings_interpolation_spec.rb
+- spec/integration/environments/setting_hooks_spec.rb
 - spec/integration/file_bucket/file_spec.rb
 - spec/integration/node/environment_spec.rb
 - spec/integration/node/facts_spec.rb
@@ -3433,6 +3436,7 @@ test_files:
 - spec/unit/pops/parser/parse_resource_spec.rb
 - spec/unit/pops/parser/parse_calls_spec.rb
 - spec/unit/pops/parser/lexer2_spec.rb
+- spec/unit/pops/utils_spec.rb
 - spec/unit/pops/binder/bindings_checker_spec.rb
 - spec/unit/pops/binder/bindings_composer_spec.rb
 - spec/unit/pops/binder/injector_spec.rb