puppet 3.1.0.rc1 → 3.1.0.rc2

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

@@ -56,8 +56,22 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     should = @resource.should(:ensure)
 
     unless @resource[:source]
-      raise Puppet::Error,
-      "You must specify a package source for BSD packages"
+      if File.exist?("/etc/pkg.conf")
+        File.open("/etc/pkg.conf", "rb").readlines.each do |line|
+          if matchdata = line.match(/^installpath\s*=\s*(.+)\s*$/i)
+            @resource[:source] = matchdata[1]
+            break
+          end
+        end
+
+        unless @resource[:source]
+          raise Puppet::Error,
+          "No valid installpath found in /etc/pkg.conf and no source was set"
+        end
+      else
+        raise Puppet::Error,
+        "You must specify a package source or configure an installpath in /etc/pkg.conf"
+      end
     end
 
     if @resource[:source][-1,1] == ::File::SEPARATOR

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

@@ -25,7 +25,7 @@ Puppet::Type.type(:package).provide :pip,
   # that's managed by `pip` or an empty array if `pip` is not available.
   def self.instances
     packages = []
-    pip_cmd = which('pip') or return []
+    pip_cmd = which(cmd) or return []
     execpipe "#{pip_cmd} freeze" do |process|
       process.collect do |line|
         next unless options = parse(line)
@@ -35,6 +35,15 @@ Puppet::Type.type(:package).provide :pip,
     packages
   end
 
+  def self.cmd
+    case Facter.value(:osfamily)
+      when "RedHat"
+        "pip-python"
+      else
+        "pip"
+    end
+  end
+
   # Return structured information about a particular package or `nil` if
   # it is not installed or `pip` itself is not available.
   def query
@@ -100,7 +109,7 @@ Puppet::Type.type(:package).provide :pip,
   def lazy_pip(*args)
     pip *args
   rescue NoMethodError => e
-    if pathname = which('pip')
+    if pathname = which(self.class.cmd)
       self.class.commands :pip => pathname
       pip *args
     else

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

@@ -13,19 +13,17 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   defaultfor :operatingsystem => :gentoo
 
   def self.instances
-    result_format = /^(\S+)\s+(\S+)\s+\[(\S+)\]\s+\[(\S+)\]\s+(\S+)\s+(.*)$/
-    result_fields = [:category, :name, :ensure, :version_available, :vendor, :description]
-
-    version_format = "{last}<version>{}"
-    search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
+    result_format = self.eix_result_format
+    result_fields = self.eix_result_fields
 
+    version_format = self.eix_version_format
     begin
       eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
 
       search_output = nil
       Puppet::Util.withenv :LASTVERSION => version_format do
-        search_output = eix "--nocolor", "--pure-packages", "--stable", "--installed", "--format", search_format
+        search_output = eix *(self.eix_search_arguments + ["--installed"])
       end
 
       packages = []
@@ -72,12 +70,10 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   def query
-    result_format = /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S+)\]\s+(\S+)\s+(.*)$/
-    result_fields = [:category, :name, :ensure, :version_available, :vendor, :description]
-
-    version_format = "{last}<version>{}"
-    search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
+    result_format = self.class.eix_result_format
+    result_fields = self.class.eix_result_fields
 
+    version_format = self.class.eix_version_format
     search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
     search_value = package_name
 
@@ -87,7 +83,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
       search_output = nil
       Puppet::Util.withenv :LASTVERSION => version_format do
-        search_output = eix "--nocolor", "--pure-packages", "--stable", "--format", search_format, "--exact", search_field, search_value
+        search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
       end
 
       packages = []
@@ -121,4 +117,25 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   def latest
     self.query[:version_available]
   end
+
+  private
+  def self.eix_search_format
+    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>'"
+  end
+
+  def self.eix_result_format
+    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
+  end
+
+  def self.eix_result_fields
+    [:category, :name, :ensure, :version_available, :vendor, :description]
+  end
+
+  def self.eix_version_format
+    "{last}<version>{}"
+  end
+
+  def self.eix_search_arguments
+    ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
+  end
 end

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

