Fix specs

Author: joshcooper

lib/puppet/provider/package/gem.rb

@@ -83,6 +83,7 @@ def self.execute_gem_command(command, command_options, custom_environment = {})
       custom_environment[:PATH] = windows_path_without_puppet_bin
     end
 
+    # This uses an unusual form of passing the command and args as [<cmd>, [<arg1>, <arg2>, ...]]
     execute(cmd, { :failonfail => true, :combine => true, :custom_environment => custom_environment })
   end
 

spec/unit/provider/package/puppet_gem_spec.rb

@@ -20,18 +20,28 @@
     let(:provider_gem_cmd) { '/opt/puppetlabs/puppet/bin/gem' }
   end
 
-  custom_environment = {"HOME"=>ENV["HOME"]}
-  custom_environment['PKG_CONFIG_PATH'] = '/opt/puppetlabs/puppet/lib/pkgconfig'
-
-  let(:execute_options) { {:failonfail => true, :combine => true, :custom_environment => custom_environment} }
+  let(:execute_options) do
+    {
+      failonfail: true,
+      combine: true,
+      custom_environment: {
+        'HOME'=>ENV['HOME'],
+        'PKG_CONFIG_PATH' => '/opt/puppetlabs/puppet/lib/pkgconfig'
+      }
+    }
+  end
 
   before :each do
     resource.provider = provider
-    allow(described_class).to receive(:command).with(:gemcmd).and_return(provider_gem_cmd)
-    allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
+    if Puppet::Util::Platform.windows?
+      # provider is loaded before we can stub, so stub the class we're testing
+      allow(provider.class).to receive(:command).with(:gemcmd).and_return(provider_gem_cmd)
+    else
+      allow(provider.class).to receive(:which).with(provider_gem_cmd).and_return(provider_gem_cmd)
+    end
+    allow(File).to receive(:file?).with(provider_gem_cmd).and_return(true)
   end
 
-
   describe '.windows_gemcmd' do
     context 'when PUPPET_DIR is not set' do
       before do
@@ -64,45 +74,43 @@
     end
 
     it "should use the path to the gem command" do
-      allow(described_class).to receive(:validate_command).with(provider_gem_cmd)
-      expect(described_class).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return('')
+      expect(described_class).to receive(:execute).with([provider_gem_cmd, be_an(Array)], be_a(Hash)).and_return('')
       provider.install
     end
 
     it "should not append install_options by default" do
-      expect(described_class).to receive(:execute_gem_command).with(provider_gem_cmd, %w{install --no-rdoc --no-ri myresource}).and_return('')
+      expect(described_class).to receive(:execute).with([provider_gem_cmd, %w{install --no-rdoc --no-ri myresource}], anything).and_return('')
       provider.install
     end
 
     it "should allow setting an install_options parameter" do
       resource[:install_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-      expect(described_class).to receive(:execute_gem_command).with(provider_gem_cmd, %w{install --force --bindir=/usr/bin --no-rdoc --no-ri myresource}).and_return('')
+      expect(described_class).to receive(:execute).with([provider_gem_cmd, %w{install --force --bindir=/usr/bin --no-rdoc --no-ri myresource}], anything).and_return('')
       provider.install
     end
   end
 
   context "when uninstalling" do
     it "should use the path to the gem command" do
-      allow(described_class).to receive(:validate_command).with(provider_gem_cmd)
-      expect(described_class).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return('')
+      expect(described_class).to receive(:execute).with([provider_gem_cmd, be_an(Array)], be_a(Hash)).and_return('')
       provider.uninstall
     end
 
     it "should not append uninstall_options by default" do
-      expect(described_class).to receive(:execute_gem_command).with(provider_gem_cmd, %w{uninstall --executables --all myresource}).and_return('')
+      expect(described_class).to receive(:execute).with([provider_gem_cmd, %w{uninstall --executables --all myresource}], anything).and_return('')
       provider.uninstall
     end
 
     it "should allow setting an uninstall_options parameter" do
       resource[:uninstall_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-      expect(described_class).to receive(:execute_gem_command).with(provider_gem_cmd, %w{uninstall --executables --all myresource --force --bindir=/usr/bin}).and_return('')
+      expect(described_class).to receive(:execute).with([provider_gem_cmd, %w{uninstall --executables --all myresource --force --bindir=/usr/bin}], anything).and_return('')
       provider.uninstall
     end
 
     it 'should invalidate the rubygems cache' do
       gem_source = double('gem_source')
       allow(Puppet::Util::Autoload).to receive(:gem_source).and_return(gem_source)
-      expect(described_class).to receive(:execute_gem_command).with(provider_gem_cmd, %w{uninstall --executables --all myresource}).and_return('')
+      expect(described_class).to receive(:execute).with([provider_gem_cmd, %w{uninstall --executables --all myresource}], anything).and_return('')
       expect(gem_source).to receive(:clear_paths)
       provider.uninstall
     end

spec/unit/provider/package/puppetserver_gem_spec.rb

@@ -16,57 +16,57 @@
 
   let(:provider_gem_cmd) { '/opt/puppetlabs/bin/puppetserver' }
 
-  custom_environment = { HOME: ENV['HOME'] }
-
-  let(:execute_options) { { failonfail: true, combine: true, custom_environment: custom_environment } }
+  let(:execute_options) do
+    { failonfail: true, combine: true, custom_environment: { 'HOME' => ENV['HOME'] } }
+  end
 
   before :each do
     resource.provider = provider
     allow(Puppet::Util).to receive(:which).with(provider_gem_cmd).and_return(provider_gem_cmd)
+    allow(File).to receive(:file?).with(provider_gem_cmd).and_return(true)
   end
 
   describe "#install" do
     it "uses the path to the gem command" do
-      allow(described_class).to receive(:validate_command).with(provider_gem_cmd)
-      expect(Puppet::Util::Execution).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return('')
+      expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, be_an(Array)], be_a(Hash)).and_return('')
       provider.install
     end
 
     it "appends version if given" do
       resource[:ensure] = ['1.2.1']
