puppet 4.8.2-universal-darwin → 4.9.0-universal-darwin

data/lib/puppet/version.rb

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

data/lib/puppet.rb

@@ -4,6 +4,8 @@ if RUBY_VERSION < "1.9.3"
   raise LoadError, "Puppet #{Puppet.version} requires ruby 1.9.3 or greater."
 end
 
+Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.1.0'
+
 # see the bottom of the file for further inclusions
 # Also see the new Vendor support - towards the end
 #
@@ -19,6 +21,20 @@ require 'puppet/external/pson/common'
 require 'puppet/external/pson/version'
 require 'puppet/external/pson/pure'
 
+# When running within puppetserver, the gettext-setup gem might not be available, so
+# we need to skip initializing i18n functionality and stub out methods normally
+# supplied by gettext-setup. Can be removed in Puppet 5. See PUP-7116.
+begin
+  require 'gettext-setup'
+  require 'locale'
+  Puppet::GETTEXT_AVAILABLE = true
+rescue LoadError
+  def _(msg)
+    msg
+  end
+  Puppet::GETTEXT_AVAILABLE = false
+end
+
 #------------------------------------------------------------
 # the top-level module
 #
@@ -36,6 +52,36 @@ module Puppet
   require 'puppet/environments'
 
   class << self
+    if Puppet::GETTEXT_AVAILABLE
+      # e.g. ~/code/puppet/locales. Also when running as a gem.
+      local_locale_path = File.absolute_path('../locales', File.dirname(__FILE__))
+      # e.g. /opt/puppetlabs/puppet/share/locale
+      posix_system_locale_path = File.absolute_path('../../../share/locale', File.dirname(__FILE__))
+      # e.g. C:\Program Files\Puppet Labs\Puppet\puppet\share\locale
+      win32_system_locale_path = File.absolute_path('../../../../../puppet/share/locale', File.dirname(__FILE__))
+
+      if File.exist?(local_locale_path)
+        locale_path = local_locale_path
+      elsif File.exist?(win32_system_locale_path)
+        locale_path = win32_system_locale_path
+      elsif File.exist?(posix_system_locale_path)
+        locale_path = posix_system_locale_path
+      else
+        # We couldn't load our locale data.
+        locale_path = nil
+      end
+
+      if locale_path
+        if Gem.loaded_specs['gettext-setup'].version < Gem::Version.new('0.8')
+          # Will load translations from PO files only
+          GettextSetup.initialize(locale_path)
+        else
+          GettextSetup.initialize(locale_path, :file_format => :mo)
+        end
+        FastGettext.locale = GettextSetup.negotiate_locale(Locale.current.language)
+      end
+    end
+
     include Puppet::Util
     attr_reader :features
   end
@@ -115,6 +161,12 @@ module Puppet
   # Load all of the settings.
   require 'puppet/defaults'
 
+  # Now that settings are loaded we have the code loaded to be able to issue
+  # deprecation warnings. Warn if we're on a deprecated ruby version.
+  if RUBY_VERSION < Puppet::OLDEST_RECOMMENDED_RUBY_VERSION
+    Puppet.deprecation_warning("Support for ruby version #{RUBY_VERSION} is deprecated and will be removed in a future release. See https://docs.puppet.com/puppet/latest/system_requirements.html#ruby for a list of supported ruby versions.")
+  end
+
   # Initialize puppet's settings. This is intended only for use by external tools that are not
   #  built off of the Faces API or the Puppet::Util::Application class. It may also be used
   #  to initialize state so that a Face may be used programatically, rather than as a stand-alone

data/lib/semver.rb

@@ -2,6 +2,8 @@ require 'puppet/util/monkey_patches'
 
 # We need to subclass Numeric to force range comparisons not to try to iterate over SemVer
 # and instead use numeric comparisons (eg >, <, >=, <=)
+# @api private
+# @deprecated
 class SemVer < Numeric
   include Comparable
 
@@ -20,17 +22,17 @@ class SemVer < Numeric
     vstring =~ /-/ ? vstring : vstring + '-'
   end
 
