puppet 2.7.26 → 3.0.0.rc4

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'stringio'
 
@@ -24,7 +24,7 @@ describe provider do
 
     it "should use dpkg-query" do
       provider.expects(:command).with(:dpkgquery).returns "myquery"
-      provider.expects(:execpipe).with("myquery -W --showformat '${Status} ${Package} ${Version}\\n'").yields StringIO.new(@fakeresult)
+      Puppet::Util::Execution.expects(:execpipe).with("myquery -W --showformat '${Status} ${Package} ${Version}\\n'").yields StringIO.new(@fakeresult)
 
       provider.instances
     end
@@ -33,7 +33,7 @@ describe provider do
       pipe = mock 'pipe'
       pipe.expects(:each).never
       pipe.expects(:each_line).yields @fakeresult
-      provider.expects(:execpipe).yields pipe
+      Puppet::Util::Execution.expects(:execpipe).yields pipe
 
       asdf = mock 'pkg1'
       provider.expects(:new).with(:ensure => "1.0", :error => "ok", :desired => "install", :name => "asdf", :status => "installed", :provider => :dpkg).returns asdf
@@ -45,7 +45,7 @@ describe provider do
       pipe = mock 'pipe'
       pipe.expects(:each).never
       pipe.expects(:each_line).yields "foobar"
-      provider.expects(:execpipe).yields pipe
+      Puppet::Util::Execution.expects(:execpipe).yields pipe
 
       Puppet.expects(:warning)
       provider.expects(:new).never

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:freebsd)
@@ -33,7 +33,7 @@ describe provider_class do
       # For better or worse, trailing '/' is needed. --daniel 2011-01-26
       path = '/path/to/directory/'
       @resource.stubs(:[]).with(:source).returns(path)
-      Puppet::Util::Execution.expects(:withenv).once.with({:PKG_PATH => path}).yields
+      Puppet::Util.expects(:withenv).once.with({:PKG_PATH => path}).yields
       @provider.expects(:pkgadd).once.with("mypackage")
 
       expect { @provider.install }.to_not raise_error
@@ -44,7 +44,7 @@ describe provider_class do
         # For better or worse, trailing '/' is needed. --daniel 2011-01-26
         path = "#{protocol}://localhost/"
         @resource.stubs(:[]).with(:source).returns(path)
-        Puppet::Util::Execution.expects(:withenv).once.with({:PACKAGESITE => path}).yields
+        Puppet::Util.expects(:withenv).once.with({:PACKAGESITE => path}).yields
         @provider.expects(:pkgadd).once.with('-r', "mypackage")
 
         expect { @provider.install }.to_not raise_error

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:gem)

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:hpux)

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

@@ -30,7 +30,7 @@ describe provider_class do
     it { should be_versionable }
   end
 
-  describe "when listing all instances", :'fails_on_ruby_1.9.2' => true do
+  describe "when listing all instances" do
     it "should call port -q installed" do
       provider_class.expects(:port).with("-q", :installed).returns("")
       provider_class.instances
@@ -45,6 +45,12 @@ describe provider_class do
       provider_class.expects(:port).returns("foo @1.234.5_2")
       provider_class.instances.size.should == 0
     end
+
+    it "should ignore variants" do
+      provider_class.parse_installed_query_line("bar @1.0beta2_38_1+x11+java (active)").
+        should == {:provider=>:macports, :revision=>"1", :name=>"bar", :ensure=>"1.0beta2_38"}
+    end
+
   end
 
   describe "when installing" do
@@ -78,43 +84,54 @@ describe provider_class do
       "1.2.3 2"
     end
     let :infoargs do
-      ["-q", :info, "--line", "--version", "--revision",  resource_name]
+      ["/opt/local/bin/port", "-q", :info, "--line", "--version", "--revision",  resource_name]
+    end
+
+    before :each do
+      provider.stubs(:command).with(:port).returns("/opt/local/bin/port")
     end
 
     it "should return nil when the package cannot be found" do
       resource[:name] = resource_name
-      provider.expects(:port).returns("")
+      provider.expects(:execute).with(infoargs, {:combine=>false}).returns("")
       provider.latest.should == nil
     end
 
     it "should return the current version if the installed port has the same revision" do
       current_hash[:revision] = "2"
