puppet 4.3.0 → 4.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 09f4069eb54dee692c19820f97cdd1785bab0dbb
+  data.tar.gz: 75ceac304aa7d93d05d7aef8badcfca74960d83a
+SHA512:
+  metadata.gz: 27d55c8abc6d2f688d7672a893ff41f5a6cb46f5c77fec5f5de493b81a47934377c890c2791c6918f1563672ad2d67bafed09078c021c2393688b1649b198266
+  data.tar.gz: a264055b603228a1b909234055387b723d0cc923c18aa7ab74c9ff1386a9ac0b5670bcbefd278b0f03ce05ba0ebf6560499d895f1dcaf70b3bb992be022dde06

data/COMMITTERS.md

@@ -8,7 +8,7 @@ branch, however, we maintain more than one active branch.  As a result
 contributors should target their changes at the master branch. This makes the
 process of contributing a little easier for the contributor since they don't
 need to concern themselves with the question, "What branch do I base my changes
-on?"  This is already called out in the [CONTRIBUTING.md](http://goo.gl/XRH2J).
+on?"  This is already called out in the [CONTRIBUTING.md](https://goo.gl/XRH2J).
 
 Therefore, it is the responsibility of the committer to re-base the change set
 on the appropriate branch which should receive the contribution.
@@ -16,7 +16,7 @@ on the appropriate branch which should receive the contribution.
 It is also the responsibility of the committer to review the change set in an
 effort to make sure the end users must opt-in to new behavior that is
 incompatible with previous behavior.  We employ the use of [feature
-flags](http://stackoverflow.com/questions/7707383/what-is-a-feature-flag) as
+flags](https://stackoverflow.com/questions/7707383/what-is-a-feature-flag) as
 the primary way to achieve this user opt-in behavior.  Finally, it is the
 responsibility of the committer to make sure the `master` and `stable` branches
 are both clean and working at all times.  Clean means that dead code is not

data/CONTRIBUTING.md

@@ -23,13 +23,13 @@ and updates to existing core types.
 
 If you are unsure of whether your contribution should be implemented as a
 module or part of Puppet Core, you may visit
-[#puppet-dev on Freenode IRC](http://freenode.net) or ask on the
+[#puppet-dev on Freenode IRC](https://freenode.net) or ask on the
 [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
 for advice.
 
 ## Getting Started
 
-* Make sure you have a [Jira account](http://tickets.puppetlabs.com)
+* Make sure you have a [Jira account](https://tickets.puppetlabs.com)
 * Make sure you have a [GitHub account](https://github.com/signup/free)
 * Submit a ticket for your issue, assuming one does not already exist.
   * Clearly describe the issue including steps to reproduce when it is a bug.
@@ -106,11 +106,11 @@ a ticket number.
 
 # Additional Resources
 
-* [Puppet Labs community guidelines](http://docs.puppetlabs.com/community/community_guidelines.html)
-* [Bug tracker (Jira)](http://tickets.puppetlabs.com)
+* [Puppet Labs community guidelines](https://docs.puppetlabs.com/community/community_guidelines.html)
+* [Bug tracker (Jira)](https://tickets.puppetlabs.com)
 * [Contributor License Agreement](http://links.puppetlabs.com/cla)
-* [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [General GitHub documentation](https://help.github.com/)
+* [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
 * #puppet-dev IRC channel on freenode.org ([Archive](https://botbot.me/freenode/puppet-dev/))
 * [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
 * [Community PR Triage notes](https://github.com/puppet-community/community-triage/tree/master/core/notes)

data/LICENSE

@@ -8,7 +8,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

data/README.md

@@ -2,7 +2,7 @@ Puppet
 ======
 
 [![Build Status](https://travis-ci.org/puppetlabs/puppet.png?branch=master)](https://travis-ci.org/puppetlabs/puppet)
-[![Inline docs](http://inch-ci.org/github/puppetlabs/puppet.png)](http://inch-ci.org/github/puppetlabs/puppet)
+[![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.png)](https://inch-ci.org/github/puppetlabs/puppet)
 
 Puppet, an automated administrative engine for your Linux, Unix, and Windows systems, performs
 administrative tasks (such as adding users, installing packages, and updating server
@@ -12,24 +12,24 @@ Documentation
 -------------
 
 Documentation for Puppet and related projects can be found online at the
-[Puppet Docs site](http://docs.puppetlabs.com).
+[Puppet Docs site](https://docs.puppetlabs.com).
 
 HTTP API
 --------
-[HTTP API Index](api/docs/http_api_index.md)
+[HTTP API Index](https://docs.puppetlabs.com/puppet/latest/reference/http_api/http_api_index.html)
 
 Installation
 ------------
 
-The best way to run Puppet is with [Puppet Enterprise](http://puppetlabs.com/puppet/puppet-enterprise),
+The best way to run Puppet is with [Puppet Enterprise](https://puppetlabs.com/puppet/puppet-enterprise),
 which also includes orchestration features, a web console, and professional support.
-[The PE documentation is available here.](http://docs.puppetlabs.com/pe/latest)
+[The PE documentation is available here.](https://docs.puppetlabs.com/pe/latest)
 
 To install an open source release of Puppet,
-[see the installation guide on the docs site.](http://docs.puppetlabs.com/guides/installation.html)
+[see the installation guide on the docs site.](http://docs.puppetlabs.com/puppet/latest/reference/install_pre.html)
 
 If you need to run Puppet from source as a tester or developer,
-[see the running from source guide on the docs site.](http://docs.puppetlabs.com/guides/from_source.html)
+[see the running from source guide on the docs site.](https://docs.puppetlabs.com/guides/from_source.html)
 
 Developing and Contributing
 ------
@@ -64,7 +64,6 @@ Bugfixes and ongoing development will occur in minor releases for the current
 major version. Security fixes will be backported to a previous major version on
 a best-effort basis, until the previous major version is no longer maintained.
 
-
 For example: If a security vulnerability is discovered in Puppet 4.1.1, we
 would fix it in the 4 series, most likely as 4.1.2. Maintainers would then make
 a best effort to backport that fix onto the latest Puppet 3 release.
@@ -72,5 +71,5 @@ a best effort to backport that fix onto the latest Puppet 3 release.
 Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:
 
-[Puppet Enterprise Support Lifecycle](http://puppetlabs.com/misc/puppet-enterprise-lifecycle)
+[Puppet Enterprise Support Lifecycle](https://puppetlabs.com/misc/puppet-enterprise-lifecycle)
 

data/conf/auth.conf

@@ -7,8 +7,8 @@
 # otherwise, the general rules may "steal" requests that should be
 # governed by the specific rules.
 #
-# See http://docs.puppetlabs.com/guides/rest_auth_conf.html for a more complete
-# description of auth.conf's behavior.
+# See https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html
+# for a more complete description of auth.conf's behavior.
 #
 # Supported syntax:
 # Each stanza in auth.conf starts with a path to match, followed

data/ext/README.environment

@@ -5,4 +5,4 @@ modules that are installed globally (normally in /etc/puppetlabs/code/modules) f
 puppet master.
 
 For more information see
-http://docs.puppetlabs.com/puppet/latest/reference/environments.html
+https://docs.puppetlabs.com/puppet/latest/reference/environments.html

data/ext/build_defaults.yaml

@@ -14,7 +14,7 @@ build_dmg: FALSE
 sign_tar: FALSE
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
-apt_host: 'apt.puppetlabs.com'
+apt_signing_server: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 tar_host: 'downloads.puppetlabs.com'

data/ext/debian/README.source

@@ -1,2 +1,2 @@
 The debian directory is now maintained on Alioth in git. 
-See http://pkg-puppet.alioth.debian.org/ for more information.
+See https://pkg-puppet.alioth.debian.org/ for more information.

data/ext/debian/control

@@ -7,7 +7,7 @@ Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1
 Build-Depends: debhelper (>= 7.0.0), openssl
 Standards-Version: 3.9.1
 Vcs-Git: git://github.com/puppetlabs/puppet
-Homepage: http://projects.puppetlabs.com/projects/puppet
+Homepage: https://puppetlabs.com/puppet/puppet-open-source
 
 Package: puppet-common
 Architecture: all

data/ext/debian/copyright

@@ -7,9 +7,9 @@ Maintainer:
  Nigel Kersten <nigel@explanatorygap.net>,
  Stig Sandbeck Mathisen <ssm@debian.org>
 Source: git://github.com/puppetlabs/puppet.git,
- http://puppetlabs.com/trac/puppet/wiki/DownloadingPuppet
+ https://docs.puppetlabs.com/puppet/latest/reference/install_pre.html
 
-Copyright: 2005-2011 Puppet Labs, LLC
+Copyright: 2005-2015 Puppet Labs
 License: Apache 2.0
 
 Files: debian/*
@@ -35,7 +35,7 @@ Files: lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
 Copyright: The FaerieMUD Consortium.
 License: CC-BY-1.0
  This work is licensed under the Creative Commons Attribution License. To view
- a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or
+ a copy of this license, visit https://creativecommons.org/licenses/by/1.0/ or
  send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California
  94305, USA.
 
@@ -46,7 +46,7 @@ License: Apache
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
  .
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
  .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,

data/ext/debian/puppetmaster.README.debian

@@ -1,15 +1,17 @@
 By default, the puppetmaster package is configured in
-/etc/default/puppetmaster to utilize the webrick server included in
-the application. This server is single-threaded, very slow and tends
+/etc/default/puppetmaster to use the WEBrick server included in
+the application. This server is single-threaded, very slow, and tends
 to fall over when you get close to 30 nodes. You will start to see
 connection-reset or End-of-file errors when this happens.
 
-You will want to a server that can scale better than webrick, such as
-Passenger (aka. mod_rails), with a front-end web-proxy such as apache.
+For production deployments, use a server that can scale better than WEBrick,
+such as Passenger (aka mod_rails), with a front-end web-proxy such as Apache.
 
-If you would like to run Passenger (aka. mod_rails) with apache install the
-puppetmaster-passenger package. It will automatically setup an apache2 virtual
-host that will run puppetmaster under Passenger.
+To run Passenger with Apache, install the puppetmaster-passenger package. It
+automatically sets up an apache2 virtual host that runs puppetmaster under
+Passenger.
 
-For more information:
-http://projects.puppetlabs.com/projects/puppet/wiki/Using_Passenger
+For more information, see https://docs.puppetlabs.com/guides/passenger.html.
+For information about the Puppet-designed Puppet Server, which deprecates
+the Passenger/Apache stack, see
+https://docs.puppetlabs.com/puppetserver/latest/.

data/ext/emacs/puppet-mode.el

@@ -18,7 +18,7 @@
 ;; use this file except in compliance with the License.  You may obtain a copy
 ;; of the License at
 ;;
-;;     http://www.apache.org/licenses/LICENSE-2.0
+;;     https://www.apache.org/licenses/LICENSE-2.0
 ;;
 ;; Unless required by applicable law or agreed to in writing, software
 ;; distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

data/ext/envpuppet

@@ -105,11 +105,11 @@ if [ "${ENVPUPPET_BLEEDING:-}" = "true" ]; then
   myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/puppet-interfaces/lib"
 fi
 
-# http://github.com/jamtur01/puppet-scaffold.git
+# https://github.com/jamtur01/puppet-scaffold.git
 mypath="${mypath}:${ENVPUPPET_BASEDIR}/puppet-scaffold/bin"
 myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/puppet-scaffold/lib"
 
-# http://github.com/puppetlabs/puppet-module-tool.git
+# https://github.com/puppetlabs/puppet-module-tool.git
 # Also known as "pmt"  Will become "puppet module"
 mypath="${mypath}:${ENVPUPPET_BASEDIR}/puppet-module-tool/bin"
 myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/puppet-module-tool/lib"

data/ext/ips/puppetagent.xml

@@ -34,7 +34,7 @@
       </common_name>
       <documentation>
         <manpage title="puppet" section="1"/>
-        <doc_link name="puppetlabs.com" uri="http://puppetlabs.com/puppet/introduction"/>
+        <doc_link name="puppetlabs.com" uri="https://puppetlabs.com/puppet/introduction"/>
       </documentation>
     </template>
   </service>

data/ext/ips/puppetmaster.xml

@@ -34,7 +34,7 @@
       </common_name>
       <documentation>
         <manpage title="puppet" section="1"/>
-        <doc_link name="puppetlabs.com" uri="http://puppetlabs.com/puppet/introduction"/>
+        <doc_link name="puppetlabs.com" uri="https://puppetlabs.com/puppet/introduction"/>
       </documentation>
     </template>
   </service>

data/ext/project_data.yaml

@@ -25,6 +25,9 @@ gem_rdoc_options:
   - README.md
   - --line-numbers
 gem_platform_dependencies:
+  universal-darwin:
+    gem_runtime_dependencies:
+      CFPropertyList: '~> 2.2.6'
   x86-mingw32:
     gem_runtime_dependencies:
       # Pinning versions that require native extensions
@@ -32,6 +35,7 @@ gem_platform_dependencies:
       win32-dir: '~> 0.4.9'
       win32-eventlog: '~> 0.6.2'
       win32-process: '~> 0.7.4'
+      # Use of win32-security is deprecated
       win32-security: '~> 0.2.5'
       win32-service: '~> 0.8.6'
       minitar: '~> 0.5.4'
@@ -41,9 +45,13 @@ gem_platform_dependencies:
       win32-dir: '~> 0.4.9'
       win32-eventlog: '~> 0.6.2'
       win32-process: '~> 0.7.4'
+      # Use of win32-security is deprecated
       win32-security: '~> 0.2.5'
       win32-service: '~> 0.8.6'
       minitar: '~> 0.5.4'
 bundle_platforms:
+  universal-darwin: ruby
   x86-mingw32: mingw
   x64-mingw32: x64_mingw
+pre_tasks:
+  'package:apple': 'cfpropertylist'

data/ext/puppet-test

@@ -23,8 +23,8 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
-# the full list of acceptable parameters. A commented list of all
+# http://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
+# for the full list of acceptable parameters. A commented list of all
 # configuration $options can also be generated by running puppetd with
 # '--genconfig'.
 #
@@ -91,7 +91,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#       https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,

data/ext/rack/example-passenger-vhost.conf

@@ -1,6 +1,6 @@
 # This Apache 2 virtual host config shows how to use Puppet as a Rack
 # application via Passenger. See
-# http://docs.puppetlabs.com/guides/passenger.html for more information.
+# https://docs.puppetlabs.com/guides/passenger.html for more information.
 
 # You can also use the included config.ru file to run Puppet with other Rack
 # servers instead of Passenger.

data/ext/redhat/puppet.spec.erb

@@ -29,8 +29,8 @@ Release:        <%= @rpmrelease -%>%{?dist}
 Vendor:         %{?_host_vendor}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
-URL:            http://puppetlabs.com
-Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
+URL:            https://puppetlabs.com
+Source0:        https://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
 
 Group:          System Environment/Base
 

data/ext/regexp_nodes/regexp_nodes.rb

@@ -2,7 +2,7 @@
 
 # = Synopsis
 # This is an external node classifier script, after
-# http://docs.puppetlabs.com/guides/external_nodes.html
+# https://docs.puppetlabs.com/guides/external_nodes.html
 #
 # = Usage
 # regexp_nodes.rb <host>

data/ext/solaris/pkginfo

@@ -2,5 +2,5 @@ PKG=CSWpuppet
 NAME=puppet - System Automation Framework
 VERSION=3.0.0
 CATEGORY=application
-VENDOR=http://projects.puppetlabs.com/projects/puppet
+VENDOR=https://projects.puppetlabs.com/projects/puppet
 EMAIL=info@puppetlabs.com

data/ext/solaris/smf/puppet.xml

@@ -36,7 +36,7 @@
       </common_name>
       <documentation>
         <manpage title="puppet" section="1"/>
-        <doc_link name="puppetlabs.com" uri="http://puppetlabs.com/puppet/introduction"/>
+        <doc_link name="puppetlabs.com" uri="https://puppetlabs.com/puppet/introduction"/>
       </documentation>
     </template>
   </service>

data/ext/suse/puppet.spec

@@ -9,8 +9,8 @@ Release: 1%{?dist}
 License: Apache 2.0
 Group:    Productivity/Networking/System
 
-URL: http://puppetlabs.com/projects/puppet/
-Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+URL: https://puppetlabs.com/projects/puppet/
+Source0: https://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 
 PreReq: %{insserv_prereq} %{fillup_prereq}
 Requires: ruby >= 1.8.7

data/ext/upload_facts.rb

@@ -58,7 +58,7 @@ is also a valid long argument.  For example, 'server' is a valid configuration
 parameter, so you can specify '--server <servername>' as an argument.
 
 See the configuration file documentation at
-http://docs.puppetlabs.com/references/stable/configuration.html for
+https://docs.puppetlabs.com/references/stable/configuration.html for
 the full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet agent with
 '--genconfig'.

data/ext/windows/puppet_interactive.bat

@@ -0,0 +1,6 @@
+@echo off
+SETLOCAL
+echo Running Puppet agent on demand ...
+cd "%~dp0"
+call puppet.bat agent --test %*
+PAUSE

data/ext/windows/puppet_shell.bat

@@ -0,0 +1,9 @@
+@echo off
+SETLOCAL
+if exist "%~dp0environment.bat" (
+  call "%~dp0environment.bat" %0 %*
+) else (
+  SET "PATH=%~dp0;%PATH%"
+)
+REM Display Ruby version
+ruby.exe -v

data/ext/windows/run_puppet_interactive.bat

@@ -0,0 +1,9 @@
+@echo Running puppet on demand ...
+@echo off
+SETLOCAL
+if exist "%~dp0environment.bat" (
+  call "%~dp0environment.bat" %0 %*
+) else (
+  SET "PATH=%~dp0;%PATH%"
+)
+elevate.exe "%~dp0puppet_interactive.bat"

data/ext/yaml_nodes.rb

@@ -30,7 +30,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#       https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,

data/install.rb

@@ -406,7 +406,7 @@ def install_binfile(from, op_file, target)
 
   File.open(from) do |ip|
     File.open(tmp_file.path, "w") do |op|
-      op.puts "#!#{ruby}"
+      op.puts "#!#{ruby}" unless $operatingsystem == "windows"
       contents = ip.readlines
       contents.shift if contents[0] =~ /^#!/
       op.write contents.join
@@ -416,30 +416,35 @@ def install_binfile(from, op_file, target)
   if $operatingsystem == "windows"
     installed_wrapper = false
 
-    if File.exists?("#{from}.bat")
-      FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
-      installed_wrapper = true
-    end
+    unless File.extname(from).match(/\.(cmd|bat)/)
+      if File.exists?("#{from}.bat")
+        FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
+        installed_wrapper = true
+      end
 
-    if File.exists?("#{from}.cmd")
-      FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
-      installed_wrapper = true
-    end
+      if File.exists?("#{from}.cmd")
+        FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
+        installed_wrapper = true
+      end
 
-    if not installed_wrapper
-      tmp_file2 = Tempfile.new('puppet-wrapper')
-      cwv = <<-EOS
+      if not installed_wrapper
+        tmp_file2 = Tempfile.new('puppet-wrapper')
+        cwv = <<-EOS
 @echo off
-setlocal
-set RUBY_BIN=%~dp0
-set RUBY_BIN=%RUBY_BIN:\\=/%
-"%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%puppet" %*
+SETLOCAL
+if exist "%~dp0environment.bat" (
+  call "%~dp0environment.bat" %0 %*
+) else (
+  SET "PATH=%~dp0;%PATH%"
+)
+ruby.exe -S -- puppet %*
 EOS
-      File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
-      FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
+        File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
+        FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
 
-      tmp_file2.unlink
-      installed_wrapper = true
+        tmp_file2.unlink
+        installed_wrapper = true
+      end
     end
   end
   FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
@@ -458,10 +463,15 @@ FileUtils.cd File.dirname(__FILE__) do
 
   prepare_installation
 
+  if $operatingsystem == "windows"
+    windows_bins = glob(%w{ext/windows/*bat})
+  end
+
   #build_rdoc(rdoc) if InstallOptions.rdoc
   #build_ri(ri) if InstallOptions.ri
   do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
   do_bins(bins, InstallOptions.bin_dir)
+  do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if $operatingsystem == "windows"
   do_libs(libs)
   do_man(man) unless $operatingsystem == "windows"
 end

data/lib/hiera/scope.rb

@@ -33,7 +33,7 @@ class Hiera
       if [CALLING_CLASS, CALLING_CLASS_PATH, CALLING_MODULE].include? key
         true
       else
-        @real.lookupvar(key) != ""
+        @real.exist?(key)
       end
     end
 

data/lib/puppet/agent.rb

@@ -41,7 +41,7 @@ class Puppet::Agent
       result = run_in_fork(should_fork) do
         with_client do |client|
           begin
-            client_args = client_options.merge(:pluginsync => Puppet[:pluginsync])
+            client_args = client_options.merge(:pluginsync => Puppet::Configurer.should_pluginsync?)
             lock { client.run(client_args) }
           rescue Puppet::LockError
             Puppet.notice "Run of #{client_class} already in progress; skipping  (#{lockfile_path} exists)"

data/lib/puppet/application/agent.rb

@@ -155,7 +155,7 @@ specify '--server <servername>' as an argument. Boolean settings translate into
 '--setting' and '--no-setting' pairs.
 
 See the configuration file documentation at
-http://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/references/stable/configuration.html for the
 full list of acceptable settings. A commented list of all settings can also be
 generated by running puppet agent with '--genconfig'.
 
@@ -404,7 +404,9 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # we want the last report to be persisted locally
     Puppet::Transaction::Report.indirection.cache_class = :yaml
 
-    if Puppet[:catalog_cache_terminus]
+    if Puppet[:noop]
+      Puppet::Resource::Catalog.indirection.cache_class = nil
+    elsif Puppet[:catalog_cache_terminus]
       Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
     end
 

data/lib/puppet/application/apply.rb

@@ -74,7 +74,7 @@ valid setting, so you can specify '--tags <class>,<tag>'
 as an argument.
 
 See the configuration file documentation at
-http://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/references/stable/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.
@@ -175,7 +175,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     if options[:catalog] == "-"
       text = $stdin.read
     else
-      text = ::File.read(options[:catalog])
+      text = Puppet::FileSystem.read(options[:catalog], :encoding => 'utf-8')
     end
     catalog = read_catalog(text)
     apply_catalog(catalog)
@@ -239,7 +239,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
             $stderr.puts "#{file} is not readable"
             exit(63)
           end
-          node.classes = ::File.read(file).split(/[\s\n]+/)
+          node.classes = Puppet::FileSystem.read(file, :encoding => 'utf-8').split(/[\s\n]+/)
         end
       end
 
@@ -315,7 +315,10 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     Puppet.settings.use :main, :agent, :ssl
 
-    if Puppet[:catalog_cache_terminus]
+
+    if Puppet[:noop]
+      Puppet::Resource::Catalog.indirection.cache_class = nil
+    elsif Puppet[:catalog_cache_terminus]
       Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
     end
 

data/lib/puppet/application/cert.rb

@@ -164,7 +164,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-http://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/references/stable/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet cert with
 '--genconfig'.

data/lib/puppet/application/device.rb

@@ -199,7 +199,7 @@ Licensed under the Apache 2.0 License
 
         require 'puppet/configurer'
         configurer = Puppet::Configurer.new
-        configurer.run(:network_device => true, :pluginsync => Puppet[:pluginsync])
+        configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_pluginsync?)
       rescue => detail
         Puppet.log_exception(detail)
         # If we rescued an error, then we return 1 as the exit code

data/lib/puppet/application/filebucket.rb

@@ -73,7 +73,7 @@ setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
-http://docs.puppetlabs.com/references/stable/configuration.html for the
+https://docs.puppetlabs.com/references/stable/configuration.html for the
 full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet with
 '--genconfig'.