-      expect(described_class).to receive(:puppetservercmd).with(%w{gem install -v 1.2.1 --no-document myresource}).and_return('')
+      expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem install -v 1.2.1 --no-document myresource}], anything).and_return('')
       provider.install
     end
 
     context "with install_options" do
       it "does not append the parameter by default" do
-        expect(described_class).to receive(:puppetservercmd).with(%w{gem install --no-document myresource}).and_return('')
+        expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem install --no-document myresource}], anything).and_return('')
         provider.install
       end
 
       it "allows setting the parameter" do
         resource[:install_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-        expect(described_class).to receive(:puppetservercmd).with(%w{gem install --force --bindir=/usr/bin --no-document myresource}).and_return('')
+        expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem install --force --bindir=/usr/bin --no-document myresource}], anything).and_return('')
         provider.install
       end
     end
 
     context "with source" do
       it "correctly sets http source" do
         resource[:source] = 'http://rubygems.com'
-        expect(described_class).to receive(:puppetservercmd).with(%w{gem install --no-document --source http://rubygems.com myresource}).and_return('')
+        expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem install --no-document --source http://rubygems.com myresource}], anything).and_return('')
         provider.install
       end
 
       it "correctly sets local file source" do
         resource[:source] = 'paint-2.2.0.gem'
-        expect(described_class).to receive(:puppetservercmd).with(%w{gem install --no-document paint-2.2.0.gem}).and_return('')
+        expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem install --no-document paint-2.2.0.gem}], anything).and_return('')
         provider.install
       end
 
       it "correctly sets local file source with URI scheme" do
         resource[:source] = 'file:///root/paint-2.2.0.gem'
-        expect(described_class).to receive(:puppetservercmd).with(%w{gem install --no-document /root/paint-2.2.0.gem}).and_return('')
+        expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem install --no-document /root/paint-2.2.0.gem}], anything).and_return('')
         provider.install
       end
 
@@ -84,20 +84,19 @@
 
   describe "#uninstall" do
     it "uses the path to the gem command" do
-      allow(described_class).to receive(:validate_command).with(provider_gem_cmd)
-      expect(Puppet::Util::Execution).to receive(:execute).with(be_a(Array), execute_options) { |args| expect(args[0]).to eq(provider_gem_cmd) }.and_return('')
+      expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, be_an(Array)], be_a(Hash)).and_return('')
       provider.uninstall
     end
 
     context "with uninstall_options" do
       it "does not append the parameter by default" do
-        expect(described_class).to receive(:puppetservercmd).with(%w{gem uninstall --executables --all myresource}).and_return('')
+        expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem uninstall --executables --all myresource}], anything).and_return('')
         provider.uninstall
       end
 
       it "allows setting the parameter" do
         resource[:uninstall_options] = [ '--force', {'--bindir' => '/usr/bin' } ]
-        expect(described_class).to receive(:puppetservercmd).with(%w{gem uninstall --executables --all myresource --force --bindir=/usr/bin}).and_return('')
+        expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem uninstall --executables --all myresource --force --bindir=/usr/bin}], anything).and_return('')
         provider.uninstall
       end
     end
@@ -106,14 +105,17 @@
   describe ".gemlist" do
     context "listing installed packages" do
       it "uses the puppet_gem provider_command to list local gems" do
+        allow(Puppet::Type::Package::ProviderPuppet_gem).to receive(:provider_command).and_return('/opt/puppetlabs/puppet/bin/gem')
+        allow(described_class).to receive(:validate_command).with('/opt/puppetlabs/puppet/bin/gem')
+
         expected = { name: 'world_airports', provider: :puppetserver_gem, ensure: ['1.1.3'] }
-        expect(described_class).to receive(:execute_rubygems_list_command).with(['gem', 'list', '--local']).and_return(File.read(my_fixture('gem-list-local-packages')))
+        expect(Puppet::Util::Execution).to receive(:execute).with(['/opt/puppetlabs/puppet/bin/gem', %w[list --local]], anything).and_return(File.read(my_fixture('gem-list-local-packages')))
         expect(described_class.gemlist({ local: true })).to include(expected)
       end
     end
 
     it "appends the gem source if given" do
-      expect(described_class).to receive(:puppetservercmd).with(%w{gem list --remote --source https://rubygems.com}).and_return('')
+      expect(Puppet::Util::Execution).to receive(:execute).with([provider_gem_cmd, %w{gem list --remote --source https://rubygems.com}], anything).and_return('')
       described_class.gemlist({ source: 'https://rubygems.com' })
     end
   end