puppet 6.8.1 → 6.9.0

data/man/man5/puppet.conf.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPETCONF" "5" "September 2019" "Puppet, Inc." "Puppet manual"
 \fBThis page is autogenerated; any changes will get overwritten\fR
 .
 .SH "Configuration settings"
@@ -904,7 +904,7 @@ The time to wait for data to be read from an HTTP connection\. If nothing is rea
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: Puppet/6\.8\.0 Ruby/2\.4\.1\-p111 (x86_64\-linux)
+\fIDefault\fR: Puppet/6\.9\.0 Ruby/2\.4\.1\-p111 (x86_64\-linux)
 .
 .IP "" 0
 .

data/man/man8/puppet-agent.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-AGENT" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-agent\fR \- The puppet agent daemon

data/man/man8/puppet-apply.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-APPLY" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-APPLY" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-apply\fR \- Apply Puppet manifests locally

data/man/man8/puppet-catalog.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CATALOG" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CATALOG" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-catalog\fR \- Compile, save, view, and convert catalogs\.

data/man/man8/puppet-config.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CONFIG" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CONFIG" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-config\fR \- Interact with Puppet\'s settings\.

data/man/man8/puppet-describe.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DESCRIBE" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-describe\fR \- Display help about resource types

data/man/man8/puppet-device.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DEVICE" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DEVICE" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-device\fR \- Manage remote network devices

data/man/man8/puppet-doc.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DOC" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DOC" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-doc\fR \- Generate Puppet references

data/man/man8/puppet-epp.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-EPP" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-EPP" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-epp\fR \- Interact directly with the EPP template parser/renderer\.

data/man/man8/puppet-facts.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FACTS" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FACTS" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-facts\fR \- Retrieve and store facts\.

data/man/man8/puppet-filebucket.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FILEBUCKET" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket

data/man/man8/puppet-generate.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-GENERATE" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-GENERATE" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-generate\fR \- Generates Puppet code from Ruby definitions\.

data/man/man8/puppet-help.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-HELP" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-HELP" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-help\fR \- Display Puppet help\.

data/man/man8/puppet-key.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-KEY" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-KEY" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-key\fR \- Create, save, and remove certificate keys\.

data/man/man8/puppet-lookup.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "LOOKUP" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "LOOKUP" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBlookup\fR \- Interactive Hiera lookup

data/man/man8/puppet-man.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MAN" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MAN" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-man\fR \- Display Puppet manual pages\.

data/man/man8/puppet-module.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MODULE" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MODULE" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-module\fR \- Creates, installs and searches for modules on the Puppet Forge\.

data/man/man8/puppet-node.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-NODE" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-node\fR \- View and manage node definitions\.

data/man/man8/puppet-parser.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PARSER" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-parser\fR \- Interact directly with the parser\.

data/man/man8/puppet-plugin.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PLUGIN" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.

data/man/man8/puppet-report.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-REPORT" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.

data/man/man8/puppet-resource.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

data/man/man8/puppet-script.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SCRIPT" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog

data/man/man8/puppet-ssl.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SSL" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SSL" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-ssl\fR \- Manage SSL keys and certificates for puppet SSL clients

data/man/man8/puppet-status.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-STATUS" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-STATUS" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-status\fR \- View puppet server status\.

data/man/man8/puppet.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "August 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "September 2019" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
@@ -22,7 +22,7 @@ agent The puppet agent daemon apply Apply Puppet manifests locally config Intera
 Specialized:
 .
 .br
-catalog Compile, save, view, and convert catalogs\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. node View and manage node definitions\. parser Interact directly with the parser\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
+catalog Compile, save, view, and convert catalogs\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.8\.0
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.9\.0

data/spec/integration/provider/service/systemd_spec.rb

@@ -7,18 +7,19 @@ describe test_title, unless: Puppet::Util::Platform.jruby? do
 
   # TODO: Unfortunately there does not seem a way to stub the executable
   #       checks in the systemd provider because they happen at load time.
-  it "should be considered suitable if /proc/1/exe is present and points to 'systemd'",
-    :if => File.exist?('/proc/1/exe') && Puppet::FileSystem.readlink('/proc/1/exe').include?('systemd') do
+
+  it "should be considered suitable if /proc/1/comm is present and contains 'systemd'",
+    :if => File.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd') do
     expect(provider_class).to be_suitable
   end
 
-  it "should not be considered suitable if /proc/1/exe is present it does not point to 'systemd'",
-    :if => File.exist?('/proc/1/exe') && !Puppet::FileSystem.readlink('/proc/1/exe').include?('systemd') do
+  it "should not be considered suitable if /proc/1/comm is present it does not contain 'systemd'",
+    :if => File.exist?('/proc/1/comm') && !Puppet::FileSystem.read('/proc/1/comm').include?('systemd') do
     expect(provider_class).not_to be_suitable
   end
 