@@ -49,11 +49,14 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   confine :operatingsystem    => :darwin
 
   has_feature :enableable
+  has_feature :refreshable
   mk_resource_methods
 
   # These are the paths in OS X where a launchd service plist could
   # exist. This is a helper method, versus a constant, for easy testing
   # and mocking
+  #
+  # @api private
   def self.launchd_paths
     [
       "/Library/LaunchAgents",
@@ -62,14 +65,14 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
       "/System/Library/LaunchDaemons"
     ]
   end
-  private_class_method :launchd_paths
 
-  # This is the path to the overrides plist file where service enabling
-  # behavior is defined in 10.6 and greater
+  # Defines the path to the overrides plist file where service enabling
+  # behavior is defined in 10.6 and greater.
+  #
+  # @api private
   def self.launchd_overrides
     "/var/db/launchd.db/com.apple.launchd/overrides.plist"
   end
-  private_class_method :launchd_overrides
 
   # Caching is enabled through the following three methods. Self.prefetch will
   # call self.instances to create an instance for each service. Self.flush will
@@ -108,7 +111,6 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     end
     array_of_files.compact
   end
-  private_class_method :return_globbed_list_of_file_paths
 
   # Sets a class instance variable with a hash of all launchd plist files that
   # are found on the system. The key of the hash is the job id and the value
@@ -271,13 +273,20 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     self.enable if did_disable_job and resource[:enable] == :true
   end
 
+  def restart
+    Puppet.debug("A restart has been triggered for the #{resource[:name]} service")
+    Puppet.debug("Stopping the #{resource[:name]} service")
+    self.stop
+    Puppet.debug("Starting the #{resource[:name]} service")
+    self.start
+  end
 
   # launchd jobs are enabled by default. They are only disabled if the key
   # "Disabled" is set to true, but it can also be set to false to enable it.
-  # Starting in 10.6, the Disabled key in the job plist is consulted, but only 
-  # if there is no entry in the global overrides plist.
-  # We need to draw a distinction between undefined, true and false for both
-  # locations where the Disabled flag can be defined.
+  # Starting in 10.6, the Disabled key in the job plist is consulted, but only
+  # if there is no entry in the global overrides plist.  We need to draw a
+  # distinction between undefined, true and false for both locations where the
+  # Disabled flag can be defined.
   def enabled?
     job_plist_disabled = nil
     overrides_disabled = nil
@@ -303,11 +312,10 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     :false
   end
 
-
   # enable and disable are a bit hacky. We write out the plist with the appropriate value
   # rather than dealing with launchctl as it is unable to change the Disabled flag
   # without actually loading/unloading the job.
-  # Starting in 10.6 we need to write out a disabled key to the global 
+  # Starting in 10.6 we need to write out a disabled key to the global
   # overrides plist, in earlier versions this is stored in the job plist itself.
   def enable
     if has_macosx_plist_overrides?
@@ -323,7 +331,6 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     end
   end
 
-
   def disable
     if has_macosx_plist_overrides?
       overrides = self.class.read_plist(self.class.launchd_overrides)
@@ -335,6 +342,4 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
       Plist::Emit.save_plist(job_plist, job_path)
     end
   end
-
-
 end

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

@@ -64,7 +64,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def upstart_version
-    @@upstart_version ||= initctl("--version").match(/initctl \(upstart ([^\)]*)\)/)[1]
+    @upstart_version ||= initctl("--version").match(/initctl \(upstart ([^\)]*)\)/)[1]
   end
 
   # Where is our override script?

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

@@ -6,7 +6,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   defaultfor :operatingsystem => "hp-ux"
   confine :operatingsystem => "hp-ux"
 
