puppet 0.25.5 → 2.6.0

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

@@ -2,31 +2,31 @@ require 'puppet/provider/nameservice'
 
 class Puppet::Provider::NameService
 class ObjectAdd < Puppet::Provider::NameService
-    def deletecmd
-        [command(:delete), @resource[:name]]
-    end
-
-    # Determine the flag to pass to our command.
-    def flag(name)
-        name = name.intern if name.is_a? String
-        self.class.option(name, :flag) || "-" + name.to_s[0,1]
-    end
+  def deletecmd
+    [command(:delete), @resource[:name]]
+  end
 
-    def modifycmd(param, value)
-        cmd = [command(:modify), flag(param), value]
-        if @resource.allowdupe? && ((param == :uid) || (param == :gid and self.class.name == :groupadd))
-            cmd << "-o"
-        end
-        cmd << @resource[:name]
+  # Determine the flag to pass to our command.
+  def flag(name)
+    name = name.intern if name.is_a? String
+    self.class.option(name, :flag) || "-" + name.to_s[0,1]
+  end
 
-        return cmd
+  def modifycmd(param, value)
+    cmd = [command(:modify), flag(param), value]
+    if @resource.allowdupe? && ((param == :uid) || (param == :gid and self.class.name == :groupadd))
+      cmd << "-o"
     end
+    cmd << @resource[:name]
 
-    def posixmethod(name)
-        name = name.intern if name.is_a? String
-        method = self.class.option(name, :method) || name
+    cmd
+  end
 
-        return method
-    end
+  def posixmethod(name)
+    name = name.intern if name.is_a? String
+    method = self.class.option(name, :method) || name
+
+    method
+  end
 end
 end

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

@@ -2,20 +2,20 @@ require 'puppet/provider/nameservice/objectadd'
 
 class Puppet::Provider::NameService
 class PW < ObjectAdd
-    def deletecmd
-        [command(:pw), "#{@resource.class.name.to_s}del", @resource[:name]]
-    end
+  def deletecmd
+    [command(:pw), "#{@resource.class.name.to_s}del", @resource[:name]]
+  end
 
-    def modifycmd(param, value)
-        cmd = [
-            command(:pw),
-            "#{@resource.class.name.to_s}mod",
-            @resource[:name],
-            flag(param),
-            value
-        ]
-        return cmd
-    end
+  def modifycmd(param, value)
+    cmd = [
+      command(:pw),
+      "#{@resource.class.name.to_s}mod",
+      @resource[:name],
+      flag(param),
+      value
+    ]
+    cmd
+  end
 end
 end
 

data/lib/puppet/provider/package.rb

@@ -2,28 +2,26 @@
 #  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
+  # 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
+  # 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
+  # Look up the current status.
+  def properties
+    if @property_hash.empty?
+      @property_hash = query || {:ensure => :absent}
+      @property_hash[:ensure] = :absent if @property_hash.empty?
     end
+    @property_hash.dup
+  end
 end

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