-  def self.[](range)
+  def self.[](range, suppress_deprecation_warning = false)
     range.gsub(/([><=])\s+/, '\1').split(/\b\s+(?!-)/).map do |r|
       case r
       when SemVer::VERSION
-        SemVer.new(pre(r)) .. SemVer.new(r)
+        SemVer.new(pre(r), suppress_deprecation_warning) .. SemVer.new(r, suppress_deprecation_warning)
       when SemVer::SIMPLE_RANGE
         r += ".0" unless SemVer.valid?(r.gsub(/x/i, '0'))
-        SemVer.new(r.gsub(/x/i, '0'))...SemVer.new(r.gsub(/(\d+)\.x/i) { "#{$1.to_i + 1}.0" } + '-')
+        SemVer.new(r.gsub(/x/i, '0'))...SemVer.new(r.gsub(/(\d+)\.x/i) { "#{$1.to_i + 1}.0" } + '-', suppress_deprecation_warning)
       when /\s+-\s+/
         a, b = r.split(/\s+-\s+/)
-        SemVer.new(pre(a)) .. SemVer.new(b)
+        SemVer.new(pre(a)) .. SemVer.new(b, suppress_deprecation_warning)
       when /^~/
         ver = r.sub(/~/, '').split('.').map(&:to_i)
         start = (ver + [0] * (3 - ver.length)).join('.')
@@ -39,13 +41,13 @@ class SemVer < Numeric
         ver[-1] = ver.last + 1
 
         finish = (ver + [0] * (3 - ver.length)).join('.')
-        SemVer.new(pre(start)) ... SemVer.new(pre(finish))
+        SemVer.new(pre(start), suppress_deprecation_warning) ... SemVer.new(pre(finish), suppress_deprecation_warning)
       when /^>=/
         ver = r.sub(/^>=/, '')
-        SemVer.new(pre(ver)) .. SemVer::MAX
+        SemVer.new(pre(ver), suppress_deprecation_warning) .. SemVer::MAX
       when /^<=/
         ver = r.sub(/^<=/, '')
-        SemVer::MIN .. SemVer.new(ver)
+        SemVer::MIN .. SemVer.new(ver, suppress_deprecation_warning)
       when /^>/
         if r =~ /-/
           ver = [r[1..-1]]
@@ -53,10 +55,10 @@ class SemVer < Numeric
           ver = r.sub(/^>/, '').split('.').map(&:to_i)
           ver[2] = ver.last + 1
         end
-        SemVer.new(ver.join('.') + '-') .. SemVer::MAX
+        SemVer.new(ver.join('.') + '-', suppress_deprecation_warning) .. SemVer::MAX
       when /^</
         ver = r.sub(/^</, '')
-        SemVer::MIN ... SemVer.new(pre(ver))
+        SemVer::MIN ... SemVer.new(pre(ver), suppress_deprecation_warning)
       else
         (1..1)
       end
@@ -65,7 +67,12 @@ class SemVer < Numeric
 
   attr_reader :major, :minor, :tiny, :special
 
-  def initialize(ver)
+  def initialize(ver, suppress_deprecation_warning = false)
+    unless suppress_deprecation_warning || Puppet[:strict] == :off
+      Puppet.warn_once(:deprecation, 'Puppet::SemVer',
+        "Use of class Puppet::SemVer is deprecated. SemanticPuppet::Version or SemanticPuppet::VersionRange should be used instead")
+    end
+
     unless SemVer.valid?(ver)
       raise ArgumentError.new("Invalid version string '#{ver}'!")
     end
@@ -130,10 +137,10 @@ class SemVer < Numeric
   end
   alias :to_s :inspect
 
-  MIN = SemVer.new('0.0.0-')
+  MIN = SemVer.new('0.0.0-', true)
   MIN.instance_variable_set(:@vstring, 'vMIN')
 
-  MAX = SemVer.new('8.0.0')
+  MAX = SemVer.new('8.0.0', true)
   MAX.instance_variable_set(:@major, Float::INFINITY) # => Infinity
   MAX.instance_variable_set(:@vstring, 'vMAX')
 end

