kitchen-docker 3.0.0 → 3.2.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.3
 platform: ruby
 authors:
 - Sean Porter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -17,207 +17,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tailor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: countloc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: chefstyle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kitchen-inspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: train
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: A Docker Driver for Test Kitchen
 email:
 - portertech@gmail.com
@@ -225,23 +37,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
-- ".github/dependabot.yml"
-- ".github/workflows/ci.yml"
+- ".github/CODEOWNERS"
+- ".github/workflows/lint.yml"
+- ".github/workflows/publish.yaml"
 - ".gitignore"
+- ".markdownlint.yaml"
+- ".release-please-manifest.json"
 - ".rubocop.yml"
-- ".tailor"
 - ".yamllint"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- cookbooks
 - docker.ps1
 - kitchen-docker.gemspec
 - kitchen.windows.yml
 - kitchen.yml
-- lib/docker/version.rb
 - lib/kitchen/docker/container.rb
 - lib/kitchen/docker/container/linux.rb
 - lib/kitchen/docker/container/windows.rb
@@ -255,14 +68,23 @@ files:
 - lib/kitchen/docker/helpers/inspec_helper.rb
 - lib/kitchen/driver/docker.rb
 - lib/kitchen/transport/docker.rb
-- lib/train/docker.rb
+- release-please-config.json
+- renovate.json
+- spec/docker_spec.rb
+- spec/dockerfile_helper_spec.rb
+- spec/inspec_helper_spec.rb
+- spec/spec_helper.rb
 - test/Dockerfile
+- test/cookbooks/cinc_test/metadata.rb
+- test/cookbooks/cinc_test/recipes/default.rb
+- test/cookbooks/docker_test/attributes/default.rb
+- test/cookbooks/docker_test/metadata.rb
+- test/cookbooks/docker_test/recipes/default.rb
 - test/integration/capabilities/disabled/capabilities_drop_spec.rb
+- test/integration/cinc/inspec/cinc_spec.rb
 - test/integration/default/disabled/default_spec.rb
 - test/integration/default/disabled/spec_helper.rb
 - test/integration/inspec/inspec_spec.rb
-- test/spec/docker_spec.rb
-- test/spec/spec_helper.rb
 homepage: https://github.com/test-kitchen/kitchen-docker
 licenses:
 - Apache 2.0
@@ -282,15 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A Docker Driver for Test Kitchen
-test_files:
-- test/Dockerfile
-- test/integration/capabilities/disabled/capabilities_drop_spec.rb
-- test/integration/default/disabled/default_spec.rb
-- test/integration/default/disabled/spec_helper.rb
-- test/integration/inspec/inspec_spec.rb
-- test/spec/docker_spec.rb
-- test/spec/spec_helper.rb
+test_files: []

data/.github/dependabot.yml

