puppet 4.0.0.rc1 → 4.0.0

data/lib/puppet/pops/parser/heredoc_support.rb

@@ -64,7 +64,7 @@ module Puppet::Pops::Parser::HeredocSupport
     # and it should start scanning after the first found \n (or if not found == error).
 
     if ctx[:newline_jump]
-      scn.pos = lexing_context[:newline_jump]
+      scn.pos = ctx[:newline_jump]
     else
       scn.scan_until(/\n/) || lex_error("Heredoc without any following lines of text")
     end

data/lib/puppet/pops/parser/lexer2.rb

@@ -161,9 +161,9 @@ class Puppet::Pops::Parser::Lexer2
   # a letter a-z and may not contain dashes (\w includes letters, digits and _).
   #
   PATTERN_CLASSREF       = %r{((::){0,1}[A-Z][\w]*)+}
-  PATTERN_NAME           = %r{((::)?[a-z][\w]*)(::[a-z][\w]*)*}
+  PATTERN_NAME           = %r{^((::)?[a-z][\w]*)(::[a-z][\w]*)*$}
 
-  PATTERN_BARE_WORD      = %r{[a-z_](?:[\w-]*[\w])?}
+  PATTERN_BARE_WORD     = %r{((?:::){0,1}(?:[a-z_](?:[\w-]*[\w])?))+}
 
   PATTERN_DOLLAR_VAR     = %r{\$(::)?(\w+::)*\w+}
   PATTERN_NUMBER         = %r{\b(?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?)\b}
@@ -536,10 +536,13 @@ class Puppet::Pops::Parser::Lexer2
             lex_error("Illegal fully qualified class reference")
           end
         else
-          # NAME or error
-          value = scn.scan(PATTERN_NAME)
+          value = scn.scan(PATTERN_BARE_WORD)
           if value
-            emit_completed([:NAME, value.freeze, scn.pos-before], before)
+            if value =~ PATTERN_NAME
+              emit_completed([:NAME, value.freeze, scn.pos-before], before)
+            else
+              emit_completed([:WORD, value.freeze, scn.pos - before], before)
+            end
           else
             # move to faulty position ('::' was ok)
             scn.pos = scn.pos + 2
@@ -581,25 +584,20 @@ class Puppet::Pops::Parser::Lexer2
 
     when 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
     'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '_'
-      value = scn.scan(PATTERN_NAME)
-      # NAME or false start because followed by hyphen(s), underscore or word
-      if value && !scn.match?(/^-+\w/)
+
+      value = scn.scan(PATTERN_BARE_WORD)
+      if value && value =~ PATTERN_NAME
         emit_completed(KEYWORDS[value] || [:NAME, value.freeze, scn.pos - before], before)
+      elsif value
+        emit_completed([:WORD, value.freeze, scn.pos - before], before)
       else
-        # Restart and check entire pattern (for ease of detecting non allowed trailing hyphen)
-        scn.pos = before
-        value = scn.scan(PATTERN_BARE_WORD)
-        # If the WORD continues with :: it must be a correct fully qualified name
-        if value && !(fully_qualified = scn.match?(/::/))
-          emit_completed([:WORD, value.freeze, scn.pos - before], before)
+        # move to faulty position ([a-z_] was ok)
+        scn.pos = scn.pos + 1
+        fully_qualified = scn.match?(/::/)
+        if fully_qualified
+          lex_error("Illegal fully qualified name")
         else
-          # move to faulty position ([a-z_] was ok)
-          scn.pos = scn.pos + 1
-          if fully_qualified
-            lex_error("Illegal fully qualified name")
-          else
-            lex_error("Illegal name or bare word")
-          end
+          lex_error("Illegal name or bare word")
         end
       end
 

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -1,5 +1,5 @@
 require 'facter'
-require 'facter/util/plist'
+require 'plist'
 require 'puppet'
 require 'tempfile'
 

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -1,6 +1,6 @@
 require 'puppet'
 require 'puppet/provider/nameservice'
-require 'facter/util/plist'
+require 'plist'
 require 'fileutils'
 
 class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameService

data/lib/puppet/provider/package/appdmg.rb

