puppet 3.4.3 → 3.5.0.rc1

data/lib/hiera_puppet.rb

@@ -71,12 +71,12 @@ module HieraPuppet
 
     if Puppet.settings[:hiera_config].is_a?(String)
       expanded_config_file = File.expand_path(Puppet.settings[:hiera_config])
-      if Puppet::FileSystem::File.exist?(expanded_config_file)
+      if Puppet::FileSystem.exist?(expanded_config_file)
         config_file = expanded_config_file
       end
     elsif Puppet.settings[:confdir].is_a?(String)
       expanded_config_file = File.expand_path(File.join(Puppet.settings[:confdir], '/hiera.yaml'))
-      if Puppet::FileSystem::File.exist?(expanded_config_file)
+      if Puppet::FileSystem.exist?(expanded_config_file)
         config_file = expanded_config_file
       end
     end

data/lib/puppet.rb

@@ -28,6 +28,8 @@ require 'puppet/external/pson/pure'
 # @api public
 module Puppet
   require 'puppet/file_system'
+  require 'puppet/context'
+  require 'puppet/environments'
 
   class << self
     include Puppet::Util
@@ -69,7 +71,7 @@ module Puppet
     end
   end
 
-  # configuration parameter access and stuff
+  # setting access and stuff
   def self.[]=(param,value)
     @@settings[param] = value
   end
@@ -105,7 +107,7 @@ module Puppet
     Puppet::Util::RunMode[@@settings.preferred_run_mode]
   end
 
-  # Load all of the configuration parameters.
+  # Load all of the settings.
   require 'puppet/defaults'
 
   def self.genmanifest
@@ -116,7 +118,7 @@ module Puppet
   end
 
   # Parse the config file for this process.
-  # @deprecated Use {#initialize_settings}
+  # @deprecated Use {initialize_settings}
   def self.parse_config()
     Puppet.deprecation_warning("Puppet.parse_config is deprecated; please use Faces API (which will handle settings and state management for you), or (less desirable) call Puppet.initialize_settings")
     Puppet.initialize_settings
@@ -136,7 +138,7 @@ module Puppet
 
   # Initialize puppet's settings for a specified run_mode.
   #
-  # @deprecated Use {#initialize_settings}
+  # @deprecated Use {initialize_settings}
   def self.initialize_settings_for_run_mode(run_mode)
     Puppet.deprecation_warning("initialize_settings_for_run_mode may be removed in a future release, as may run_mode itself")
     do_initialize_settings_for_run_mode(run_mode, [])
@@ -148,6 +150,8 @@ module Puppet
     Puppet.settings.initialize_global_settings(args)
     run_mode = Puppet::Util::RunMode[run_mode]
     Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
+    Puppet.push_context(Puppet.base_context(Puppet.settings), "Initial context after settings initialization")
+    Puppet::Parser::Functions.reset
   end
   private_class_method :do_initialize_settings_for_run_mode
 
@@ -166,15 +170,74 @@ module Puppet
   # Set default for YAML.load to unsafe so we don't affect programs
   # requiring puppet -- in puppet we will call safe explicitly
   SafeYAML::OPTIONS[:default_mode] = :unsafe
+
+  # The bindings used for initialization of puppet
+  # @api private
+  def self.base_context(settings)
+    environments = settings[:environmentpath]
+    modulepath = Puppet::Node::Environment.split_path(settings[:basemodulepath])
+
+    loaders = Puppet::Environments::Directories.from_path(environments, modulepath)
+    loaders << Puppet::Environments::Legacy.new
+
+    {
+      :environments => Puppet::Environments::Combined.new(*loaders)
+    }
+  end
+
+  # A simple set of bindings that is just enough to limp along to
+  # initialization where the {base_context} bindings are put in place
+  # @api private
+  def self.bootstrap_context
+    root_environment = Puppet::Node::Environment.create(:'*root*', [], '')
+    {
+      :current_environment => root_environment,
+      :root_environment => root_environment
+    }
+  end
+
+  # @param overrides [Hash] A hash of bindings to be merged with the parent context.
+  # @param description [String] A description of the context.
+  # @api private
+  def self.push_context(overrides, description = "")
+    @context.push(overrides, description)
+  end
+
+  # Return to the previous context.
+  # @raise [StackUnderflow] if the current context is the root
+  # @api private
+  def self.pop_context
+    @context.pop
+  end
+
+  # Lookup a binding by name or return a default value provided by a passed block (if given).
+  # @api private
+  def self.lookup(name, &block)
+    @context.lookup(name, &block)
+  end
+
+  # @param bindings [Hash] A hash of bindings to be merged with the parent context.
+  # @param description [String] A description of the context.
+  # @yield [] A block executed in the context of the temporarily pushed bindings.
+  # @api private
+  def self.override(bindings, description = "", &block)
+    @context.override(bindings, description, &block)
+  end
+
+  require 'puppet/node'
+
+  # The single instance used for normal operation
+  @context = Puppet::Context.new(bootstrap_context)
 end
 
 # This feels weird to me; I would really like for us to get to a state where there is never a "require" statement
 #  anywhere besides the very top of a file.  That would not be possible at the moment without a great deal of
 #  effort, but I think we should strive for it and revisit this at some point.  --cprice 2012-03-16
 
