puppet 0.25.5 → 2.6.0

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

@@ -0,0 +1,108 @@
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
+  desc "OpenSolaris image packaging system. See pkg(5) for more information"
+
+  commands :pkg => "/usr/bin/pkg"
+
+  confine :operatingsystem => :solaris
+
+  #defaultfor [:operatingsystem => :solaris, :kernelrelease => "5.11"]
+
+  def self.instances
+    packages = []
+
+    cmd = "#{command(:pkg)} list -H"
+    execpipe(cmd) do |process|
+      hash = {}
+
+      # now turn each returned line into a package object
+      process.each { |line|
+        if hash = parse_line(line)
+          packages << new(hash)
+        end
+      }
+    end
+
+    packages
+  end
+
+  self::REGEX = %r{^(\S+)\s+(\S+)\s+(\S+)\s+}
+  self::FIELDS = [:name, :version, :status]
+
+  def self.parse_line(line)
+    hash = {}
+    if match = self::REGEX.match(line)
+
+      self::FIELDS.zip(match.captures) { |field,value|
+        hash[field] = value
+      }
+
+      hash[:provider] = self.name
+      hash[:error] = "ok"
+
+      if hash[:status] == "installed"
+        hash[:ensure] = :present
+      else
+        hash[:ensure] = :absent
+      end
+    else
+      Puppet.warning "Failed to match 'pkg list' line #{line.inspect}"
+      return nil
+    end
+
+    hash
+  end
+
+  # return the version of the package
+  # TODO deal with multiple publishers
+  def latest
+    version = nil
+    pkg(:list, "-Ha", @resource[:name]).split("\n").each do |line|
+      v = line.split[2]
+      case v
+      when "known"
+        return v
+      when "installed"
+        version = v
+      else
+        Puppet.warn "unknown package state for #{@resource[:name]}: #{v}"
+      end
+    end
+    version
+  end
+
+  # install the package
+  def install
+    pkg :install, @resource[:name]
+  end
+
+  # uninstall the package
+  def uninstall
+    pkg :uninstall, '-r', @resource[:name]
+  end
+
+  # update the package to the latest version available
+  def update
+    self.install
+  end
+
+  # list a specific package
+  def query
+    begin
+      output = pkg(:list, "-H", @resource[:name])
+    rescue Puppet::ExecutionFailure
+      # pkg returns 1 if the package is not found.
+      return {:ensure => :absent, :status => 'missing',
+        :name => @resource[:name], :error => 'ok'}
+    end
+
+    hash = self.class.parse_line(output) ||
+      {:ensure => :absent, :status => 'missing', :name => @resource[:name], :error => 'ok'}
+
+    raise Puppet::Error.new( "Package #{hash[:name]}, version #{hash[:version]} is in error state: #{hash[:error]}") if hash[:error] != "ok"
+
+    hash
+  end
+
+end

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

@@ -29,108 +29,116 @@ require 'puppet/provider/package'
 require 'facter/util/plist'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
-    desc "Package management based on Apple's Installer.app and DiskUtility.app.  This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages.  See `the wiki docs </trac/puppet/wiki/DmgPackages>` for more detail."
-    
-    confine :operatingsystem => :darwin
-    defaultfor :operatingsystem => :darwin
-    commands :installer => "/usr/sbin/installer"
-    commands :hdiutil => "/usr/bin/hdiutil"
-    commands :curl => "/usr/bin/curl"
+  desc "Package management based on Apple's Installer.app and DiskUtility.app.  This package works by checking the contents of a DMG image for Apple pkg or mpkg files. Any number of pkg or mpkg files may exist in the root directory of the DMG file system. Sub directories are not checked for packages.  See `the wiki docs <http://projects.puppetlabs.com/projects/puppet/wiki/Package_Management_With_Dmg_Patterns>` for more detail."
 
-    # JJM We store a cookie for each installed .pkg.dmg in /var/db
-    def self.instance_by_name
-        Dir.entries("/var/db").find_all { |f|
-            f =~ /^\.puppet_pkgdmg_installed_/
-        }.collect do |f|
-            name = f.sub(/^\.puppet_pkgdmg_installed_/, '')
-            yield name if block_given?
-            name
-        end
+  confine :operatingsystem => :darwin
+  defaultfor :operatingsystem => :darwin
+  commands :installer => "/usr/sbin/installer"
+  commands :hdiutil => "/usr/bin/hdiutil"
+  commands :curl => "/usr/bin/curl"
+
+  # JJM We store a cookie for each installed .pkg.dmg in /var/db
+  def self.instance_by_name
+    Dir.entries("/var/db").find_all { |f|
+      f =~ /^\.puppet_pkgdmg_installed_/
+    }.collect do |f|
+      name = f.sub(/^\.puppet_pkgdmg_installed_/, '')
+      yield name if block_given?
+      name
     end
