puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/util/monkey_patches/lines.rb

@@ -0,0 +1,13 @@
+require 'puppet/util/monkey_patches'
+require 'enumerator'
+
+module Puppet::Util::MonkeyPatches::Lines
+  def lines(separator = $/)
+    if block_given?
+      self.each_line(separator) {|line| yield line }
+      return self
+    else
+      return enum_for(:each_line, separator)
+    end
+  end
+end

data/lib/puppet/util/network_device/cisco/device.rb

@@ -86,8 +86,8 @@ class Puppet::Util::NetworkDevice::Cisco::Device < Puppet::Util::NetworkDevice::
   def canonalize_ifname(interface)
     IF.each do |k,ifnames|
       if found = ifnames.find { |ifname| interface =~ /^#{ifname}\s*\d/i }
-        interface =~ /^#{found}(.+)\b/i
-        return "#{k.to_s}#{$1}".gsub(/\s+/,'')
+        found = /^#{found}(.+)\Z/i.match(interface)
+        return "#{k.to_s}#{found[1]}".gsub(/\s+/,'')
       end
     end
     interface

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

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'puppet/util/loadedfile'
+require 'puppet/util/network_device'
 
 class Puppet::Util::NetworkDevice::Config < Puppet::Util::LoadedFile
 

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

@@ -1,3 +1,5 @@
+require 'puppet/util/network_device'
+
 # stub
 module Puppet::Util::NetworkDevice::Transport
 end

data/lib/puppet/util/pidlock.rb

@@ -1,69 +1,40 @@
 require 'fileutils'
+require 'puppet/util/lockfile'
 
 class Puppet::Util::Pidlock
-  attr_reader :lockfile
 
   def initialize(lockfile)
-    @lockfile = lockfile
+    @lockfile = Puppet::Util::Lockfile.new(lockfile)
   end
 
   def locked?
     clear_if_stale
-    return true if File.exists? @lockfile
-
-    # HACK!  There was a temporary change to the lockfile behavior introduced in 2.7.10 and 2.7.11, and reverted
-    # in 2.7.12.  We need to pull some chicanery to be backwards-compatible with those versions.  For more info,
-    # see the comments on the method... and this hack should be removed for the 3.x series.
-    handle_2_7_10_disabled_lockfile
-    File.exists? @lockfile
+    @lockfile.locked?
   end
 
   def mine?
     Process.pid == lock_pid
   end
 
-  def anonymous?
-    return false unless File.exists?(@lockfile)
-    File.read(@lockfile) == ""
-  end
-
-  def lock(opts = {})
-    opts = {:anonymous => false}.merge(opts)
+  def lock
+    return mine? if locked?
 
-    if locked?
-      mine?
-    else
-      if opts[:anonymous]
-        File.open(@lockfile, 'w') { |fd| true }
-      else
-        File.open(@lockfile, "w") { |fd| fd.write(Process.pid) }
-      end
-      true
-    end
+    @lockfile.lock(Process.pid)
   end
 
-  def unlock(opts = {})
-    return false unless locked?
-
-    opts = {:anonymous => false}.merge(opts)
-
-    if mine? or (opts[:anonymous] and anonymous?)
-      File.unlink(@lockfile)
-      true
+  def unlock()
+    if mine?
+      return @lockfile.unlock
     else
       false
     end
   end
 
-  private
   def lock_pid
-    if File.exists? @lockfile
-      File.read(@lockfile).to_i
-    else
-      nil
-    end
+    @lockfile.lock_data.to_i
   end
 
+
   def clear_if_stale
     return if lock_pid.nil?
 
@@ -74,44 +45,9 @@ class Puppet::Util::Pidlock
     begin
       Process.kill(0, lock_pid)
     rescue *errors
-      File.unlink(@lockfile)
+      @lockfile.unlock
     end
   end
+  private :clear_if_stale
 
-
-  ######################################################################################
-  # Backwards compatibility hack
-  ######################################################################################
-  # A change to lockfile behavior was introduced in 2.7.10 and 2.7.11; basically,
-  # instead of using a single lockfile to indicate both administrative disabling of
-  # the agent *and* the case where an agent run is already in progress, we started using
-  # two separate lockfiles: the 'normal' one for the "run in progress" case, and a
-  # separate one with a ".disabled" extension to indicate administrative disabling.
-  #
-  # This was determined to cause incompatibilities with mcollective, so the behavior
-  # was reverted for 2.7.12.  Unfortunately this leaves the possibility that someone
-  # may have run "agent --disable" to administratively disable a 2.7.10 or 2.7.11
-  # agent, and then upgraded to a newer version.  This method exists only to
-  # provide backwards compatibility.  Basically, it just recognizes the 2.7.10/2.7.11
-  # ".disabled" lock file, warns, and cleans it up.
-  #
-  # This should be removed for the 3.x series.
-  #
-  # For more information, please see tickets #12844, #3757, #4836, and #11057
-  #
-  # -- cprice 2012-03-01
-  #
-  def handle_2_7_10_disabled_lockfile
-    disabled_lockfile_path = @lockfile + ".disabled"
-    if (File.exists?(disabled_lockfile_path))
-      Puppet.warning("Found special lockfile '#{disabled_lockfile_path}'; this file was " +
-          "generated by a call to 'puppet agent --disable' in puppet 2.7.10 or 2.7.11. " +
-          "The expected lockfile path is '#{@lockfile}'; renaming the lock file.")
-      File.rename(disabled_lockfile_path, @lockfile)
-    end
-  end
-  private :handle_2_7_10_disabled_lockfile
-  ######################################################################################
-  # End backwards compatibility hack
-  ######################################################################################
 end

data/lib/puppet/util/platform.rb

@@ -10,13 +10,6 @@ module Puppet
         !!File::ALT_SEPARATOR
       end
       module_function :windows?
-
-      def default_paths
-        return [] if windows?
-
-        %w{/usr/sbin /sbin}
-      end
-      module_function :default_paths
     end
   end
 end

data/lib/puppet/util/posix.rb

@@ -1,6 +1,16 @@
 # Utility methods for interacting with POSIX objects; mostly user and group
 module Puppet::Util::POSIX
 
+  # This is a list of environment variables that we will set when we want to override the POSIX locale
+  LOCALE_ENV_VARS = ['LANG', 'LC_ALL', 'LC_MESSAGES', 'LANGUAGE',
+                           'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME']
+
+  # This is a list of user-related environment variables that we will unset when we want to provide a pristine
+  # environment for "exec" runs
+  USER_ENV_VARS = ['HOME', 'USER', 'LOGNAME']
+
+
+
   # Retrieve a field from a POSIX Etc object.  The id can be either an integer
   # or a name.  This only works for users and groups.  It's also broken on
   # some platforms, unfortunately, which is why we fall back to the other

data/lib/puppet/util/rdoc.rb

@@ -1,11 +1,15 @@
-
+require 'puppet/util'
 module Puppet::Util::RDoc
-
   module_function
 
   # launch a rdoc documenation process
   # with the files/dir passed in +files+
   def rdoc(outputdir, files, charset = nil)
+    unless Puppet.features.rdoc1?
+      raise "the version of RDoc included in Ruby #{::RUBY_VERSION} is not supported"
+    end
+
+    begin
       Puppet[:ignoreimport] = true
 
       # then rdoc
@@ -18,9 +22,10 @@ module Puppet::Util::RDoc
       r = RDoc::RDoc.new
 
       RDoc::RDoc::GENERATORS["puppet"] = RDoc::RDoc::Generator.new(
-          "puppet/util/rdoc/generators/puppet_generator.rb",
-          "PuppetGenerator".intern,
-          "puppet")
+        "puppet/util/rdoc/generators/puppet_generator.rb",
+        :PuppetGenerator,
+        "puppet"
+      )
 
       # specify our own format & where to output
       options = [ "--fmt", "puppet",
@@ -32,12 +37,12 @@ module Puppet::Util::RDoc
       options << "--force-update" if Options::OptionList.options.any? { |o| o[0] == "--force-update" }
       options += [ "--charset", charset] if charset
       options += files
-      #TODO dedup file paths (not strict duplication sense, parents, children, etc
 
       # launch the documentation process
       r.document(options)
-  rescue RDoc::RDocError => e
+    rescue RDoc::RDocError => e
       raise Puppet::ParseError.new("RDoc error #{e}")
+    end
   end
 
   # launch a output to console manifest doc
@@ -83,5 +88,4 @@ module Puppet::Util::RDoc
       end
     end
   end
-
 end

data/lib/puppet/util/reference.rb

@@ -1,9 +1,11 @@
 require 'puppet/util/instance_loader'
+require 'puppet/util/methodhelper'
 require 'fileutils'
 
 # Manage Reference Documentation.
 class Puppet::Util::Reference
   include Puppet::Util
+  include Puppet::Util::MethodHelper
   include Puppet::Util::Docs
 
   extend Puppet::Util::InstanceLoader
@@ -82,9 +84,7 @@ class Puppet::Util::Reference
 
   def initialize(name, options = {}, &block)
     @name = name
-    options.each do |option, value|
-      send(option.to_s + "=", value)
-    end
+    set_options(options)
 
     meta_def(:generate, &block)
 

data/lib/puppet/util/rubygems.rb

@@ -0,0 +1,55 @@
+require 'puppet/util'
+
+module Puppet::Util::RubyGems
+
+  #Base/factory class for rubygems source
+  class Source
+    class << self
+      def has_rubygems?
+        begin
+          require 'rubygems'
+          true
+        rescue LoadError
+          false
+        end
+      end
+
+      def source
+        if has_rubygems?
+          Gem::Specification.respond_to?(:latest_specs) ? Gems18Source : OldGemsSource
+        else
+          NoGemsSource
+        end
+      end
+
+      def new(*args)
+        object = source.allocate
+        object.send(:initialize, *args)
+        object
+      end
+    end
+  end
+
+  # For RubyGems >= 1.8.0
+  class Gems18Source < Source
+    def directories
+      Gem::Specification.latest_specs.collect do |spec|
+        File.join(spec.full_gem_path, 'lib')
+      end
+    end
+  end
+
+  # RubyGems < 1.8.0
+  class OldGemsSource < Source
+    def directories
+      @paths ||= Gem.latest_load_paths
+    end
+  end
+
+  class NoGemsSource < Source
+    def directories
+      []
+    end
+  end
+end
+

data/lib/puppet/util/run_mode.rb

@@ -27,17 +27,18 @@ module Puppet
         name == :user
       end
 
+
       def conf_dir
         which_dir(
-          (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc") : "/etc/puppet"),
-          "~/.puppet"
+            Puppet::Settings.default_global_config_dir,
+            Puppet::Settings.default_user_config_dir
         )
       end
 
       def var_dir
         which_dir(
-          (Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : "/var/lib/puppet"),
-          "~/.puppet/var"
+            Puppet::Settings.default_global_var_dir,
+            Puppet::Settings.default_user_var_dir
         )
       end
 
@@ -45,18 +46,8 @@ module Puppet
         "$vardir/run"
       end
 
-      def logopts
-        if master?
-          {
-            :default => "$vardir/log",
-            :mode    => 0750,
-            :owner   => "service",
-            :group   => "service",
-            :desc    => "The Puppet log directory."
-          }
-        else
-          ["$vardir/log", "The Puppet log directory."]
-        end
+      def log_dir
+        "$vardir/log"
       end
 
       private

data/lib/puppet/util/selinux.rb

@@ -136,21 +136,6 @@ module Puppet::Util::SELinux
     nil
   end
 
-  ########################################################################
-  # Internal helper methods from here on in, kids.  Don't fiddle.
-  private
-
-  # Check filesystem a path resides on for SELinux support against
-  # whitelist of known-good filesystems.
-  # Returns true if the filesystem can support SELinux labels and
-  # false if not.
-  def selinux_label_support?(file)
-    fstype = find_fs(file)
-    return false if fstype.nil?
-    filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs']
-    filesystems.include?(fstype)
-  end
-
   # Internal helper function to read and parse /proc/mounts
   def read_mounts
     mounts = ""
@@ -186,26 +171,46 @@ module Puppet::Util::SELinux
     mntpoint
   end
 
-  # Internal helper function to return which type of filesystem a given file
-  # path resides on
+  def realpath(path)
+    path, rest = Pathname.new(path), []
+    path, rest = path.dirname, [path.basename] + rest while ! path.exist?
+    File.join( path.realpath, *rest )
+  end
+
+  def parent_directory(path)
+    Pathname.new(path).dirname.to_s
+  end
+
+  # Internal helper function to return which type of filesystem a
+  # given file path resides on
   def find_fs(path)
-    return nil unless mounts = read_mounts
-
-    # cleanpath eliminates useless parts of the path (like '.', or '..', or
-    # multiple slashes), without touching the filesystem, and without
-    # following symbolic links.  This gives the right (logical) tree to follow
-    # while we try and figure out what file-system the target lives on.
-    path = Pathname(path).cleanpath
-    unless path.absolute?
-      raise Puppet::DevError, "got a relative path in SELinux find_fs: #{path}"
+    unless mnts = read_mounts
+      return nil
     end
 
-    # Now, walk up the tree until we find a match for that path in the hash.
-    path.ascend do |segment|
-      return mounts[segment.to_s] if mounts.has_key?(segment.to_s)
+    # For a given file:
+    # Check if the filename is in the data structure;
+    #   return the fstype if it is.
+    # Just in case: return something if you're down to "/" or ""
+    # Remove the last slash and everything after it,
+    #   and repeat with that as the file for the next loop through.
+    path = realpath(path)
+    while not path.empty?
+      return mnts[path] if mnts.has_key?(path)
+      path = parent_directory(path)
     end
+    mnts['/']
+  end
 
-    # Should never be reached...
-    return mounts['/']
+  # Check filesystem a path resides on for SELinux support against
+  # whitelist of known-good filesystems.
+  # Returns true if the filesystem can support SELinux labels and
+  # false if not.
+  def selinux_label_support?(file)
+    fstype = find_fs(file)
+    return false if fstype.nil?
+    filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs']
+    filesystems.include?(fstype)
   end
+
 end