puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

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

@@ -17,6 +17,10 @@ describe provider_class do
     provider
   end
 
+  before :each do
+    resource.provider = provider
+  end
+
   describe "when installing" do
     it "should use the path to the gem" do
       provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"
@@ -44,6 +48,17 @@ describe provider_class do
       provider.install
     end
 
+    it "should not append install_options by default" do
+      provider.expects(:execute).with { |args| args.length == 5 }.returns ""
+      provider.install
+    end
+
+    it "should allow setting an install_options parameter" do
+      resource[:install_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
+      provider.expects(:execute).with { |args| args[5] == '--force' && args[6] == '--bindir=/usr/bin' }.returns ''
+      provider.install
+    end
+
     describe "when a source is specified" do
       describe "as a normal file" do
         it "should use the file name instead of the gem name" do

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

@@ -299,8 +299,8 @@ describe provider_class do
   end
 
   describe "#install_options" do
-    it "returns empty array by default" do
-      expect(provider.install_options).to eq([])
+    it "returns nil by default" do
+      expect(provider.install_options).to eq(nil)
     end
 
     it "returns install_options when set" do
@@ -314,7 +314,7 @@ describe provider_class do
     end
 
     it 'returns install_options when set as hash' do
-      provider.resource[:install_options] = { '-Darch' => 'vax' }
+      provider.resource[:install_options] = [{ '-Darch' => 'vax' }]
       expect(provider.install_options).to eq(['-Darch=vax'])
     end
 
@@ -325,8 +325,8 @@ describe provider_class do
   end
 
   describe "#uninstall_options" do
-    it "returns empty array by default" do
-      expect(provider.uninstall_options).to eq([])
+    it "returns nil by default" do
+      expect(provider.uninstall_options).to eq(nil)
     end
 
     it "returns uninstall_options when set" do
@@ -340,7 +340,7 @@ describe provider_class do
     end
 
     it 'returns uninstall_options when set as hash' do
-      provider.resource[:uninstall_options] = { '-Darch' => 'vax' }
+      provider.resource[:uninstall_options] = [{ '-Darch' => 'vax' }]
       expect(provider.uninstall_options).to eq(['-Darch=vax'])
     end
     it 'returns uninstall_options when an array with hashes' do

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

@@ -241,7 +241,7 @@ describe Puppet::Type.type(:package).provider(:windows) do
     end
 
     it 'should sort hash keys' do
-      provider.join_options([{'b' => '2', 'a' => '1', 'c' => '3'}]).should == ['a=1 b=2 c=3']
+      provider.join_options([{'b' => '2', 'a' => '1', 'c' => '3'}]).should == ['a=1', 'b=2', 'c=3']
     end
 
     it 'should return strings and hashes' do

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

@@ -1,26 +1,36 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
-provider = Puppet::Type.type(:package).provider(:yum)
+provider_class = Puppet::Type.type(:package).provider(:yum)
+
+describe provider_class do
+  let(:name) { 'mypackage' }
+  let(:resource) do
+    Puppet::Type.type(:package).new(
+      :name     => name,
+      :ensure   => :installed,
+      :provider => 'yum'
+    )
+  end
+
+  let(:provider) do
+    provider = provider_class.new
+    provider.resource = resource
+    provider
+  end
 
-describe provider do
   before do
-    # Create a mock resource
-     @resource = stub 'resource'
-     @resource.stubs(:[]).with(:name).returns 'mypackage'
-     @provider = provider.new(@resource)
-     @provider.stubs(:resource).returns @resource
-     @provider.stubs(:yum).returns 'yum'
-     @provider.stubs(:rpm).returns 'rpm'
-     @provider.stubs(:get).with(:name).returns 'mypackage'
-     @provider.stubs(:get).with(:version).returns '1'
-     @provider.stubs(:get).with(:release).returns '1'
-     @provider.stubs(:get).with(:arch).returns 'i386'
+    provider.stubs(:yum).returns 'yum'
+    provider.stubs(:rpm).returns 'rpm'
+    provider.stubs(:get).with(:version).returns '1'
+    provider.stubs(:get).with(:release).returns '1'
+    provider.stubs(:get).with(:arch).returns 'i386'
   end
+
   # provider should repond to the following methods
-   [:install, :latest, :update, :purge].each do |method|
+   [:install, :latest, :update, :purge, :install_options].each do |method|
      it "should have a(n) #{method}" do
-       @provider.should respond_to(method)
+       provider.should respond_to(method)
     end
   end
 
@@ -32,35 +42,45 @@ describe provider do
     end
 
     it 'should call yum install for :installed' do
-      @resource.stubs(:should).with(:ensure).returns :installed
-      @provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, 'mypackage')
-      @provider.install
+      resource.stubs(:should).with(:ensure).returns :installed
+      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, 'mypackage')
+      provider.install
     end
 
     it 'should use :install to update' do
