Merge branch 'feature/master/4258-pkgutil' into 2.7.x

* feature/master/4258-pkgutil: (29 commits)
  (#4258) Fix pkgutil spec test to have the correct provider
  (#4258) Remove superfluous command check that called pkgutil
  (#4258) Fix fd leak opening pkgutil config files
  (#4258) Permit variations of -nv in both pkgutil.conf files
  (#4258) Stop file and config checks from breaking spec
  (#4258) Check wgetopts in pkgutil.conf
  (#4258) Fix hash duplication affecting canonical provider instance
  (#4258) Use pkgutil -a to reliably determine package common names/aliases
  (#4258) Update pkgutil spec for recent impl changes
  (#4258) pkgutil: bug fix: if shortname is not equal to package name
  (#4258) pkgutil provider: better handling of short package names
  (#4258) pkgutil provider: misc enhancements
  Add spec tests for pkgutil package provider
  * Fix exception on parse failure of pkgutil output * Fix exception when querying latest version for unknown package
  Fixing indentation
  Removing blastwave references and unused PAGER
  Changing indentation to 2-spaces as per 2.6+ style
  Single package queries made more robust when dealing with pkgutil noise
  Fixing wget verbose regex
  These regular expressions will not match anything.  pkgutil doesn't output anything that can be matched.
  ...

1 files changed, 182 insertions, 0 deletions

diff --git a/spec/unit/provider/package/pkgutil_spec.rb b/spec/unit/provider/package/pkgutil_spec.rb
new file mode 100755
index 000000000..5549b3f6d
--- /dev/null
+++ b/spec/unit/provider/package/pkgutil_spec.rb
@@ -0,0 +1,182 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+provider = Puppet::Type.type(:package).provider(:pkgutil)
+
+describe provider do
+  before(:each) do
+    @resource = Puppet::Type.type(:package).new(
+      :name     => "TESTpkg",
+      :ensure   => :present,
+      :provider => :pkgutil
+    )
+    @provider = provider.new(@resource)
+
+    # Stub all file and config tests
+    provider.stubs(:healthcheck)
+  end
+
+  it "should have an install method" do
+    @provider.should respond_to(:install)
+  end
+
+  it "should have a latest method" do
+    @provider.should respond_to(:uninstall)
+  end
+
+  it "should have an update method" do
+    @provider.should respond_to(:update)
+  end
+
+  it "should have a latest method" do
+    @provider.should respond_to(:latest)
+  end
+
+  describe "when installing" do
+    it "should use a command without versioned package" do
+      @resource[:ensure] = :latest
+      @provider.expects(:pkguti).with('-y', '-i', 'TESTpkg')
+      @provider.install
+    end
+  end
+
+  describe "when updating" do
+    it "should use a command without versioned package" do
+      @provider.expects(:pkguti).with('-y', '-u', 'TESTpkg')
+      @provider.update
+    end
+  end
+
+  describe "when uninstalling" do
+    it "should call the remove operation" do
+      @provider.expects(:pkguti).with('-y', '-r', 'TESTpkg')
+      @provider.uninstall
+    end
+  end
+
+  describe "when getting latest version" do
+    it "should return TESTpkg's version string" do
+      fake_data = "
+noisy output here
+TESTpkg                   1.4.5,REV=2007.11.18      1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.latest.should == "1.4.5,REV=2007.11.20"
+    end
+
+    it "should handle TESTpkg's 'SAME' version string" do
+      fake_data = "
+noisy output here
+TESTpkg                   1.4.5,REV=2007.11.18      SAME"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.latest.should == "1.4.5,REV=2007.11.18"
+    end
+
+    it "should handle a non-existent package" do
+      fake_data = "noisy output here
+Not in catalog"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.latest.should == nil
+    end
+
+    it "should warn on unknown pkgutil noise" do
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns("testingnoise")
+      @provider.latest.should == nil
+    end
+
+    it "should ignore pkgutil noise/headers to find TESTpkg" do
+      fake_data = "# stuff
+=> Fetching new catalog and descriptions (http://mirror.opencsw.org/opencsw/unstable/i386/5.11) if available ...
+2011-02-19 23:05:46 URL:http://mirror.opencsw.org/opencsw/unstable/i386/5.11/catalog [534635/534635] -> \"/var/opt/csw/pkgutil/catalog.mirror.opencsw.org_opencsw_unstable_i386_5.11.tmp\" [1]
+Checking integrity of /var/opt/csw/pkgutil/catalog.mirror.opencsw.org_opencsw_unstable_i386_5.11 with gpg.
+gpg: Signature made February 17, 2011 05:27:53 PM GMT using DSA key ID E12E9D2F
+gpg: Good signature from \"Distribution Manager <dm@blastwave.org>\"
+==> 2770 packages loaded from /var/opt/csw/pkgutil/catalog.mirror.opencsw.org_opencsw_unstable_i386_5.11
+package                   installed                 catalog
+TESTpkg                   1.4.5,REV=2007.11.18      1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.latest.should == "1.4.5,REV=2007.11.20"
+    end
+
+    it "should find REALpkg via an alias (TESTpkg)" do
+      fake_data = "
+noisy output here
+REALpkg                   1.4.5,REV=2007.11.18      1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.query[:name].should == "TESTpkg"
+    end
+  end
+
+  describe "when querying current version" do
+    it "should return TESTpkg's version string" do
+      fake_data = "TESTpkg  1.4.5,REV=2007.11.18  1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.query[:ensure].should == "1.4.5,REV=2007.11.18"
+    end
+
+    it "should handle a package that isn't installed" do
+      fake_data = "TESTpkg  notinst  1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.query[:ensure].should == :absent
+    end
+
+    it "should handle a non-existent package" do
+      fake_data = "noisy output here
+Not in catalog"
+      provider.expects(:pkguti).with(['-c', '--single', 'TESTpkg']).returns fake_data
+      @provider.query[:ensure].should == :absent
+    end
+  end
+
+  describe "when querying current instances" do
+    it "should warn on unknown pkgutil noise" do
+      provider.expects(:pkguti).with(['-a']).returns("testingnoise")
+      provider.expects(:pkguti).with(['-c']).returns("testingnoise")
+      Puppet.expects(:warning).times(2)
+      provider.expects(:new).never
+      provider.instances.should == []
+    end
+
+    it "should return TESTpkg's version string" do
+      fake_data = "TESTpkg  TESTpkg  1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-a']).returns fake_data
+
+      fake_data = "TESTpkg  1.4.5,REV=2007.11.18  1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c']).returns fake_data
+
+      testpkg = mock 'pkg1'
+      provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).returns testpkg
+      provider.instances.should == [testpkg]
+    end
+
+    it "should also return both TESTpkg and mypkg alias instances" do
+      fake_data = "mypkg  TESTpkg  1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-a']).returns fake_data
+
+      fake_data = "TESTpkg  1.4.5,REV=2007.11.18  1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c']).returns fake_data
+
+      testpkg = mock 'pkg1'
+      provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).returns testpkg
+
+      aliaspkg = mock 'pkg2'
+      provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "mypkg", :provider => :pkgutil).returns aliaspkg
+
+      provider.instances.should == [testpkg,aliaspkg]
+    end
+
+    it "shouldn't mind noise in the -a output" do
+      fake_data = "noisy output here"
+      provider.expects(:pkguti).with(['-a']).returns fake_data
+
+      fake_data = "TESTpkg  1.4.5,REV=2007.11.18  1.4.5,REV=2007.11.20"
+      provider.expects(:pkguti).with(['-c']).returns fake_data
+
+      testpkg = mock 'pkg1'
+      provider.expects(:new).with(:ensure => "1.4.5,REV=2007.11.18", :name => "TESTpkg", :provider => :pkgutil).returns testpkg
+
+      provider.instances.should == [testpkg]
+    end
+  end
+
+end