@@ -50,7 +50,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
 
   def self.installpkgdmg(source, name)
     require 'open-uri'
-    require 'facter/util/plist'
+    require 'plist'
     cached_source = source
     tmpdir = Dir.mktmpdir
     begin

data/lib/puppet/provider/package/gem.rb

@@ -8,11 +8,12 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     interpreted as the path to a local gem file.  If source is not present at all,
     the gem will be installed from the default gem repositories.
 
-    This provider supports the `install_options` attribute, which allows command-line flags to be passed to the gem command.
+    This provider supports the `install_options` and `uninstall_options` attributes,
+    which allow command-line flags to be passed to the gem command.
     These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
     or an array where each element is either a string or a hash."
 
-  has_feature :versionable, :install_options
+  has_feature :versionable, :install_options, :uninstall_options
 
   commands :gemcmd => "gem"
 
@@ -54,12 +55,12 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     # so we don't need to check for them
 
     if desc =~ /^(\S+)\s+\((.+)\)/
-      name = $1
+      gem_name = $1
       versions = $2.split(/,\s*/)
       {
-        :name     => name,
+        :name     => gem_name,
         :ensure   => versions.map{|v| v.split[0]},
-        :provider => :gem
+        :provider => name
       }
     else
       Puppet.warning "Could not match #{desc}" unless desc.chomp.empty?
@@ -122,7 +123,15 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   end
 
   def uninstall
-    gemcmd "uninstall", "-x", "-a", resource[:name]
+    command = [command(:gemcmd), "uninstall"]
+    command << "--executables" << "--all" << resource[:name]
+
+    command += uninstall_options if resource[:uninstall_options]
+
+    output = execute(command)
+
+    # Apparently some stupid gem versions don't exit non-0 on failure
+    self.fail "Could not uninstall: #{output.chomp}" if output.include?("ERROR")
   end
 
   def update
@@ -132,4 +141,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   def install_options
     join_options(resource[:install_options])
   end
+
+  def uninstall_options
+    join_options(resource[:uninstall_options])
+  end
 end

data/lib/puppet/provider/package/pkgdmg.rb

@@ -9,7 +9,7 @@
 # in /var/db/.puppet_pkgdmg_installed_<name>
 
 require 'puppet/provider/package'
-require 'facter/util/plist'
+require 'plist'
 require 'puppet/util/http_proxy'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do

data/lib/puppet/provider/package/puppet_gem.rb

@@ -0,0 +1,17 @@
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
+  desc "Puppet Ruby Gem support. This provider is useful for managing
+        gems needed by the ruby provided in the puppet-agent package."
+
+  has_feature :versionable, :install_options, :uninstall_options
+
+  if Puppet.features.microsoft_windows?
+    # On windows, we put our ruby ahead of anything that already
+    # existed on the system PATH. This means that we do not need to
+    # sort out the absolute path.
+    commands :gemcmd => "gem"
+  else
+    commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem"
+  end
+end

data/lib/puppet/provider/service/launchd.rb

@@ -1,4 +1,4 @@
-require 'facter/util/plist'
+require 'plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
     This provider manages jobs with `launchd`, which is the default service

data/lib/puppet/provider/user/directoryservice.rb

@@ -1,5 +1,5 @@
 require 'puppet'
-require 'facter/util/plist'
+require 'plist'
 require 'base64'
 
 Puppet::Type.type(:user).provide :directoryservice do
@@ -175,7 +175,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   end
 
   # The plist embedded in the ShadowHashData key is a binary plist. The
-  # facter/util/plist library doesn't read binary plists, so we need to
+  # plist library doesn't read binary plists, so we need to
   # extract the binary plist, convert it to XML, and return it.
   def self.get_embedded_binary_plist(shadow_hash_data)
     embedded_binary_plist = Array(shadow_hash_data['dsAttrTypeNative:ShadowHashData'][0].delete(' ')).pack('H*')

data/lib/puppet/settings.rb

@@ -1014,7 +1014,7 @@ Generated on #{Time.now}.
   #    --config)
   # 2. If we're running as a root process, use the system puppet.conf
   #    (usually /etc/puppetlabs/puppet/puppet.conf)
