puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/spec/unit/provider/group/windows_adsi_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Puppet::Type.type(:group).provider(:windows_adsi) do
+describe Puppet::Type.type(:group).provider(:windows_adsi), :if => Puppet.features.microsoft_windows? do
   let(:resource) do
     Puppet::Type.type(:group).new(
       :title => 'testers',
@@ -15,8 +15,8 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
   let(:connection) { stub 'connection' }
 
   before :each do
-    Puppet::Util::ADSI.stubs(:computer_name).returns('testcomputername')
-    Puppet::Util::ADSI.stubs(:connect).returns connection
+    Puppet::Util::Windows::ADSI.stubs(:computer_name).returns('testcomputername')
+    Puppet::Util::Windows::ADSI.stubs(:connect).returns connection
   end
 
   describe ".instances" do
@@ -30,14 +30,14 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
     end
   end
 
-  describe "group type :members property helpers", :if => Puppet.features.microsoft_windows? do
+  describe "group type :members property helpers" do
 
     let(:user1) { stub(:account => 'user1', :domain => '.', :to_s => 'user1sid') }
     let(:user2) { stub(:account => 'user2', :domain => '.', :to_s => 'user2sid') }
 
     before :each do
-      Puppet::Util::Windows::Security.stubs(:name_to_sid_object).with('user1').returns(user1)
-      Puppet::Util::Windows::Security.stubs(:name_to_sid_object).with('user2').returns(user2)
+      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user1').returns(user1)
+      Puppet::Util::Windows::SID.stubs(:name_to_sid_object).with('user2').returns(user2)
     end
 
     describe "#members_insync?" do
@@ -89,7 +89,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
       provider.members.should =~ ['user1', 'user2', 'user3']
     end
 
-    it "should be able to set group members", :if => Puppet.features.microsoft_windows? do
+    it "should be able to set group members" do
       provider.group.stubs(:members).returns ['user1', 'user2']
 
       member_sids = [
@@ -100,8 +100,8 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
 
       provider.group.stubs(:member_sids).returns(member_sids[0..1])
 
-      Puppet::Util::Windows::Security.expects(:name_to_sid_object).with('user2').returns(member_sids[1])
-      Puppet::Util::Windows::Security.expects(:name_to_sid_object).with('user3').returns(member_sids[2])
+      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with('user2').returns(member_sids[1])
+      Puppet::Util::Windows::SID.expects(:name_to_sid_object).with('user3').returns(member_sids[2])
 
       provider.group.expects(:remove_member_sids).with(member_sids[0])
       provider.group.expects(:add_member_sids).with(member_sids[2])
@@ -115,7 +115,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
       resource[:members] = ['user1', 'user2']
 
       group = stub 'group'
-      Puppet::Util::ADSI::Group.expects(:create).with('testers').returns group
+      Puppet::Util::Windows::ADSI::Group.expects(:create).with('testers').returns group
 
       create = sequence('create')
       group.expects(:commit).in_sequence(create)
@@ -125,7 +125,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
     end
 
     it 'should not create a group if a user by the same name exists' do
-      Puppet::Util::ADSI::Group.expects(:create).with('testers').raises( Puppet::Error.new("Cannot create group if user 'testers' exists.") )
+      Puppet::Util::Windows::ADSI::Group.expects(:create).with('testers').raises( Puppet::Error.new("Cannot create group if user 'testers' exists.") )
       expect{ provider.create }.to raise_error( Puppet::Error,
         /Cannot create group if user 'testers' exists./ )
     end
@@ -138,11 +138,11 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
   end
 
   it "should be able to test whether a group exists" do
-    Puppet::Util::ADSI.stubs(:sid_uri_safe).returns(nil)
-    Puppet::Util::ADSI.stubs(:connect).returns stub('connection')
+    Puppet::Util::Windows::ADSI.stubs(:sid_uri_safe).returns(nil)
+    Puppet::Util::Windows::ADSI.stubs(:connect).returns stub('connection')
     provider.should be_exists
 
-    Puppet::Util::ADSI.stubs(:connect).returns nil
+    Puppet::Util::Windows::ADSI.stubs(:connect).returns nil
     provider.should_not be_exists
   end
 
@@ -152,8 +152,8 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
     provider.delete
   end
 
-  it "should report the group's SID as gid", :if => Puppet.features.microsoft_windows? do
-    Puppet::Util::Windows::Security.expects(:name_to_sid).with('testers').returns('S-1-5-32-547')
+  it "should report the group's SID as gid" do
+    Puppet::Util::Windows::SID.expects(:name_to_sid).with('testers').returns('S-1-5-32-547')
     provider.gid.should == 'S-1-5-32-547'
   end
 
@@ -162,7 +162,7 @@ describe Puppet::Type.type(:group).provider(:windows_adsi) do
     provider.send(:gid=, 500)
   end
 
-  it "should prefer the domain component from the resolved SID", :if => Puppet.features.microsoft_windows? do
+  it "should prefer the domain component from the resolved SID" do
     provider.members_to_s(['.\Administrators']).should == 'BUILTIN\Administrators'
   end
 end

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

@@ -174,4 +174,14 @@ describe provider_class do
                    {:provider=>:gem, :ensure=>["1.11.3.3"], :name=>"rvm"}]
     end
   end
+
+  describe "listing gems" do
+    describe "searching for a single package" do
+      it "searches for an exact match" do
+        provider_class.expects(:execute).with(includes('^bundler$')).returns(File.read(my_fixture('gem-list-single-package')))
+        expected = {:name => 'bundler', :ensure => %w[1.6.2], :provider => :gem}
+        expect(provider_class.gemlist({:justme => 'bundler'})).to eq(expected)
+      end
+    end
+  end
 end

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

@@ -17,7 +17,7 @@ describe provider_class do
   def expect_pkgadd_with_source(source)
     provider.expects(:pkgadd).with do |fullname|
       ENV.should_not be_key('PKG_PATH')
-      fullname.should == source
+      fullname.should == [source]
     end
   end
 
@@ -28,7 +28,7 @@ describe provider_class do
       ENV.should be_key('PKG_PATH')
       ENV['PKG_PATH'].should == source
 
-      fullname.should == provider.resource[:name]
+      fullname.should == [provider.resource[:name]]
     end
     provider.expects(:execpipe).with(['/bin/pkg_info', '-I', provider.resource[:name]]).yields('')
 
@@ -37,6 +37,15 @@ describe provider_class do
     ENV.should_not be_key('PKG_PATH')
   end
 
+  describe 'provider features' do
+    it { should be_installable }
+    it { should be_install_options }
+    it { should be_uninstallable }
+    it { should be_uninstall_options }
+    it { should be_upgradeable }
+    it { should be_versionable }
+  end
+
   before :each do
     # Stub some provider methods to avoid needing the actual software
     # installed, so we can test on whatever platform we want.
@@ -45,7 +54,7 @@ describe provider_class do
     provider_class.stubs(:command).with(:pkgdelete).returns('/bin/pkg_delete')
   end
 
-  context "::instances" do
+  context "#instances" do
     it "should return nil if execution failed" do
       provider_class.expects(:execpipe).raises(Puppet::ExecutionFailure, 'wawawa')
       provider_class.instances.should be_nil
@@ -69,7 +78,7 @@ describe provider_class do
       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[0].should == {:name => 'bash', :ensure => '3.1.17', :flavor => 'static'}
       instances[1].should == {:name => 'vim',  :ensure => '7.0.42', :flavor => 'no_x11'}
     end
   end
@@ -100,7 +109,7 @@ describe provider_class do
     end
 
     it "should install correctly when given a directory-unlike source" do
-      source = '/whatever.pkg'
+      source = '/whatever.tgz'
       provider.resource[:source] = source
       expect_pkgadd_with_source(source)
 
@@ -224,6 +233,46 @@ describe provider_class do
         }.to raise_error(Puppet::Error, /No valid installpath found in \/etc\/pkg\.conf and no source was set/)
       end
     end
