puppet 3.2.4 → 3.3.0.rc2

data/spec/unit/provider/package/openbsd_spec.rb

@@ -62,6 +62,16 @@ describe provider_class do
       provider_class.instances.map(&:name).sort.should ==
         %w{bash bzip2 expat gettext libiconv lzo openvpn python vim wget}.sort
     end
+
+    it "should return all flavors if set" do
+      fixture = File.read(my_fixture('pkginfo_flavors.list'))
+      provider_class.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(fixture)
+      instances = provider_class.instances.map {|p| {:name => p.get(:name),
+        :ensure => p.get(:ensure), :flavor => p.get(:flavor)}}
+      instances.size.should == 2
+      instances[0].should == {:name => 'bash', :ensure => '3.1.17',  :flavor => 'static'}
+      instances[1].should == {:name => 'vim',  :ensure => '7.0.42', :flavor => 'no_x11'}
+    end
   end
 
   context "#install" do
@@ -184,7 +194,29 @@ describe provider_class do
       provider.install
     end
 
-    %w{ installpath installpath= }.each do |line|
+    it "should append installpath" do
+      urls = ["ftp://your.ftp.mirror/pub/OpenBSD/5.2/packages/amd64/",
+              "http://another.ftp.mirror/pub/OpenBSD/5.2/packages/amd64/"]
+      lines = ["installpath  = #{urls[0]}\n",
+               "installpath += #{urls[1]}\n"]
+
+      expect_read_from_pkgconf(lines)
+      expect_pkgadd_with_env_and_name(urls.join(":")) do
+        provider.install
+      end
+    end
+
+    it "should handle append on first installpath" do
+      url = "ftp://your.ftp.mirror/pub/OpenBSD/5.2/packages/amd64/"
+      lines = ["installpath += #{url}\n"]
+
+      expect_read_from_pkgconf(lines)
+      expect_pkgadd_with_env_and_name(url) do
+        provider.install
+      end
+    end
+
+    %w{ installpath installpath= installpath+=}.each do |line|
       it "should reject '#{line}'" do
         expect_read_from_pkgconf([line])
         expect {
@@ -226,4 +258,55 @@ describe provider_class do
       provider.query.should be_nil
     end
   end
+
+  context "#install_options" do
+    it "should return nill by default" do
+      provider.install_options.should be_nil
+    end
+
+    it "should return install_options when set" do
+      provider.resource[:install_options] = ['-n']
+      provider.resource[:install_options].should == ['-n']
+    end
+
+    it "should return multiple install_options when set" do
+      provider.resource[:install_options] = ['-L', '/opt/puppet']
+      provider.resource[:install_options].should == ['-L', '/opt/puppet']
+    end
+
+    it 'should return install_options when set as hash' do
+      provider.resource[:install_options] = { '-Darch' => 'vax' }
+      provider.install_options.should == ['-Darch=vax']
+    end
+  end
+  
+  context "#uninstall_options" do
+    it "should return nill by default" do
+      provider.uninstall_options.should be_nil
+    end
+
+    it "should return uninstall_options when set" do
+      provider.resource[:uninstall_options] = ['-n']
+      provider.resource[:uninstall_options].should == ['-n']
+    end
+
+    it "should return multiple uninstall_options when set" do
+      provider.resource[:uninstall_options] = ['-q', '-c']
+      provider.resource[:uninstall_options].should == ['-q', '-c']
+    end
+
+    it 'should return uninstall_options when set as hash' do
+      provider.resource[:uninstall_options] = { '-Dbaddepend' => '1' }
+      provider.uninstall_options.should == ['-Dbaddepend=1']
+    end
+  end
+  
+  context "#uninstall" do
+    describe 'when uninstalling' do
+      it 'should use erase to purge' do
+        provider.expects(:pkgdelete).with('-c', '-q', 'bash')
+        provider.purge
+      end
+    end
+  end
 end

data/spec/unit/provider/package/opkg_spec.rb

@@ -82,7 +82,7 @@ describe Puppet::Type.type(:package).provider(:opkg) do
       context "with invalid URL for opkg" do
         before do
           # Emulate the `opkg` command returning a non-zero exit value
-          Puppet::Util::Execution.stubs(:execute).raises Puppet::ExecutionFailure
+          Puppet::Util::Execution.stubs(:execute).raises Puppet::ExecutionFailure, 'oops'
         end
 
         context "puppet://server/whatever" do
@@ -91,7 +91,7 @@ describe Puppet::Type.type(:package).provider(:opkg) do
           end
 
           it "should fail" do
-            expect { provider.install }.to raise_error, Puppet::ExecutionFailure
+            expect { provider.install }.to raise_error Puppet::ExecutionFailure
           end
         end
 
@@ -101,7 +101,7 @@ describe Puppet::Type.type(:package).provider(:opkg) do
           end
 
           it "should fail" do
-            expect { provider.install }.to raise_error, Puppet::ExecutionFailure
+            expect { provider.install }.to raise_error Puppet::ExecutionFailure
           end
         end
       end

data/spec/unit/provider/package/pip_spec.rb

@@ -90,6 +90,22 @@ describe provider_class do
       @provider.query.should == nil
     end
 
+    it "should be case insensitive" do
+      @resource[:name] = "Real_Package"
+
+      provider_class.expects(:instances).returns [provider_class.new({
+        :ensure   => "1.2.5",
+        :name     => "real_package",
+        :provider => :pip,
+      })]
+
+      @provider.query.should == {
+        :ensure   => "1.2.5",
+        :name     => "real_package",
+        :provider => :pip,
+      }
+    end
+
   end
 
   describe "latest" do

data/spec/unit/provider/package/pkgdmg_spec.rb

@@ -64,26 +64,81 @@ describe Puppet::Type.type(:package).provider(:pkgdmg) do
         resource[:source] = "http://fake.puppetlabs.com/foo.dmg"
       end
 
-      it "should call tmpdir and use the returned directory" do
+      it "should call tmpdir and then call curl with that directory" do
         Dir.expects(:mktmpdir).returns tmpdir
         Dir.stubs(:entries).returns ["foo.pkg"]
         described_class.expects(:curl).with do |*args|
-          args[0] == "-o" and args[1].include? tmpdir
+          args[0] == "-o" and args[1].include? tmpdir and args.include? "--fail"
         end
         described_class.stubs(:hdiutil).returns fake_hdiutil_plist
         described_class.expects(:installpkg)
 
         provider.install
       end
+
+      it "should use an http proxy host and port if specified" do
+        Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
+        Puppet::Util::HttpProxy.expects(:http_proxy_port).returns 'some_port'
+        Dir.expects(:mktmpdir).returns tmpdir
+        Dir.stubs(:entries).returns ["foo.pkg"]
+        described_class.expects(:curl).with do |*args|
+          args.should be_include 'some_host:some_port'
+          args.should be_include '--proxy'
+        end
+        described_class.stubs(:hdiutil).returns fake_hdiutil_plist
+        described_class.expects(:installpkg)
+
+        provider.install
+      end
+
+      it "should use an http proxy host only if specified" do
+        Puppet::Util::HttpProxy.expects(:http_proxy_host).returns 'some_host'
+        Puppet::Util::HttpProxy.expects(:http_proxy_port).returns nil
+        Dir.expects(:mktmpdir).returns tmpdir
+        Dir.stubs(:entries).returns ["foo.pkg"]
+        described_class.expects(:curl).with do |*args|
+          args.should be_include 'some_host'
+          args.should be_include '--proxy'
+        end
+        described_class.stubs(:hdiutil).returns fake_hdiutil_plist
+        described_class.expects(:installpkg)
+
+        provider.install
+      end
+
     end
   end
 
   describe "when installing flat pkg file" do
-    it "should call installpkg if a flat pkg file is found instead of a .dmg image" do
-      resource[:source] = "/tmp/test.pkg"
-      resource[:name] = "testpkg"
-      provider.class.expects(:installpkgdmg).with("/tmp/test.pkg", "testpkg").returns ""
-      provider.install
+    describe "with a local source" do
+      it "should call installpkg if a flat pkg file is found instead of a .dmg image" do
+        resource[:source] = "/tmp/test.pkg"
+        resource[:name] = "testpkg"
+        provider.class.expects(:installpkgdmg).with("/tmp/test.pkg", "testpkg").returns ""
+        provider.install
+      end
+    end
+
+    describe "with a remote source" do
+      let(:remote_source) { 'http://fake.puppetlabs.com/test.pkg' }
+      let(:tmpdir) { '/path/to/tmpdir' }
+      let(:tmpfile) { File.join(tmpdir, 'testpkg.pkg') }
+
+      before do
+        resource[:name]   = 'testpkg'
+        resource[:source] = remote_source
+
+        Dir.stubs(:mktmpdir).returns tmpdir
+      end
+
+      it "should call installpkg if a flat pkg file is found instead of a .dmg image" do
+        described_class.expects(:curl).with do |*args|
+          args.should be_include tmpfile
+          args.should be_include remote_source
+        end
+        provider.class.expects(:installpkg).with(tmpfile, 'testpkg', remote_source)
+        provider.install
+      end
     end
   end
 end

data/spec/unit/provider/package/rpm_spec.rb

@@ -8,16 +8,18 @@ describe provider_class do
 
   let (:packages) do
     <<-RPM_OUTPUT
-    cracklib-dicts 0 2.8.9 3.3 x86_64
-    basesystem 0 8.0 5.1.1.el5.centos noarch
-    chkconfig 0 1.3.30.2 2.el5 x86_64
-    myresource 0 1.2.3.4 5.el4 noarch
+    cracklib-dicts 0 2.8.9 3.3 x86_64 :DESC: The standard CrackLib dictionaries
+    basesystem 0 8.0 5.1.1.el5.centos noarch :DESC: The skeleton package which defines a simple Red Hat Enterprise Linux system
+    chkconfig 0 1.3.30.2 2.el5 x86_64 :DESC: A system tool for maintaining the /etc/rc*.d hierarchy
+    myresource 0 1.2.3.4 5.el4 noarch :DESC: Now with summary
+    mysummaryless 0 1.2.3.4 5.el4 noarch :DESC:
     RPM_OUTPUT
   end
 
+  let(:resource_name) { 'myresource' }
   let(:resource) do
     Puppet::Type.type(:package).new(
-      :name     => 'myresource',
+      :name     => resource_name,
       :ensure   => :installed
     )
   end
@@ -28,6 +30,10 @@ describe provider_class do
     provider
   end
 
+  let(:nevra_format) { %Q{'%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH} :DESC: %{SUMMARY}\\n'} }
+  let(:execute_options) do
+    {:failonfail => true, :combine => true, :custom_environment => {}}
+  end
   let(:rpm_version) { "RPM version 5.0.0\n" }
 
   before(:each) do
@@ -35,13 +41,13 @@ describe provider_class do
     subject.stubs(:which).with("rpm").returns("/bin/rpm")
     subject.instance_variable_set("@current_version", nil)
     Puppet::Type::Package::ProviderRpm.expects(:execute).with(["/bin/rpm", "--version"]).returns(rpm_version).at_most_once
-    Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "--version"], {:failonfail => true, :combine => true, :custom_environment => {}}).returns(rpm_version).at_most_once
+    Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "--version"], execute_options).returns(rpm_version).at_most_once
   end
 
   describe "self.instances" do
     describe "with a modern version of RPM" do
       it "should include all the modern flags" do