@@ -0,0 +1,128 @@
+require 'puppet/provider/package'
+require 'puppet/util/package'
+
+Puppet::Type.type(:package).provide :aix, :parent => Puppet::Provider::Package do
+  desc "Installation from AIX Software directory"
+
+  # The commands we are using on an AIX box are installed standard
+  # (except nimclient) nimclient needs the bos.sysmgt.nim.client fileset.
+  commands    :lslpp => "/usr/bin/lslpp",
+        :installp => "/usr/sbin/installp"
+
+  # AIX supports versionable packages with and without a NIM server
+  has_feature :versionable
+
+  confine  :operatingsystem => [ :aix ]
+  defaultfor :operatingsystem => :aix
+
+  attr_accessor   :latest_info
+
+  def self.srclistcmd(source)
+    [ command(:installp), "-L", "-d", source ]
+  end
+
+  def self.prefetch(packages)
+    raise Puppet::Error, "The aix provider can only be used by root" if Process.euid != 0
+
+    return unless packages.detect { |name, package| package.should(:ensure) == :latest }
+
+    sources = packages.collect { |name, package| package[:source] }.uniq
+
+    updates = {}
+    sources.each do |source|
+      execute(self.srclistcmd(source)).each do |line|
+        if line =~ /^[^#][^:]*:([^:]*):([^:]*)/
+          current = {}
+          current[:name]    = $1
+          current[:version] = $2
+          current[:source]  = source
+
+          if updates.key?(current[:name])
+            previous = updates[current[:name]]
+
+            updates[ current[:name] ] = current unless Puppet::Util::Package.versioncmp(previous[:version], current[:version]) == 1
+
+          else
+            updates[current[:name]] = current
+          end
+        end
+      end
+    end
+
+    packages.each do |name, package|
+      if info = updates[package[:name]]
+        package.provider.latest_info = info[0]
+      end
+    end
+  end
+
+  def uninstall
+    # Automatically process dependencies when installing/uninstalling
+    # with the -g option to installp.
+    installp "-gu", @resource[:name]
+  end
+
+  def install(useversion = true)
+    unless source = @resource[:source]
+      self.fail "A directory is required which will be used to find packages"
+    end
+
+    pkg = @resource[:name]
+
+    pkg << " #{@resource.should(:ensure)}" if (! @resource.should(:ensure).is_a? Symbol) and useversion
+
+    installp "-acgwXY", "-d", source, pkg
+  end
+
+  def self.pkglist(hash = {})
+    cmd = [command(:lslpp), "-qLc"]
+
+    if name = hash[:pkgname]
+      cmd << name
+    end
+
+    begin
+      list = execute(cmd).scan(/^[^#][^:]*:([^:]*):([^:]*)/).collect { |n,e|
+        { :name => n, :ensure => e, :provider => self.name }
+      }
+    rescue Puppet::ExecutionFailure => detail
+      if hash[:pkgname]
+        return nil
+      else
+        raise Puppet::Error, "Could not list installed Packages: #{detail}"
+      end
+    end
+
+    if hash[:pkgname]
+      return list.shift
+    else
+      return list
+    end
+  end
+
+  def self.instances
+    pkglist.collect do |hash|
+      new(hash)
+    end
+  end
+
+  def latest
+    upd = latest_info
+
+    unless upd.nil?
+      return "#{upd[:version]}"
+    else
+      raise Puppet::DevError, "Tried to get latest on a missing package" if properties[:ensure] == :absent
+
+      return properties[:ensure]
+    end
+  end
+
+  def query
+    self.class.pkglist(:pkgname => @resource[:name])
+  end
+
+  def update
+    self.install(false)
+  end
+end

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

@@ -14,101 +14,97 @@
 
 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."
+  desc "Package management which copies application bundles to a target."
 
-    confine :operatingsystem => :darwin
-    
-    commands :hdiutil => "/usr/bin/hdiutil"
-    commands :curl => "/usr/bin/curl"
-    commands :ditto => "/usr/bin/ditto"
+  confine :operatingsystem => :darwin
 
-    # 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
+  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
+  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
+  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 'facter/util/plist'
+  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 'facter/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
-        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
-        end
+          ensure
+            hdiutil "eject", mounts[0]
+          end
+      end
+    ensure
+      # JJM Remove the file if open-uri didn't already do so.
+      File.unlink(cached_source) if File.exist?(cached_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
+    FileTest.exists?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}") ? {:name => @resource[:name], :ensure => :present} : nil
+  end
 
-    def query
-        if FileTest.exists?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}")
-            return {:name => @resource[:name], :ensure => :present}
-        else
-            return nil
-        end
+  def install
+    source = nil
+    unless source = @resource[:source]
+      self.fail "Mac OS X PKG DMG's must specify a package source."
     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)
+    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
 

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

@@ -2,51 +2,50 @@ require 'puppet/provider/package'
 
 # OS X Packaging sucks.  We can install packages, but that's about it.
 Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package do
-    desc "Package management based on OS X's builtin packaging system.  This is
-        essentially the simplest and least functional package system in existence --
-        it only supports installation; no deletion or upgrades.  The provider will
-        automatically add the ``.pkg`` extension, so leave that off when specifying
-        the package name."
+  desc "Package management based on OS X's builtin packaging system.  This is
+    essentially the simplest and least functional package system in existence --
+    it only supports installation; no deletion or upgrades.  The provider will
+    automatically add the ``.pkg`` extension, so leave that off when specifying
+    the package name."
 
-    confine :operatingsystem => :darwin
-    commands :installer => "/usr/sbin/installer"
+  confine :operatingsystem => :darwin
+  commands :installer => "/usr/sbin/installer"
+
+  def self.instances
+    instance_by_name.collect do |name|
 
-    def self.instances
-        instance_by_name.collect do |name|
             self.new(
-                :name => name,
-                :provider => :apple,
-                :ensure => :installed
-            )
-        end
+                
+        :name => name,
+        :provider => :apple,
+        
+        :ensure => :installed
+      )
     end
-
-    def self.instance_by_name
-        Dir.entries("/Library/Receipts").find_all { |f|
-            f =~ /\.pkg$/
-        }.collect { |f|
-            name = f.sub(/\.pkg/, '')
-            yield name if block_given?
-
-            name
-        }
+  end
+
+  def self.instance_by_name
+    Dir.entries("/Library/Receipts").find_all { |f|
+      f =~ /\.pkg$/
+    }.collect { |f|
+      name = f.sub(/\.pkg/, '')
+      yield name if block_given?
+
+      name
+    }
+  end
+
+  def query
+    FileTest.exists?("/Library/Receipts/#{@resource[:name]}.pkg") ? {:name => @resource[:name], :ensure => :present} : nil
+  end
+
+  def install
+    source = nil
+    unless source = @resource[:source]
+      self.fail "Mac OS X packages must specify a package source"
     end
 
-    def query
-        if FileTest.exists?("/Library/Receipts/#{@resource[:name]}.pkg")
-            return {:name => @resource[:name], :ensure => :present}
-        else
-            return nil
-        end
-    end
-
-    def install
-        source = nil
-        unless source = @resource[:source]
-            self.fail "Mac OS X packages must specify a package source"
-        end
-
-        installer "-pkg", source, "-target", "/"
-    end
+    installer "-pkg", source, "-target", "/"
+  end
 end