-  commands :modify => "/usr/sam/lbin/usermod.sam", :delete => "/usr/sam/lbin/userdel.sam", :add => "/usr/sbin/useradd"
+  commands :modify => "/usr/sam/lbin/usermod.sam", :delete => "/usr/sam/lbin/userdel.sam", :add => "/usr/sam/lbin/useradd.sam"
   options :comment, :method => :gecos
   options :groups, :flag => "-G"
   options :home, :flag => "-d", :method => :dir
@@ -19,7 +19,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
     value !~ /\s/
   end
 
-  has_features :manages_homedir, :allows_duplicates
+  has_features :manages_homedir, :allows_duplicates, :manages_passwords
 
   def deletecmd
     super.insert(1,"-F")
@@ -28,4 +28,39 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
   def modifycmd(param,value)
     super.insert(1,"-F")
   end
+
+  def password
+    # Password management routine for trusted and non-trusted systems
+    #temp=""
+    while ent = Etc.getpwent() do
+      if ent.name == resource.name
+        temp=ent.name
+        break
+      end
+    end
+    Etc.endpwent()
+    if !temp
+      return nil
+    end
+
+    ent = Etc.getpwnam(resource.name)
+    if ent.passwd == "*"
+      # Either no password or trusted password, check trusted
+      file_name="/tcb/files/auth/#{resource.name.chars.first}/#{resource.name}"
+      if File.file?(file_name)
+        # Found the tcb user for the specific user, now get passwd
+        File.open(file_name).each do |line|
+          if ( line =~ /u_pwd/ )
+            temp_passwd=line.split(":")[1].split("=")[1]
+            ent.passwd = temp_passwd
+            return ent.passwd
+          end
+        end
+      else
+        debug "No trusted computing user file #{file_name} found."
+      end
+    else
+      return ent.passwd
+    end
+  end
 end

data/lib/puppet/resource.rb

@@ -90,34 +90,6 @@ class Puppet::Resource
     end
   end
 
-  def self.canonicalize_type(type)
-    type, _ = get_type_and_title type, ""
-    type
-  end
-
-  def self.get_type_and_title(type, title)
-    type, title = extract_type_and_title(type, title)
-    [munge_type_name(type), title]
-  end
-
-  def self.extract_type_and_title(argtype, argtitle)
-    if    (argtitle || argtype) =~ /^([^\[\]]+)\[(.+)\]$/m then [ $1,                 $2            ]
-    elsif argtitle                                         then [ argtype,            argtitle      ]
-    elsif argtype.is_a?(Puppet::Type)                      then [ argtype.class.name, argtype.title ]
-    elsif argtype.is_a?(Hash)                              then
-      raise ArgumentError, "Puppet::Resource.new does not take a hash as the first argument. "+
-        "Did you mean (#{(argtype[:type] || argtype["type"]).inspect}, #{(argtype[:title] || argtype["title"]).inspect }) ?"
-    else raise ArgumentError, "No title provided and #{argtype.inspect} is not a valid resource reference"
-    end
-  end
-
-  def self.munge_type_name(value)
-    return :main if value == :main
-    return "Class" if value == "" or value.nil? or value.to_s.downcase == "component"
-
-    value.to_s.split("::").collect { |s| s.capitalize }.join("::")
-  end
-
   def yaml_property_munge(x)
     case x
     when Hash
@@ -222,12 +194,13 @@ class Puppet::Resource
       send(attr.to_s + "=", value)
     end
 
-    @type, @title = self.class.get_type_and_title(type, title)
+    @type, @title = extract_type_and_title(type, title)
 
+    @type = munge_type_name(@type)
 
     if self.class?
       @title = :main if @title == ""
-      @title = self.class.munge_type_name(@title)
+      @title = munge_type_name(@title)
     end
 
     if params = attributes[:parameters]
@@ -366,14 +339,10 @@ class Puppet::Resource
     missing_arguments.collect do |param, default|
       external_value = lookup_external_default_for(param, scope)
 