-      provider.expects(:port).with(*infoargs).returns(new_info_line)
+      provider.expects(:execute).with(infoargs, {:combine=>false}).returns(new_info_line)
       provider.expects(:query).returns(current_hash)
       provider.latest.should == current_hash[:ensure]
     end
 
     it "should return the new version_revision if the installed port has a lower revision" do
       current_hash[:revision] = "1"
-      provider.expects(:port).with(*infoargs).returns(new_info_line)
+      provider.expects(:execute).with(infoargs, {:combine=>false}).returns(new_info_line)
       provider.expects(:query).returns(current_hash)
       provider.latest.should == "1.2.3_2"
     end
+
+    it "should return the newest version if the port is not installed" do
+      resource[:name] = resource_name
+      provider.expects(:execute).with(infoargs, {:combine=>false}).returns(new_info_line)
+      provider.expects(:execute).with(["/opt/local/bin/port", "-q", :installed, resource[:name]], {:combine=>false}).returns("")
+      provider.latest.should == "1.2.3_2"
+    end
   end
 
   describe "when updating a port" do
-    it "should execute port upgrade if the port is installed" do
+    it "should execute port install if the port is installed" do
       resource[:name] = resource_name
       resource[:ensure] = :present
-      provider.expects(:query).returns(current_hash)
-      provider.expects(:port).with("-q", :upgrade, resource_name)
+      provider.stubs(:query).returns(current_hash)
+      provider.expects(:port).with("-q", :install, resource_name)
       provider.update
     end
 
-    it "should execute port install if the port is not installed", :'fails_on_ruby_1.9.2' => true do
+    it "should execute port install if the port is not installed" do
       resource[:name] = resource_name
       resource[:ensure] = :present
-      provider.expects(:query).returns("")
+      provider.stubs(:query).returns("")
       provider.expects(:port).with("-q", :install, resource_name)
       provider.update
     end

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

@@ -1,3 +1,4 @@
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 describe Puppet::Type.type(:package).provider(:msi) do
@@ -32,24 +33,26 @@ describe Puppet::Type.type(:package).provider(:msi) do
     it { should be_installable }
     it { should be_uninstallable }
     it { should be_install_options }
+    it { should be_uninstall_options }
   end
 
-  context '::instances' do
-    it 'should return an array of provider instances' do
-      installer([1, 2])
+  describe 'on Windows', :as_platform => :windows do
+    it 'should not be the default provider' do
+      Puppet::Type.type(:package).defaultprovider.should_not == subject.class
+    end
+  end
 
-      MsiPackage.map do |pkg|
-        pkg[:name].should        == "name-#{pkg[:productcode]}"
-        pkg[:ensure].should      == :installed
-        pkg[:provider].should    == :msi
-        pkg[:packagecode].should == "package-#{pkg[:productcode]}"
-      end.count.should == 2
+  context '::instances' do
+    it 'should return an empty array' do
+      described_class.instances.should == []
     end
+  end
 
-    it 'should return an empty array of none found' do
-      installer([])
+  context '#initialize' do
+    it 'should issue a deprecation warning' do
+      Puppet.expects(:deprecation_warning).with("The `:msi` package provider is deprecated, use the `:windows` provider instead.")
 
-      MsiPackage.to_a.size.should == 0
+      Puppet::Type.type(:package).new(:name => name, :provider => :msi, :source => source)
     end
   end
 
@@ -216,13 +219,13 @@ describe Puppet::Type.type(:package).provider(:msi) do
       provider.install_options.should be_nil
     end
 
-    it 'should use the install_options as parameter/value pairs' do
+    it 'should return the options' do
       resource[:install_options] = { 'INSTALLDIR' => 'C:\mysql-here' }
 
       provider.install_options.should == ['INSTALLDIR=C:\mysql-here']
     end
 
-    it 'should only quote the value when an install_options value has a space in it' do
+    it 'should only quote if needed' do
       resource[:install_options] = { 'INSTALLDIR' => 'C:\mysql here' }
 
       provider.install_options.should == ['INSTALLDIR="C:\mysql here"']
@@ -234,4 +237,16 @@ describe Puppet::Type.type(:package).provider(:msi) do
       provider.install_options.should == ['INSTALLDIR="C:\mysql \"here\""']
     end
   end
+
+  context '#uninstall_options' do
+    it 'should return nil by default' do
+      provider.uninstall_options.should be_nil
+    end
+
+    it 'should return the options' do
+      resource[:uninstall_options] = { 'INSTALLDIR' => 'C:\mysql-here' }
+
+      provider.uninstall_options.should == ['INSTALLDIR=C:\mysql-here']
+    end
+  end
 end

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:package).provider(:nim)

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

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'stringio'
 