data/locales/config.yaml

@@ -0,0 +1,29 @@
+---
+# This is the project-specific configuration file for setting up
+# fast_gettext for your project.
+gettext:
+  # This is used for the name of the .pot and .po files; they will be
+  # called <project_name>.pot?
+  project_name: 'puppet'
+  # This is used in comments in the .pot and .po files to indicate what
+  # project the files belong to and should be a little more descriptive than
+  # <project_name>
+  package_name: Puppet automation framework
+  # The locale that the default messages in the .pot file are in
+  default_locale: en
+  # The address for sending bug reports.
+  bugs_address: https://tickets.puppetlabs.com
+  # The holder of the copyright.
+  copyright_holder: Puppet, Inc.
+  # Patterns for +Dir.glob+ used to find all files that might contain
+  # translatable content, relative to the project root directory
+  source_files:
+    - 'lib/**/*.rb'
+  # Patterns for +Dir.glob+ used to find all files contained in
+  # `source_files` that should be ignored when searching for translatable
+  # content, relative to the project root directory
+  exclude_files:
+    - 'lib/puppet/pops/types/type_formatter.rb'
+    # The semantic_puppet gem is temporarily vendored (PUP-7114), and it
+    # handles its own translation.
+    - 'lib/semantic_puppet/**/*.rb'

data/locales/puppet.pot

@@ -0,0 +1,79 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2017 Puppet, Inc.
+# This file is distributed under the same license as the Puppet automation framework package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Puppet automation framework 4.8.2-338-g562b302\n"
+"\n"
+"Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
+"POT-Creation-Date: 2017-01-25 09:32-0800\n"
+"PO-Revision-Date: 2017-01-25 09:32-0800\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+msgid "Apache 2 license; see COPYING"
+msgstr ""
+
+msgid "Display Puppet help."
+msgstr ""
+
+msgid "Display help about Puppet subcommands and their actions."
+msgstr ""
+
+msgid "[<subcommand>] [<action>]"
+msgstr ""
+
+msgid "Short help text for the specified subcommand or action."
+msgstr ""
+
+msgid ""
+"      Get help for an action:\n"
+"\n"
+"      $ puppet help\n"
+msgstr ""
+
+msgid "--version VERSION"
+msgstr ""
+
+msgid "The version of the subcommand for which to show help."
+msgstr ""
+
+msgid "Puppet help only takes two (optional) arguments: a subcommand and an action"
+msgstr ""
+
+msgid "Version only makes sense when a Faces subcommand is given"
+msgstr ""
+
+msgid "Legacy subcommands don't take actions"
+msgstr ""
+
+msgid ""
+"Could not load help for the application #{applicationname}.\n"
+"Please check the error logs for more information.\n"
+"\n"
+"Detail: \"#{detail.message}\"\n"
+msgstr ""
+
+msgid ""
+"Could not load help for the face #{facename}.\n"
+"Please check the error logs for more information.\n"
+"\n"
+"Detail: \"#{detail.message}\"\n"
+msgstr ""
+
+msgid "\"Unable to load action #{actionname} from #{face}\""
+msgstr ""
+
+msgid " (Deprecated)"
+msgstr ""
+
+msgid "! Subcommand unavailable due to error. Check error logs."
+msgstr ""

data/man/man5/puppet.conf.5

@@ -1285,7 +1285,7 @@ Where to retrieve external facts for pluginsync
 What files to ignore when pulling down plugins\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \.svn CVS \.git
+\fIDefault\fR: \.svn CVS \.git \.hg
 .
 .IP "" 0
 .

data/spec/fixtures/unit/data_providers/environments/hiera_misc/data/common.yaml

@@ -44,3 +44,5 @@ recursive: '%{r1}'
 km_qualified: "Value from qualified interpolation OS = %{os.name}"
 
 km_multi: "cluster/%{literal('%')}{::cluster}/%{literal('%')}{role}"
+
+domain: "-- %{domain} --"

data/spec/fixtures/unit/data_providers/environments/hiera_modules/modules/two/data/common.yaml

