puppet 6.0.10 → 6.1.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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPETCONF" "5" "December 2018" "Puppet, Inc." "Puppet manual"
 \fBThis page is autogenerated; any changes will get overwritten\fR
 .
 .SH "Configuration settings"
@@ -237,16 +237,16 @@ The certificate directory\.
 Whether certificate revocation checking should be enabled, and what level of checking should be performed\.
 .
 .P
-When certificate revocation is enabled, Puppet expects the contents of its CRL to be one or more PEM\-encoded CRLs concatenated together\. When using a cert bundle, CRLs for all CAs in the chain of trust must be included in the crl file\. The chain should be ordered from least to most authoritative, with the first CRL listed being for the root of the chain and the last being for the leaf CA\.
+When certificate revocation is enabled Puppet expects the contents of its CRL to be one or more PEM encoded CRLs concatenated together\. When using a cert bundle CRLs for all CAs in the chain of trust must be included in the crl file with the first CRL listed being for the root of the chain, the last being for the leaf CA\.
 .
 .P
-When certificate_revocation is set to \'true\' or \'chain\', Puppet ensures that each CA in the chain of trust has not been revoked by its issuing CA\.
+When certificate_revocation is set to \'true\' or \'chain\', Puppet will ensure that each CA in the chain of trust has not been revoked by its issuing CA\.
 .
 .P
-When certificate_revocation is set to \'leaf\', Puppet verifies certs against the issuing CA\'s revocation list, but it does not verify the revocation status of the issuing CA or any CA above it within the chain of trust\.
+When certificate_revocation is set to \'leaf\', Puppet will verify certs against the issuing CA\'s revocation list but not verify the revocation status of the issuing CA or any CA above it within the chain of trust\.
 .
 .P
-When certificate_revocation is set to \'false\', Puppet disables all certificate revocation checking and does not attempt to download the CRL\.
+When certificate_revocation is set to \'false\', Puppet will disable all certificate revocation checking and will not attempt to download the CRL\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: chain
@@ -560,10 +560,7 @@ The name of a registered environment data provider used when obtaining environme
 
 .
 .SS "environment_timeout"
-How long the Puppet master should cache data it loads from an environment\.
-.
-.P
-A value of \fB0\fR will disable caching\. This setting can also be set to \fBunlimited\fR, which will cache environments until the master is restarted or told to refresh the cache\.
+How long the Puppet master should cache data it loads from an environment\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\. A value of \fB0\fR will disable caching\. This setting can also be set to \fBunlimited\fR, which will cache environments until the master is restarted or told to refresh the cache\.
 .
 .P
 You should change this setting once your Puppet deployment is doing non\-trivial work\. We chose the default value of \fB0\fR because it lets new users update their code without any extra steps, but it lowers the performance of your Puppet master\.
@@ -574,10 +571,13 @@ We recommend setting this to \fBunlimited\fR and explicitly refreshing your Pupp
 .IP "\(bu" 4
 With Puppet Server, you should refresh environments by calling the \fBenvironment\-cache\fR API endpoint\. See the docs for the Puppet Server administrative API\.
 .
+.IP "\(bu" 4
+With a Rack Puppet master, you should restart the web server or the application server\. Passenger lets you touch a \fBrestart\.txt\fR file to refresh an application without restarting Apache; see the Passenger docs for details\.
+.
 .IP "" 0
 .
 .P
-Any value other than \fB0\fR or \fBunlimited\fR is deprecated, since most Puppet servers use a pool of Ruby interpreters which all have their own cache timers\. When these timers drift out of sync, agents can be served inconsistent catalogs\.
+We don\'t recommend using any value other than \fB0\fR or \fBunlimited\fR, since most Puppet masters use a pool of Ruby interpreters which all have their own cache timers\. When these timers drift out of sync, agents can be served inconsistent catalogs\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 0
@@ -670,7 +670,7 @@ Where the fileserver configuration is stored\.
 .IP "" 0
 .
 .SS "filetimeout"