@@ -32,7 +32,7 @@ describe provider_class do
     end
 
     it "should return all packages when invoked" do
-      fixture = File.new(my_fixture('pkginfo.list'))
+      fixture = File.read(my_fixture('pkginfo.list'))
       subject.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(fixture)
       subject.instances.map(&:name).sort.should ==
         %w{bash bzip2 expat gettext libiconv lzo openvpn python vim wget}.sort
@@ -86,7 +86,7 @@ describe provider_class do
     end
 
     it "should return the package version if in the output" do
-      fixture = File.new(my_fixture('pkginfo.list'))
+      fixture = File.read(my_fixture('pkginfo.list'))
       provider = subject.new(package(:name => 'bash'))
       provider.expects(:execpipe).with(%w{/bin/pkg_info -I bash}).yields(fixture)
       provider.get_version.should == '3.1.17'

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

@@ -1,15 +1,18 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'stringio'
 
 provider = Puppet::Type.type(:package).provider(:pacman)
 
 describe provider do
+  let(:no_extra_options) { { :custom_environment => {} } }
+  let(:executor) { Puppet::Util::Execution }
+  let(:resolver) { Puppet::Util }
+
   before do
-    provider.stubs(:command).with(:pacman).returns('/usr/bin/pacman')
-    @resource = stub 'resource'
-    @resource.stubs(:[]).returns("package")
-    @resource.stubs(:name).returns("name")
+    resolver.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
+    provider.stubs(:which).with('/usr/bin/pacman').returns('/usr/bin/pacman')
+    @resource = Puppet::Type.type(:package).new(:name => 'package')
     @provider = provider.new(@resource)
   end
 
@@ -20,46 +23,97 @@ describe provider do
       })
     end
 
-    it "should call pacman" do
-      provider.
+    it "should call pacman to install the right package quietly" do
+      executor.
         expects(:execute).
         at_least_once.
-        with { |args|
-          args[0] == "/usr/bin/pacman"
-        }.
+        with(["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-Sy", @resource[:name]], no_extra_options).
         returns ""
 
       @provider.install
     end
 
-    it "should be quiet" do
-      provider.
-        expects(:execute).
-        with { |args|
-          args[1,2] == ["--noconfirm", "--noprogressbar"]
-        }.
-        returns("")
-
-      @provider.install
-    end
-
-    it "should install the right package" do
-      provider.
-        expects(:execute).
-        with { |args|
-          args[3,4] == ["-Sy", @resource[0]]
-        }.
-        returns("")
-
-      @provider.install
-    end
-
     it "should raise an ExecutionFailure if the installation failed" do
-      provider.stubs(:execute).returns("")
+      executor.stubs(:execute).returns("")
       @provider.expects(:query).returns(nil)
 
       lambda { @provider.install }.should raise_exception(Puppet::ExecutionFailure)
     end
+
+    context "when :source is specified" do
+      before :each do
+        @install = sequence("install")
+      end
+
+      context "recognizable by pacman" do
+        %w{
+          /some/package/file
+          http://some.package.in/the/air
+          ftp://some.package.in/the/air
+        }.each do |source|
+          it "should install #{source} directly" do
+            @resource[:source] = source
+
+            executor.expects(:execute).
+              with(all_of(includes("-Sy"), includes("--noprogressbar")), no_extra_options).
+              in_sequence(@install).
+              returns("")
+
+            executor.expects(:execute).
+              with(all_of(includes("-U"), includes(source)), no_extra_options).
+              in_sequence(@install).
+              returns("")
+
+            @provider.install
+          end
+        end
+      end
+
+      context "as a file:// URL" do
+        before do
+          @package_file = "file:///some/package/file"
+          @actual_file_path = "/some/package/file"
+          @resource[:source] = @package_file
+        end
+
+        it "should install from the path segment of the URL" do
+          executor.expects(:execute).
+            with(all_of(includes("-Sy"),
+                        includes("--noprogressbar"),
+                        includes("--noconfirm")),
+                 no_extra_options).
+            in_sequence(@install).
+            returns("")
+
+          executor.expects(:execute).
+            with(all_of(includes("-U"), includes(@actual_file_path)), no_extra_options).
+            in_sequence(@install).
+            returns("")
+
+          @provider.install
+        end
+      end
+
+      context "as a puppet URL" do
+        before do
+          @resource[:source] = "puppet://server/whatever"
+        end
+
+        it "should fail" do
+          lambda { @provider.install }.should raise_error(Puppet::Error)
+        end
+      end
+
+      context "as a malformed URL" do
+        before do
+          @resource[:source] = "blah://"
+        end
+
+        it "should fail" do
+          lambda { @provider.install }.should raise_error(Puppet::Error)
+        end
+      end
+    end
   end
 
   describe "when updating" do
