puppet 3.7.4 → 3.7.5

data/lib/puppet/provider/yumrepo/inifile.rb

@@ -73,7 +73,9 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
   # @return [Array<String>] All present directories that may contain yum repo configs.
   def self.reposdir(conf='/etc/yum.conf', dirs=['/etc/yum.repos.d', '/etc/yum/repos.d'])
     reposdir = find_conf_value('reposdir', conf)
-    dirs << reposdir if reposdir
+    # Use directories in reposdir if they are set instead of default
+    dirs = reposdir.split(",").map(&:strip) if reposdir
+    
 
     # We can't use the below due to Ruby 1.8.7
     # dirs.select! { |dir| Puppet::FileSystem.exist?(dir) }
@@ -100,6 +102,7 @@ Puppet::Type.type(:yumrepo).provide(:inifile) do
   def self.find_conf_value(value, conf='/etc/yum.conf')
     if Puppet::FileSystem.exist?(conf)
       file = Puppet::Util::IniConfig::PhysicalFile.new(conf)
+      file.read
       if (main = file.get_section('main'))
         main[value]
       end

data/lib/puppet/resource.rb

@@ -211,6 +211,7 @@ class Puppet::Resource
   # @api public
   def initialize(type, title = nil, attributes = {})
     @parameters = {}
+    environment = attributes[:environment]
     if type.is_a?(Class) && type < Puppet::Type
       # Set the resource type to avoid an expensive `known_resource_types`
       # lookup.
@@ -441,7 +442,7 @@ class Puppet::Resource
         end
       end
 
-      if Puppet[:parser] == 'current'
+      if !Puppet.future_parser?
         # If the value is an array with only one value, then
         # convert it to a single value.  This is largely so that
         # the database interaction doesn't have to worry about
@@ -480,7 +481,7 @@ class Puppet::Resource
     end
 
     # Perform optional type checking
-    if Puppet[:parser] == 'future'
+    if Puppet.future_parser?
       # Perform type checking
       arg_types = resource_type.argument_types
       # Parameters is a map from name, to parameter, and the parameter again has name and value

data/lib/puppet/resource/catalog.rb

@@ -296,13 +296,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def resource(type, title = nil)
     # Always create a resource reference, so that it always
     # canonicalizes how we are referring to them.
+    attributes = { :environment => environment_instance }
     if title
-      res = Puppet::Resource.new(type, title)
+      res = Puppet::Resource.new(type, title, attributes)
     else
       # If they didn't provide a title, then we expect the first
       # argument to be of the form 'Class[name]', which our
       # Reference class canonicalizes for us.
-      res = Puppet::Resource.new(nil, type)
+      res = Puppet::Resource.new(nil, type, attributes)
     end
     res.catalog = self
     title_key      = [res.type, res.title.to_s]

data/lib/puppet/resource/type.rb

@@ -341,7 +341,7 @@ class Puppet::Resource::Type
     @argument_types = {}
     # Stop here if not running under future parser, the rest requires pops to be initialized
     # and that the type system is available
-    return unless Puppet[:parser] == 'future' && name_to_type_hash
+    return unless Puppet.future_parser? && name_to_type_hash
     name_to_type_hash.each do |name, t|
       # catch internal errors
       unless @arguments.include?(name)

data/lib/puppet/settings/environment_conf.rb

@@ -1,7 +1,7 @@
 # Configuration settings for a single directory Environment.
 # @api private
 class Puppet::Settings::EnvironmentConf
-  VALID_SETTINGS = [:modulepath, :manifest, :config_version, :environment_timeout].freeze
+  VALID_SETTINGS = [:modulepath, :manifest, :config_version, :environment_timeout, :parser].freeze
 
   # Given a path to a directory environment, attempts to load and parse an
   # environment.conf in ini format, and return an EnvironmentConf instance.
@@ -37,8 +37,8 @@ class Puppet::Settings::EnvironmentConf
   # Configuration values are exactly those returned by the environment object,
   # without interpolation.  This is a special case for the default configured
   # environment returned by the Puppet::Environments::StaticPrivate loader.
-  def self.static_for(environment, environment_timeout = 0)
-    Static.new(environment, environment_timeout)
+  def self.static_for(environment, parser, environment_timeout = 0)
+    Static.new(environment, environment_timeout, parser)
   end
 
   attr_reader :section, :path_to_env, :global_modulepath