-      if external_value.nil?
-        next if default.nil?
-
-        value = if default.respond_to? :safeevaluate
-                  default.safeevaluate(scope)
-                else
-                  default
-                end
+      if external_value.nil? && default.nil?
+        next
+      elsif external_value.nil?
+        value = default.safeevaluate(scope)
       else
         value = external_value
       end
@@ -452,6 +421,24 @@ class Puppet::Resource
     end
   end
 
+  def extract_type_and_title(argtype, argtitle)
+    if    (argtitle || argtype) =~ /^([^\[\]]+)\[(.+)\]$/m then [ $1,                 $2            ]
+    elsif argtitle                                         then [ argtype,            argtitle      ]
+    elsif argtype.is_a?(Puppet::Type)                      then [ argtype.class.name, argtype.title ]
+    elsif argtype.is_a?(Hash)                              then
+      raise ArgumentError, "Puppet::Resource.new does not take a hash as the first argument. "+
+        "Did you mean (#{(argtype[:type] || argtype["type"]).inspect}, #{(argtype[:title] || argtype["title"]).inspect }) ?"
+    else raise ArgumentError, "No title provided and #{argtype.inspect} is not a valid resource reference"
+    end
+  end
+
+  def munge_type_name(value)
+    return :main if value == :main
+    return "Class" if value == "" or value.nil? or value.to_s.downcase == "component"
+
+    value.to_s.split("::").collect { |s| s.capitalize }.join("::")
+  end
+
   def parse_title
     h = {}
     type = resource_type

data/lib/puppet/resource/type.rb

@@ -27,7 +27,7 @@ class Puppet::Resource::Type
   }
   RESOURCE_EXTERNAL_NAMES_TO_KINDS = RESOURCE_KINDS_TO_EXTERNAL_NAMES.invert
 
-  attr_accessor :file, :line, :doc, :code, :parent, :resource_type_collection
+  attr_accessor :file, :line, :doc, :code, :ruby_code, :parent, :resource_type_collection
   attr_reader :namespace, :arguments, :behaves_like, :module_name
 
   # This should probably be renamed to 'kind' eventually, in accordance with the changes
@@ -135,11 +135,7 @@ class Puppet::Resource::Type
 
     code.safeevaluate(scope) if code
 
-    evaluate_ruby_code(scope) unless ruby_code.empty?
-  end
-
-  def ruby_code
-    @ruby_code ||= []
+    evaluate_ruby_code(resource, scope) if ruby_code
   end
 
   def initialize(type, name, options = {})
@@ -186,10 +182,6 @@ class Puppet::Resource::Type
       self.doc += other.doc
     end
 
-    other.ruby_code.each do |c|
-      self.ruby_code << c
-    end
-
     # This might just be an empty, stub class.
     return unless other.code
 
@@ -268,10 +260,10 @@ class Puppet::Resource::Type
 
   # MQR TODO:
   #
-  # The change(s) introduced by the fix for #4270 are mostly silly & should be
+  # The change(s) introduced by the fix for #4270 are mostly silly & should be 
   # removed, though we didn't realize it at the time.  If it can be established/
   # ensured that nodes never call parent_type and that resource_types are always
-  # (as they should be) members of exactly one resource_type_collection the
+  # (as they should be) members of exactly one resource_type_collection the 
   # following method could / should be replaced with:
   #
   # def parent_type
@@ -369,8 +361,8 @@ class Puppet::Resource::Type
     parent_scope(resource.scope, klass)
   end
 
-  def evaluate_ruby_code(scope)
-    ruby_code.each { |c| c.evaluate(scope, scope.known_resource_types) }
+  def evaluate_ruby_code(resource, scope)
+    Puppet::DSL::ResourceAPI.new(resource, scope, ruby_code).evaluate
   end
 
   # Split an fq name into a namespace and name

data/lib/puppet/settings.rb

@@ -48,7 +48,7 @@ class Puppet::Settings
     else
       fqdn = hostname
     end
-    fqdn.gsub(/\.$/, '')
+    fqdn.to_s.gsub(/\.$/, '')
   end
 
   def self.hostname_fact()