@@ -1,4 +1,4 @@
 ---
 lookup_options:
-  roles::devco::packages:
+  two::arg:
     merge: unique

data/spec/fixtures/unit/data_providers/environments/sample/modules/backend/hiera.yaml

@@ -0,0 +1,5 @@
+---
+:version: 4
+:hierarchy:
+  - :name: "Other"
+    :backend: special

data/spec/fixtures/unit/data_providers/environments/sample/modules/backend/lib/puppet/bindings/backend/default.rb

@@ -0,0 +1,9 @@
+Puppet::Bindings.newbindings('backend::default') do
+  # In the default bindings for this module
+  bind {
+    # bind its name to the 'puppet' environment data provider
+    name         'special'
+    in_multibind "puppet::path_based_data_provider_factories"
+    to_instance "PuppetX::Backend::SpecialDataProviderFactory"
+ }
+end

data/spec/fixtures/unit/data_providers/environments/sample/modules/backend/lib/puppet_x/backend/special_data_provider_factory.rb

@@ -0,0 +1,23 @@
+module PuppetX::Backend
+  class SpecialDataProviderFactory < Puppet::Plugins::DataProviders::PathBasedDataProviderFactory
+    def create(name, paths, parent_data_provider)
+      SpecialDataProvider.new(name, paths)
+    end
+
+    def resolve_paths(datadir, declared_paths, paths, lookup_invocation)
+      paths
+    end
+  end
+
+  class SpecialDataProvider < Puppet::Plugins::DataProviders::PathBasedDataProvider
+    def unchecked_lookup(key, lookup_invocation, merge)
+      value = {
+        'backend::test::param_a' => 'module data param_a is 1000',
+        'backend::test::param_b' => 'module data param_b is 2000',
+      }[key]
+      throw :no_such_key if value.nil?
+      value
+    end
+  end
+end
+

data/spec/fixtures/unit/data_providers/environments/sample/modules/backend/manifests/init.pp

@@ -0,0 +1,5 @@
+class backend {
+  class test($param_a = 1, $param_b = 2, $param_c = 3) {
+    notice("$param_a, $param_b, $param_c")
+  }
+}

data/spec/fixtures/unit/data_providers/environments/sample/modules/backend/metadata.json

@@ -0,0 +1,9 @@
+{
+    "name": "example/one",
+    "version": "0.0.2",
+    "source": "git@github.com/example/example-one.git",
+    "dependencies": [],
+    "author": "Bob the Builder",
+    "license": "Apache-2.0",
+    "data_provider": "hiera"
+}

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/lib/puppet_x/helindbe/sample_env_data.rb

@@ -19,6 +19,7 @@ module PuppetX::Helindbe
         'test::param_a' => 'env data param_a is 10',
         'test::param_b' => 'env data param_b is 20',
         # demo: this overrides a parameter for a class in the dataprovider module
+        'backend::test::param_c' => 'env data param_c is 3000',
         'dataprovider::test::param_c' => 'env data param_c is 300',
       }
     end

data/spec/fixtures/unit/data_providers/environments/sample/modules/dataprovider/manifests/init.pp

@@ -1,5 +1,5 @@
 class dataprovider {
   class test($param_a = 1, $param_b = 2, $param_c = 3) {
-    notify { "$param_a, $param_b, $param_c": }
+    notice("$param_a, $param_b, $param_c")
   }
 }

data/spec/fixtures/unit/functions/lookup/data/common.yaml

@@ -0,0 +1,19 @@
+---
+abc::a: global_a
+abc::c:
+  - global_c
+
+abc::e:
+  k1: global_e1
+
+abc::f:
+  k1:
+    s1: global_f11
+  k2:
+    s3: global_f23
+
+bca::e:
+  k1: global_e1
+
+no_provider::e:
+  k1: global_e1

data/spec/fixtures/unit/functions/lookup_fixture/data/common.yaml