@@ -100,6 +100,12 @@ class Puppet::Settings::EnvironmentConf
     end
   end
 
+  def parser
+    get_setting(:parser, Puppet.settings.value(:parser)) do |value|
+      value
+    end
+  end
+
   def config_version
     get_setting(:config_version) do |config_version|
       absolute(config_version)
@@ -152,10 +158,12 @@ class Puppet::Settings::EnvironmentConf
   # @api private
   class Static
     attr_reader :environment_timeout
+    attr_reader :parser
 
-    def initialize(environment, environment_timeout)
+    def initialize(environment, environment_timeout, parser)
       @environment = environment
       @environment_timeout = environment_timeout
+      @parser = parser
     end
 
     def manifest

data/lib/puppet/type/package.rb

@@ -306,10 +306,19 @@ module Puppet
     end
 
     newparam(:source) do
-      desc "Where to find the actual package. This must be a local file
-        (or on a network file system) or a URL that your specific
-        packaging type understands; Puppet will not retrieve files for you,
-        although you can manage packages as `file` resources."
+      desc "Where to find the package file. This is only used by providers that don't
+        automatically download packages from a central repository. (For example:
+        the `yum` and `apt` providers ignore this attribute, but the `rpm` and
+        `dpkg` providers require it.)
+
+        Different providers accept different values for `source`. Most providers
+        accept paths to local files stored on the target system. Some providers
+        may also accept URLs or network drive paths. Puppet will not
+        automatically retrieve source files for you, and usually just passes the
+        value of `source` to the package installation command.
+
+        You can use a `file` resource if you need to manually copy package files
+        to the target system."
 
       validate do |value|
         provider.validate_source(value)
@@ -326,10 +335,14 @@ module Puppet
 
     newparam(:adminfile) do
       desc "A file containing package defaults for installing packages.
-        This is currently only used on Solaris.  The value will be
-        validated according to system rules, which in the case of
-        Solaris means that it should either be a fully qualified path
-        or it should be in `/var/sadm/install/admin`."
+
+        This attribute is only used on Solaris. Its value should be a path to a
+        local file stored on the target system. Solaris's package tools expect
+        either an absolute file path or a relative path to a file in
+        `/var/sadm/install/admin`.
+
+        The value of `adminfile` will be passed directly to the `pkgadd` or
+        `pkgrm` command with the `-a <ADMINFILE>` option."
     end
 
     newparam(:responsefile) do
@@ -425,11 +438,8 @@ module Puppet
     newparam(:allow_virtual, :boolean => true, :parent => Puppet::Parameter::Boolean, :required_features => :virtual_packages) do
       desc 'Specifies if virtual package names are allowed for install and uninstall.'
 
-      # In a future release, this should be defaulted to true and the below deprecation warning removed
-      defaultto do
-        Puppet.deprecation_warning('The package type\'s allow_virtual parameter will be changing its default value from false to true in a future release. If you do not want to allow virtual packages, please explicitly set allow_virtual to false.') unless value
-        false
-      end
+      # In a future release, this should be defaulted to true
+      defaultto false
     end
 
     autorequire(:file) do

data/lib/puppet/util/autoload.rb

@@ -70,11 +70,11 @@ class Puppet::Util::Autoload
       end
     end
 
-    def loadall(path)
+    def loadall(path, env = nil)
       # Load every instance of everything we can find.
-      files_to_load(path).each do |file|
+      files_to_load(path, env).each do |file|
         name = file.chomp(".rb")
-        load_file(name, nil) unless loaded?(name)
+        load_file(name, env) unless loaded?(name)
       end
     end
 
@@ -90,8 +90,8 @@ class Puppet::Util::Autoload
       path and File.join(path, name)
     end
 
-    def files_to_load(path)
-      search_directories(nil).map {|dir| files_in_dir(dir, path) }.flatten.uniq
+    def files_to_load(path, env = nil)
+      search_directories(env).map {|dir| files_in_dir(dir, path) }.flatten.uniq
     end
 
     def files_in_dir(dir, path)
@@ -209,8 +209,8 @@ class Puppet::Util::Autoload
   #
   # This uses require, rather than load, so that already-loaded files don't get
   # reloaded unnecessarily.
-  def loadall
-    self.class.loadall(@path)
+  def loadall(env = nil)
+    self.class.loadall(@path, env)
   end
 
   def loaded?(name)