+  end
 
-    def self.instances
-        instance_by_name.collect do |name|
-            new(
-                :name => name,
-                :provider => :pkgdmg,
-                :ensure => :installed
-            )
-        end
+  def self.instances
+    instance_by_name.collect do |name|
+
+      new(
+
+        :name => name,
+        :provider => :pkgdmg,
+
+        :ensure => :installed
+      )
     end
+  end
 
-    def self.installpkg(source, name, orig_source)
-      installer "-pkg", source, "-target", "/"
-      # Non-zero exit status will throw an exception.
-      File.open("/var/db/.puppet_pkgdmg_installed_#{name}", "w") do |t|
-          t.print "name: '#{name}'\n"
-          t.print "source: '#{orig_source}'\n"
-      end
+  def self.installpkg(source, name, orig_source)
+    installer "-pkg", source, "-target", "/"
+    # Non-zero exit status will throw an exception.
+    File.open("/var/db/.puppet_pkgdmg_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
-            raise Puppet::Error.new("Mac OS X PKG DMG's must specificy a source string ending in .dmg")
-        end
-        require 'open-uri'
+  def self.installpkgdmg(source, name)
+    unless source =~ /\.dmg$/i || source =~ /\.pkg$/i
+      raise Puppet::Error.new("Mac OS X PKG DMG's must specificy a source string ending in .dmg or flat .pkg file")
+    end
+    require 'open-uri'
+    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
+      end
+    end
 
-        begin
-            File.open(cached_source) do |dmg|
-                xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path
-                hdiutil_info = Plist::parse_xml(xml_str)
-                unless hdiutil_info.has_key?("system-entities")
-                    raise Puppet::Error.new("No disk entities returned by mount at %s" % dmg.path)
-                end
-                mounts = hdiutil_info["system-entities"].collect { |entity|
-                    entity["mount-point"]
-                }.compact
-                begin
-                    mounts.each do |mountpoint|
-                        Dir.entries(mountpoint).select { |f|
-                            f =~ /\.m{0,1}pkg$/i
-                        }.each do |pkg|
-                            installpkg("#{mountpoint}/#{pkg}", name, source)
-                        end
-                    end
-                ensure
-                    mounts.each do |mountpoint|
-                        hdiutil "eject", mountpoint
-                    end
-                end
+    begin
+      if source =~ /\.dmg$/i
+        File.open(cached_source) do |dmg|
+          xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-noidme", "-mountrandom", "/tmp", dmg.path
+          hdiutil_info = Plist::parse_xml(xml_str)
+          raise Puppet::Error.new("No disk entities returned by mount at #{dmg.path}") unless hdiutil_info.has_key?("system-entities")
+          mounts = hdiutil_info["system-entities"].collect { |entity|
+            entity["mount-point"]
+          }.compact
+          begin
+            mounts.each do |mountpoint|
+              Dir.entries(mountpoint).select { |f|
+                f =~ /\.m{0,1}pkg$/i
+              }.each do |pkg|
+                installpkg("#{mountpoint}/#{pkg}", name, source)
+              end
             end
-        ensure
-            # JJM Remove the file if open-uri didn't already do so.
-            File.unlink(cached_source) if File.exist?(cached_source)
+          ensure
+            mounts.each do |mountpoint|
+              hdiutil "eject", mountpoint
+            end
+          end
         end
+      elsif source =~ /\.pkg$/i
+        installpkg(cached_source, name, source)
+      else
+        raise Puppet::Error.new("Mac OS X PKG DMG's must specificy a source string ending in .dmg or flat .pkg file")
+      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
 
-    def query
-        if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
-            return {:name => @resource[:name], :ensure => :present}
-        else
-            return nil
-        end
+  def query
+    if FileTest.exists?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
+      Puppet.debug "/var/db/.puppet_pkgdmg_installed_#{@resource[:name]} found"
+      return {:name => @resource[:name], :ensure => :present}
+    else
+      return nil
     end
+  end
 
-    def install
-        source = nil
-        unless source = @resource[:source]
-            raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package source.")
-        end
-        unless name = @resource[:name]
-            raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package name.")
-        end
-        self.class.installpkgdmg(source,name)
+  def install
+    source = nil
+    unless source = @resource[:source]
+      raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package source.")
+    end
+    unless name = @resource[:name]
+      raise Puppet::Error.new("Mac OS X PKG DMG's must specify a package name.")
     end
+    self.class.installpkgdmg(source,name)
+  end
 end
 

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

@@ -1,125 +1,122 @@
 require 'puppet/provider/package'
+require 'fileutils'
 
 Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
-    desc "Provides packaging support for Gentoo's portage system."
+  desc "Provides packaging support for Gentoo's portage system."
 
-    has_feature :versionable
+  has_feature :versionable
 
-    commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/eix-update"
+  commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/eix-update"
 
-    confine :operatingsystem => :gentoo
+  confine :operatingsystem => :gentoo
 
-    defaultfor :operatingsystem => :gentoo
+  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]
+  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"
+    version_format = "{last}<version>{}"
+    search_format = "<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] <homepage> <description>\n"
 