-      @provider.expects(:install)
-      @provider.update
+      provider.expects(:install)
+      provider.update
     end
 
     it 'should be able to set version' do
-      @resource.stubs(:should).with(:ensure).returns '1.2'
-      @provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, 'mypackage-1.2')
-      @provider.stubs(:query).returns :ensure => '1.2'
-      @provider.install
+      resource[:ensure] = '1.2'
+
+      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :install, 'mypackage-1.2')
+      provider.stubs(:query).returns :ensure => '1.2'
+      provider.install
     end
 
     it 'should be able to downgrade' do
-      @resource.stubs(:should).with(:ensure).returns '1.0'
-      @provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :downgrade, 'mypackage-1.0')
-      @provider.stubs(:query).returns(:ensure => '1.2').then.returns(:ensure => '1.0')
-      @provider.install
+      resource[:ensure] = '1.0'
+
+      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', :downgrade, 'mypackage-1.0')
+      provider.stubs(:query).returns(:ensure => '1.2').then.returns(:ensure => '1.0')
+      provider.install
+    end
+
+    it 'should accept install options' do
+      resource[:ensure] = :installed
+      resource[:install_options] = ['-t', {'-x' => 'expackage'}]
+
+      provider.expects(:yum).with('-d', '0', '-e', '0', '-y', ['-t', '-x=expackage'], :install, 'mypackage')
+      provider.install
     end
   end
 
   describe 'when uninstalling' do
     it 'should use erase to purge' do
-      @provider.expects(:yum).with('-y', :erase, 'mypackage')
-      @provider.purge
+      provider.expects(:yum).with('-y', :erase, 'mypackage')
+      provider.purge
     end
   end
 
@@ -68,61 +88,132 @@ describe provider do
     provider.should be_versionable
   end
 
-  describe '#latest' do
-    describe 'when latest_info is nil' do
-      before :each do
-        @provider.stubs(:latest_info).returns(nil)
-      end
+  describe 'determining the latest version available for a package' do
+
+    it "passes the value of enablerepo install_options when querying" do
+      resource[:install_options] = [
+        {'--enablerepo' => 'contrib'},
+        {'--enablerepo' => 'centosplus'},
+      ]
+      provider.stubs(:properties).returns({:ensure => '3.4.5'})
+
+      described_class.expects(:latest_package_version).with('mypackage', ['contrib', 'centosplus'], [])
+      provider.latest
+    end
 
-      it 'raises if ensure is absent and latest_info is nil' do
-        @provider.stubs(:properties).returns({:ensure => :absent})
+    it "passes the value of disablerepo install_options when querying" do
+      resource[:install_options] = [
+        {'--disablerepo' => 'updates'},
+        {'--disablerepo' => 'centosplus'},
+      ]
+      provider.stubs(:properties).returns({:ensure => '3.4.5'})
 
-        expect { @provider.latest }.to raise_error(
-          Puppet::DevError,
-          'Tried to get latest on a missing package'
-        )
+      described_class.expects(:latest_package_version).with('mypackage', [], ['updates', 'centosplus'])
+      provider.latest
+    end
+
+    describe 'and a newer version is not available' do
+      before :each do
+        described_class.stubs(:latest_package_version).with('mypackage', [], []).returns nil
       end
 
-      it 'returns the ensure value if the package is not already installed' do
-        @provider.stubs(:properties).returns({:ensure => '3.4.5'})
+      it 'raises an error the package is not installed' do
+        provider.stubs(:properties).returns({:ensure => :absent})
+        expect {
+          provider.latest
+        }.to raise_error(Puppet::DevError, 'Tried to get latest on a missing package')
+      end
 
-        @provider.latest.should == '3.4.5'
+      it 'returns version of the currently installed package' do
+        provider.stubs(:properties).returns({:ensure => '3.4.5'})
+        provider.latest.should == '3.4.5'
       end
     end
 