data/lib/puppet/util/errors.rb

@@ -14,7 +14,7 @@ module Puppet::Util::Errors
   # Add line and file info to the supplied exception if info is available from
   # this object, is appropriately populated and the supplied exception supports
   # it.  When other is supplied, the backtrace will be copied to the error
-  # object.
+  # object and the 'original' will be dropped from the error.
   #
   # @param error [Exception] exception that is populated with info
   # @param other [Exception] original exception, source of backtrace info
@@ -25,7 +25,9 @@ module Puppet::Util::Errors
     error.original ||= other if error.respond_to?(:original=)
 
     error.set_backtrace(other.backtrace) if other and other.respond_to?(:backtrace)
-
+    # It is not meaningful to keep the wrapped exception since its backtrace has already
+    # been adopted by the error. (The instance variable is private for good reasons).
+    error.instance_variable_set(:@original, nil)
     error
   end
 

data/lib/puppet/util/network_device/config.rb

@@ -82,6 +82,11 @@ class Puppet::Util::NetworkDevice::Config
     when "type"
       device.provider = value
     when "url"
+      begin
+        URI.parse(value)
+      rescue URI::InvalidURIError
+        raise Puppet::Error, "#{value} is an invalid url"
+      end
       device.url = value
     when "debug"
       device.options[:debug] = true

data/lib/puppet/version.rb

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

data/lib/puppetx.rb

@@ -31,7 +31,7 @@ module Puppetx
   # @api public
   module Puppet
 
-    if ::Puppet[:binder] || ::Puppet[:parser] == 'future'
+    if ::Puppet[:binder] || ::Puppet.future_parser?
         # Extension-points are registered here:
         # - If in a Ruby submodule it is best to create it here
         # - The class does not have to be required; it will be auto required when the binder
@@ -68,7 +68,7 @@ module Puppetx
 
     # @api public
     module SyntaxCheckers
-      if ::Puppet[:binder] || ::Puppet[:parser] == 'future'
+      if ::Puppet[:binder] || ::Puppet.future_parser?
 
         # Classes in this name-space are lazily loaded as they may be overridden and/or never used
         # (Lazy loading is done by binding to the name of a class instead of a Class instance).

data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee.rb

@@ -0,0 +1,8 @@
+module Puppet::Parser::Functions
+  newfunction(:callee, :type => :rvalue, :doc => <<-EOS
+    A function using the 3x API
+  EOS
+  ) do |arguments|
+    "usee::callee() got '#{arguments[0]}'"
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/lib/puppet/parser/functions/callee_ws.rb

@@ -0,0 +1,8 @@
+module Puppet::Parser::Functions
+  newfunction(:callee_ws, :type => :rvalue, :doc => <<-EOS
+    A function using the 3x API
+  EOS
+  ) do |arguments|
+    "usee::callee_ws() got '#{self['passed_in_scope']}'"
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/usee/metadata.json

@@ -0,0 +1,9 @@
+{
+  "name": "test-usee",
+  "author": "test",
+  "description": "",
+  "license": "",
+  "source": "",
+  "version": "1.0.0",
+  "dependencies": []
+}

data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/caller.rb

@@ -0,0 +1,5 @@
+Puppet::Functions.create_function(:'user::caller') do
+  def caller()
+    call_function('callee', 'first') + ' - ' + call_function('callee', 'second')
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/lib/puppet/functions/user/caller_ws.rb

@@ -0,0 +1,12 @@
+Puppet::Functions.create_function(:'user::caller_ws', Puppet::Functions::InternalFunction) do
+  dispatch :caller_ws do
+    scope_param
+    param 'String', :value
+  end
+
+  def caller_ws(scope, value)
+    scope = scope.compiler.newscope(scope)
+    scope['passed_in_scope'] = value
+    call_function_with_scope(scope, 'callee_ws')
+  end
+end

data/spec/fixtures/unit/pops/loaders/loaders/mix_4x_and_3x_functions/user/metadata.json

@@ -0,0 +1,9 @@
+{
+  "name": "test-user",
+  "author": "test",
+  "description": "",
+  "license": "",
+  "source": "",
+  "version": "1.0.0",
+  "dependencies": [{ "name": "test/usee" }]
+}