+
+    it 'should use install_options as Array' do
+      provider.resource[:source] = '/tma1/'
+      provider.resource[:install_options] = ['-r', '-z']
+      provider.expects(:pkgadd).with(['-r', '-z', 'bash'])
+      provider.install
+    end
+  end
+
+  context "#latest"  do
+    before do
+      provider.resource[:source] = '/tmp/tcsh.tgz'
+      provider.resource[:name] = 'tcsh'
+      provider.stubs(:pkginfo).with('tcsh')
+    end
+
+    it "should return the ensure value if the package is already installed" do
+      provider.stubs(:properties).returns({:ensure => '4.2.45'})
+      provider.stubs(:pkginfo).with('-Q', 'tcsh')
+      provider.latest.should == '4.2.45'
+    end
+
+    it "should recognize a new version" do
+      pkginfo_query = 'tcsh-6.18.01p1'
+      provider.stubs(:pkginfo).with('-Q', 'tcsh').returns(pkginfo_query)
+      provider.latest.should == '6.18.01p1'
+    end
+
+    it "should recognize a newer version" do
+      provider.stubs(:properties).returns({:ensure => '1.6.8'})
+      pkginfo_query = 'tcsh-1.6.10'
+      provider.stubs(:pkginfo).with('-Q', 'tcsh').returns(pkginfo_query)
+      provider.latest.should == '1.6.10'
+    end
+
+    it "should recognize a package that is already the newest" do
+      pkginfo_query = 'tcsh-6.18.01p0 (installed)'
+      provider.stubs(:pkginfo).with('-Q', 'tcsh').returns(pkginfo_query)
+      provider.latest.should == '6.18.01p0'
+    end
   end
 
   context "#get_version" do