-        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf '%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\n'").yields(packages)
+        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf #{nevra_format}").yields(packages)
 
         installed_packages = subject.instances
       end
@@ -50,7 +56,7 @@ describe provider_class do
     describe "with a version of RPM < 4.1" do
       let(:rpm_version) { "RPM version 4.0.2\n" }
       it "should exclude the --nosignature flag" do
-        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa  --nodigest --qf '%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\n'").yields(packages)
+        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa  --nodigest --qf #{nevra_format}").yields(packages)
 
         installed_packages = subject.instances
       end
@@ -59,14 +65,14 @@ describe provider_class do
     describe "with a version of RPM < 4.0.2" do
       let(:rpm_version) { "RPM version 3.0.5\n" }
       it "should exclude the --nodigest flag" do
-        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa   --qf '%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\n'").yields(packages)
+        Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa   --qf #{nevra_format}").yields(packages)
 
         installed_packages = subject.instances
       end
     end
 
     it "returns an array of packages" do
-      Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf '%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\n'").yields(packages)
+      Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf #{nevra_format}").yields(packages)
 
       installed_packages = subject.instances
 
@@ -78,7 +84,8 @@ describe provider_class do
           :version => "2.8.9",
           :release => "3.3",
           :arch => "x86_64",
-          :ensure => "2.8.9-3.3"
+          :ensure => "2.8.9-3.3",
+          :description => "The standard CrackLib dictionaries",
         }
       installed_packages[1].properties.should ==
         {
@@ -88,7 +95,8 @@ describe provider_class do
           :version => "8.0",
           :release => "5.1.1.el5.centos",
           :arch => "noarch",
-          :ensure => "8.0-5.1.1.el5.centos"
+          :ensure => "8.0-5.1.1.el5.centos",
+          :description => "The skeleton package which defines a simple Red Hat Enterprise Linux system",
         }
       installed_packages[2].properties.should ==
         {
@@ -98,7 +106,19 @@ describe provider_class do
           :version => "1.3.30.2",
           :release => "2.el5",
           :arch => "x86_64",
-          :ensure => "1.3.30.2-2.el5"
+          :ensure => "1.3.30.2-2.el5",
+          :description => "A system tool for maintaining the /etc/rc*.d hierarchy",
+        }
+      installed_packages.last.properties.should ==
+        {
+          :provider    => :rpm,
+          :name        => "mysummaryless",
+          :epoch       => "0",
+          :version     => "1.2.3.4",
+          :release     => "5.el4",
+          :arch        => "noarch",
+          :ensure      => "1.2.3.4-5.el4",
+          :description => "",
         }
     end
   end