-The minimum time to wait between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or puppet\.conf) has changed on disk\. The default will change in a future release to be \'unlimited\', requiring a reload of the Puppet service to pick up changes to its internal configuration\. Currently we do not accept a value of \'unlimited\'\. To reparse files within an environment in Puppet Server please use the environment_cache endpoint
+The minimum time to wait between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or templates) has changed on disk\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: 15s
@@ -692,14 +692,6 @@ Freezes the \'main\' class, disallowing any code to be added to it\. This essent
 .
 .IP "" 0
 .
-.SS "func3x_check"
-Causes validation of loaded legacy Ruby functions (3x API) to raise errors about illegal constructs that could cause harm or that simply does not work\. This flag is on by default\. This flag is made available so that the validation can be turned off in case the method of validation is faulty \- if encountered, please file a bug report\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: true
-.
-.IP "" 0
-.
 .SS "future_features"
 Whether or not to enable all features currently being developed for future major releases of Puppet\. Should be used with caution, as in development features are experimental and can have unexpected effects\.
 .
@@ -876,7 +868,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\.0\.10 Ruby/2\.4\.1\-p111 (x86_64\-linux)
+\fIDefault\fR: Puppet/6\.1\.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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-APPLY" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CATALOG" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CONFIG" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DEVICE" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DOC" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-EPP" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FACTS" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "December 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket
@@ -67,12 +67,8 @@ Use the local filebucket\. This uses the default configuration information and t
 Use a remote filebucket\. This uses the default configuration information and the bucket located at the \'$bucketdir\' setting by default\.
 .
 .TP
-\-\-server_list
-A list of comma seperated servers; only the first entry is used for file storage\. This setting takes precidence over \fBserver\fR\.
-.
-.TP
 \-\-server
-The server to use for file storage\. This setting is only used if \fBserver_list\fR is not set\.
+The server to send the file to, instead of locally\.
 .
 .TP
 \-\-todate

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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-GENERATE" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-HELP" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-KEY" "8" "December 2018" "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 "PUPPET\-LOOKUP" "8" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-LOOKUP" "8" "December 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-lookup\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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MAN" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MODULE" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SSL" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-STATUS" "8" "December 2018" "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" "July 2019" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "December 2018" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
@@ -25,4 +25,4 @@ Specialized:
 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
 .
 .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\.0\.10
+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\.1\.0

data/spec/fixtures/unit/provider/package/pkgng/pkg.query

@@ -1 +1,7 @@
-zsh-5.0.2                      The Z shell
+ca_root_nss 3.15.3.1 security/ca_root_nss
+curl 7.33.0 ftp/curl
+gnupg 2.0.22 security/gnupg
+nmap 6.40 security/nmap
+pkg 1.2.4_1 ports-mgmt/pkg
+zsh 5.0.2_1 shells/zsh
+tac_plus F4.0.4.27a net/tac_plus4

data/spec/fixtures/unit/provider/package/pkgng/pkg.query.zsh

@@ -0,0 +1 @@
+zsh 5.0.2_1 shells/zsh

data/spec/integration/agent/logging_spec.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet'
@@ -69,9 +70,9 @@ describe 'agent logging' do
   shared_examples "an agent" do |argv, expected|
     before(:each) do
       # Don't actually run the agent, bypassing cert checks, forking and the puppet run itself
-      allow_any_instance_of(Puppet::Application::Agent).to receive(:run_command)
+      Puppet::Application::Agent.any_instance.stubs(:run_command)
       # Let exceptions be raised instead of exiting
-      allow_any_instance_of(Puppet::Application::Agent).to receive(:exit_on_fail).and_yield
+      Puppet::Application::Agent.any_instance.stubs(:exit_on_fail).yields
     end
 
     def double_of_bin_puppet_agent_call(argv)
