puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/environments.rb

@@ -38,11 +38,6 @@ module Puppet::Environments
         raise EnvironmentNotFound, name
       end
     end
-
-    def clear_all
-      root = Puppet.lookup(:root_environment) { nil }
-      root.instance_variable_set(:@future_parser, nil) unless root.nil?
-    end
   end
 
   # @!macro [new] loader_search_paths
@@ -112,7 +107,7 @@ module Puppet::Environments
     def get_conf(name)
       env = get(name)
       if env
-        Puppet::Settings::EnvironmentConf.static_for(env, Puppet[:parser])
+        Puppet::Settings::EnvironmentConf.static_for(env)
       else
         nil
       end
@@ -135,61 +130,6 @@ module Puppet::Environments
     end
   end
 
-  # Old-style environments that come either from explicit stanzas in
-  # puppet.conf or from dynamic environments created from use of `$environment`
-  # in puppet.conf.
-  #
-  # @example Explicit Stanza
-  #   [environment_name]
-  #   modulepath=/var/my_env/modules
-  #
-  # @example Dynamic Environments
-  #   [master]
-  #   modulepath=/var/$environment/modules
-  #
-  # @api private
-  class Legacy
-    include EnvironmentCreator
-
-    # @!macro loader_search_paths
-    def search_paths
-      ["file://#{Puppet[:config]}"]
-    end
-
-    # @note The list of environments for the Legacy environments is always
-    #   empty.
-    #
-    # @!macro loader_list
-    def list
-      []
-    end
-
-    # @note Because the Legacy system cannot list out all of its environments,
-    #   get is able to return environments that are not returned by a call to
-    #   {#list}.
-    #
-    # @!macro loader_get
-    def get(name)
-      Puppet::Node::Environment.new(name)
-    end
-
-    # @note Because the Legacy system cannot list out all of its environments,
-    #   this method will never fail and is only calling get directly.
-    #
-    # @!macro loader_get_or_fail
-    def get!(name)
-      get(name)
-    end
-
-    # @note we could return something here, but since legacy environments
-    #   are deprecated, there is no point.
-    #
-    # @!macro loader_get_conf
-    def get_conf(name)
-      nil
-    end
-  end
-
   # Reads environments from a directory on disk. Each environment is
   # represented as a sub-directory. The environment's manifest setting is the
   # `manifest` directory of the environment directory. The environment's
@@ -227,6 +167,7 @@ module Puppet::Environments
     def list
       valid_directories.collect do |envdir|
         name = Puppet::FileSystem.basename_string(envdir).intern
+
         create_environment(name)
       end
     end
@@ -252,14 +193,12 @@ module Puppet::Environments
     def create_environment(name, setting_values = nil)
       env_symbol = name.intern
       setting_values = Puppet.settings.values(env_symbol, Puppet.settings.preferred_run_mode)