@@ -114,7 +134,7 @@ describe provider_class do
 
     describe "when not already installed" do
       it "should only include the '-i' flag" do
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-i", '/path/to/package'], {:failonfail => true, :combine => true, :custom_environment => {}})
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-i", '/path/to/package'], execute_options)
         provider.install
       end
    end
@@ -127,12 +147,20 @@ describe provider_class do
      end
 
      it "should include the '-U --oldpackage' flags" do
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", ["-U", "--oldpackage"], '/path/to/package'], {:failonfail => true, :combine => true, :custom_environment => {}})
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", ["-U", "--oldpackage"], '/path/to/package'], execute_options)
         provider.install
      end
    end
   end
 
+  describe "#latest" do
+    it "should retrieve version string after querying rpm for version from source file" do
+      resource.expects(:[]).with(:source).returns('source-string')
+      Puppet::Util::Execution.expects(:execfail).with(["/bin/rpm", "-q", "--qf", nevra_format, "-p", "source-string"], Puppet::Error).returns("myresource 0 1.2.3.4 5.el4 noarch :DESC:\n")
+      provider.latest.should == "1.2.3.4-5.el4"
+    end
+  end
+
   describe "#uninstall" do
     let(:resource) do
       Puppet::Type.type(:package).new(
@@ -142,33 +170,96 @@ describe provider_class do
     end
 
     describe "on a modern RPM" do
-      before(:each) do 
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q",  "myresource", '--nosignature', '--nodigest', "--qf", "%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\n"], {:failonfail => true, :combine => true, :custom_environment => {}}).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
+      before(:each) do
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q",  "myresource", '--nosignature', '--nodigest', "--qf", nevra_format], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch :DESC:\n")
       end
 
       let(:rpm_version) { "RPM version 4.10.0\n" }
 
       it "should include the architecture in the package name" do
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-e", 'myresource-1.2.3.4-5.el4.noarch'], {:failonfail => true, :combine => true, :custom_environment => {}}).returns('').at_most_once
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-e", 'myresource-1.2.3.4-5.el4.noarch'], execute_options).returns('').at_most_once
         provider.uninstall
       end
     end
 
     describe "on an ancient RPM" do
