puppet 3.2.0.rc1 → 3.2.0.rc2

data/Gemfile

@@ -4,7 +4,7 @@ def location_for(place, fake_version = nil)
   if place =~ /^(git:[^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
-    [fake_version, { :path => File.expand_path($1), :require => false }].compact
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
     [place, { :require => false }]
   end
@@ -18,13 +18,13 @@ platforms :ruby do
   gem "racc", "~> 1.4", :group => :development
 end
 
-gem "puppet", *location_for("file://#{File.dirname(__FILE__)}", '99.0.0')
+gem "puppet", :path => File.dirname(__FILE__), :require => false
 gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6')
-gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0', '99.0.0')
+gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
 gem "rake", :require => false
 gem "rspec", "~> 2.11.0", :require => false
 gem "mocha", "~> 0.10.5", :require => false
-gem "rgen", "0.6.1", :require => false
+gem "rgen", "0.6.2", :require => false
 
 gem "yarjuf", "~> 1.0"
 

data/lib/puppet/application/apply.rb

@@ -27,7 +27,7 @@ class Puppet::Application::Apply < Puppet::Application
     end
   end
 
-  option("--parseonly") do
+  option("--parseonly") do |args|
     puts "--parseonly has been removed. Please use 'puppet parser validate <manifest>'"
     exit 1
   end

data/lib/puppet/application/master.rb

@@ -23,7 +23,7 @@ class Puppet::Application::Master < Puppet::Application
     end
   end
 
-  option("--parseonly") do
+  option("--parseonly") do |args|
     puts "--parseonly has been removed. Please use 'puppet parser validate <manifest>'"
     exit 1
   end

data/lib/puppet/daemon.rb

@@ -144,6 +144,8 @@ class Puppet::Daemon
 
     # Finally, loop forever running events - or, at least, until we exit.
     run_event_loop
+
+    server.wait_for_shutdown if server
   end
 
   def run_event_loop

data/lib/puppet/defaults.rb

@@ -1095,6 +1095,13 @@ EOT
       on every run.  Puppet can be run with this enabled by default and then selectively
       disabled when a recompile is desired.",
     },
+    :ignoremissingtypes => {
+      :default    => false,
+      :type       => :boolean,
+      :desc       => "Skip searching for classes and definitions that were missing during a
+      prior compilation. The list of missing objects is maintained per-environment and
+      persists until the environment is cleared or the master is restarted.",
+    },
     :ignorecache => {
       :default    => false,
       :type       => :boolean,

data/lib/puppet/file_serving/fileset.rb

@@ -24,36 +24,6 @@ class Puppet::FileServing::Fileset
     result
   end
 
-  # Return a list of all files in our fileset.  This is different from the
-  # normal definition of find in that we support specific levels
-  # of recursion, which means we need to know when we're going another
-  # level deep, which Find doesn't do.
-  def files
-    files = perform_recursion
-
-    # Now strip off the leading path, so each file becomes relative, and remove
-    # any slashes that might end up at the beginning of the path.
-    result = files.collect { |file| file.sub(%r{^#{Regexp.escape(@path)}/*}, '') }
-
-    # And add the path itself.
-    result.unshift(".")
-
-    result
-  end
-
-  # Should we ignore this path?
-  def ignore?(path)
-    return false if @ignore == [nil]
-
-    # 'detect' normally returns the found result, whereas we just want true/false.
-    ! @ignore.detect { |pattern| File.fnmatch?(pattern, path) }.nil?
-  end
-
-  def ignore=(values)
-    values = [values] unless values.is_a?(Array)
-    @ignore = values
-  end
-
   def initialize(path, options = {})
     if Puppet.features.microsoft_windows?
       # REMIND: UNC path
@@ -66,8 +36,8 @@ class Puppet::FileServing::Fileset
     @path = path
 
     # Set our defaults.
-    @ignore = []
-    @links = :manage
+    self.ignore = []
+    self.links = :manage
     @recurse = false
     @recurselimit = :infinite
 
@@ -77,23 +47,40 @@ class Puppet::FileServing::Fileset
       initialize_from_hash(options)
     end
 
-    raise ArgumentError.new("Fileset paths must exist") unless stat = stat(path)
+    raise ArgumentError.new("Fileset paths must exist") unless valid?(path)
     raise ArgumentError.new("Fileset recurse parameter must not be a number anymore, please use recurselimit") if @recurse.is_a?(Integer)
   end
 
+  # Return a list of all files in our fileset.  This is different from the
+  # normal definition of find in that we support specific levels
+  # of recursion, which means we need to know when we're going another
+  # level deep, which Find doesn't do.
+  def files
+    files = perform_recursion
+
+    # Now strip off the leading path, so each file becomes relative, and remove
+    # any slashes that might end up at the beginning of the path.
+    result = files.collect { |file| file.sub(%r{^#{Regexp.escape(@path)}/*}, '') }
+
+    # And add the path itself.
+    result.unshift(".")
+
+    result
+  end
+
+  def ignore=(values)
+    values = [values] unless values.is_a?(Array)
+    @ignore = values
+  end
+
   def links=(links)
     links = links.to_sym
     raise(ArgumentError, "Invalid :links value '#{links}'") unless [:manage, :follow].include?(links)
     @links = links
-    @stat_method = links == :manage ? :lstat : :stat
+    @stat_method = File.method(@links == :manage ? :lstat : :stat)
   end
 
-  # Should we recurse further?  This is basically a single
-  # place for all of the logic around recursion.
-  def recurse?(depth)
-    # recurse if told to, and infinite recursion or current depth not at the limit
-    self.recurse and (self.recurselimit == :infinite or depth <= self.recurselimit)
-  end
+  private
 
   def initialize_from_hash(options)
     options.each do |option, value|
@@ -121,61 +108,65 @@ class Puppet::FileServing::Fileset
     end
   end
 
-  private
-
-  # Pull the recursion logic into one place.  It's moderately hairy, and this
-  # allows us to keep the hairiness apart from what we do with the files.
-  def perform_recursion
-    # Start out with just our base directory.
-    current_dirs = [@path]
+  FileSetEntry = Struct.new(:depth, :path, :ignored, :stat_method) do
+    def down_level(to)
+      FileSetEntry.new(depth + 1, File.join(path, to), ignored, stat_method)
+    end
 
-    next_dirs = []
+    def basename
+      File.basename(path)
+    end
 
-    depth = 1
+    def children
+      return [] unless directory?
 
-    result = []
-    return result unless recurse?(depth)
+      Dir.entries(path).
+        reject { |child| ignore?(child) }.
+        collect { |child| down_level(child) }
+    end
 
-    while dir_path = current_dirs.shift
-      next unless stat = stat(dir_path)
-      next unless stat.directory?
+    def ignore?(child)
+      return true if child == "." || child == ".."
+      return false if ignored == [nil]
 
-      Dir.entries(dir_path).each do |file_path|
-        next if [".", ".."].include?(file_path)
+      ignored.any? { |pattern| File.fnmatch?(pattern, child) }
+    end
 
-        # Note that this also causes matching directories not
-        # to be recursed into.
-        next if ignore?(file_path)
+    def directory?
+      stat_method.call(path).directory?
+    rescue Errno::ENOENT, Errno::EACCES
+      false
+    end
+  end
 
-        # Add it to our list of files to return
-        result << File.join(dir_path, file_path)
+  # Pull the recursion logic into one place.  It's moderately hairy, and this
+  # allows us to keep the hairiness apart from what we do with the files.
+  def perform_recursion
+    current_dirs = [FileSetEntry.new(0, @path, @ignore, @stat_method)]
 
-        # And to our list of files/directories to iterate over.
-        next_dirs << File.join(dir_path, file_path)
-      end
+    result = []
 
-      # Move to the next recusion level
-      if current_dirs.empty?
-        depth += 1
-        break unless recurse?(depth)
-        current_dirs = next_dirs
-        next_dirs = []
+    while entry = current_dirs.shift
+      if continue_recursion_at?(entry.depth + 1)
+        entry.children.each do |child|
+          result << child.path
+          current_dirs << child
+        end
       end
     end
 
     result
   end
-  public
-  # Stat a given file, using the links-appropriate method.
-  def stat(path)
-    @stat_method ||= self.links == :manage ? :lstat : :stat
-
-    begin
-      return File.send(@stat_method, path)
-    rescue
-      # If this happens, it is almost surely because we're
-      # trying to manage a link to a file that does not exist.
-      return nil
-    end
+
+  def valid?(path)
+    @stat_method.call(path)
+    true
+  rescue Errno::ENOENT, Errno::EACCES
+    false
+  end
+
+  def continue_recursion_at?(depth)
+    # recurse if told to, and infinite recursion or current depth not at the limit
+    self.recurse && (self.recurselimit == :infinite || depth <= self.recurselimit)
   end
 end

data/lib/puppet/indirector/catalog/static_compiler.rb

@@ -113,7 +113,7 @@ class Puppet::Resource::Catalog::StaticCompiler < Puppet::Indirector::Code
       result.each { |data| data.source = "#{source}/#{data.relative_path}" }
       break result if result and ! result.empty? and sourceselect == :first
       result
-    end.flatten
+    end.flatten.compact
 
     # This only happens if we have sourceselect == :all
     unless sourceselect == :first

data/lib/puppet/network/http/connection.rb

@@ -58,7 +58,7 @@ module Puppet::Network::HTTP
         msg = error.message
         msg << ": [" + ssl_validator.verify_errors.join('; ') + "]"
         raise Puppet::Error, msg
-      elsif error.message =~ /hostname (was )?not match/
+      elsif error.message =~ /hostname (\w+ )?not match/
         leaf_ssl_cert = ssl_validator.peer_certs.last
 
         valid_certnames = [leaf_ssl_cert.name, *leaf_ssl_cert.subject_alt_names].uniq

data/lib/puppet/network/http/webrick.rb

@@ -43,7 +43,7 @@ class Puppet::Network::HTTP::WEBrick
     @mutex.synchronize do
       raise "WEBrick server is not listening" unless @listening
       @server.shutdown
-      @thread.join
+      wait_for_shutdown
       @server = nil
       @listening = false
     end
@@ -55,6 +55,10 @@ class Puppet::Network::HTTP::WEBrick
     end
   end
 
+  def wait_for_shutdown
+    @thread.join
+  end
+
   # Configure our http log file.
   def setup_logger
     # Make sure the settings are all ready for us.

data/lib/puppet/network/server.rb

@@ -108,4 +108,8 @@ class Puppet::Network::Server
     unlisten
     remove_pidfile
   end
+
+  def wait_for_shutdown
+    @http_server.wait_for_shutdown
+  end
 end

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

@@ -41,7 +41,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # it should remain excluded. When that bug is adddressed this should be
     # reexamined.
     excludes += %w{wait-for-state portmap-wait}
-    excludes
+    # these excludes were found with grep -r -L start /etc/init.d
+    excludes += %w{rcS module-init-tools}
   end
 
   # List all services of this type.

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

@@ -6,6 +6,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   commands :systemctl => "systemctl"
 
   #defaultfor :osfamily => [:redhat, :suse]
+  defaultfor :osfamily => [:archlinux]
 
   def self.instances
     i = []

data/lib/puppet/rails/fact_name.rb

@@ -1,3 +1,4 @@
+require 'active_record'
 require 'puppet/rails'
 require 'puppet/rails/fact_value'
 

data/lib/puppet/rails/fact_value.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 class Puppet::Rails::FactValue < ActiveRecord::Base
   belongs_to :fact_name
   belongs_to :host

data/lib/puppet/resource/type_collection.rb

@@ -199,9 +199,11 @@ class Puppet::Resource::TypeCollection
     searchspace.each do |fqname|
       result = send(type, fqname)
       unless result
-        # do not try to autoload if we already tried and it wasn't conclusive
-        # as this is a time consuming operation.
-        unless @notfound[fqname]
+        if @notfound[fqname] and Puppet[:ignoremissingtypes]
+          # do not try to autoload if we already tried and it wasn't conclusive
+          # as this is a time consuming operation. Warn the user.
+          Puppet.warning "Not attempting to load #{type} #{fqname} as this object was missing during a prior compilation"
+        else
           result = loader.try_load_fqname(type, fqname)
           @notfound[fqname] = result.nil?
         end

data/lib/puppet/settings/file_setting.rb

@@ -109,7 +109,7 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
   end
 
   def munge(value)
-    if value.is_a?(String)
+    if value.is_a?(String) and value != ':memory:' # for sqlite3 in-memory tests
       value = File.expand_path(value)
     end
     value

data/lib/puppet/transaction/resource_harness.rb

@@ -117,11 +117,17 @@ class Puppet::Transaction::ResourceHarness
     end
     event
   rescue => detail
+    # Execution will continue on StandardErrors, just store the event
     Puppet.log_exception(detail)
     event.status = "failure"
 
     event.message = "change from #{property.is_to_s(current_value)} to #{property.should_to_s(property.should)} failed: #{detail}"
     event
+  rescue Exception => detail
+    # Execution will halt on Exceptions, they get raised to the application
+    event.status = "failure"
+    event.message = "change from #{property.is_to_s(current_value)} to #{property.should_to_s(property.should)} failed: #{detail}"
+    raise
   ensure
     event.send_log
   end

data/lib/puppet/util/adsi.rb

@@ -28,7 +28,7 @@ module Puppet::Util::ADSI
       unless @computer_name
         buf = " " * 128
         Win32API.new('kernel32', 'GetComputerName', ['P','P'], 'I').call(buf, buf.length.to_s)
-        @computer_name = buf.unpack("A*")
+        @computer_name = buf.unpack("A*")[0]
       end
       @computer_name
     end

data/lib/puppet/util/monkey_patches.rb

@@ -126,25 +126,6 @@ class Array
 
     slice(n, length - n) or []
   end unless method_defined? :drop
-  
-  # Array does not have a to_hash method and Hash uses this instead of checking with "respond_to?" if an
-  # array can convert itself or not. (This is a bad thing in Hash). When Array is extended with a method_missing,
-  # (like when using the RGen package 0.6.1 where meta methods are available on arrays), this trips up the
-  # Hash implementation.
-  # This patch simply does what the regular to_hash does, and it is accompanied by a respond_to? method that
-  # returns false for :to_hash.
-  # This is really ugly, and should be removed when the implementation in lib/rgen/array_extension.rb is
-  # fixed to handle to_hash correctly.
-  def to_hash
-    raise NoMethodError.new
-  end
-  
-  # @see #to_hash   
-  def respond_to? m, include_private=false
-    return false if m == :to_hash
-    super
-  end
-
 end
 
 

data/lib/puppet/version.rb

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

data/spec/lib/puppet_spec/database.rb

@@ -23,7 +23,7 @@ end
 # automatically for you.  Nothing to do there.
 def setup_scratch_database
   Puppet[:dbadapter] = 'sqlite3'
-  Puppet[:dblocation] = ':memory'
+  Puppet[:dblocation] = ':memory:'
   Puppet[:railslog] = PuppetSpec::Files.tmpfile('storeconfigs.log')
   Puppet::Rails.init
 end