+require 'puppet/indirector'
 require 'puppet/type'
-require 'puppet/parser'
 require 'puppet/resource'
+require 'puppet/parser'
 require 'puppet/network'
 require 'puppet/ssl'
 require 'puppet/module'

data/lib/puppet/agent.rb

@@ -15,10 +15,14 @@ class Puppet::Agent
   def initialize(client_class, should_fork=true)
     @splayed = false
 
-    @should_fork = should_fork
+    @should_fork = can_fork? && should_fork
     @client_class = client_class
   end
 
+  def can_fork?
+    Puppet.features.posix?
+  end
+
   def needing_restart?
     Puppet::Application.restart_requested?
   end

data/lib/puppet/application.rb

@@ -21,7 +21,7 @@ module Puppet
 #      Puppet::Application::Example.new.run
 #
 #
-# class Puppet::Application::Example << Puppet::Application
+# class Puppet::Application::Example < Puppet::Application
 #
 #     def preinit
 #         # perform some pre initialization
@@ -353,15 +353,24 @@ class Application
       plugin_hook('initialize_app_defaults') { initialize_app_defaults }
     end
 
-    require 'puppet'
-    require 'puppet/util/instrumentation'
-    Puppet::Util::Instrumentation.init
-
-    exit_on_fail("initialize")                                   { plugin_hook('preinit')       { preinit } }
-    exit_on_fail("parse application options")                    { plugin_hook('parse_options') { parse_options } }
-    exit_on_fail("prepare for execution")                        { plugin_hook('setup')         { setup } }
-    exit_on_fail("configure routes from #{Puppet[:route_file]}") { configure_indirector_routes }
-    exit_on_fail("run")                                          { plugin_hook('run_command')   { run_command } }
+    new_context = Puppet.base_context(Puppet.settings)
+    configured_environment = new_context[:environments].get(Puppet[:environment])
+    configured_environment = configured_environment.override_from_commandline(Puppet.settings)
+    new_context[:current_environment] = configured_environment
+
+    # Setup a new context using the app's configuration
+    Puppet.override(new_context,
+                    "New base context and current environment from application's configuration") do
+      require 'puppet'
+      require 'puppet/util/instrumentation'
+      Puppet::Util::Instrumentation.init
+
+      exit_on_fail("initialize")                                   { plugin_hook('preinit')       { preinit } }
+      exit_on_fail("parse application options")                    { plugin_hook('parse_options') { parse_options } }
+      exit_on_fail("prepare for execution")                        { plugin_hook('setup')         { setup } }
+      exit_on_fail("configure routes from #{Puppet[:route_file]}") { configure_indirector_routes }
+      exit_on_fail("run")                                          { plugin_hook('run_command')   { run_command } }
+    end
   end
 
   def main
@@ -405,7 +414,7 @@ class Application
 
   def configure_indirector_routes
     route_file = Puppet[:route_file]
-    if Puppet::FileSystem::File.exist?(route_file)
+    if Puppet::FileSystem.exist?(route_file)
       routes = YAML.load_file(route_file)
       application_routes = routes[name.to_s]
       Puppet::Indirector.configure_routes(application_routes) if application_routes

data/lib/puppet/application/agent.rb

@@ -437,7 +437,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
   def setup_listen(daemon)
     Puppet.warning "Puppet --listen / kick is deprecated. See http://links.puppetlabs.com/puppet-kick-deprecation"