-    describe 'when latest_info is populated' do
-      before :each do
-        @provider.stubs(:latest_info).returns({
+    describe 'and a newer version is available' do
+      let(:latest_version) do
+        {
           :name     => 'mypackage',
           :epoch    => '1',
           :version  => '2.3.4',
           :release  => '5',
           :arch     => 'i686',
-          :provider => :yum,
-          :ensure   => '2.3.4-5'
-        })
+        }
       end
 
       it 'includes the epoch in the version string' do
-        @provider.latest.should == '1:2.3.4-5'
+        described_class.stubs(:latest_package_version).with('mypackage', [], []).returns(latest_version)
+        provider.latest.should == '1:2.3.4-5'
       end
     end
   end
 
-  describe 'prefetching' do
-    let(:nevra_format) { Puppet::Type::Package::ProviderRpm::NEVRA_FORMAT }
+  describe "lazy loading of latest package versions" do
+    before { described_class.clear }
+    after { described_class.clear }
 
-    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
-      mysummaryless 0 1.2.3.4 5.el4 noarch
-      RPM_OUTPUT
+    let(:mypackage_version) do
+      {
+        :name     => 'mypackage',
+        :epoch    => '1',
+        :version  => '2.3.4',
+        :release  => '5',
+        :arch     => 'i686',
+      }
     end
 
-    let(:yumhelper_output) do
+    let(:mypackage_newerversion) do
+      {
+        :name     => 'mypackage',
+        :epoch    => '1',
+        :version  => '4.5.6',
+        :release  => '7',
+        :arch     => 'i686',
+      }
+    end
+
+    let(:latest_versions) { {'mypackage' => [mypackage_version]} }
+    let(:enabled_versions) { {'mypackage' => [mypackage_newerversion]} }
+
+    it "returns the version hash if the package was found" do
+      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
+      version = described_class.latest_package_version('mypackage', [], [])
+      expect(version).to eq(mypackage_version)
+    end
+
+    it "is nil if the package was not found in the query" do
+      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
+      version = described_class.latest_package_version('nopackage', [], [])
+      expect(version).to be_nil
+    end
+
+    it "caches the package list and reuses that for subsequent queries" do
+      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
+
+      2.times {
+        version = described_class.latest_package_version('mypackage', [], [])
+        expect(version).to eq mypackage_version
+      }
+    end
+
+    it "caches separate lists for each combination of 'enablerepo' and 'disablerepo'" do
+      described_class.expects(:fetch_latest_versions).with([], []).once.returns(latest_versions)
+      described_class.expects(:fetch_latest_versions).with(['enabled'], ['disabled']).once.returns(enabled_versions)
+
+      2.times {
+        version = described_class.latest_package_version('mypackage', [], [])
+        expect(version).to eq mypackage_version
+      }
+
+      2.times {
+        version = described_class.latest_package_version('mypackage', ['enabled'], ['disabled'])
+        expect(version).to eq(mypackage_newerversion)
+      }
+    end
+  end
+
+  describe "querying for the latest version of all packages" do
+    let(:yumhelper_single_arch) do
       <<-YUMHELPER_OUTPUT
  * base: centos.tcpdiag.net
  * extras: centos.mirrors.hoobly.com
@@ -134,62 +225,66 @@ _pkg mysummaryless 0 1.2.3.4 5.el4 noarch
      YUMHELPER_OUTPUT
     end
 
-    let(:execute_options) do
-      {:failonfail => true, :combine => true, :custom_environment => {}}
+    let(:yumhelper_multi_arch) do
+      yumhelper_single_arch + <<-YUMHELPER_OUTPUT
+_pkg nss-tools 0 3.14.3 4.el6_4 i386
+_pkg pixman 0 0.26.2 5.el6_4 i386
+      YUMHELPER_OUTPUT
     end
 
-    let(:rpm_version) { "RPM version 4.8.0\n" }
 
-    let(:package_type) { Puppet::Type.type(:package) }
-    let(:yum_provider) { provider }
-
-    def pretend_we_are_root_for_yum_provider
-      Process.stubs(:euid).returns(0)
+    it "creates an entry for each line that's prefixed with '_pkg'" do
+      described_class.expects(:python).with([described_class::YUMHELPER]).returns(yumhelper_single_arch)
+      entries = described_class.fetch_latest_versions([], [])
+      expect(entries.keys).to include 'nss-tools'
+      expect(entries.keys).to include 'pixman'
+      expect(entries.keys).to include 'myresource'
+      expect(entries.keys).to include 'mysummaryless'
     end
 