@@ -95,15 +96,16 @@ describe 'agent logging' do
           #
           # It's not something we are specifically testing here since it occurs
           # regardless of user flags.
-          expect(Puppet::Util::Log).to receive(:newdestination).with(instance_of(Puppet::Transaction::Report))
+          Puppet::Util::Log.expects(:newdestination).with(instance_of(Puppet::Transaction::Report)).at_least_once
           expected[:loggers].each do |logclass|
-            expect(Puppet::Util::Log).to receive(:newdestination).with(logclass)
+            Puppet::Util::Log.expects(:newdestination).with(logclass).at_least_once
           end
           double_of_bin_puppet_agent_call(argv)
 
           expect(Puppet::Util::Log.level).to eq(expected[:level])
         end
       end
+
     end
   end
 
@@ -171,7 +173,7 @@ describe 'agent logging' do
         argv = (onetime_daemonize_args + [log_level_args, log_dest_args]).flatten.compact
 
         describe "for #{argv}" do
-          it_should_behave_like("an agent", argv, with_expectations_based_on(argv))
+          it_should_behave_like( "an agent", argv, with_expectations_based_on(argv))
         end
       end
     end

data/spec/integration/application/apply_spec.rb

@@ -8,7 +8,7 @@ describe "apply" do
   before :each do
     Puppet[:reports] = "none"
     # Let exceptions be raised instead of exiting
-    allow_any_instance_of(Puppet::Application).to receive(:exit_on_fail).and_yield
+    Puppet::Application.any_instance.stubs(:exit_on_fail).yields
   end
 
   describe "when applying provided catalogs" do
@@ -99,7 +99,7 @@ end
         apply.options[:catalog] = file_containing('manifest', catalog.to_json)
 
         Puppet[:environmentpath] = envdir
-        expect_any_instance_of(Puppet::Pops::Loader::Runtime3TypeLoader).not_to receive(:find)
+        Puppet::Pops::Loader::Runtime3TypeLoader.any_instance.expects(:find).never
         expect { apply.run }.to have_printed(/the Puppet::Type says hello.*applytest was here/m)
       end
 
@@ -110,8 +110,8 @@ end
         tn = Puppet::Pops::Loader::TypedName.new(:resource_type_pp, 'applytest')
         rt = Puppet::Pops::Resource::ResourceTypeImpl.new('applytest', [Puppet::Pops::Resource::Param.new(String, 'message')], [Puppet::Pops::Resource::Param.new(String, 'name', true)])
 
-        expect(compiler.loaders.runtime3_type_loader.instance_variable_get(:@resource_3x_loader)).to receive(:set_entry).once.with(tn, rt, instance_of(String))
-          .and_return(Puppet::Pops::Loader::Loader::NamedEntry.new(tn, rt, nil))
+        compiler.loaders.runtime3_type_loader.instance_variable_get(:@resource_3x_loader).expects(:set_entry).once.with(tn, rt, is_a(String))
+          .returns(Puppet::Pops::Loader::Loader::NamedEntry.new(tn, rt, nil))
         expect { compiler.compile }.not_to have_printed(/the Puppet::Type says hello/)
       end
 
@@ -165,7 +165,7 @@ end
                     'street' => String,
                     'zipcode' => String,
                     'city' => String,
-                  }
+                  } 
                 }]
               PUPPET
               'address.pp' => <<-PUPPET,
@@ -173,7 +173,7 @@ end
                   parent => Mod::StreetAddress,
                   attributes => {
                     'state' => String
-                  }
+                  } 
                 }]
               PUPPET
               'contact.pp' => <<-PUPPET,
@@ -239,7 +239,7 @@ end
     Puppet.override(:current_environment => special) do
       Puppet[:environment] = 'special'
       puppet = Puppet::Application[:apply]
-      allow(puppet).to receive(:command_line).and_return(double('command_line', :args => [manifest]))
+      puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
       expect { puppet.run_command }.to exit_with(0)
     end
 