-        begin
-            if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
-                update_eix
-            end
+    begin
+      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
 
-            search_output = nil
-            Puppet::Util::Execution.withenv :LASTVERSION => version_format do
-                search_output = eix "--nocolor", "--pure-packages", "--stable", "--installed", "--format", search_format
-            end
+      search_output = nil
+      Puppet::Util::Execution.withenv :LASTVERSION => version_format do
+        search_output = eix "--nocolor", "--pure-packages", "--stable", "--installed", "--format", search_format
+      end
 
-            packages = []
-            search_output.each do |search_result|
-                match = result_format.match(search_result)
+      packages = []
+      search_output.each do |search_result|
+        match = result_format.match(search_result)
 
-                if match
-                    package = {}
-                    result_fields.zip(match.captures) do |field, value|
-                        package[field] = value unless !value or value.empty?
-                    end
-                    package[:provider] = :portage
-                    packages << new(package)
-                end
-            end
-
-            return packages
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error.new(detail)
+        if match
+          package = {}
+          result_fields.zip(match.captures) do |field, value|
+            package[field] = value unless !value or value.empty?
+          end
+          package[:provider] = :portage
+          packages << new(package)
         end
-    end
-
-    def install
-        should = @resource.should(:ensure)
-        name = package_name
-        unless should == :present or should == :latest
-            # We must install a specific version
-            name = "=%s-%s" % [name, should]
-        end
-        emerge name
-    end
+      end
 
-    # The common package name format.
-    def package_name
-        @resource[:category] ? "%s/%s" % [@resource[:category], @resource[:name]] : @resource[:name]
+      return packages
+    rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error.new(detail)
     end
-
-    def uninstall
-        emerge "--unmerge", package_name
-    end
-
-    def update
-        self.install
+  end
+
+  def install
+    should = @resource.should(:ensure)
+    name = package_name
+    unless should == :present or should == :latest
+      # We must install a specific version
+      name = "=#{name}-#{should}"
     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"
-
-        search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
-        search_value = package_name
-
-        begin
-            if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
-                update_eix
-            end
-
-            search_output = nil
-            Puppet::Util::Execution.withenv :LASTVERSION => version_format do
-                search_output = eix "--nocolor", "--pure-packages", "--stable", "--format", search_format, "--exact", search_field, search_value
-            end
-
-            packages = []
-            search_output.each do |search_result|
-                match = result_format.match(search_result)
-
-                if match
-                    package = {}
-                    result_fields.zip(match.captures) do |field, value|
-                        package[field] = value unless !value or value.empty?
-                    end
-                    package[:ensure] = package[:ensure] ? package[:ensure] : :absent
-                    packages << package
-                end
-            end
-
-            case packages.size
-                when 0
-                    not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
-                    raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
-                when 1
-                    return packages[0]
-                else
-                    raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
-            end
-        rescue Puppet::ExecutionFailure => detail
-            raise Puppet::Error.new(detail)
+    emerge name
+  end
+
+  # The common package name format.
+  def package_name
+    @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
+  end
+
+  def uninstall
+    emerge "--unmerge", package_name
+  end
+
+  def update
+    self.install
+  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"
+
+    search_field = package_name.count('/') > 0 ? "--category-name" : "--name"
+    search_value = package_name
+
+    begin
+      update_eix if !FileUtils.uptodate?("/var/cache/eix", %w{/usr/bin/eix /usr/portage/metadata/timestamp})
+
+      search_output = nil
+      Puppet::Util::Execution.withenv :LASTVERSION => version_format do
+        search_output = eix "--nocolor", "--pure-packages", "--stable", "--format", search_format, "--exact", search_field, search_value
+      end
+
+      packages = []
+      search_output.each do |search_result|
+        match = result_format.match(search_result)
+
+        if match
+          package = {}
+          result_fields.zip(match.captures) do |field, value|
+            package[field] = value unless !value or value.empty?
+          end
+          package[:ensure] = package[:ensure] ? package[:ensure] : :absent
+          packages << package
         end
+      end
+
+      case packages.size
+        when 0
+          not_found_value = "#{@resource[:category] ? @resource[:category] : "<unspecified category>"}/#{@resource[:name]}"
+          raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
+        when 1
+          return packages[0]
+        else
+          raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
+      end
+    rescue Puppet::ExecutionFailure => detail
+      raise Puppet::Error.new(detail)
     end
+  end
 
-    def latest
-        return self.query[:version_available]
-    end
+  def latest
+    self.query[:version_available]
+  end
 end