-  it "should not be considered suitable if /proc/1/exe is absent",
-    :if => !File.exist?('/proc/1/exe') do
+  it "should not be considered suitable if /proc/1/comm is absent",
+    :if => !File.exist?('/proc/1/comm') do
     expect(provider_class).not_to be_suitable
   end
 end

data/spec/integration/util/execution_spec.rb

@@ -52,7 +52,7 @@ describe Puppet::Util::Execution, unless: Puppet::Util::Platform.jruby? do
     end
   end
 
-  describe "#execute (non-Windows)", :if => !Puppet.features.microsoft_windows? do
+  describe "#execute (non-Windows)", :if => !Puppet::Util::Platform.windows? do
     it "should execute basic shell command" do
       result = Puppet::Util::Execution.execute("ls /tmp", :failonfail => true)
       expect(result.exitstatus).to eq(0)

data/spec/lib/puppet_spec/matchers.rb

@@ -1,18 +1,5 @@
 require 'stringio'
 
-########################################################################
-# Backward compatibility for Jenkins outdated environment.
-module RSpec
-  module Matchers
-    module BlockAliases
-      alias_method :to,     :should      unless method_defined? :to
-      alias_method :to_not, :should_not  unless method_defined? :to_not
-      alias_method :not_to, :should_not  unless method_defined? :not_to
-    end
-  end
-end
-
-
 ########################################################################
 # Custom matchers...
 RSpec::Matchers.define :have_matching_element do |expected|

data/spec/spec_helper.rb

@@ -20,10 +20,8 @@ require 'puppet'
 # FastGettext's implementation of these methods.
 require 'puppet/gettext/stubs'
 
-gem 'rspec', '>=3.1.0'
-require 'rspec/expectations'
+require 'rspec'
 require 'rspec/its'
-require 'rspec/collection_matchers'
 
 # So everyone else doesn't have to include this base constant.
 module PuppetSpec

data/spec/unit/application/agent_spec.rb

@@ -603,6 +603,25 @@ describe Puppet::Application::Agent do
     end
   end
 
+  describe "when starting in daemon mode on non-windows", :unless => Puppet.features.microsoft_windows? do
+    before :each do
+      allow(Puppet).to receive(:notice)
+      Puppet[:daemonize] = true
+      allow(Puppet::SSL::StateMachine).to receive(:new).and_return(machine)
+    end
+
+    it "should not print config in default mode" do
+      execute_agent
+      expect(@logs).to be_empty
+    end
+
+    it "should print config in debug mode" do
+      @puppetd.options[:debug] = true
+      execute_agent
+      expect(@logs).to include(an_object_having_attributes(level: :debug, message: /agent_catalog_run_lockfile=/))
+    end
+  end
+
   def execute_agent
     @puppetd.setup
     @puppetd.run_command

data/spec/unit/context_spec.rb

@@ -3,35 +3,11 @@ require 'spec_helper'
 describe Puppet::Context do
   let(:context) { Puppet::Context.new({ :testing => "value" }) }
 
-  context "with the implicit test_helper.rb pushed context" do
-    it "fails to lookup a value that does not exist" do
-      expect { context.lookup("a") }.to raise_error(Puppet::Context::UndefinedBindingError)
-    end
-
-    it "calls a provided block for a default value when none is found" do
-      expect(context.lookup("a") { "default" }).to eq("default")
-    end
-
-    it "behaves as if pushed a {} if you push nil" do
-      context.push(nil)
-      expect(context.lookup(:testing)).to eq("value")
-      context.pop
-    end
-
-    it "fails if you try to pop off the top of the stack" do
-      expect { context.pop }.to raise_error(Puppet::Context::StackUnderflow)
-    end
-  end
-
   describe "with additional context" do
     before :each do
       context.push("a" => 1)
     end
 
-    it "holds values for later lookup" do
-      expect(context.lookup("a")).to eq(1)
-    end
-
     it "allows rebinding values in a nested context" do
       inner = nil
       context.override("a" => 2) do
@@ -111,26 +87,131 @@ describe Puppet::Context do
     end
   end
 
-  context 'support lazy entries' do
-    it 'by evaluating a bound proc' do
-      result = nil
-      context.override(:a => lambda {|| 'yay'}) do
-        result = context.lookup(:a)
+  context "with multiple threads" do
+    it "a value pushed in another thread is not seen in the original thread" do
+      context.push(a: 1)
+      t = Thread.new do
+        context.push(a: 2, b: 5)
       end
