Satisfy Rubocop

Author: Phil-Friderici

lib/puppet/provider/docker_compose/ruby.rb

@@ -20,7 +20,6 @@ def set_tmpdir
 
   def exists?
     Puppet.info("Checking for compose project #{name}")
-    compose_services = {}
     compose_containers = []
 
     set_tmpdir

lib/puppet/provider/docker_stack/ruby.rb

@@ -14,7 +14,7 @@ def exists?
     stack_services = {}
     stack_containers = []
     resource[:compose_files].each do |file|
-      compose_file = YAML.safe_load(File.read(file), [], [], true)
+      compose_file = YAML.safe_load_file(file, [], [], true)
       # rubocop:disable Style/StringLiterals
       containers = docker([
                             'ps',
@@ -79,7 +79,7 @@ def destroy
   end
 
   def bundle_file
-    return resource[:bundle_file].map { |x| ['-c', x] }.flatten unless resource[:bundle_file].nil?
+    resource[:bundle_file]&.map { |x| ['-c', x] }&.flatten
   end
 
   def compose_files

spec/acceptance/docker_full_spec.rb

@@ -5,7 +5,7 @@
 if os[:kernel] == 'windows'
   docker_args = 'docker_ee => true'
   default_image = 'winamd64/hello-seattle'
-  default_image_tag = if os[:release][:major] == '2019' || os[:release][:major] == '2022'
+  default_image_tag = if ['2019', '2022'].include?(os[:release][:major])
                         'nanoserver'
                       else
                         'nanoserver-sac2016'
@@ -40,7 +40,6 @@
   default_docker_exec_lr_command = '/bin/sh -c "touch /root/test_file.txt; while true; do echo hello world; sleep 1; done"'
   default_docker_exec_command = 'touch /root/test_file.txt'
   docker_mount_path = '/root'
-  storage_driver = 'devicemapper'
   storage_driver = if os[:family] == 'RedHat'
                      'devicemapper'
                    else

spec/acceptance/docker_params_changed_spec.rb

@@ -53,26 +53,26 @@
                     else
                       'hello-world:latest'
                     end
-    let(:pp1) do
+    let(:ppone) do
       "
           class {'docker': #{docker_args}}
           docker::run {'servercore': image => '#{docker_image}', restart => 'always', net => '#{docker_network}' }
       "
     end
 
-    let(:pp2) do
+    let(:pptwo) do
       "
           class {'docker': #{docker_args}}
           docker::run {'servercore': image => '#{image_changed}', restart => 'always', net => '#{docker_network}' }
       "
     end
 
     it 'creates servercore with first image' do
-      expect(docker_run_idempotent_apply(pp1)).to be true
+      expect(docker_run_idempotent_apply(ppone)).to be true
     end
 
     it 'detect image change and apply the change' do
-      apply_manifest(pp2, catch_failures: true)
+      apply_manifest(pptwo, catch_failures: true)
       run_shell('docker inspect --format="{{ .Config.Image }}" servercore') do |r|
         expect(r.stdout).to match(%r{#{image_changed}})
       end
@@ -88,26 +88,26 @@ class {'docker': #{docker_args}}
       volumes2 = "volumes => ['volume-1:#{volume_location}volume_1', 'volume-2:#{volume_location}volume_2']"
     end
 
-    let(:pp1) do
+    let(:ppone) do
       "
           class {'docker': #{docker_args}}
           docker::run {'servercore': image => '#{docker_image}', restart => 'always', net => '#{docker_network}', #{volumes1}}
       "
     end
 
-    let(:pp2) do
+    let(:pptwo) do
       "
           class {'docker': #{docker_args}}
           docker::run {'servercore': image => '#{docker_image}', restart => 'always', net => '#{docker_network}', #{volumes2}}
       "
     end
 
     it "creates servercore with #{volumes1}" do
-      expect(docker_run_idempotent_apply(pp1)).to be true
+      expect(docker_run_idempotent_apply(ppone)).to be true
     end
 
     it "creates servercore with #{volumes2}" do
-      apply_manifest(pp2, catch_failures: true)
+      apply_manifest(pptwo, catch_failures: true)
       run_shell('docker inspect servercore --format="{{ json .Mounts }}"') do |r|
         inspect_result = JSON.parse(r.stdout)
         inspect_result = inspect_result.map { |item| item['Name'] }.sort
@@ -120,26 +120,26 @@ class {'docker': #{docker_args}}
     ports1 = "ports => ['4444']"
     ports2 = "ports => ['4444', '4445']"
 
-    let(:pp1) do
+    let(:ppone) do
       "
           class {'docker': #{docker_args}}
           docker::run {'servercore': image => '#{docker_image}', restart => 'always', net => '#{docker_network}', #{ports1}}
       "
     end
 
-    let(:pp2) do
+    let(:pptwo) do
       "
           class {'docker': #{docker_args}}
           docker::run {'servercore': image => '#{docker_image}', restart => 'always', net => '#{docker_network}', #{ports2}}
       "
     end
 
     it 'creates servercore with ports => ["4444"]' do
-      expect(docker_run_idempotent_apply(pp1)).to be true
+      expect(docker_run_idempotent_apply(ppone)).to be true
     end
 
     it 'creates servercore with ports => ["4444", "4445"]' do
-      apply_manifest(pp2, catch_failures: true)
+      apply_manifest(pptwo, catch_failures: true)
       run_shell('docker inspect servercore --format="{{ json .HostConfig.PortBindings }}"') do |r|
         inspect_result = JSON.parse(r.stdout)
         inspect_result = inspect_result.keys.map { |item| item.split('/')[0] }.sort

spec/spec_helper.rb

@@ -23,7 +23,7 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
+    default_facts.merge!(YAML.safe_load_file(f, [], [], true))
   rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end

spec/spec_helper_acceptance_local.rb

@@ -60,7 +60,7 @@ def fetch_puppet_version
 
   # Configure all nodes in nodeset
   c.before :suite do
-    if os[:family] == 'debian' || os[:family] == 'ubuntu'
+    if ['debian', 'ubuntu'].include?(os[:family])
       run_shell('apt-get update -y')
       # run_shell('apt-get upgrade -y')
       run_shell('apt-get install -y lsb-release')

spec/unit/lib/puppet/provider/docker_compose/ruby_spec.rb

@@ -16,8 +16,7 @@
   describe '#exists?' do
     before(:each) do
       allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
-      allow(provider).to receive(:execute).and_return(YAML.safe_load("services:\n  web:\n    image: mysql\n    restart: always\n"))
-      allow(provider).to receive(:docker).and_return("'db-mysql'\n")
+      allow(provider).to receive_messages(execute: YAML.safe_load("services:\n  web:\n    image: mysql\n    restart: always\n"), docker: "'db-mysql'\n")
     end
 
     it 'ignores services with restart: no' do

spec/unit/lib/puppet/type/docker_compose_spec.rb

@@ -23,13 +23,13 @@
 
   it 'has expected properties' do
     properties.each do |property|
-      expect(compose.properties.map(&:name)).to be_include(property)
+      expect(compose.properties.map(&:name)).to include(property)
     end
   end
 
   it 'has expected parameters' do
     params.each do |param|
-      expect(compose.parameters).to be_include(param)
+      expect(compose.parameters).to include(param)
     end
   end
 

spec/unit/lib/puppet/type/docker_network_spec.rb

@@ -29,13 +29,13 @@
 
   it 'has expected properties' do
     properties.each do |property|
-      expect(network.properties.map(&:name)).to be_include(property)
+      expect(network.properties.map(&:name)).to include(property)
     end
   end
 
   it 'has expected parameters' do
     params.each do |param|
-      expect(network.parameters).to be_include(param)
+      expect(network.parameters).to include(param)
     end
   end
 end

spec/unit/lib/puppet/type/docker_stack_spec.rb

@@ -21,13 +21,13 @@
 
   it 'has expected properties' do
     properties.each do |property|
-      expect(stack.properties.map(&:name)).to be_include(property)
+      expect(stack.properties.map(&:name)).to include(property)
     end
   end
 
   it 'has expected parameters' do
     params.each do |param|
-      expect(stack.parameters).to be_include(param)
+      expect(stack.parameters).to include(param)
     end
   end