puppet 6.0.4-x64-mingw32 → 6.0.5-x64-mingw32

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

@@ -1,9 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:freebsd)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:freebsd) do
   before :each do
     # Create a mock resource
     @resource = stub 'resource'
@@ -15,16 +12,16 @@ describe provider_class do
     @resource.stubs(:[]).with(:name).returns   "mypackage"
     @resource.stubs(:[]).with(:ensure).returns :installed
 
-    @provider = provider_class.new
+    @provider = subject()
     @provider.resource = @resource
   end
 
   it "should have an install method" do
-    @provider = provider_class.new
+    @provider = subject()
     expect(@provider).to respond_to(:install)
   end
 
-  describe "when installing" do
+  context "when installing" do
     before :each do
       @resource.stubs(:should).with(:ensure).returns(:installed)
     end

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

@@ -1,10 +1,7 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:gem)
-
-context 'installing myresource' do
-  describe provider_class do
+context Puppet::Type.type(:package).provider(:gem) do
+  context 'installing myresource' do
     let(:resource) do
       Puppet::Type.type(:package).new(
         :name     => 'myresource',
@@ -13,7 +10,7 @@ context 'installing myresource' do
     end
 
     let(:provider) do
-      provider = provider_class.new
+      provider = described_class.new
       provider.resource = resource
       provider
     end
@@ -22,9 +19,9 @@ context 'installing myresource' do
       resource.provider = provider
     end
 
-    describe "when installing" do
+    context "when installing" do
       it "should use the path to the gem" do
-        provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"
+        described_class.stubs(:command).with(:gemcmd).returns "/my/gem"
         provider.expects(:execute).with { |args| args[0] == "/my/gem" }.returns ""
         provider.install
       end
@@ -60,42 +57,47 @@ context 'installing myresource' do
         provider.install
       end
 
-      describe "when a source is specified" do
-        describe "as a normal file" do
+      context "when a source is specified" do
+        context "as a normal file" do
           it "should use the file name instead of the gem name" do
             resource[:source] = "/my/file"
             provider.expects(:execute).with { |args| args[2] == "/my/file" }.returns ""
             provider.install
           end
         end
-        describe "as a file url" do
+
+        context "as a file url" do
           it "should use the file name instead of the gem name" do
             resource[:source] = "file:///my/file"
             provider.expects(:execute).with { |args| args[2] == "/my/file" }.returns ""
             provider.install
           end
         end
-        describe "as a puppet url" do
+
+        context "as a puppet url" do
           it "should fail" do
             resource[:source] = "puppet://my/file"
             expect { provider.install }.to raise_error(Puppet::Error)
           end
         end
-        describe "as a non-file and non-puppet url" do
+
+        context "as a non-file and non-puppet url" do
           it "should treat the source as a gem repository" do
             resource[:source] = "http://host/my/file"
             provider.expects(:execute).with { |args| args[2..4] == ["--source", "http://host/my/file", "myresource"] }.returns ""
             provider.install
           end
         end
-        describe "as a windows path on windows", :if => Puppet::Util::Platform.windows? do
+
+        context "as a windows path on windows", :if => Puppet::Util::Platform.windows? do
           it "should treat the source as a local path" do
             resource[:source] = "c:/this/is/a/path/to/a/gem.gem"
             provider.expects(:execute).with { |args| args[2] == "c:/this/is/a/path/to/a/gem.gem" }.returns ""
             provider.install
           end
         end
-        describe "with an invalid uri" do
+
+        context "with an invalid uri" do
           it "should fail" do
             URI.expects(:parse).raises(ArgumentError)
             resource[:source] = "http:::::uppet:/:/my/file"
@@ -105,7 +107,7 @@ context 'installing myresource' do
       end
     end
 
-    describe "#latest" do
+    context "#latest" do
       it "should return a single value for 'latest'" do
         #gemlist is used for retrieving both local and remote version numbers, and there are cases
         # (particularly local) where it makes sense for it to return an array.  That doesn't make
@@ -131,55 +133,55 @@ context 'installing myresource' do
       end
     end
 
-    describe "#instances" do
+    context "#instances" do
       before do
-        provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"
+        described_class.stubs(:command).with(:gemcmd).returns "/my/gem"
       end
 
       it "should return an empty array when no gems installed" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns("\n")
-        expect(provider_class.instances).to eq([])
+        described_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns("\n")
+        expect(described_class.instances).to eq([])
       end
 
       it "should return ensure values as an array of installed versions" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns <<-HEREDOC.gsub(/        /, '')
+        described_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns <<-HEREDOC.gsub(/        /, '')
         systemu (1.2.0)
         vagrant (0.8.7, 0.6.9)
         HEREDOC
 
-        expect(provider_class.instances.map {|p| p.properties}).to eq([
+        expect(described_class.instances.map {|p| p.properties}).to eq([
           {:ensure => ["1.2.0"],          :provider => :gem, :name => 'systemu'},
           {:ensure => ["0.8.7", "0.6.9"], :provider => :gem, :name => 'vagrant'}
         ])
       end
 
       it "should ignore platform specifications" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns <<-HEREDOC.gsub(/        /, '')
+        described_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns <<-HEREDOC.gsub(/        /, '')
         systemu (1.2.0)
         nokogiri (1.6.1 ruby java x86-mingw32 x86-mswin32-60, 1.4.4.1 x86-mswin32)
         HEREDOC
 
-        expect(provider_class.instances.map {|p| p.properties}).to eq([
+        expect(described_class.instances.map {|p| p.properties}).to eq([
           {:ensure => ["1.2.0"],          :provider => :gem, :name => 'systemu'},
           {:ensure => ["1.6.1", "1.4.4.1"], :provider => :gem, :name => 'nokogiri'}
         ])
       end
 
       it "should not list 'default: ' text from rubygems''" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}, anything).returns <<-HEREDOC.gsub(/        /, '')
+        described_class.expects(:execute).with(%w{/my/gem list --local}, anything).returns <<-HEREDOC.gsub(/        /, '')
         bundler (1.16.1, default: 1.16.0, 1.15.1)
         HEREDOC
 
-        expect(provider_class.instances.map {|p| p.properties}).to eq([
+        expect(described_class.instances.map {|p| p.properties}).to eq([
           {:name => 'bundler', :ensure => ["1.16.1", "1.16.0", "1.15.1"], :provider => :gem}
         ])
       end
 
       it "should not fail when an unmatched line is returned" do
-        provider_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).
+        described_class.expects(:execute).with(%w{/my/gem list --local}, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).
           returns(File.read(my_fixture('line-with-1.8.5-warning')))
 
-        expect(provider_class.instances.map {|p| p.properties}).
+        expect(described_class.instances.map {|p| p.properties}).
           to eq([{:provider=>:gem, :ensure=>["0.3.2"], :name=>"columnize"},
                  {:provider=>:gem, :ensure=>["1.1.3"], :name=>"diff-lcs"},
                  {:provider=>:gem, :ensure=>["0.0.1"], :name=>"metaclass"},
@@ -193,18 +195,18 @@ context 'installing myresource' do
       end
     end
 
-    describe "listing gems" do
-      describe "searching for a single package" do
+    context "listing gems" do
+      context "searching for a single package" do
         it "searches for an exact match" do
-          provider_class.expects(:execute).with(includes('\Abundler\z'), {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).returns(File.read(my_fixture('gem-list-single-package')))
+          described_class.expects(:execute).with(includes('\Abundler\z'), {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}}).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)
+          expect(described_class.gemlist({:justme => 'bundler'})).to eq(expected)
         end
       end
     end
 
-    describe 'insync?' do
-      describe 'for array of versions' do
+    context 'insync?' do
+      context 'for array of versions' do
         let(:is) { ['1.3.4', '3.6.1', '5.1.2'] }
 
         it 'returns true for ~> 1.3' do
@@ -233,7 +235,7 @@ context 'installing myresource' do
         end
       end
 
-      describe 'for string version' do
+      context 'for string version' do
         let(:is) { '1.3.4' }
 
         it 'returns true for ~> 1.3' do
@@ -273,10 +275,8 @@ context 'installing myresource' do
       end
     end
   end
-end
 
-context 'uninstalling myresource' do
-  describe provider_class do
+  context 'uninstalling myresource' do
     let(:resource) do
       Puppet::Type.type(:package).new(
         :name     => 'myresource',
@@ -285,7 +285,7 @@ context 'uninstalling myresource' do
     end
 
     let(:provider) do
-      provider = provider_class.new
+      provider = described_class.new
       provider.resource = resource
       provider
     end
@@ -294,9 +294,9 @@ context 'uninstalling myresource' do
       resource.provider = provider
     end
 
-    describe "when uninstalling" do
+    context "when uninstalling" do
       it "should use the path to the gem" do
-        provider_class.stubs(:command).with(:gemcmd).returns "/my/gem"
+        described_class.stubs(:command).with(:gemcmd).returns "/my/gem"
         provider.expects(:execute).with { |args| args[0] == "/my/gem" }.returns ""
         provider.uninstall
       end

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

@@ -1,9 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:hpux)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:hpux) do
   before(:each) do
     # Create a mock resource
     @resource = stub 'resource'
@@ -16,33 +13,33 @@ describe provider_class do
     @resource.stubs(:[]).with(:source).returns "mysource"
     @resource.stubs(:[]).with(:ensure).returns :installed
 
-    @provider = provider_class.new
+    @provider = subject()
     @provider.stubs(:resource).returns @resource
   end
 
   it "should have an install method" do
-    @provider = provider_class.new
+    @provider = subject()
     expect(@provider).to respond_to(:install)
   end
 
   it "should have an uninstall method" do
-    @provider = provider_class.new
+    @provider = subject()
     expect(@provider).to respond_to(:uninstall)
   end
 
   it "should have a swlist method" do
-    @provider = provider_class.new
+    @provider = subject()
     expect(@provider).to respond_to(:swlist)
   end
 
-  describe "when installing" do
+  context "when installing" do
     it "should use a command-line like 'swinstall -x mount_all_filesystems=false -s SOURCE PACKAGE-NAME'" do
       @provider.expects(:swinstall).with('-x', 'mount_all_filesystems=false', '-s', 'mysource', 'mypackage')
       @provider.install
     end
   end
 
-  describe "when uninstalling" do
+  context "when uninstalling" do
     it "should use a command-line like 'swremove -x mount_all_filesystems=false PACKAGE-NAME'" do
       @provider.expects(:swremove).with('-x', 'mount_all_filesystems=false', 'mypackage')
       @provider.uninstall

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

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:macports)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:macports) do
   let :resource_name do
     "foo"
   end
@@ -21,7 +19,7 @@ describe provider_class do
     {:name => resource_name, :ensure => "1.2.3", :revision => "1", :provider => :macports}
   end
 
-  describe "provider features" do
+  context "provider features" do
     subject { provider }
 
     it { is_expected.to be_installable }
@@ -30,30 +28,30 @@ describe provider_class do
     it { is_expected.to be_versionable }
   end
 
-  describe "when listing all instances" do
+  context "when listing all instances" do
     it "should call port -q installed" do
-      provider_class.expects(:port).with("-q", :installed).returns("")
-      provider_class.instances
+      described_class.expects(:port).with("-q", :installed).returns("")
+      described_class.instances
     end
 
     it "should create instances from active ports" do
-      provider_class.expects(:port).returns("foo @1.234.5_2 (active)")
-      expect(provider_class.instances.size).to eq(1)
+      described_class.expects(:port).returns("foo @1.234.5_2 (active)")
+      expect(described_class.instances.size).to eq(1)
     end
 
     it "should ignore ports that aren't activated" do
-      provider_class.expects(:port).returns("foo @1.234.5_2")
-      expect(provider_class.instances.size).to eq(0)
+      described_class.expects(:port).returns("foo @1.234.5_2")
+      expect(described_class.instances.size).to eq(0)
     end
 
     it "should ignore variants" do
-      expect(provider_class.parse_installed_query_line("bar @1.0beta2_38_1+x11+java (active)")).
+      expect(described_class.parse_installed_query_line("bar @1.0beta2_38_1+x11+java (active)")).
         to eq({:provider=>:macports, :revision=>"1", :name=>"bar", :ensure=>"1.0beta2_38"})
     end
 
   end
 
-  describe "when installing" do
+  context "when installing" do
    it "should not specify a version when ensure is set to latest" do
      resource[:ensure] = :latest
      provider.expects(:port).with { |flag, method, name, version|
@@ -79,7 +77,7 @@ describe provider_class do
    end
   end
 
-  describe "when querying for the latest version" do
+  context "when querying for the latest version" do
     let :new_info_line do
       "1.2.3 2"
     end
@@ -120,7 +118,7 @@ describe provider_class do
     end
   end
 
-  describe "when updating a port" do
+  context "when updating a port" do
     it "should execute port install if the port is installed" do
       resource[:name] = resource_name
       resource[:ensure] = :present

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

@@ -1,10 +1,6 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 
-provider_class = Puppet::Type.type(:package).provider(:nim)
-
-describe provider_class do
-
+describe Puppet::Type.type(:package).provider(:nim) do
   before(:each) do
     # Create a mock resource
     @resource = stub 'resource'
@@ -17,12 +13,12 @@ describe provider_class do
     @resource.stubs(:[]).with(:source).returns "mysource"
     @resource.stubs(:[]).with(:ensure).returns :installed
 
-    @provider = provider_class.new
+    @provider = subject()
     @provider.resource = @resource
   end
 
   it "should have an install method" do
-    @provider = provider_class.new
+    @provider = subject()
     expect(@provider).to respond_to(:install)
   end
 
@@ -48,7 +44,6 @@ END
 
   context "when installing" do
     it "should install a package" do
-
       @resource.stubs(:should).with(:ensure).returns(:installed)
       Puppet::Util::Execution.expects(:execute).with("/usr/sbin/nimclient -o showres -a resource=mysource |/usr/bin/grep -p -E 'mypackage\\.foo'").returns(bff_showres_output)
       @provider.expects(:nimclient).with("-o", "cust", "-a", "installp_flags=acgwXY", "-a", "lpp_source=mysource", "-a", "filesets=mypackage.foo 1.2.3.8")
@@ -56,7 +51,6 @@ END
     end
 
     context "when installing versioned packages" do
-
       it "should fail if the package is not available on the lpp source" do
         nimclient_showres_output = ""
 
@@ -131,7 +125,6 @@ OUTPUT
         expect { @provider.install }.to raise_error(Puppet::Error, "NIM package provider is unable to downgrade packages")
     end
 
-
     it "should succeed if an RPM package is available on the lpp source" do
         nimclient_sequence = sequence('nimclient')
 

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

@@ -1,12 +1,9 @@
-#! /usr/bin/env ruby
 require 'spec_helper'
 require 'stringio'
 
-provider_class = Puppet::Type.type(:package).provider(:openbsd)
-
-describe provider_class do
+describe Puppet::Type.type(:package).provider(:openbsd) do
   let(:package) { Puppet::Type.type(:package).new(:name => 'bash', :provider => 'openbsd') }
-  let(:provider) { provider_class.new(package) }
+  let(:provider) { described_class.new(package) }
 
   def expect_read_from_pkgconf(lines)
     pkgconf = stub(:readlines => lines)
@@ -37,7 +34,7 @@ describe provider_class do
     expect(ENV).not_to be_key('PKG_PATH')
   end
 
-  describe 'provider features' do
+  context 'provider features' do
     it { is_expected.to be_installable }
     it { is_expected.to be_install_options }
     it { is_expected.to be_uninstallable }
@@ -49,34 +46,34 @@ describe provider_class do
   before :each do
     # Stub some provider methods to avoid needing the actual software
     # installed, so we can test on whatever platform we want.
-    provider_class.stubs(:command).with(:pkginfo).returns('/bin/pkg_info')
-    provider_class.stubs(:command).with(:pkgadd).returns('/bin/pkg_add')
-    provider_class.stubs(:command).with(:pkgdelete).returns('/bin/pkg_delete')
+    described_class.stubs(:command).with(:pkginfo).returns('/bin/pkg_info')
+    described_class.stubs(:command).with(:pkgadd).returns('/bin/pkg_add')
+    described_class.stubs(:command).with(:pkgdelete).returns('/bin/pkg_delete')
   end
 
   context "#instances" do
     it "should return nil if execution failed" do
-      provider_class.expects(:execpipe).raises(Puppet::ExecutionFailure, 'wawawa')
-      expect(provider_class.instances).to be_nil
+      described_class.expects(:execpipe).raises(Puppet::ExecutionFailure, 'wawawa')
+      expect(described_class.instances).to be_nil
     end
 
     it "should return the empty set if no packages are listed" do
-      provider_class.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(StringIO.new(''))
-      expect(provider_class.instances).to be_empty
+      described_class.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(StringIO.new(''))
+      expect(described_class.instances).to be_empty
     end
 
     it "should return all packages when invoked" do
       fixture = File.read(my_fixture('pkginfo.list'))
-      provider_class.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(fixture)
-      expect(provider_class.instances.map(&:name).sort).to eq(
+      described_class.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(fixture)
+      expect(described_class.instances.map(&:name).sort).to eq(
         %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),
+      described_class.expects(:execpipe).with(%w{/bin/pkg_info -a}).yields(fixture)
+      instances = described_class.instances.map {|p| {:name => p.get(:name),
         :ensure => p.get(:ensure), :flavor => p.get(:flavor)}}
       expect(instances.size).to eq(2)
       expect(instances[0]).to eq({:name => 'bash', :ensure => '3.1.17', :flavor => 'static'})