@@ -233,8 +282,8 @@ describe provider_class do
     end
 
     it "should return the package version if in the output" do
-      fixture = File.read(my_fixture('pkginfo.list'))
-      provider.expects(:execpipe).with(%w{/bin/pkg_info -I bash}).yields(fixture)
+      output = 'bash-3.1.17         GNU Bourne Again Shell'
+      provider.expects(:execpipe).with(%w{/bin/pkg_info -I bash}).yields(output)
       provider.get_version.should == '3.1.17'
     end
 
@@ -279,7 +328,7 @@ describe provider_class do
       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
@@ -300,7 +349,7 @@ describe provider_class do
       provider.uninstall_options.should == ['-Dbaddepend=1']
     end
   end
-  
+
   context "#uninstall" do
     describe 'when uninstalling' do
       it 'should use erase to purge' do
@@ -308,5 +357,13 @@ describe provider_class do
         provider.purge
       end
     end
+
+    describe 'with uninstall_options' do
+      it 'should use uninstall_options as Array' do
+        provider.resource[:uninstall_options] = ['-q', '-c']
+        provider.expects(:pkgdelete).with(['-q', '-c'], 'bash')
+        provider.uninstall
+      end
+    end
   end
 end

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

@@ -2,58 +2,73 @@
 require 'spec_helper'
 require 'stringio'
 
-provider = Puppet::Type.type(:package).provider(:pacman)
 
-describe provider do
+describe Puppet::Type.type(:package).provider(:pacman) do
   let(:no_extra_options) { { :failonfail => true, :combine => true, :custom_environment => {} } }
   let(:executor) { Puppet::Util::Execution }
   let(:resolver) { Puppet::Util }
 
+  let(:resource) { Puppet::Type.type(:package).new(:name => 'package', :provider => 'pacman') }
+  let(:provider) { described_class.new(resource) }
+
   before do
     resolver.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
-    provider.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
+    described_class.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
     resolver.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
-    provider.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
-    @resource = Puppet::Type.type(:package).new(:name => 'package')
-    @provider = provider.new(@resource)
+    described_class.stubs(:which).with('/usr/bin/yaourt').returns('/usr/bin/yaourt')
   end
 
   describe "when installing" do
     before do