data/spec/integration/parser/environment_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "A parser environment setting" do
+
+  let(:confdir) { Puppet[:confdir] }
+  let(:environmentpath) { File.expand_path("envdir", confdir) }
+  let(:testingdir) { File.join(environmentpath, "testing") }
+
+  before(:each) do
+    FileUtils.mkdir_p(testingdir)
+  end
+
+  it "selects the given parser when compiling" do
+    manifestsdir = File.expand_path("manifests", confdir)
+    FileUtils.mkdir_p(manifestsdir)
+
+    File.open(File.join(testingdir, "environment.conf"), "w") do |f|
+      f.puts(<<-ENVCONF)
+        parser='future'
+        manifest =#{manifestsdir}
+      ENVCONF
+    end
+
+    File.open(File.join(confdir, "puppet.conf"), "w") do |f|
+      f.puts(<<-EOF)
+          environmentpath=#{environmentpath}
+          parser='current'
+      EOF
+    end
+
+    File.open(File.join(manifestsdir, "site.pp"), "w") do |f|
+      f.puts("notice( [1,2,3].map |$x| { $x*10 })")
+    end
+
+    expect { a_catalog_compiled_for_environment('testing') }.to_not raise_error
+  end
+
+  def a_catalog_compiled_for_environment(envname)
+    Puppet.initialize_settings
+    expect(Puppet[:environmentpath]).to eq(environmentpath)
+    node = Puppet::Node.new('testnode', :environment => 'testing')
+    expect(node.environment).to eq(Puppet.lookup(:environments).get('testing'))
+    Puppet.override(:current_environment => Puppet.lookup(:environments).get('testing')) do
+      Puppet::Parser::Compiler.compile(node)
+    end
+  end
+end

data/spec/integration/parser/future_compiler_spec.rb

@@ -600,12 +600,17 @@ describe "Puppet::Parser::Compiler" do
         expect(catalog).to have_resource("Notify[value second]")
       end
 
-      it 'denies when missing required arguments' do
-        expect do
-          compile_to_catalog(<<-MANIFEST)
-            with(1) |$x, $y| { }
-          MANIFEST
-        end.to raise_error(/Parameter \$y is required but no value was given/m)
+      # Conditinoally left out for Ruby 1.8.x since the Proc created for the expected number of arguments will accept
+      # a call with fewer arguments and then pass all arguments to the closure. The closure then receives an argument
+      # array of correct size with nil values instead of an array with too few arguments
+      unless RUBY_VERSION[0,3] == '1.8'
+        it 'denies when missing required arguments' do
+          expect do
+            compile_to_catalog(<<-MANIFEST)
+              with(1) |$x, $y| { }
+            MANIFEST
+          end.to raise_error(/Parameter \$y is required but no value was given/m)
+        end
       end
 
       it 'accepts anything when parameters are untyped' do

data/spec/unit/application/device_spec.rb

@@ -126,7 +126,6 @@ describe Puppet::Application::Device do
   describe "during setup" do
     before :each do
       @device.options.stubs(:[])
-      Puppet.stubs(:info)
       Puppet[:libdir] = "/dev/null/lib"
       Puppet::SSL::Host.stubs(:ca_location=)
       Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
@@ -271,6 +270,7 @@ describe Puppet::Application::Device do
     before :each do
       @device.options.stubs(:[]).with(:fingerprint).returns(false)
       Puppet.stubs(:notice)
+      @device.options.stubs(:[]).with(:detailed_exitcodes).returns(false)
       @device.options.stubs(:[]).with(:client)
       Puppet::Util::NetworkDevice::Config.stubs(:devices).returns({})
     end
@@ -283,7 +283,7 @@ describe Puppet::Application::Device do
     it "should get the device list" do
       device_hash = stub_everything 'device hash'
       Puppet::Util::NetworkDevice::Config.expects(:devices).returns(device_hash)
-      @device.main
+      expect { @device.main }.to exit_with 1
     end
 
     it "should exit if the device list is empty" do