-      before(:each) do 
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q",  "myresource", '', '', "--qf", "%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\n"], {:failonfail => true, :combine => true, :custom_environment => {}}).returns("myresource 0 1.2.3.4 5.el4 noarch\n")
+      before(:each) do
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q",  "myresource", '', '', '--qf', nevra_format], execute_options).returns("myresource 0 1.2.3.4 5.el4 noarch :DESC:\n")
       end
 
       let(:rpm_version) { "RPM version 3.0.6\n" }
 
       it "should exclude the architecture from the package name" do
-        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-e", 'myresource-1.2.3.4-5.el4'], {:failonfail => true, :combine => true, :custom_environment => {}}).returns('').at_most_once
+        Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-e", 'myresource-1.2.3.4-5.el4'], execute_options).returns('').at_most_once
         provider.uninstall
       end
     end
 
   end
 
+  describe "parsing" do
+    def parser_test(rpm_output_string, gold_hash, number_of_warnings = 0)
+      Puppet.expects(:warning).times(number_of_warnings)
+      Puppet::Util::Execution.expects(:execute).with(["/bin/rpm", "-q", resource_name, "--nosignature", "--nodigest", "--qf", nevra_format], execute_options).returns(rpm_output_string)
+      provider.query.should == gold_hash
+    end
+
+    let(:resource_name) { 'name' }
+    let('delimiter') { ':DESC:' }
+    let(:package_hash) do
+      {
+        :name => 'name',
+        :epoch => 'epoch',
+        :version => 'version',
+        :release => 'release',
+        :arch => 'arch',
+        :description => 'a description',
+        :provider => :rpm,
+        :ensure => 'version-release',
+      }
+    end
+    let(:line) { 'name epoch version release arch :DESC: a description' }
+
+    ['name', 'epoch', 'version', 'release', 'arch'].each do |field|
+
+      it "should still parse if #{field} is replaced by delimiter" do
+        parser_test(
+          line.gsub(field, delimiter),
+          package_hash.merge(
+            field.to_sym => delimiter,
+            :ensure => 'version-release'.gsub(field, delimiter)
+          )
+        )
+      end
+
+    end
+
+    it "should still parse if missing description" do
+      parser_test(
+        line.gsub(/#{delimiter} .+$/, delimiter),
+        package_hash.merge(:description => '')
+      )
+    end
+
+    it "should still parse if missing delimeter and description entirely" do
+      parser_test(
+        line.gsub(/ #{delimiter} .+$/, ''),
+        package_hash.merge(:description => nil)
+      )
+    end
+
+    it "should still parse if description contains a new line" do
+      parser_test(
+        line.gsub(/#{delimiter} .+$/, "#{delimiter} whoops\nnewline"),
+        package_hash.merge(:description => 'whoops')
+      )
+    end
+
+    it "should warn but not fail if line is unparseable" do
+      parser_test('bad data', {}, 1)
+    end
+  end
+
   describe ".nodigest" do
     { '4.0'   => nil,
       '4.0.1' => nil,