(MODULES-11578) Update support for newer ruby_task_helper

lib/facter/choco_install_path.rb

@@ -4,7 +4,7 @@
 require Pathname.new(__FILE__).dirname + '../' + 'puppet_x/chocolatey/chocolatey_install'
 
 Facter.add('choco_install_path') do
-  confine osfamily: :windows
+  confine 'os.family': :windows
   setcode do
     PuppetX::Chocolatey::ChocolateyInstall.install_path || 'C:\ProgramData\chocolatey'
   end

lib/facter/choco_temp_dir.rb

@@ -4,7 +4,7 @@
 require Pathname.new(__FILE__).dirname + '../' + 'puppet_x/chocolatey/chocolatey_install'
 
 Facter.add('choco_temp_dir') do
-  confine osfamily: :windows
+  confine 'os.family': :windows
   setcode do
     PuppetX::Chocolatey::ChocolateyInstall.temp_dir || ENV.fetch('TEMP', nil)
   end

lib/facter/chocolateyversion.rb

@@ -4,7 +4,7 @@
 require Pathname.new(__FILE__).dirname + '../' + 'puppet_x/chocolatey/chocolatey_version'
 
 Facter.add('chocolateyversion') do
-  confine osfamily: :windows
+  confine 'os.family': :windows
   setcode do
     choco_ver = PuppetX::Chocolatey::ChocolateyVersion.version || '0'
     choco_ver.to_s

lib/puppet/provider/chocolateyconfig/windows.rb

@@ -7,7 +7,7 @@
 Puppet::Type.type(:chocolateyconfig).provide(:windows) do
   @doc = 'Windows based provider for chocolateyconfig type.'
 
-  confine operatingsystem: :windows
+  confine 'os.name': :windows
   defaultfor operatingsystem: :windows
 
   require Pathname.new(__FILE__).dirname + '../../../' + 'puppet_x/chocolatey/chocolatey_common'

metadata.json

@@ -22,7 +22,7 @@
     },
     {
       "name": "puppetlabs/ruby_task_helper",
-      "version_requirement": ">= 0.4.0 < 1.0.0"
+      "version_requirement": ">= 0.4.0 <= 1.0.0"
     }
   ],
   "operatingsystem_support": [

spec/unit/puppet/provider/chocolateyconfig/windows_spec.rb

@@ -146,7 +146,7 @@
       before(:each) do
         allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        allow(File).to receive(:read).with(choco_config).and_return(choco_config_contents)
+        allow(File).to receive(:open).with(choco_config).and_return(StringIO.new(choco_config_contents))
       end
 
       it 'matches the count of configs in the config' do
@@ -248,7 +248,7 @@
       allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).at_most(:once)
       allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config).at_most(:once)
       allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true).at_most(:once)
-      allow(File).to receive(:read).with(choco_config).and_return(choco_config_contents).at_most(:once)
+      allow(File).to receive(:open).with(choco_config).and_return(StringIO.new(choco_config_contents)).at_most(:once)
 
       resource[:name] = resource_name
       resource[:value] = resource_value

spec/unit/puppet/provider/chocolateyfeature/windows_spec.rb

@@ -134,7 +134,7 @@
       before :each do
         allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        allow(File).to receive(:read).with(choco_config).and_return(choco_config_contents)
+        allow(File).to receive(:open).with(choco_config).and_return(StringIO.new(choco_config_contents))
 
         features = provider_class.read_choco_features
       end

spec/unit/puppet/provider/chocolateysource/windows_spec.rb

@@ -209,7 +209,7 @@
       before :each do
         allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        allow(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        allow(File).to receive(:open).with(choco_config).and_return(StringIO.new(choco_config_contents))
 
         sources = provider_class.read_sources
       end
@@ -511,7 +511,7 @@
       allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).at_most(:once)
       allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config).at_most(:once)
       allow(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true).at_most(:once)
-      allow(File).to receive(:read).with(choco_config).and_return(choco_config_contents).at_most(:once)
+      allow(File).to receive(:open).with(choco_config).and_return(StringIO.new(choco_config_contents)).at_most(:once)
 
       resource[:name] = resource_name
       resource[:location] = resource_location

spec/unit/puppet/provider/package/chocolatey_spec.rb

@@ -160,7 +160,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
 
         choco_features = provider.read_choco_features
         expect(choco_features.count).to eq 14
@@ -170,7 +170,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
 
         choco_features = provider.read_choco_features
         expect(choco_features[0]).to be_an_instance_of REXML::Element
@@ -212,7 +212,7 @@
       expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall)
       expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
       expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-      expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+      expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
       expect(provider.choco_features.count).to eq 14
       provider.choco_features[0].is_a?(Hash)
     end
@@ -240,7 +240,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).twice
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_version).and_return(minimum_supported_choco_exit_codes).at_least(:once)
         resource[:ensure] = :present
         expect(provider).to receive(:chocolatey).with('install', 'chocolatey', '-y', nil, '--ignore-package-exit-codes')
@@ -252,7 +252,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).twice
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_version).and_return(choco_zero_ten_zero).at_least(:once)
         resource[:ensure] = :present
         expect(provider).to receive(:chocolatey).with('install', 'chocolatey', '-y', nil, '--ignore-package-exit-codes')
@@ -264,7 +264,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).twice
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents_upec
+        expect(File).to receive(:open).with(choco_config).and_return choco_config_contents_upec
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_version).and_return(choco_zero_ten_zero).at_least(:once)
         resource[:ensure] = :present
         expect(provider).to receive(:chocolatey).with('install', 'chocolatey', '-y', nil)
@@ -276,7 +276,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).twice
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_version).and_return(minimum_supported_choco_no_progress).at_least(:once)
         resource[:ensure] = :present
         expect(provider).to receive(:chocolatey).with('install', 'chocolatey', '-y', nil, '--ignore-package-exit-codes', '--no-progress')
@@ -288,7 +288,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).twice
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_version).and_return(choco_zero_eleven_zero).at_least(:once)
         resource[:ensure] = :present
         expect(provider).to receive(:chocolatey).with('install', 'chocolatey', '-y', nil, '--ignore-package-exit-codes', '--no-progress')
@@ -300,7 +300,7 @@
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:set_env_chocolateyinstall).twice
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_config_file).and_return(choco_config)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:file_exists?).with(choco_config).and_return(true)
-        expect(File).to receive(:read).with(choco_config).and_return choco_config_contents
+        expect(File).to receive(:open).with(choco_config).and_return StringIO.new(choco_config_contents)
         expect(PuppetX::Chocolatey::ChocolateyCommon).to receive(:choco_version).and_return(minimum_supported_choco_no_progress).at_least(:once)
         resource[:ensure] = :present
         resource[:package_settings] = { 'verbose' => true }