-    def expect_yum_provider_to_provide_rpm
-      Puppet::Type::Package::ProviderYum.stubs(:rpm).with('--version').returns(rpm_version)
-      Puppet::Type::Package::ProviderYum.expects(:command).with(:rpm).returns("/bin/rpm")
+    it "creates an entry for each package name and architecture" do
+      described_class.expects(:python).with([described_class::YUMHELPER]).returns(yumhelper_single_arch)
+      entries = described_class.fetch_latest_versions([], [])
+      expect(entries.keys).to include 'nss-tools.x86_64'
+      expect(entries.keys).to include 'pixman.x86_64'
+      expect(entries.keys).to include 'myresource.noarch'
+      expect(entries.keys).to include 'mysummaryless.noarch'
     end
 
-    def expect_execpipe_to_provide_package_info_for_an_rpm_query
-      Puppet::Util::Execution.expects(:execpipe).with("/bin/rpm -qa --nosignature --nodigest --qf '#{nevra_format}'").yields(packages)
-    end
+    it "stores multiple entries if a package is build for multiple architectures" do
+      described_class.expects(:python).with([described_class::YUMHELPER]).returns(yumhelper_multi_arch)
+      entries = described_class.fetch_latest_versions([], [])
+      expect(entries.keys).to include 'nss-tools.x86_64'
+      expect(entries.keys).to include 'pixman.x86_64'
+      expect(entries.keys).to include 'nss-tools.i386'
+      expect(entries.keys).to include 'pixman.i386'
 
-    def expect_python_yumhelper_call_to_return_latest_info
-      Puppet::Type::Package::ProviderYum.expects(:python).with(regexp_matches(/yumhelper.py$/)).returns(yumhelper_output)
+      expect(entries['nss-tools']).to have(2).items
+      expect(entries['pixman']).to have(2).items
     end
 
-    def a_package_type_instance_with_yum_provider_and_ensure_latest(name)
-      type_instance = package_type.new(:name => name)
-      type_instance.provider = yum_provider.new
-      type_instance[:ensure] = :latest
-      return type_instance
+    it "passes the repos to enable to the helper" do
+      described_class.expects(:python).with do |script, *args|
+        expect(script).to eq described_class::YUMHELPER
+        expect(args).to eq %w[-e updates -e centosplus]
+      end.returns('')
+      described_class.fetch_latest_versions(['updates', 'centosplus'], [])
     end
 
-    before do
-      pretend_we_are_root_for_yum_provider
-      expect_yum_provider_to_provide_rpm
-      expect_execpipe_to_provide_package_info_for_an_rpm_query
-      expect_python_yumhelper_call_to_return_latest_info
+    it "passes the repos to disable to the helper" do
+      described_class.expects(:python).with do |script, *args|
+        expect(script).to eq described_class::YUMHELPER
+        expect(args).to eq %w[-d updates -d centosplus]
+      end.returns('')
+      described_class.fetch_latest_versions([], ['updates', 'centosplus'])
     end
 
-    it "injects latest provider info into passed resources when prefetching" do
-      myresource = a_package_type_instance_with_yum_provider_and_ensure_latest('myresource')
-      mysummaryless = a_package_type_instance_with_yum_provider_and_ensure_latest('mysummaryless')
-
-      yum_provider.prefetch({ "myresource" => myresource, "mysummaryless" => mysummaryless })
-
-      expect(@logs.map(&:message).grep(/^Failed to match rpm line/)).to be_empty
-      expect(myresource.provider.latest_info).to eq({
-        :name=>"myresource",
-        :epoch=>"0",
-        :version=>"1.2.3.4",
-        :release=>"5.el4",
-        :arch=>"noarch",
-        :provider=>:yum,
-        :ensure=>"1.2.3.4-5.el4"
-      })
+    it 'passes a combination of repos to the helper' do
+      described_class.expects(:python).with do |script, *args|
+        expect(script).to eq described_class::YUMHELPER
+        expect(args).to eq %w[-e os -e contrib -d updates -d centosplus]
+      end.returns('')
+      described_class.fetch_latest_versions(['os', 'contrib'], ['updates', 'centosplus'])
     end
   end
 end