fix: resolve gemspec load path and refactor proxy config method

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ name: Lint & Unit
 
 jobs:
   lint-unit:
-    uses: test-kitchen/.github/.github/workflows/lint-unit.yml@v0.1.2
+    uses: test-kitchen/.github/.github/workflows/lint-unit.yml@v0.2.3
 
   integration-windows:
     name: Windows ${{matrix.suite}} ${{matrix.os}}

.rubocop.yml

@@ -1,5 +1,6 @@
+---
 require:
-  - chefstyle
+  - cookstyle/chefstyle
 
 AllCops:
   TargetRubyVersion: 3.1

Gemfile

@@ -1,19 +1,19 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :development do
-  gem 'kitchen-inspec', '~> 2.0'
-  gem 'train', '>= 2.1', '< 4.0' # validate 4.x when it's released
+  gem "kitchen-inspec", "~> 2.0"
+  gem "train", ">= 2.1", "< 4.0" # validate 4.x when it's released
 end
 
 group :test do
-  gem 'bundler'
-  gem 'rake'
-  gem 'rspec', '~> 3.2'
-  gem 'rspec-its', '~> 2.0'
+  gem "bundler"
+  gem "rake"
+  gem "rspec", "~> 3.2"
+  gem "rspec-its", "~> 2.0"
 end
 
 group :chefstyle do
-  gem 'chefstyle', '~> 2.2', '>= 2.2.3'
+  gem "cookstyle"
 end

kitchen-docker.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "kitchen/docker/docker_version"
 

lib/kitchen/docker/container.rb

@@ -32,7 +32,7 @@ def create(state)
         if container_exists?(state)
           info("Container ID #{state[:container_id]} already exists.")
         elsif !container_exists?(state) && state[:container_id]
-          raise ActionFailed, "Container ID #{state[:container_id]} was found in the kitchen state data, "\
+          raise ActionFailed, "Container ID #{state[:container_id]} was found in the kitchen state data, " \
                               "but the container does not exist."
         end
 

lib/kitchen/docker/helpers/container_helper.rb

@@ -74,7 +74,7 @@ def create_dir_on_container(state, path)
           cmd = "mkdir -p #{path}"
 
           if state[:platform].include?("windows")
-            psh = "-Command if(-not (Test-Path \'#{path}\')) { New-Item -Path \'#{path}\' -Force }"
+            psh = "-Command if(-not (Test-Path '#{path}')) { New-Item -Path '#{path}' -Force }"
             cmd = build_powershell_command(psh)
           end
 
@@ -151,23 +151,16 @@ def remove_container(state)
         end
 
         def dockerfile_proxy_config
-          env_variables = ""
-          if config[:http_proxy]
-            env_variables << "ENV http_proxy=#{config[:http_proxy]}\n"
-            env_variables << "ENV HTTP_PROXY=#{config[:http_proxy]}\n"
-          end
-
-          if config[:https_proxy]
-            env_variables << "ENV https_proxy=#{config[:https_proxy]}\n"
-            env_variables << "ENV HTTPS_PROXY=#{config[:https_proxy]}\n"
-          end
+          %i{http_proxy https_proxy no_proxy}.map do |proxy_type|
+            proxy_env_vars(proxy_type)
+          end.join
+        end
 
-          if config[:no_proxy]
-            env_variables << "ENV no_proxy=#{config[:no_proxy]}\n"
-            env_variables << "ENV NO_PROXY=#{config[:no_proxy]}\n"
-          end
+        def proxy_env_vars(proxy_type)
+          return "" unless config[proxy_type]
 
-          env_variables
+          value = config[proxy_type]
+          "ENV #{proxy_type}=#{value}\nENV #{proxy_type.upcase}=#{value}\n"
         end
       end
       # rubocop:enable Metrics/ModuleLength, Style/Documentation

lib/kitchen/docker/helpers/image_helper.rb

@@ -72,8 +72,8 @@ def build_image(state, dockerfile)
                      file.write(dockerfile)
                      file.close
                      docker_command("#{cmd} #{build_context}",
-                                    input: dockerfile_contents,
-                                    environment: { BUILDKIT_PROGRESS: "plain" })
+                       input: dockerfile_contents,
+                       environment: { BUILDKIT_PROGRESS: "plain" })
                    ensure
                      file.close unless file.closed?
                      file.unlink

lib/kitchen/driver/docker.rb

@@ -90,7 +90,7 @@ class Docker < Kitchen::Driver::Base
             "ping -t localhost"
           end
         else
-          "/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no -o PasswordAuthentication=yes "\
+          "/usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no -o PasswordAuthentication=yes " \
           "-o UsePrivilegeSeparation=no -o PidFile=/tmp/sshd.pid"
         end
       end