-  # 3. Otherwise, use the user puppet.conf (usually ~/.puppet/puppet.conf)
+  # 3. Otherwise, use the user puppet.conf (usually ~/.puppetlabs/etc/puppet/puppet.conf)
   #
   # @api private
   # @todo this code duplicates {Puppet::Util::RunMode#which_dir} as described

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/util/run_mode.rb

@@ -1,4 +1,5 @@
 require 'etc'
+require 'fileutils'
 
 module Puppet
   module Util
@@ -49,51 +50,67 @@ module Puppet
       # @todo this code duplicates {Puppet::Settings#which\_configuration\_file}
       #   as described in {http://projects.puppetlabs.com/issues/16637 #16637}
       def which_dir( system, user )
-        File.expand_path(if Puppet.features.root? then system else user end)
+        if Puppet.features.root?
+          File.expand_path(system)
+        else
+          # Starting with puppet 4 and AIO packaging, AIO introduced new paths for
+          # both root and non-root users. The paths used by the root user are created
+          # by packaging, so no special action is required in the code.
+          #
+          # However, for non-root users, these new paths introduce deep paths (see below
+          # in the two RunMode sub-classes). Since puppet doesn't create parent directories
+          # for directories in the settings catalog, we take this opportunity to create
+          # those parent directories. (Note that pre-AIO this code would have had to do the
+          # same thing, except that everything was under ~/.puppet which was confdir so was
+          # created.)
+          expanded_user = File.expand_path(user)
+          FileUtils.mkdir_p(File.dirname(expanded_user)) if File.exists?(File.expand_path('~'))
+          expanded_user
+        end
       end
     end
 
     class UnixRunMode < RunMode
       def conf_dir
-        which_dir("/etc/puppetlabs/puppet", "~/.puppet")
+        which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet")
       end
 
       def code_dir
-        which_dir("/etc/puppetlabs/code", "~/.puppet/code")
+        which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code")
       end
 
       def var_dir
-        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppet/var")
+        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
       end
 
       def run_dir
-        which_dir("/var/run/puppetlabs", "~/.puppet/var/run")
+        which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
       end
 
       def log_dir
-        which_dir("/var/log/puppetlabs", "~/.puppet/var/log")
+        which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log")
       end
     end
 
     class WindowsRunMode < RunMode
       def conf_dir
-        which_dir(File.join(windows_common_base("puppet/etc")), "~/.puppet")
+        which_dir(File.join(windows_common_base("puppet/etc")), "~/.puppetlabs/etc/puppet")
       end
 
       def code_dir
-        which_dir(File.join(windows_common_base("code")), "~/.puppet/code")
+        which_dir(File.join(windows_common_base("code")), "~/.puppetlabs/etc/code")
       end
 
       def var_dir
-        which_dir(File.join(windows_common_base("puppet/cache")), "~/.puppet/var")
+        which_dir(File.join(windows_common_base("puppet/cache")), "~/.puppetlabs/opt/puppet/cache")
       end
 
       def run_dir
-        which_dir(File.join(windows_common_base("puppet/var/run")), "~/.puppet/var/run")
+        which_dir(File.join(windows_common_base("puppet/var/run")), "~/.puppetlabs/var/run")
       end
 
       def log_dir
-        which_dir(File.join(windows_common_base("puppet/var/log")), "~/.puppet/var/log")
+        which_dir(File.join(windows_common_base("puppet/var/log")), "~/.puppetlabs/var/log")
       end
 
     private

data/lib/puppet/util/windows/registry.rb

@@ -260,7 +260,7 @@ module Puppet::Util::Windows
 
         if result != FFI::ERROR_SUCCESS
           msg = "Failed to delete registry value #{name} at #{key.keyname}"
-          raise Puppet::Util::Windows::Error.new(msg)
+          raise Puppet::Util::Windows::Error.new(msg, result)
         end
       end
 
@@ -274,8 +274,8 @@ module Puppet::Util::Windows
         result = RegDeleteKeyExW(key.hkey, name_ptr, regsam, 0)
 
         if result != FFI::ERROR_SUCCESS
-          msg = "Failed to delete registry value #{name} at #{key.keyname}"
-          raise Puppet::Util::Windows::Error.new(msg)
+          msg = "Failed to delete registry key #{name} at #{key.keyname}"
+          raise Puppet::Util::Windows::Error.new(msg, result)
         end
       end
 