-      env = Puppet::Node::Environment.create(
+      Puppet::Node::Environment.create(
         env_symbol,
         Puppet::Node::Environment.split_path(setting_values.interpolate(:modulepath)),
         setting_values.interpolate(:manifest),
         setting_values.interpolate(:config_version)
       )
-      env.watching = false
-      env
     end
 
     def valid_directory?(envdir)
@@ -318,16 +257,11 @@ module Puppet::Environments
       nil
     end
 
-    def clear_all
-      @loaders.each {|loader| loader.clear_all}
-    end
   end
 
   class Cached
     include EnvironmentLoader
 
-    INFINITY = 1.0 / 0.0
-
     class DefaultCacheExpirationService
       def created(env)
       end
@@ -348,29 +282,10 @@ module Puppet::Environments
       @cache_expiration_service || DefaultCacheExpirationService.new
     end
 
-    # Returns the end of time (the next Mesoamerican Long Count cycle-end after 2012 (5125+2012) = 7137,
-    # of for a 32 bit machine using Ruby < 1.9.3, the year 2038.
-    def self.end_of_time
-      begin
-        Time.gm(7137)
-      rescue ArgumentError
-        Time.gm(2038)
-      end
-    end
-
-    END_OF_TIME = end_of_time
-    START_OF_TIME = Time.gm(1)
-
     def initialize(loader)
       @loader = loader
-      @cache_expiration_service = Puppet::Environments::Cached.cache_expiration_service
       @cache = {}
-
-      # Holds expiration times in sorted order - next to expire is first
-      @expirations = SortedSet.new
-
-      # Infinity since it there are no entries, this is a cache of the first to expire time
-      @next_expiration = END_OF_TIME
+      @cache_expiration_service = Puppet::Environments::Cached.cache_expiration_service
     end
 
     # @!macro loader_list
@@ -385,34 +300,15 @@ module Puppet::Environments
 
     # @!macro loader_get
     def get(name)
-      # Aggressively evict all that has expired
-      # This strategy favors smaller memory footprint over environment
-      # retrieval time.
-      clear_all_expired
+      evict_if_expired(name)
       if result = @cache[name]
-        # found in cache
         return result.value
       elsif (result = @loader.get(name))
-        # environment loaded, cache it
-        cache_entry = entry(result)
-        @cache_expiration_service.created(result)
-        add_entry(name, cache_entry)
+        @cache[name] = entry(result)
         result
       end
     end
 
-    # Adds a cache entry to the cache
-    def add_entry(name, cache_entry)
-      Puppet.debug("Caching environment '#{name}' #{cache_entry.label}")
-      @cache[name] = cache_entry
-      expires = cache_entry.expires
-      @expirations.add(expires)
-      if @next_expiration > expires
-        @next_expiration = expires
-      end
-    end
-    private :add_entry
-
     # Clears the cache of the environment with the given name.
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear(name)
@@ -422,27 +318,7 @@ module Puppet::Environments
     # Clears all cached environments.
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear_all()
-      super
       @cache = {}
-      @expirations.clear
-      @next_expiration = END_OF_TIME
-    end
-
-    # Clears all environments that have expired, either by exceeding their time to live, or
-    # through an explicit eviction determined by the cache expiration service.
-    #
-    def clear_all_expired()
-      t = Time.now
-      return if t < @next_expiration && ! @cache.any? {|name, _| @cache_expiration_service.expired?(name.to_sym) }
-      to_expire = @cache.select { |name, entry| entry.expires < t || @cache_expiration_service.expired?(name.to_sym) }
-      to_expire.each do |name, entry|
-        Puppet.debug("Evicting cache entry for environment '#{name}'")
-        @cache_expiration_service.evicted(name)
-        clear(name)
-        @expirations.delete(entry.expires)
-        Puppet.settings.clear_environment_settings(name)
-      end
-      @next_expiration = @expirations.first || END_OF_TIME
     end
 
     # This implementation evicts the cache, and always gets the current
@@ -461,11 +337,13 @@ module Puppet::Environments
     # Creates a suitable cache entry given the time to live for one environment
     #
     def entry(env)
+      @cache_expiration_service.created(env)
       ttl = (conf = get_conf(env.name)) ? conf.environment_timeout : Puppet.settings.value(:environment_timeout)
+      Puppet.debug {"Caching environment '#{env.name}' (cache ttl: #{ttl})"}
       case ttl
       when 0
         NotCachedEntry.new(env)     # Entry that is always expired (avoids syscall to get time)
-      when INFINITY
+      when Float::INFINITY
         Entry.new(env)              # Entry that never expires (avoids syscall to get time)
       else
         TTLEntry.new(env, ttl)
@@ -476,6 +354,7 @@ module Puppet::Environments
     # Also clears caches in Settings that may prevent the entry from being updated
     def evict_if_expired(name)
       if (result = @cache[name]) && (result.expired? || @cache_expiration_service.expired?(name))
+      Puppet.debug {"Evicting cache entry for environment '#{name}'"}
         @cache.delete(name)
         @cache_expiration_service.evicted(name)
 
@@ -494,14 +373,6 @@ module Puppet::Environments
       def expired?
         false
       end
-
-      def label
-        ""
-      end
-
-      def expires
-        END_OF_TIME
-      end
     end
 
     # Always evicting entry
@@ -509,14 +380,6 @@ module Puppet::Environments
       def expired?
         true
       end
-
-      def label
-        "(ttl = 0 sec)"
-      end
-
-      def expires
-        START_OF_TIME
-      end
     end
 
     # Time to Live eviction policy entry
@@ -524,20 +387,11 @@ module Puppet::Environments
       def initialize(value, ttl_seconds)
         super value
         @ttl = Time.now + ttl_seconds
-        @ttl_seconds = ttl_seconds
       end
 
       def expired?
         Time.now > @ttl
       end
-
-      def label
-        "(ttl = #{@ttl_seconds} sec)"
-      end
-
-      def expires
-        @ttl
-      end
     end
   end
 end

data/lib/puppet/error.rb

@@ -54,39 +54,13 @@ module Puppet
     include ExternalFileError
   end
 
-  # Contains an issue code and can be annotated with an environment and a node
-  class ParseErrorWithIssue < Puppet::ParseError
-    attr_reader :issue_code, :basic_message
-    attr_accessor :environment, :node
-
-    # @param message [String] The error message
-    # @param file [String] The path to the file where the error was found
-    # @param line [Integer] The line in the file
-    # @param pos [Integer] The position on the line
-    # @param original [Exception] Original exception
-    # @param issue_code [Symbol] The issue code
-    #
-    def initialize(message, file=nil, line=nil, pos=nil, original=nil, issue_code= nil)
-      super(message, file, line, pos, original)
-      @issue_code = issue_code
-      @basic_message = message
-    end
-
-    def to_s
-      msg = super
-      msg = "Could not parse for environment #{environment}: #{msg}" if environment
-      msg = "#{msg} on node #{node}" if node
-      msg
-    end
-  end
-
-  # An error that already contains location information in the message text
-  class PreformattedError < Puppet::ParseErrorWithIssue
-  end
-
   # An error class for when I don't know what happened.  Automatically
   # prints a stack trace when in debug mode.
   class DevError < Puppet::Error
     include ExternalFileError
   end
+
+  class MissingCommand < Puppet::Error
+  end
+
 end

data/lib/puppet/external/nagios/base.rb

@@ -283,8 +283,8 @@ class Nagios::Base
     oc.sub!(/Nagios/,'nagios')
     oc.sub!(/::/,'')
     ocs.push oc
-    ocs.each { |oc|
-      str += "objectclass: #{oc}\n"
+    ocs.each { |objclass|
+      str += "objectclass: #{objclass}\n"
     }
     @parameters.each { |name,value|
       next if self.class.suppress.include?(name)

data/lib/puppet/external/pson/common.rb

@@ -27,15 +27,6 @@ module PSON
       const_set :Parser, parser
     end
 
-    def registered_document_types
-      @registered_document_types ||= {}
-    end
-
-    # Register a class-constant for deserializaion.
-    def register_document_type(name,klass)
-      registered_document_types[name.to_s] = klass
-    end
-
     # Return the constant located at _path_.
     # Anything may be registered as a path by calling register_path, above.
     # Otherwise, the format of _path_ has to be either ::A::B::C or A::B::C.
@@ -44,7 +35,7 @@ module PSON
     # the given path, an ArgumentError is raised.
     def deep_const_get(path) # :nodoc:
       path = path.to_s
-      registered_document_types[path] || path.split(/::/).inject(Object) do |p, c|
+      path.split(/::/).inject(Object) do |p, c|
         case
         when c.empty?             then p
         when p.const_defined?(c)  then p.const_get(c)
@@ -126,9 +117,6 @@ module PSON
   # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
   #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
   #   to false.
-  # * *create_additions*: If set to false, the Parser doesn't create
-  #   additions even if a matching class and create_id was found. This option
-  #   defaults to true.
   def parse(source, opts = {})
     PSON.parser.new(source, opts).parse
   end
@@ -145,9 +133,6 @@ module PSON
   # * *allow_nan*: If set to true, allow NaN, Infinity, and -Infinity in
   #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
   #   to true.
-  # * *create_additions*: If set to false, the Parser doesn't create
-  #   additions even if a matching class and create_id was found. This option
-  #   defaults to true.
   def parse!(source, opts = {})
     opts = {
       :max_nesting => false,
@@ -350,7 +335,7 @@ module ::Kernel
     nil
   end
 
-  # Ouputs _objs_ to STDOUT as PSON strings in a pretty format, with
+  # Outputs _objs_ to STDOUT as PSON strings in a pretty format, with
   # indentation and over many lines.
   def jj(*objs)
     objs.each do |obj|

data/lib/puppet/external/pson/pure/generator.rb

@@ -361,6 +361,7 @@ module PSON
           # method should be used, if you want to convert raw strings to PSON
           # instead of UTF-8 strings, e.g. binary data.
           def to_pson_raw_object
+            # create_id will be ignored during deserialization
             {
               PSON.create_id  => self.class.name,
               'raw'           => self.unpack('C*'),

data/lib/puppet/external/pson/pure/parser.rb

@@ -60,9 +60,6 @@ module PSON
       # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
       #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
       #   to false.
-      # * *create_additions*: If set to false, the Parser doesn't create
-      #   additions even if a matching class and create_id was found. This option
-      #   defaults to true.
       # * *object_class*: Defaults to Hash
       # * *array_class*: Defaults to Array
       def initialize(source, opts = {})
@@ -76,9 +73,6 @@ module PSON
           @max_nesting = 0
         end
         @allow_nan = !!opts[:allow_nan]
-        ca = true
-        ca = opts[:create_additions] if opts.key?(:create_additions)
-        @create_id = ca ? PSON.create_id : nil
         @object_class = opts[:object_class] || Hash
         @array_class = opts[:array_class] || Array
       end
@@ -299,11 +293,6 @@ module PSON
             end
           when scan(OBJECT_CLOSE)
             raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!" if delim
-            if @create_id and klassname = result[@create_id]
-              klass = PSON.deep_const_get klassname
-              break unless klass and klass.pson_creatable?
-              result = klass.pson_create(result)
-            end
             break
           when skip(IGNORE)
             ;

data/lib/puppet/face/catalog.rb

@@ -21,8 +21,8 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
     `certname`; use the `--terminus` option to change the source of the catalog.
   EOT
 
-  get_action(:destroy).summary "Invalid for this subcommand."
-  get_action(:search).summary "Invalid for this subcommand."
+  deactivate_action(:destroy)
+  deactivate_action(:search)
   find = get_action(:find)
   find.summary "Retrieve the catalog for a node."
   find.arguments "<certname>"
@@ -50,7 +50,7 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
 
       $ puppet catalog apply --terminus rest
 
-      From `secret_agent.rb` (API example):
+      API example:
 
           # ...
           Puppet::Face[:catalog, '0.0.1'].download
@@ -104,7 +104,7 @@ Puppet::Indirector::Face.define(:catalog, '0.0.1') do
 
       $ puppet catalog download
 
-      From `secret_agent.rb` (API example):
+      API example:
 
           Puppet::Face[:plugin, '0.0.1'].download
           Puppet::Face[:facts, '0.0.1'].upload