-    unless Puppet::FileSystem::File.exist?(Puppet[:rest_authconfig])
+    unless Puppet::FileSystem.exist?(Puppet[:rest_authconfig])
       Puppet.err "Will not start without authorization file #{Puppet[:rest_authconfig]}"
       exit(14)
     end

data/lib/puppet/application/apply.rb

@@ -8,6 +8,7 @@ class Puppet::Application::Apply < Puppet::Application
     options[:code] = arg
   end
   option("--loadclasses","-L")
+  option("--test","-t")
   option("--verbose","-v")
   option("--use-nodes")
   option("--detailed-exitcodes")
@@ -63,9 +64,9 @@ manifests.
 
 OPTIONS
 -------
-Note that any configuration parameter that's valid in the configuration
+Note that any setting that's valid in the configuration
 file is also a valid long argument. For example, 'tags' is a
-valid configuration parameter, so you can specify '--tags <class>,<tag>'
+valid setting, so you can specify '--tags <class>,<tag>'
 as an argument.
 
 See the configuration file documentation at
@@ -103,6 +104,10 @@ configuration options can also be generated by running puppet with
 * --execute:
   Execute a specific piece of Puppet code
 
+* --test:
+  Enable the most common options used for testing. These are 'verbose',
+  'detailed-exitcodes' and 'show_diff'.
+
 * --verbose:
   Print extra information.
 
@@ -163,9 +168,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet[:code] = options[:code] || STDIN.read
     else
       manifest = command_line.args.shift
-      raise "Could not find file #{manifest}" unless Puppet::FileSystem::File.exist?(manifest)
+      raise "Could not find file #{manifest}" unless Puppet::FileSystem.exist?(manifest)
       Puppet.warning("Only one file can be applied per run.  Skipping #{command_line.args.join(', ')}") if command_line.args.size > 0
-      Puppet[:manifest] = manifest
     end
 
     unless Puppet[:node_name_fact].empty?
@@ -178,59 +182,75 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       facts.name = Puppet[:node_name_value]
     end
 
-    # Find our Node
-    unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
-      raise "Could not find node #{Puppet[:node_name_value]}"
-    end
+    configured_environment = Puppet.lookup(:current_environment)
+    apply_environment = manifest ?
+      configured_environment.override_with(:manifest => manifest) :
+      configured_environment
 
-    # Merge in the facts.
-    node.merge(facts.values) if facts
+    Puppet.override(:environments => Puppet::Environments::Static.new(apply_environment)) do
+      # Find our Node
+      unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
+        raise "Could not find node #{Puppet[:node_name_value]}"
+      end
 
-    # Allow users to load the classes that puppet agent creates.
-    if options[:loadclasses]
-      file = Puppet[:classfile]
-      if Puppet::FileSystem::File.exist?(file)
-        unless FileTest.readable?(file)
-          $stderr.puts "#{file} is not readable"
-          exit(63)
+      # Merge in the facts.
+      node.merge(facts.values) if facts
+
+      # Allow users to load the classes that puppet agent creates.
+      if options[:loadclasses]
+        file = Puppet[:classfile]
+        if Puppet::FileSystem.exist?(file)
+          unless FileTest.readable?(file)
+            $stderr.puts "#{file} is not readable"
+            exit(63)
+          end
+          node.classes = ::File.read(file).split(/[\s\n]+/)
         end
-        node.classes = ::File.read(file).split(/[\s\n]+/)
       end
-    end
 
-    begin
-      # Compile our catalog
-      starttime = Time.now
-      catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
+      begin
+        # Compile our catalog
+        starttime = Time.now
+        catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node)
 
-      # Translate it to a RAL catalog
-      catalog = catalog.to_ral
+        # Translate it to a RAL catalog
+        catalog = catalog.to_ral
 
-      catalog.finalize
+        catalog.finalize
 
-      catalog.retrieval_duration = Time.now - starttime
+        catalog.retrieval_duration = Time.now - starttime
 
-      if options[:write_catalog_summary]
-        catalog.write_class_file
-        catalog.write_resource_file
-      end
+        if options[:write_catalog_summary]
+          catalog.write_class_file
+          catalog.write_resource_file
+        end
 