@@ -296,8 +296,8 @@ describe Puppet::Application::Device do
         Puppet[:confdir] = make_absolute("/dummy")
         Puppet[:certname] = "certname"
         @device_hash = {
-          "device1" => OpenStruct.new(:name => "device1", :url => "url", :provider => "cisco"),
-          "device2" => OpenStruct.new(:name => "device2", :url => "url", :provider => "cisco"),
+          "device1" => OpenStruct.new(:name => "device1", :url => "ssh://user:pass@testhost", :provider => "cisco"),
+          "device2" => OpenStruct.new(:name => "device2", :url => "https://user:pass@testhost/some/path", :provider => "rest"),
         }
         Puppet::Util::NetworkDevice::Config.stubs(:devices).returns(@device_hash)
         Puppet.stubs(:[]=)
@@ -310,38 +310,76 @@ describe Puppet::Application::Device do
 
       it "should set vardir to the device vardir" do
         Puppet.expects(:[]=).with(:vardir, make_absolute("/dummy/devices/device1"))
-        @device.main
+        expect { @device.main }.to exit_with 1
       end
 
       it "should set confdir to the device confdir" do
         Puppet.expects(:[]=).with(:confdir, make_absolute("/dummy/devices/device1"))
-        @device.main
+        expect { @device.main }.to exit_with 1
       end
 
       it "should set certname to the device certname" do
         Puppet.expects(:[]=).with(:certname, "device1")
         Puppet.expects(:[]=).with(:certname, "device2")
-        @device.main
+        expect { @device.main }.to exit_with 1
       end
 
       it "should make sure all the required folders and files are created" do
         Puppet.settings.expects(:use).with(:main, :agent, :ssl).twice
-        @device.main
+        expect { @device.main }.to exit_with 1
       end
 
       it "should initialize the device singleton" do
         Puppet::Util::NetworkDevice.expects(:init).with(@device_hash["device1"]).then.with(@device_hash["device2"])
-        @device.main
+        expect { @device.main }.to exit_with 1
+      end
+
+      it "should print the device url scheme, host, and port" do
+        Puppet.expects(:info).with "starting applying configuration to device1 at ssh://testhost"
+        Puppet.expects(:info).with "starting applying configuration to device2 at https://testhost:443/some/path"
+        expect { @device.main }.to exit_with 1
       end
 
       it "should setup the SSL context" do
         @device.expects(:setup_host).twice
-        @device.main
+        expect { @device.main }.to exit_with 1
       end
 
       it "should launch a configurer for this device" do
         @configurer.expects(:run).twice
-        @device.main
+        expect { @device.main }.to exit_with 1
+      end
+
+      it "exits 1 when configurer raises error" do
+        @configurer.stubs(:run).raises(Puppet::Error).then.returns(0)
+        expect { @device.main }.to exit_with 1
+      end
+
+      it "exits 0 when run happens without puppet errors but with failed run" do
+        @configurer.stubs(:run).returns(6,2)
+        expect { @device.main }.to exit_with 0
+      end
+
+      it "exits 2 when --detailed-exitcodes and successful runs" do
+        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
+        @configurer.stubs(:run).returns(0,2)
+        expect { @device.main }.to exit_with 2
+      end
+
+      it "exits 1 when --detailed-exitcodes and failed parse" do
+        @configurer = stub_everything 'configurer'
+        Puppet::Configurer.stubs(:new).returns(@configurer)
+        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
+        @configurer.stubs(:run).returns(6,1)
+        expect { @device.main }.to exit_with 7
+      end
+
+      it "exits 6 when --detailed-exitcodes and failed run" do
+        @configurer = stub_everything 'configurer'
+        Puppet::Configurer.stubs(:new).returns(@configurer)
+        @device.options.stubs(:[]).with(:detailed_exitcodes).returns(true)
+        @configurer.stubs(:run).returns(6,2)
+        expect { @device.main }.to exit_with 6
       end
 
       [:vardir, :confdir].each do |setting|
@@ -369,7 +407,7 @@ describe Puppet::Application::Device do
           end
 
 
-          @device.main
+          expect { @device.main }.to exit_with 1
 
           expect(found_devices).to eq(all_devices)
         end
@@ -399,7 +437,7 @@ describe Puppet::Application::Device do
         end
 
 
-        @device.main
+        expect { @device.main }.to exit_with 1
 
         # make sure that we were called with each of the defined devices
         expect(found_devices).to eq(all_devices)
@@ -408,7 +446,7 @@ describe Puppet::Application::Device do
       it "should expire all cached attributes" do
         Puppet::SSL::Host.expects(:reset).twice
 
-        @device.main
+        expect { @device.main }.to exit_with 1
       end
     end
   end