puppet 0.22.4 → 0.23.0

data/lib/puppet/provider/mount/netinfo.rb

@@ -19,20 +19,20 @@ require 'puppet/provider/mount'
 # 
 #     defaultfor :operatingsystem => :darwin
 #     
-#     def initialize(model)
+#     def initialize(resource)
 #         warning "The NetInfo mount provider is highly experimental.  Use at your own risk."
 #         super
 #     end
 #     
 #     def mount
 #         cmd = []
-#         if opts = @model.should(:options)
+#         if opts = @resource.should(:options)
 #             cmd << opts
 #         end
-#         cmd << @model.should(:device)
-#         cmd << @model[:name]
+#         cmd << @resource.should(:device)
+#         cmd << @resource[:name]
 #         mountcmd cmd
 #     end
 # end
 
-# $Id: netinfo.rb 2171 2007-02-07 17:29:19Z luke $
+# $Id: netinfo.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/mount/parsed.rb

@@ -31,7 +31,7 @@ Puppet::Type.type(:mount).provide(:parsed,
     text_line :comment, :match => /^\s*#/
     text_line :blank, :match => /^\s*$/
 
-    record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t"
+    record_line self.name, :fields => @fields, :separator => /\s+/, :joiner => "\t", :optional => [:pass, :dump]
 end
 
-# $Id: parsed.rb 1860 2006-11-12 21:25:13Z luke $
+# $Id: parsed.rb 2564 2007-06-11 22:49:06Z luke $

data/lib/puppet/provider/nameservice.rb

@@ -25,22 +25,10 @@ class Puppet::Provider::NameService < Puppet::Provider
             super
         end
 
-        def list
+        def instances
             objects = []
             listbyname do |name|
-                obj = nil
-                check = model.validproperties
-                if obj = model[name]
-                    obj[:check] = check
-                else
-                    # unless it exists, create it as an unmanaged object
-                    obj = model.create(:name => name, :check => check)
-                end
-
-                next unless obj # In case there was an error somewhere
-                
-                objects << obj
-                yield obj if block_given?
+                objects << new(:name => name, :ensure => :present)
             end
 
             objects
@@ -56,9 +44,9 @@ class Puppet::Provider::NameService < Puppet::Provider
         end
 
         def options(name, hash)
-            unless model.validattr?(name)
+            unless resource_type.validattr?(name)
                 raise Puppet::DevError, "%s is not a valid attribute for %s" %
-                    [name, model.name]
+                    [name, resource_type.name]
             end
             @options ||= {}
             @options[name] ||= {}
@@ -89,9 +77,9 @@ class Puppet::Provider::NameService < Puppet::Provider
             return names
         end
 
-        def model=(model)
+        def resource_type=(resource_type)
             super
-            @model.validproperties.each do |prop|
+            @resource_type.validproperties.each do |prop|
                 next if prop == :ensure
                 unless public_method_defined?(prop)
                     define_method(prop) { get(prop) || :absent}
@@ -105,13 +93,13 @@ class Puppet::Provider::NameService < Puppet::Provider
         # This is annoying, but there really aren't that many options,
         # and this *is* built into Ruby.
         def section
-            unless defined? @model
+            unless defined? @resource_type
                 raise Puppet::DevError,
-                    "Cannot determine Etc section without a model"
+                    "Cannot determine Etc section without a resource type"
 
             end
 
-            if @model.name == :group
+            if @resource_type.name == :group
                 "gr"
             else
                 "pw"
@@ -146,7 +134,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     def autogen(field)
         field = symbolize(field)
         id_generators = {:user => :uid, :group => :gid}
-        if id_generators[@model.class.name] == field
+        if id_generators[@resource.class.name] == field
             return autogen_id(field)
         else
             if value = self.class.autogen_default(field)
@@ -165,11 +153,11 @@ class Puppet::Provider::NameService < Puppet::Provider
         highest = 0
 
         group = method = nil
-        case @model.class.name
+        case @resource.class.name
         when :user: group = :passwd; method = :uid
         when :group: group = :group; method = :gid
         else
-            raise Puppet::DevError, "Invalid model name %s" % model
+            raise Puppet::DevError, "Invalid resource name %s" % resource
         end
         
         # Make sure we don't use the same value multiple times
@@ -239,7 +227,7 @@ class Puppet::Provider::NameService < Puppet::Provider
             execute(cmd)
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error, "Could not %s %s %s: %s" %
-                [type, @model.class.name, @model.name, detail]
+                [type, @resource.class.name, @resource.name, detail]
         end
     end
 
@@ -266,7 +254,7 @@ class Puppet::Provider::NameService < Puppet::Provider
         if @objectinfo.nil? or refresh == true
             @etcmethod ||= ("get" + self.class.section().to_s + "nam").intern
             begin
-                @objectinfo = Etc.send(@etcmethod, @model[:name])
+                @objectinfo = Etc.send(@etcmethod, @resource[:name])
             rescue ArgumentError => detail
                 @objectinfo = nil
             end
@@ -288,7 +276,7 @@ class Puppet::Provider::NameService < Puppet::Provider
         # Reset our group list
         Etc.setgrent
 
-        user = @model[:name]
+        user = @resource[:name]
 
         # Now iterate across all of the groups, adding each one our
         # user is a member of
@@ -310,7 +298,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     # Convert the Etc struct into a hash.
     def info2hash(info)
         hash = {}
-        self.class.model.validproperties.each do |param|
+        self.class.resource_type.validproperties.each do |param|
             method = posixmethod(param)
             if info.respond_to? method
                 hash[param] = info.send(posixmethod(param))
@@ -320,7 +308,7 @@ class Puppet::Provider::NameService < Puppet::Provider
         return hash
     end
 
-    def initialize(model)
+    def initialize(resource)
         super
 
         @objectinfo = nil
@@ -336,9 +324,9 @@ class Puppet::Provider::NameService < Puppet::Provider
             execute(cmd)
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error, "Could not set %s on %s[%s]: %s" %
-                [param, @model.class.name, @model.name, detail]
+                [param, @resource.class.name, @resource.name, detail]
         end
     end
 end
 
-# $Id: nameservice.rb 2359 2007-03-28 06:06:54Z luke $
+# $Id: nameservice.rb 2555 2007-06-08 17:20:00Z luke $

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

@@ -32,7 +32,7 @@ class NetInfo < Puppet::Provider::NameService
         if defined? @netinfodir
             return @netinfodir
         else
-            return @model.name.to_s + "s"
+            return @resource_type.name.to_s + "s"
         end
     end
 
@@ -45,6 +45,12 @@ class NetInfo < Puppet::Provider::NameService
         end
     end
     
+    def self.instances
+        report(@resource_type.validproperties).collect do |hash|
+            self.new(hash)
+        end
+    end
+    
     # Convert a NetInfo line into a hash of data.
     def self.line2hash(line, params)
         values = line.split(/\t/)
@@ -61,12 +67,6 @@ class NetInfo < Puppet::Provider::NameService
         hash
     end
     
-    def self.list
-        report(@model.validproperties).collect do |hash|
-            @model.hash2obj(hash)
-        end
-    end
-    
     # What field the value is stored under.
     def self.netinfokey(name)
         name = symbolize(name)
@@ -118,7 +118,7 @@ class NetInfo < Puppet::Provider::NameService
         cmd = [command(:niutil)]
         cmd << arg
 
-        cmd << "/" << "/%s/%s" % [self.class.netinfodir(), @model[:name]]
+        cmd << "/" << "/%s/%s" % [self.class.netinfodir(), @resource[:name]]
         return cmd
     end
 
@@ -136,9 +136,9 @@ class NetInfo < Puppet::Provider::NameService
         # Because our stupid type can't create the whole thing at once,
         # we have to do this hackishness.  Yay.
         if arg == :present
-            @model.class.validproperties.each do |name|
+            @resource.class.validproperties.each do |name|
                 next if name == :ensure
-                next unless val = @model.should(name) || autogen(name)
+                next unless val = @resource.should(name) || autogen(name)
                 self.send(name.to_s + "=", val)
             end
         end
@@ -157,7 +157,7 @@ class NetInfo < Puppet::Provider::NameService
     # Retrieve everything about this object at once, instead of separately.
     def getinfo(refresh = false)
         if refresh or (! defined? @infohash or ! @infohash)
-            properties = [:name] + self.class.model.validproperties
+            properties = [:name] + self.class.resource_type.validproperties
             properties.delete(:ensure) if properties.include? :ensure
             @infohash = single_report(*properties)
         end
@@ -171,7 +171,7 @@ class NetInfo < Puppet::Provider::NameService
         #     warning "Netinfo providers cannot currently handle multiple values"
         # end
 
-        cmd << "-createprop" << "/" << "/%s/%s" % [self.class.netinfodir, @model[:name]]
+        cmd << "-createprop" << "/" << "/%s/%s" % [self.class.netinfodir, @resource[:name]]
 
         value = [value] unless value.is_a?(Array)
         if key = netinfokey(param)
@@ -192,7 +192,7 @@ class NetInfo < Puppet::Provider::NameService
     
     # Get a report for a single resource, not the whole table
     def single_report(*properties)
-        self.class.report(*properties).find do |hash| hash[:name] == @model[:name] end
+        self.class.report(*properties).find do |hash| hash[:name] == self.name end
     end
 
     def setuserlist(group, list)
@@ -207,4 +207,4 @@ class NetInfo < Puppet::Provider::NameService
 end
 end
 
-# $Id: netinfo.rb 2169 2007-02-07 06:47:10Z luke $
+# $Id: netinfo.rb 2552 2007-06-05 01:17:00Z luke $

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

@@ -12,7 +12,7 @@ class ObjectAdd < Puppet::Provider::NameService
     end
     
     def deletecmd
-        [command(:delete), @model[:name]]
+        [command(:delete), @resource[:name]]
     end
 
     # Determine the flag to pass to our command.
@@ -25,10 +25,10 @@ class ObjectAdd < Puppet::Provider::NameService
         cmd = [command(:modify),
             flag(param),
             value]
-        if @model[:allowdupe]  == :true
+        if @resource[:allowdupe]  == :true
             cmd << "-o"
         end
-        cmd << @model[:name]
+        cmd << @resource[:name]
 
         return cmd
     end
@@ -42,4 +42,4 @@ class ObjectAdd < Puppet::Provider::NameService
 end
 end
 
-# $Id: objectadd.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: objectadd.rb 2501 2007-05-09 23:08:42Z luke $

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

@@ -3,14 +3,14 @@ require 'puppet/provider/nameservice/objectadd'
 class Puppet::Provider::NameService
 class PW < ObjectAdd
     def deletecmd
-        [command(:pw), "#{@model.class.name.to_s}del", @model[:name]]
+        [command(:pw), "#{@resource.class.name.to_s}del", @resource[:name]]
     end
 
     def modifycmd(param, value)
         cmd = [
             command(:pw),
-            "#{@model.class.name.to_s}mod",
-            @model[:name],
+            "#{@resource.class.name.to_s}mod",
+            @resource[:name],
             flag(param),
             value
         ]
@@ -19,4 +19,4 @@ class PW < ObjectAdd
 end
 end
 
-# $Id: pw.rb 1979 2006-12-28 08:06:46Z luke $
+# $Id: pw.rb 2501 2007-05-09 23:08:42Z luke $

data/lib/puppet/provider/package.rb

@@ -0,0 +1,31 @@
+#  Created by Luke A. Kanies on 2007-06-05.
+#  Copyright (c) 2007. All rights reserved.
+
+class Puppet::Provider::Package < Puppet::Provider
+    # Prefetch our package list, yo.
+    def self.prefetch(packages)
+        instances.each do |prov|
+            if pkg = packages[prov.name]
+                pkg.provider = prov
+            end
+        end
+    end
+
+    # Clear out the cached values.
+    def flush
+        @property_hash.clear
+    end
+
+    # Look up the current status.
+    def properties
+        if @property_hash.empty?
+            @property_hash = query || {:ensure => :absent}
+            if @property_hash.empty?
+                @property_hash[:ensure] = :absent
+            end
+        end
+        @property_hash.dup
+    end
+end
+
+# $Id: package.rb 2559 2007-06-11 20:48:06Z luke $

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

@@ -0,0 +1,118 @@
+# Jeff McCune <mccune.jeff@gmail.com>
+# Changed to app.dmg by: Udo Waechter <root@zoide.net>
+# Mac OS X Package Installer which handles application (.app)
+# bundles inside an Apple Disk Image.
+#
+# Motivation: DMG files provide a true HFS file system
+# and are easier to manage.
+#
+# Note: the 'apple' Provider checks for the package name
+# in /L/Receipts.  Since we possibly install multiple apps's from 
+# a single source, we treat the source .app.dmg file as the package name.
+# As a result, we store installed .app.dmg file names
+# in /var/db/.puppet_appdmg_installed_<name>
+
+# require 'ruby-debug'
+# Debugger.start
+
+require 'puppet/provider/package'
+Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Package) do
+    desc "Package management which copies application bundles to a target."
+
+    defaultfor :operatingsystem => :darwin
+    confine :exists => "/Library/Receipts"
+    commands :hdiutil => "/usr/bin/hdiutil"
+    commands :curl => "/usr/bin/curl"
+    commands :ditto => "/usr/bin/ditto"
+	
+    # JJM We store a cookie for each installed .app.dmg in /var/db
+    def self.instances_by_name
+        Dir.entries("/var/db").find_all { |f|
+            f =~ /^\.puppet_appdmg_installed_/
+        }.collect do |f|
+            name = f.sub(/^\.puppet_appdmg_installed_/, '')
+            yield name if block_given?
+            name
+        end
+    end
+
+    def self.instances
+        instances_by_name.collect do |name|
+            new(:name => name, :provider => :appdmg, :ensure => :installed)
+        end
+    end
+    
+    def self.installapp(source, name, orig_source)
+      appname = File.basename(source);
+	  ditto "--rsrc", source, "/Applications/#{appname}"
+      File.open("/var/db/.puppet_appdmg_installed_#{name}", "w") do |t|
+          t.print "name: '#{name}'\n"
+          t.print "source: '#{orig_source}'\n"
+      end
+    end
+
+    def self.installpkgdmg(source, name)
+        unless source =~ /\.dmg$/i
+            self.fail "Mac OS X PKG DMG's must specificy a source string ending in .dmg"
+        end
+        require 'open-uri'
+        require 'puppet/util/plist'
+        cached_source = source
+        if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
+            cached_source = "/tmp/#{name}"
+            begin
+                curl "-o", cached_source, "-C", "-", "-k", "-s", "--url", source
+                Puppet.debug "Success: curl transfered [#{name}]"
+            rescue Puppet::ExecutionFailure
+                Puppet.debug "curl did not transfer [#{name}].  Falling back to slower open-uri transfer methods."
+                cached_source = source
+            end
+        end
+        
+        begin
+            open(cached_source) do |dmg|
+                xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "/tmp", dmg.path
+                    ptable = Plist::parse_xml xml_str
+                    # JJM Filter out all mount-paths into a single array, discard the rest.
+                    mounts = ptable['system-entities'].collect { |entity|
+                        entity['mount-point']
+                    }.select { |mountloc|; mountloc }
+                    begin
+                        mounts.each do |fspath|
+                            Dir.entries(fspath).select { |f|
+                                f =~ /\.app$/i
+                                }.each do |pkg|
+					    			installapp("#{fspath}/#{pkg}", name, source)
+				 			   end
+                        end # mounts.each do
+                    ensure
+                        hdiutil "eject", mounts[0]
+                    end # begin
+            end # open() do
+        ensure
+            # JJM Remove the file if open-uri didn't already do so.
+            File.unlink(cached_source) if File.exist?(cached_source)
+        end # begin
+    end # def self.installpkgdmg
+
+    def query
+        if FileTest.exists?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}")
+            return {:name => @resource[:name], :ensure => :present}
+        else
+            return nil
+        end
+    end
+
+    def install
+        source = nil
+        unless source = @resource[:source]
+            self.fail "Mac OS X PKG DMG's must specify a package source."
+        end
+        unless name = @resource[:name]
+            self.fail "Mac OS X PKG DMG's must specify a package name."
+        end
+        self.class.installpkgdmg(source,name)
+    end
+end
+
+# $Id: appdmg.rb 2609 2007-06-18 18:46:00Z luke $