-      expect(result).to eq('yay')
+      t.join
+
+      expect(context.lookup(:a)).to eq(1)
+      expect{ context.lookup(:b) }.to raise_error(Puppet::Context::UndefinedBindingError)
+    end
+
+    it "pops on a different thread do not interfere" do
+      context.push(a: 1)
+      t = Thread.new do
+        context.pop
+      end
+      t.join
+
+      # Raises exception if the binding we pushed has already been popped
+      context.pop
+    end
+
+    it "a mark in one thread is not seen in another thread" do
+      t = Thread.new do
+        context.push(b: 2)
+        context.mark('point b')
+      end
+      t.join
+
+      expect { context.rollback('point b') }.to raise_error(Puppet::Context::UnknownRollbackMarkError)
+    end
+  end
+end
+
+
+describe Puppet::Context::EmptyStack do
+  let(:empty_stack) { Puppet::Context::EmptyStack.new }
+
+  it "raises undefined binding on lookup" do
+    expect { empty_stack.lookup("a") }.to raise_error(Puppet::Context::UndefinedBindingError)
+  end
+
+  it "calls a provided block for a default value when none is found" do
+    expect(empty_stack.lookup("a") { "default" }).to eq("default")
+  end
+
+  it "raises an error when trying to pop" do
+    expect { empty_stack.pop }.to raise_error(Puppet::Context::StackUnderflow)
+  end
+
+  it "returns a stack when something is pushed" do
+    stack = empty_stack.push(a: 1)
+    expect(stack).to be_a(Puppet::Context::Stack)
+  end
+
+  it "returns a new stack with no bindings when pushed nil" do
+    stack = empty_stack.push(nil)
+    expect(stack).not_to be(empty_stack)
+    expect(stack.pop).to be(empty_stack)
+  end
+end
+
+describe Puppet::Context::Stack do
+  let(:empty_stack) { Puppet::Context::EmptyStack.new }
+
+  context "a stack with depth of 1" do
+    let(:stack) { empty_stack.push(a: 1) }
+
+    it "returns the empty stack when popped" do
+      expect(stack.pop).to be(empty_stack)
+    end
+
+    it "calls a provided block for a default value when none is found" do
+      expect(stack.lookup("a") { "default" }).to eq("default")
+    end
+
+    it "returns a new but equivalent stack when pushed nil" do
+      stackier = stack.push(nil)
+      expect(stackier).not_to be(stack)
+      expect(stackier.pop).to be(stack)
+      expect(stackier.bindings).to eq(stack.bindings)
+    end
+  end
+
+  context "a stack with more than 1 element" do
+    let(:level_one) { empty_stack.push(a: 1, c: 4) }
+    let(:level_two) { level_one.push(b: 2, c: 3) }
+
+    it "falls back to lower levels on lookup" do
+      expect(level_two.lookup(:c)).to eq(3)
+      expect(level_two.lookup(:a)).to eq(1)
+      expect{ level_two.lookup(:d) }.to raise_error(Puppet::Context::UndefinedBindingError)
+    end
+
+    it "the parent is immutable" do
+      expect(level_one.lookup(:c)).to eq(4)
+      expect{ level_one.lookup(:b) }.to raise_error(Puppet::Context::UndefinedBindingError)
+    end
+  end
+
+  context 'supports lazy entries' do
+    it 'by evaluating a bound proc' do
+      stack = empty_stack.push(a: lambda { || 'yay' })
+      expect(stack.lookup(:a)).to eq('yay')
     end
 
     it 'by memoizing the bound value' do
-      result1 = nil
-      result2 = nil
       original = 'yay'
-      context.override(:a => lambda {|| tmp = original; original = 'no'; tmp}) do
-        result1 = context.lookup(:a)
-        result2 = context.lookup(:a)
-      end
-      expect(result1).to eq('yay')
+      stack = empty_stack.push(:a => lambda {|| tmp = original; original = 'no'; tmp})
+      expect(stack.lookup(:a)).to eq('yay')
+      expect(original).to eq('no')
+      expect(stack.lookup(:a)).to eq('yay')
+    end
+
+    it 'the bound value is memoized only at the top level of the stack' do
+      # I'm just characterizing the current behavior here
+
+      original = 'yay'
+      stack = empty_stack.push(:a => lambda {|| tmp = original; original = 'no'; tmp})
+      stack_two = stack.push({})
+      expect(stack.lookup(:a)).to eq('yay')
       expect(original).to eq('no')
-      expect(result2).to eq('yay')
+      expect(stack.lookup(:a)).to eq('yay')
+      expect(stack_two.lookup(:a)).to eq('no')
     end
   end
 end