-      @provider.stubs(:query).returns({
+      provider.stubs(:query).returns({
         :ensure => '1.0'
       })
     end
 
-    it "should call pacman to install the right package quietly" do
-
-      if @provider.yaourt?
-        args = ['/usr/bin/yaourt', '--noconfirm', '-S', @resource[:name]]
-      else
-        args = ['/usr/bin/pacman', '--noconfirm', '--noprogressbar', '-Sy', @resource[:name]]
-      end
-
-      executor.
-        expects(:execute).
-        at_least_once.
-        with(args, no_extra_options).
-        returns ''
+    it "should call pacman to install the right package quietly when yaourt is not installed" do
+      provider.stubs(:yaourt?).returns(false)
+      args = ['--noconfirm', '--noprogressbar', '-Sy', resource[:name]]
+      provider.expects(:pacman).at_least_once.with(*args).returns ''
+      provider.install
+    end
 
-      @provider.install
+    it "should call yaourt to install the right package quietly when yaourt is installed" do
+      provider.stubs(:yaourt?).returns(true)
+      args = ['--noconfirm', '-S', resource[:name]]
+      provider.expects(:yaourt).at_least_once.with(*args).returns ''
+      provider.install
     end
 
     it "should raise an ExecutionFailure if the installation failed" do
       executor.stubs(:execute).returns("")
-      @provider.expects(:query).returns(nil)
+      provider.expects(:query).returns(nil)
 
-      lambda { @provider.install }.should raise_exception(Puppet::ExecutionFailure)
+      lambda { provider.install }.should raise_exception(Puppet::ExecutionFailure)
     end
 
-    context "when :source is specified" do
-      before :each do
-        @install = sequence("install")
+    describe "and install_options are given" do
+      before do
+        resource[:install_options] = ['-x', {'--arg' => 'value'}]
+      end
+
+      it "should call pacman to install the right package quietly when yaourt is not installed" do
+        provider.stubs(:yaourt?).returns(false)
+        args = ['--noconfirm', '--noprogressbar', '-x', '--arg=value', '-Sy', resource[:name]]
+        provider.expects(:pacman).at_least_once.with(*args).returns ''
+        provider.install
       end
 
+      it "should call yaourt to install the right package quietly when yaourt is installed" do
+        provider.stubs(:yaourt?).returns(true)
+        args = ['--noconfirm', '-x', '--arg=value', '-S', resource[:name]]
+        provider.expects(:yaourt).at_least_once.with(*args).returns ''
+        provider.install
+      end
+    end
+
+    context "when :source is specified" do
+      let(:install_seq) { sequence("install") }
+
       context "recognizable by pacman" do
         %w{
           /some/package/file
@@ -61,28 +76,28 @@ describe provider do
           ftp://some.package.in/the/air
         }.each do |source|
           it "should install #{source} directly" do
-            @resource[:source] = source
+            resource[:source] = source
 
             executor.expects(:execute).
               with(all_of(includes("-Sy"), includes("--noprogressbar")), no_extra_options).
-              in_sequence(@install).
+              in_sequence(install_seq).
               returns("")
 
             executor.expects(:execute).
               with(all_of(includes("-U"), includes(source)), no_extra_options).
-              in_sequence(@install).
+              in_sequence(install_seq).
               returns("")
 
-            @provider.install
+            provider.install
           end
         end
       end
 
       context "as a file:// URL" do
+        let(:actual_file_path) { "/some/package/file" }
+
         before do
-          @package_file = "file:///some/package/file"
-          @actual_file_path = "/some/package/file"
-          @resource[:source] = @package_file
+          resource[:source] = "file:///some/package/file"
         end
 
         it "should install from the path segment of the URL" do
@@ -91,35 +106,35 @@ describe provider do
                         includes("--noprogressbar"),
                         includes("--noconfirm")),
                  no_extra_options).
-            in_sequence(@install).
+            in_sequence(install_seq).
             returns("")
 
           executor.expects(:execute).
-            with(all_of(includes("-U"), includes(@actual_file_path)), no_extra_options).
-            in_sequence(@install).
+            with(all_of(includes("-U"), includes(actual_file_path)), no_extra_options).
+            in_sequence(install_seq).
             returns("")
 
-          @provider.install
+          provider.install
         end
       end
 
       context "as a puppet URL" do
         before do
-          @resource[:source] = "puppet://server/whatever"
+          resource[:source] = "puppet://server/whatever"
         end
 
         it "should fail" do
-          lambda { @provider.install }.should raise_error(Puppet::Error)
+          lambda { provider.install }.should raise_error(Puppet::Error)
         end
       end
 
       context "as a malformed URL" do
         before do
-          @resource[:source] = "blah://"
+          resource[:source] = "blah://"
         end
 
         it "should fail" do
-          lambda { @provider.install }.should raise_error(Puppet::Error)
+          lambda { provider.install }.should raise_error(Puppet::Error)
         end
       end
     end
@@ -127,19 +142,23 @@ describe provider do
 
   describe "when updating" do
     it "should call install" do
-      @provider.expects(:install).returns("install return value")
-      @provider.update.should == "install return value"
+      provider.expects(:install).returns("install return value")
+      provider.update.should == "install return value"
     end
   end
 
   describe "when uninstalling" do
     it "should call pacman to remove the right package quietly" do
-      executor.
-        expects(:execute).
-        with(["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", @resource[:name]], no_extra_options).
-        returns ""
+      args = ["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", resource[:name]]
+      executor.expects(:execute).with(args, no_extra_options).returns ""
+      provider.uninstall
+    end
 