@@ -0,0 +1,19 @@
+---
+abc::a: global_a
+abc::c:
+  - global_c
+
+abc::e:
+  k1: global_e1
+
+abc::f:
+  k1:
+    s1: global_f11
+  k2:
+    s3: global_f23
+
+bca::e:
+  k1: global_e1
+
+no_provider::e:
+  k1: global_e1

data/spec/integration/application/apply_spec.rb

@@ -134,6 +134,92 @@ end
     end
   end
 
+  context 'from environment with pcore object types' do
+    include PuppetSpec::Compiler
+
+    let!(:envdir) { Puppet[:environmentpath] }
+    let(:env_name) { 'spec' }
+    let(:dir_structure) {
+      {
+        'environment.conf' => <<-CONF,
+          rich_data = true
+        CONF
+        'modules' => {
+          'mod' => {
+            'types' => {
+              'streetaddress.pp' => <<-PUPPET,
+                type Mod::StreetAddress = Object[{
+                  attributes => {
+                    'street' => String,
+                    'zipcode' => String,
+                    'city' => String,
+                  } 
+                }]
+              PUPPET
+              'address.pp' => <<-PUPPET,
+                type Mod::Address = Object[{
+                  parent => Mod::StreetAddress,
+                  attributes => {
+                    'state' => String
+                  } 
+                }]
+              PUPPET
+              'contact.pp' => <<-PUPPET,
+                type Mod::Contact = Object[{
+                  attributes => {
+                    'address' => Mod::Address,
+                    'email' => String
+                  }
+                }]
+              PUPPET
+            },
+            'manifests' => {
+              'init.pp' => <<-PUPPET,
+                define mod::person(Mod::Contact $contact) {
+                  notify { $title: }
+                  notify { $contact.address.street: }
+                  notify { $contact.address.zipcode: }
+                  notify { $contact.address.city: }
+                  notify { $contact.address.state: }
+                }
+
+                class mod {
+                  mod::person { 'Test Person':
+                    contact => Mod::Contact(
+                      Mod::Address('The Street 23', '12345', 'Some City', 'A State'),
+                      'test@example.com')
+                  }
+                }
+              PUPPET
+            }
+          }
+        }
+      }
+    }
+
+    let(:env) { Puppet::Node::Environment.create(env_name.to_sym, [File.join(envdir, env_name, 'modules')]) }
+    let(:node) { Puppet::Node.new('test', :environment => env) }
+
+    before(:each) do
+      dir_contained_in(envdir, env_name => dir_structure)
+      PuppetSpec::Files.record_tmp(File.join(envdir, env_name))
+    end
+
+    it 'can compile the catalog' do
+      compile_to_catalog('include mod', node)
+    end
+
+    it 'can apply the catalog' do
+      catalog = compile_to_catalog('include mod', node)
+
+      Puppet[:environment] = env_name
+      apply = Puppet::Application[:apply]
+      apply.options[:catalog] = file_containing('manifest', catalog.to_pson)
+      expect { apply.run_command; exit(0) }.to exit_with(0)
+      expect(@logs.map(&:to_s)).to include('The Street 23')
+    end
+  end
+
   it "applies a given file even when a directory environment is specified" do
     manifest = file_containing("manifest.pp", "notice('it was applied')")
 
@@ -414,8 +500,8 @@ class amod::bad_type {
         apply.expects(:apply_catalog).with do |catalog|
           catalog.resource(:notify, 'rx')['message'].is_a?(Regexp)
           catalog.resource(:notify, 'bin')['message'].is_a?(Puppet::Pops::Types::PBinaryType::Binary)
-          catalog.resource(:notify, 'ver')['message'].is_a?(Semantic::Version)
-          catalog.resource(:notify, 'vrange')['message'].is_a?(Semantic::VersionRange)
+          catalog.resource(:notify, 'ver')['message'].is_a?(SemanticPuppet::Version)
+          catalog.resource(:notify, 'vrange')['message'].is_a?(SemanticPuppet::VersionRange)
           catalog.resource(:notify, 'tspan')['message'].is_a?(Puppet::Pops::Time::Timespan)
           catalog.resource(:notify, 'tstamp')['message'].is_a?(Puppet::Pops::Time::Timestamp)
         end