@@ -1,7 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: bundler
-    directory: "/"
-    schedule:
-      interval: weekly
-    open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -1,124 +0,0 @@
----
-name: Lint & Unit
-
-"on":
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  yamllint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Run yaml Lint
-        uses: actionshub/yamllint@main
-
-  chefstyle:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        ruby: ["3.1"]
-    name: Chefstyle on Ruby ${{ matrix.ruby }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - uses: r7kamura/rubocop-problem-matchers-action@v1
-      - run: bundle exec chefstyle
-
-  unit:
-    name: Unit test on Ruby ${{ matrix.ruby }}
-    needs: [yamllint, chefstyle]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ["2.7", "3.0", "3.1"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - run: bundle exec rake spec
-
-  integration-windows:
-    name: Windows ${{matrix.suite}} ${{matrix.os}}
-    runs-on: windows-latest
-    needs: unit
-    strategy:
-      fail-fast: false
-      matrix:
-        suite: [default]
-        os: [ubuntu-20.04]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.1"
-          bundler-cache: true
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
-
-  integration-linux:
-    name: Linux ${{matrix.suite}} ${{matrix.os}}
-    runs-on: ubuntu-latest
-    needs: unit
-    strategy:
-      fail-fast: false
-      matrix:
-        suite:
-          - default
-          - no-build-context
-          - arm64
-          - amd64
-          - inspec
-        os:
-          - amazonlinux-2
-          - ubuntu-1804
-          - ubuntu-2004
-          - fedora-latest
-          - centos-7
-          - oraclelinux-7
-          - rockylinux-8
-          - debian-11
-          - debian-12
-          - opensuse-15
-          - dockerfile
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.1"
-          bundler-cache: true
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
-
-  integration-capabilities:
-    name: Linux ${{matrix.suite}} ${{matrix.os}}
-    runs-on: ubuntu-latest
-    needs: unit
-    strategy:
-      fail-fast: false
-      matrix:
-        suite:
-          - capabilities
-        os: [debian-11, ubuntu-1804, ubuntu-2004]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "3.1"
-          bundler-cache: true
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}

data/.tailor

@@ -1,4 +0,0 @@
-Tailor.config do |config|
-  config.formatters "text"
-  config.file_set 'lib/**/*.rb'
-end

data/lib/docker/version.rb

@@ -1,25 +0,0 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-begin
-  require 'docker'
-
-  # Override API_VERSION constant in docker-api gem to use version 1.24 of the Docker API
-  # This override is for the docker-api gem to communicate to the Docker engine on Windows
-  module Docker
-    VERSION = '0.0.0'
-    API_VERSION = '1.24'
-  end
-rescue LoadError => e
-  logger.debug("[Docker] docker-api gem not found for InSpec verifier. #{e}")
-end

data/lib/train/docker.rb

@@ -1,125 +0,0 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Monkey patched Docker train transport to support running the InSpec verifier on Windows
-begin
-  # Requires train gem with a minimum version of 2.1.0
-  require 'train'
-
-  module Train::Transports
-    # Patched train transport with Windows support for InSpec verifier
-    class Docker < Train.plugin(1)
-      name 'docker'
-
-      include_options Train::Extras::CommandWrapper
-      option :host, required: true
-
-      def connection(state = {}, &block)
-        opts = merge_options(options, state || {})
-        validate_options(opts)
-
-        if @connection && @connection_options == opts
-          reuse_connection(&block)
-        else
-          create_new_connection(opts, &block)
-        end
-      end
-
-      private
-
-      # Creates a new Docker connection instance and save it for potential future
-      # reuse.
-      #
-      # @param options [Hash] connection options
-      # @return [Docker::Connection] a Docker connection instance
-      # @api private
-      def create_new_connection(options, &block)
-        if @connection
-          logger.debug("[Docker] shutting previous connection #{@connection}")
-          @connection.close
-        end
-
-        @connection_options = options
-        @connection = Connection.new(options, &block)
-      end
-
-      # Return the last saved Docker connection instance.
-      #
-      # @return [Docker::Connection] a Docker connection instance
-      # @api private
-      def reuse_connection
-        logger.debug("[Docker] reusing existing connection #{@connection}")
-        yield @connection if block_given?
-        @connection
-      end
-    end
-  end
-
-  class Train::Transports::Docker
-    class Connection < BaseConnection
-      def initialize(conf)
-        super(conf)
-        @id = options[:host]
-        @container = ::Docker::Container.get(@id) ||
-                    fail("Can't find Docker container #{@id}")
-        @cmd_wrapper = nil
-        @cmd_wrapper = CommandWrapper.load(self, @options)
-        self
-      end
-
-      def uri
-        if @container.nil?
-          "docker://#{@id}"
-        else
-          "docker://#{@container.id}"
-        end
-      end
-
-      private
-
-      def file_via_connection(path)
-        if os.aix?
-          Train::File::Remote::Aix.new(self, path)
-        elsif os.solaris?
-          Train::File::Remote::Unix.new(self, path)
-        elsif os.windows?
-          Train::File::Remote::Windows.new(self, path)
-        else
-          Train::File::Remote::Linux.new(self, path)
-        end
-      end
-
-      def platform_specific_cmd(cmd)
-        return cmd if @container.info.nil?
-        if @container.info['Platform'] == 'windows'
-          return ['cmd.exe', '/c', cmd]
-        else
-          return ['/bin/sh', '-c', cmd]
-        end
-      end
-
-      def run_command_via_connection(cmd, &_data_handler)
-        cmd = @cmd_wrapper.run(cmd) unless @cmd_wrapper.nil?
-        stdout, stderr, exit_status = @container.exec(platform_specific_cmd(cmd))
-        CommandResult.new(stdout.join, stderr.join, exit_status)
-      rescue ::Docker::Error::DockerError => _
-        raise
-      rescue => _
-        # @TODO: differentiate any other error
-        raise
-      end
-    end
-  end
-rescue LoadError => e
-  logger.debug("[Docker] train gem not found for InSpec verifier. #{e}")
-end

data/test/spec/docker_spec.rb

@@ -1,64 +0,0 @@
-#
-# Copyright 2016, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'spec_helper'
-
-describe Kitchen::Driver::Docker do
-  describe '#config_to_options' do
-    let(:config) { }
-    subject { described_class.new.send(:config_to_options, config) }
-
-    context 'with nil' do
-      let(:config) { nil }
-      it { is_expected.to eq '' }
-    end # /context with nil
-
-    context 'with a string' do
-      let(:config) { '--foo' }
-      it { is_expected.to eq '--foo' }
-    end # /context with a string
-
-    context 'with a string with spaces' do
-      let(:config) { '--foo bar' }
-      it { is_expected.to eq '--foo bar' }
-    end # /context with a string with spaces
-
-    context 'with an array of strings' do
-      let(:config) { %w{--foo --bar} }
-      it { is_expected.to eq '--foo --bar' }
-    end # /context with an array of strings
-
-    context 'with an array of hashes' do
-      let(:config) { [{foo: 'bar'}, {other: 'baz'}] }
-      it { is_expected.to eq '--foo=bar --other=baz' }
-    end # /context with an array of hashes
-
-    context 'with a hash of strings' do
-      let(:config) { {foo: 'bar', other: 'baz'} }
-      it { is_expected.to eq '--foo=bar --other=baz' }
-    end # /context with a hash of strings
-
-    context 'with a hash of arrays' do
-      let(:config) { {foo: %w{bar baz}} }
-      it { is_expected.to eq '--foo=bar --foo=baz' }
-    end # /context with a hash of arrays
-
-    context 'with a hash of strings with spaces' do
-      let(:config) { {foo: 'bar two', other: 'baz'} }
-      it { is_expected.to eq '--foo=bar\\ two --other=baz' }
-    end # /context with a hash of strings with spaces
-  end # /describe #config_to_options
-end