-      @provider.uninstall
+    it "adds any uninstall_options" do
+      resource[:uninstall_options] = ['-x', {'--arg' => 'value'}]
+      args = ["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-x", "--arg=value", "-R", resource[:name]]
+      executor.expects(:execute).with(args, no_extra_options).returns ""
+      provider.uninstall
     end
   end
 
@@ -147,8 +166,8 @@ describe provider do
     it "should query pacman" do
       executor.
         expects(:execute).
-        with(["/usr/bin/pacman", "-Qi", @resource[:name]], no_extra_options)
-      @provider.query
+        with(["/usr/bin/pacman", "-Qi", resource[:name]], no_extra_options)
+      provider.query
     end
 
     it "should return the version" do
@@ -176,20 +195,20 @@ Description    : A library-based package manager with dependency support
 EOF
 
       executor.expects(:execute).returns(query_output)
-      @provider.query.should == {:ensure => "1.01.3-2"}
+      provider.query.should == {:ensure => "1.01.3-2"}
     end
 
     it "should return a nil if the package isn't found" do
       executor.expects(:execute).returns("")
-      @provider.query.should be_nil
+      provider.query.should be_nil
     end
 
     it "should return a hash indicating that the package is missing on error" do
       executor.expects(:execute).raises(Puppet::ExecutionFailure.new("ERROR!"))
-      @provider.query.should == {
+      provider.query.should == {
         :ensure => :purged,
         :status => 'missing',
-        :name => @resource[:name],
+        :name => resource[:name],
         :error => 'ok',
       }
     end
@@ -199,18 +218,18 @@ EOF
 
   describe "when fetching a package list" do
     it "should retrieve installed packages" do
-      provider.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
-      provider.installedpkgs
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Q'])
+      described_class.installedpkgs
     end
 
     it "should retrieve installed package groups" do
-      provider.expects(:execpipe).with(["/usr/bin/pacman", '-Qg'])
-      provider.installedgroups
+      described_class.expects(:execpipe).with(["/usr/bin/pacman", '-Qg'])
+      described_class.installedgroups
     end
 
     it "should return installed packages with their versions" do
-      provider.expects(:execpipe).yields(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
-      packages = provider.installedpkgs
+      described_class.expects(:execpipe).yields(StringIO.new("package1 1.23-4\npackage2 2.00\n"))
+      packages = described_class.installedpkgs
 
       packages.length.should == 2
 
@@ -228,8 +247,8 @@ EOF
     end
 
     it "should return installed groups with a dummy version" do
-      provider.expects(:execpipe).yields(StringIO.new("group1 pkg1\ngroup1 pkg2"))
-      groups = provider.installedgroups
+      described_class.expects(:execpipe).yields(StringIO.new("group1 pkg1\ngroup1 pkg2"))
+      groups = described_class.installedgroups
 
       groups.length.should == 1
 
@@ -241,14 +260,14 @@ EOF
     end
 
     it "should return nil on error" do
-      provider.expects(:execpipe).twice.raises(Puppet::ExecutionFailure.new("ERROR!"))
-      provider.instances.should be_nil
+      described_class.expects(:execpipe).twice.raises(Puppet::ExecutionFailure.new("ERROR!"))
+      described_class.instances.should be_nil
     end
 
     it "should warn on invalid input" do
-      provider.expects(:execpipe).yields(StringIO.new("blah"))
-      provider.expects(:warning).with("Failed to match line blah")
-      provider.installedpkgs == []
+      described_class.expects(:execpipe).yields(StringIO.new("blah"))
+      described_class.expects(:warning).with("Failed to match line blah")
+      described_class.installedpkgs == []
     end
   end
 
@@ -265,7 +284,7 @@ EOF
         in_sequence(get_latest_version).
         returns("")
 
-      @provider.latest
+      provider.latest
     end
 
     it "should get query pacman for the latest version" do
@@ -277,10 +296,10 @@ EOF
       executor.
         expects(:execute).
         in_sequence(get_latest_version).
-        with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', @resource[:name]], no_extra_options).
+        with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', resource[:name]], no_extra_options).
         returns("")
 
-      @provider.latest
+      provider.latest
     end
 
     it "should return the version number from pacman" do
@@ -289,7 +308,7 @@ EOF
         at_least_once().
         returns("1.00.2-3\n")
 
-      @provider.latest.should == "1.00.2-3"
+      provider.latest.should == "1.00.2-3"
     end
   end
 end