@@ -70,45 +124,21 @@ describe provider do
   end
 
   describe "when uninstalling" do
-    it "should call pacman" do
-      provider.
+    it "should call pacman to remove the right package quietly" do
+      executor.
         expects(:execute).
-        with { |args|
-          args[0] == "/usr/bin/pacman"
-        }.
+        with(["/usr/bin/pacman", "--noconfirm", "--noprogressbar", "-R", @resource[:name]], no_extra_options).
         returns ""
 
       @provider.uninstall
     end
-
-    it "should be quiet" do
-      provider.
-        expects(:execute).
-        with { |args|
-          args[1,2] == ["--noconfirm", "--noprogressbar"]
-        }.
-        returns("")
-
-      @provider.uninstall
-    end
-
-    it "should remove the right package" do
-      provider.
-        expects(:execute).
-        with { |args|
-          args[3,4] == ["-R", @resource[0]]
-        }.
-        returns("")
-
-      @provider.uninstall
-    end
   end
 
   describe "when querying" do
     it "should query pacman" do
-      provider.
+      executor.
         expects(:execute).
-        with(["/usr/bin/pacman", "-Qi", @resource[0]])
+        with(["/usr/bin/pacman", "-Qi", @resource[:name]], no_extra_options)
       @provider.query
     end
 
@@ -136,21 +166,21 @@ Install Script : Yes
 Description    : A library-based package manager with dependency support
 EOF
 
-      provider.expects(:execute).returns(query_output)
+      executor.expects(:execute).returns(query_output)
       @provider.query.should == {:ensure => "1.01.3-2"}
     end
 
     it "should return a nil if the package isn't found" do
-      provider.expects(:execute).returns("")
+      executor.expects(:execute).returns("")
       @provider.query.should be_nil
     end
 
     it "should return a hash indicating that the package is missing on error" do
-      provider.expects(:execute).raises(Puppet::ExecutionFailure.new("ERROR!"))
+      executor.expects(:execute).raises(Puppet::ExecutionFailure.new("ERROR!"))
       @provider.query.should == {
         :ensure => :purged,
         :status => 'missing',
-        :name => @resource[0],
+        :name => @resource[:name],
         :error => 'ok',
       }
     end
@@ -195,39 +225,37 @@ EOF
 
   describe "when determining the latest version" do
     it "should refresh package list" do
-      refreshed = states('refreshed').starts_as('unrefreshed')
-      provider.
+      get_latest_version = sequence("get_latest_version")
+      executor.
         expects(:execute).
-        when(refreshed.is('unrefreshed')).
-        with(['/usr/bin/pacman', '-Sy']).
-        then(refreshed.is('refreshed'))
+        in_sequence(get_latest_version).
+        with(['/usr/bin/pacman', '-Sy'], no_extra_options)
 
-      provider.
+      executor.
         stubs(:execute).
-        when(refreshed.is('refreshed')).
+        in_sequence(get_latest_version).
         returns("")
 
       @provider.latest
     end
 
     it "should get query pacman for the latest version" do
-      refreshed = states('refreshed').starts_as('unrefreshed')
-      provider.
+      get_latest_version = sequence("get_latest_version")
+      executor.
         stubs(:execute).
-        when(refreshed.is('unrefreshed')).
-        then(refreshed.is('refreshed'))
+        in_sequence(get_latest_version)
 
-      provider.
+      executor.
         expects(:execute).
-        when(refreshed.is('refreshed')).
-        with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', @resource[0]]).
+        in_sequence(get_latest_version).
+        with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', @resource[:name]], no_extra_options).
         returns("")
 
       @provider.latest
     end
 
     it "should return the version number from pacman" do
-      provider.
+      executor.
         expects(:execute).
         at_least_once().
         returns("1.00.2-3\n")