-      exit_status = apply_catalog(catalog)
+        exit_status = apply_catalog(catalog)
 
-      if not exit_status
+        if not exit_status
+          exit(1)
+        elsif options[:detailed_exitcodes] then
+          exit(exit_status)
+        else
+          exit(0)
+        end
+      rescue => detail
+        Puppet.log_exception(detail)
         exit(1)
-      elsif options[:detailed_exitcodes] then
-        exit(exit_status)
-      else
-        exit(0)
       end
-    rescue => detail
-      Puppet.log_exception(detail)
-      exit(1)
     end
   end
 
+  # Enable all of the most common test options.
+  def setup_test
+    Puppet.settings.handlearg("--show_diff")
+    options[:verbose] = true
+    options[:detailed_exitcodes] = true
+  end
+
   def setup
+    setup_test if options[:test]
+
     exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     Puppet::Util::Log.newdestination(:console) unless options[:setdest]
@@ -257,7 +277,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       catalog = Puppet::Resource::Catalog.convert_from(Puppet::Resource::Catalog.default_format,text)
       catalog = Puppet::Resource::Catalog.pson_create(catalog) unless catalog.is_a?(Puppet::Resource::Catalog)
     rescue => detail
-      raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}"
+      raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}", detail.backtrace
     end
 
     catalog.to_ral

data/lib/puppet/application/cert.rb

@@ -154,9 +154,9 @@ unless the '--all' option is set.
 
 OPTIONS
 -------
-Note that any configuration parameter that's valid in the configuration
+Note that any setting that's valid in the configuration
 file is also a valid long argument. For example, 'ssldir' is a valid
-configuration parameter, so you can specify '--ssldir <directory>' as an
+setting, so you can specify '--ssldir <directory>' as an
 argument.
 
 See the configuration file documentation at
@@ -170,7 +170,7 @@ configuration options can also be generated by running puppet cert with
   'clean', 'list', and 'fingerprint' actions.
 
 * --digest:
-  Set the digest for fingerprinting (defaults to the the digest used when
+  Set the digest for fingerprinting (defaults to the digest used when
   signing the cert). Valid values depends on your openssl and openssl ruby
   extension version.
 

data/lib/puppet/application/device.rb

@@ -1,7 +1,6 @@
 require 'puppet/application'
 require 'puppet/util/network_device'
 
-
 class Puppet::Application::Device < Puppet::Application
 
   run_mode :agent
@@ -107,7 +106,7 @@ Supported url must conforms to:
 
 OPTIONS
 -------
-Note that any configuration parameter that's valid in the configuration file
+Note that any setting that's valid in the configuration file
 is also a valid long argument.  For example, 'server' is a valid configuration
 parameter, so you can specify '--server <servername>' as an argument.
 
@@ -173,9 +172,9 @@ Licensed under the Apache 2.0 License
         Puppet.info "starting applying configuration to #{device.name} at #{device.url}"
 
         # override local $vardir and $certname
-        Puppet.settings.set_value(:confdir, ::File.join(Puppet[:devicedir], device.name), :cli)
-        Puppet.settings.set_value(:vardir, ::File.join(Puppet[:devicedir], device.name), :cli)
-        Puppet.settings.set_value(:certname, device.name, :cli)
+        Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
+        Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
+        Puppet[:certname] = device.name
 
         # this will reload and recompute default settings and create the devices sub vardir, or we hope so :-)
         Puppet.settings.use :main, :agent, :ssl
@@ -194,9 +193,9 @@ Licensed under the Apache 2.0 License
       rescue => detail
         Puppet.log_exception(detail)
       ensure
-        Puppet.settings.set_value(:vardir, vardir, :cli)
-        Puppet.settings.set_value(:confdir, confdir, :cli)
-        Puppet.settings.set_value(:certname, certname, :cli)
+        Puppet[:vardir] = vardir
+        Puppet[:confdir] = confdir
+        Puppet[:certname] = certname
         Puppet::SSL::Host.reset
       end
     end

data/lib/puppet/application/doc.rb

@@ -171,7 +171,7 @@ HELP
     exit_code = 0
     files = []
     unless @manifest
-      env = Puppet::Node::Environment.new
+      env = Puppet.lookup(:environments).get(Puppet[:environment])
       files += env.modulepath
       files << ::File.dirname(env[:manifest])
     end