@@ -250,7 +250,7 @@ end
     manifest = file_containing("manifest.pp", "notice(\"$server_facts\")")
 
     puppet = Puppet::Application[:apply]
-    allow(puppet).to receive(:command_line).and_return(double('command_line', :args => [manifest]))
+    puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
 
     expect { puppet.run_command }.to exit_with(0)
 
@@ -271,7 +271,7 @@ end
       Puppet[:node_terminus] = 'exec'
       Puppet[:external_nodes] = enc
       puppet = Puppet::Application[:apply]
-      allow(puppet).to receive(:command_line).and_return(double('command_line', :args => [manifest]))
+      puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
       expect { puppet.run_command }.to exit_with(0)
     end
 
@@ -281,7 +281,7 @@ end
   context "handles errors" do
     it "logs compile errors once" do
       Puppet.initialize_settings([])
-      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => []))
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => []))
       apply.options[:code] = '08'
 
       msg = 'valid octal'
@@ -296,7 +296,7 @@ end
 
     it "logs compile post processing errors once" do
       Puppet.initialize_settings([])
-      apply = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => []))
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => []))
       path = File.expand_path('/tmp/content_file_test.Q634Dlmtime')
       apply.options[:code] = "file { '#{path}':
         content => 'This is the test file content',
@@ -338,7 +338,7 @@ end
 
     def init_cli_args_and_apply_app(args, execute)
       Puppet.initialize_settings(args)
-      puppet = Puppet::Application.find(:apply).new(double('command_line', :subcommand_name => :apply, :args => args))
+      puppet = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => args))
       puppet.options[:code] = execute
       return puppet
     end
@@ -476,7 +476,7 @@ class amod::bad_type {
         catalog = compile_to_catalog(execute, node)
         apply = Puppet::Application[:apply]
         apply.options[:catalog] = file_containing('manifest', catalog.to_json)
-        expect(apply).to receive(:apply_catalog) do |cat|
+        apply.expects(:apply_catalog).with do |cat|
           expect(cat.resource(:notify, 'rx')['message']).to be_a(String)
           expect(cat.resource(:notify, 'bin')['message']).to be_a(String)
           expect(cat.resource(:notify, 'ver')['message']).to be_a(String)
@@ -484,7 +484,6 @@ class amod::bad_type {
           expect(cat.resource(:notify, 'tspan')['message']).to be_a(String)
           expect(cat.resource(:notify, 'tstamp')['message']).to be_a(String)
         end
-
         apply.run
       end
 
@@ -492,10 +491,9 @@ class amod::bad_type {
         json = compile_to_catalog('include amod::bad_type', node).to_json
         apply = Puppet::Application[:apply]
         apply.options[:catalog] = file_containing('manifest', json)
-        expect(apply).to receive(:apply_catalog) do |catalog|
+        apply.expects(:apply_catalog).with do |catalog|
           expect(catalog.resource(:notify, 'bogus')['message']).to be_a(String)
         end
-
         apply.run
       end
 
@@ -518,7 +516,7 @@ class amod::bad_type {
           catalog.to_json
         end
         apply.options[:catalog] = file_containing('manifest', serialized_catalog)
-        expect(apply).to receive(:apply_catalog) do |cat|
+        apply.expects(:apply_catalog).with do |cat|
           expect(cat.resource(:notify, 'rx')['message']).to be_a(Regexp)
           # The resource return in this expect is a String, but since it was a Binary type that
           # was converted with `resolve_and_replace`, we want to make sure that the encoding
@@ -529,9 +527,9 @@ class amod::bad_type {
           expect(cat.resource(:notify, 'tspan')['message']).to be_a(Puppet::Pops::Time::Timespan)
           expect(cat.resource(:notify, 'tstamp')['message']).to be_a(Puppet::Pops::Time::Timestamp)
         end
-
         apply.run
       end
     end
+
   end
 end