data/lib/puppet/vendor/deep_merge/PUPPET_README.md

@@ -0,0 +1,6 @@
+Deep_merge - Recursive Merging for Ruby Hashes
+=============================================
+
+Deep_merge 1.0.0+
+
+Copied from https://github.com/danielsdeleo/deep_merge/tree/f9df6fdb0d0090318e8015814e68e5ca2973b493

data/lib/puppet/vendor/load_plist.rb

@@ -0,0 +1 @@
+$: << File.join([File.dirname(__FILE__), "plist/lib"])

data/lib/puppet/vendor/plist/CHANGELOG

@@ -0,0 +1,82 @@
+= plist - All-purpose Property List manipulation library
+
+2006-09-20 (r80):
+ * tweak a comment in generator.rb to make it clear that we're not using Base64.b64encode because it's broken.
+
+=== Release version 3.0.0!
+
+2006-09-20 (r77 - r79):
+ * move IndentedString inside Plist::Emit and :nodoc: it
+ * Tag 3.0.0! (from rev 78)
+
+2006-09-19 (r73 - r75):
+ * Really fix the rakefile this time (apparently I deleted some code that I needed...)
+ * alter the fix_whitespace rake task to ignore the assets directory
+ * cleanup whitespace
+
+2006-09-18 (r70 - r72):
+ * Update this file ;)
+ * Fix Rakefile
+   * gem install -t now works correctly
+   * Remove super-sekr1t rdoc staging area from rdoc publishing task
+
+2006-09-15 (r64 - r69):
+* Change behavior of empty collection elements to match What Apple Does
+* Fix some gem packaging infrastructure
+
+2006-09-13 (r61 - r63):
+* Merge generator injection removal branch into trunk!
+
+2006-09-13 (r52 - r60):
+* Fix indentation/newlines in generator (finally!)
+* Refix indentation to be more faithful to the way Apple emits their plists
+* Remove horrific regex and replace it with proper comment parsing
+* Empty plists return nil when parsed
+* Sort hash keys before emitting (now we can test multi-element hashes!)
+* Inject #<=> into Symbol so that sorting Symbol-keyed hashes won't freak out
+
+2006-09-12 (r47 - r51):
+* More test rejiggering
+* New tests to expose some bugs
+
+2006-09-10 (r33 - r46):
+* Update tests for new generator code
+* Rejigger some tests
+* Make the generator try to call #to_plist_node on any object it tries to serialize, thus allowing class authors to define how their objects will be serialized
+* Marshal.dump unrecognized objects into <data> elements
+* Make the parser strip out comments and Marshal.load <data> elements if possible
+* Update some rdoc
+
+=== Release version 2.1.1!
+
+2006-09-10 (r31 - r32):
+* Added encoding / decoding for entities (&amp; etc)
+* Changed parsing of <data> elements to return StringIO objects
+* Fixed bug with empty <key> tags
+
+2006-08-24 (r25 - r30):
+* Invert ownership of methods in the generator, allowing us to remove the self.extend(self)
+* New branch to remove method inject from parser
+
+2006-08-23 (r22 - r24):
+* Add rcov task to Rakefile
+* Add some tests
+
+2006-08-20 (r9 - r21):
+* Add a bunch of rdoc and rdoc infrastructure
+* Add rake task to clean up errant whitespace
+* Spin off a branch to remove a bunch of method injection in the generator code
+* Rename some tests for clarity's sake
+* Replace NARF generation code with Ben's generation code
+  * Update tests
+  * This broke indentation (will be fixed later)
+* Add Plist::Emit.dump, so you can dump objects which don't include Plist::Emit, update tests to match
+* Fix a bug with the method that wraps output in the plist header/footer
+
+2006-08-19 (r1 - r8):
+* The beginnings of merging the plist project into the NARF plist library (under the plist project's name)
+  * fancier project infrastructure (more tests, Rakefile, the like)
+  * Add/update copyright notices in the source files
+  * Move a bunch of documentation out to README
+  * Split library into chunks
+* Properly delete files when cleaning up from tests