beaker-docker 2.5.2 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/release.yml +41 -0
- data/.github/workflows/release.yml +90 -16
- data/.github/workflows/test.yml +59 -44
- data/.rubocop.yml +3 -0
- data/.rubocop_todo.yml +6 -6
- data/CHANGELOG.md +27 -0
- data/Gemfile +3 -8
- data/Rakefile +0 -7
- data/beaker-docker.gemspec +9 -6
- data/lib/beaker/hypervisor/docker.rb +1 -1
- data/lib/beaker-docker/version.rb +1 -1
- data/spec/spec_helper.rb +1 -25
- metadata +37 -14
- data/.simplecov +0 -11
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 17c2d4bee3cddacd85d34a58f05cfe7bacd408798b33fda5ad2dae86f6dfd54b
|
|
4
|
+
data.tar.gz: 7cace9fa1d40da17c5688d7c1e65e14ddbc4e6258af775443ce119eeccf06e80
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 153752e625e0b4326187f090d232ec7463ef433d464049817d701d153d861673dda80f90a6005bf07937fc0487e80b1fd18c252cc30a59386f82e40c0d43ae70
|
|
7
|
+
data.tar.gz: 6f027a769a4001fb1c1ec408e3931a3638765d47821077b8673844ceaeb0f4c96191174964be663e7494a431e3d69928b30a7debf1ccf106a78d32173140fa7a
|
data/.github/release.yml
ADDED
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
---
|
|
2
|
+
# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
|
|
3
|
+
|
|
4
|
+
changelog:
|
|
5
|
+
exclude:
|
|
6
|
+
labels:
|
|
7
|
+
- duplicate
|
|
8
|
+
- invalid
|
|
9
|
+
- modulesync
|
|
10
|
+
- question
|
|
11
|
+
- skip-changelog
|
|
12
|
+
- wont-fix
|
|
13
|
+
- wontfix
|
|
14
|
+
- github_actions
|
|
15
|
+
|
|
16
|
+
categories:
|
|
17
|
+
- title: Breaking Changes 🛠
|
|
18
|
+
labels:
|
|
19
|
+
- backwards-incompatible
|
|
20
|
+
|
|
21
|
+
- title: New Features 🎉
|
|
22
|
+
labels:
|
|
23
|
+
- enhancement
|
|
24
|
+
|
|
25
|
+
- title: Bug Fixes 🐛
|
|
26
|
+
labels:
|
|
27
|
+
- bug
|
|
28
|
+
- bugfix
|
|
29
|
+
|
|
30
|
+
- title: Documentation Updates 📚
|
|
31
|
+
labels:
|
|
32
|
+
- documentation
|
|
33
|
+
- docs
|
|
34
|
+
|
|
35
|
+
- title: Dependency Updates ⬆️
|
|
36
|
+
labels:
|
|
37
|
+
- dependencies
|
|
38
|
+
|
|
39
|
+
- title: Other Changes
|
|
40
|
+
labels:
|
|
41
|
+
- "*"
|
|
@@ -1,32 +1,106 @@
|
|
|
1
|
-
|
|
1
|
+
---
|
|
2
|
+
name: Gem Release
|
|
2
3
|
|
|
3
4
|
on:
|
|
4
5
|
push:
|
|
5
6
|
tags:
|
|
6
7
|
- '*'
|
|
7
8
|
|
|
9
|
+
permissions: {}
|
|
10
|
+
|
|
8
11
|
jobs:
|
|
9
|
-
release:
|
|
10
|
-
|
|
12
|
+
build-release:
|
|
13
|
+
# Prevent releases from forked repositories
|
|
11
14
|
if: github.repository_owner == 'voxpupuli'
|
|
15
|
+
name: Build the gem
|
|
16
|
+
runs-on: ubuntu-24.04
|
|
12
17
|
steps:
|
|
13
18
|
- uses: actions/checkout@v4
|
|
14
|
-
- name: Install Ruby
|
|
19
|
+
- name: Install Ruby
|
|
15
20
|
uses: ruby/setup-ruby@v1
|
|
16
21
|
with:
|
|
17
|
-
ruby-version: '
|
|
18
|
-
env:
|
|
19
|
-
BUNDLE_WITHOUT: release
|
|
22
|
+
ruby-version: 'ruby'
|
|
20
23
|
- name: Build gem
|
|
21
|
-
|
|
24
|
+
shell: bash
|
|
25
|
+
run: gem build --verbose *.gemspec
|
|
26
|
+
- name: Upload gem to GitHub cache
|
|
27
|
+
uses: actions/upload-artifact@v4
|
|
28
|
+
with:
|
|
29
|
+
name: gem-artifact
|
|
30
|
+
path: '*.gem'
|
|
31
|
+
retention-days: 1
|
|
32
|
+
compression-level: 0
|
|
33
|
+
|
|
34
|
+
create-github-release:
|
|
35
|
+
needs: build-release
|
|
36
|
+
name: Create GitHub release
|
|
37
|
+
runs-on: ubuntu-24.04
|
|
38
|
+
permissions:
|
|
39
|
+
contents: write # clone repo and create release
|
|
40
|
+
steps:
|
|
41
|
+
- name: Download gem from GitHub cache
|
|
42
|
+
uses: actions/download-artifact@v5
|
|
43
|
+
with:
|
|
44
|
+
name: gem-artifact
|
|
45
|
+
- name: Create Release
|
|
46
|
+
shell: bash
|
|
47
|
+
env:
|
|
48
|
+
GH_TOKEN: ${{ github.token }}
|
|
49
|
+
run: gh release create --repo ${{ github.repository }} ${{ github.ref_name }} --generate-notes *.gem
|
|
50
|
+
|
|
51
|
+
release-to-github:
|
|
52
|
+
needs: build-release
|
|
53
|
+
name: Release to GitHub
|
|
54
|
+
runs-on: ubuntu-24.04
|
|
55
|
+
permissions:
|
|
56
|
+
packages: write # publish to rubygems.pkg.github.com
|
|
57
|
+
steps:
|
|
58
|
+
- name: Download gem from GitHub cache
|
|
59
|
+
uses: actions/download-artifact@v5
|
|
60
|
+
with:
|
|
61
|
+
name: gem-artifact
|
|
62
|
+
- name: Publish gem to GitHub packages
|
|
63
|
+
run: gem push --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem
|
|
64
|
+
env:
|
|
65
|
+
GEM_HOST_API_KEY: ${{ secrets.GITHUB_TOKEN }}
|
|
66
|
+
|
|
67
|
+
release-to-rubygems:
|
|
68
|
+
needs: build-release
|
|
69
|
+
name: Release gem to rubygems.org
|
|
70
|
+
runs-on: ubuntu-24.04
|
|
71
|
+
environment: release # recommended by rubygems.org
|
|
72
|
+
permissions:
|
|
73
|
+
id-token: write # rubygems.org authentication
|
|
74
|
+
steps:
|
|
75
|
+
- name: Download gem from GitHub cache
|
|
76
|
+
uses: actions/download-artifact@v5
|
|
77
|
+
with:
|
|
78
|
+
name: gem-artifact
|
|
79
|
+
- uses: rubygems/configure-rubygems-credentials@v1.0.0
|
|
22
80
|
- name: Publish gem to rubygems.org
|
|
81
|
+
shell: bash
|
|
23
82
|
run: gem push *.gem
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
83
|
+
|
|
84
|
+
release-verification:
|
|
85
|
+
name: Check that all releases are done
|
|
86
|
+
runs-on: ubuntu-24.04
|
|
87
|
+
permissions:
|
|
88
|
+
contents: read # minimal permissions that we have to grant
|
|
89
|
+
needs:
|
|
90
|
+
- create-github-release
|
|
91
|
+
- release-to-github
|
|
92
|
+
- release-to-rubygems
|
|
93
|
+
steps:
|
|
94
|
+
- name: Download gem from GitHub cache
|
|
95
|
+
uses: actions/download-artifact@v5
|
|
96
|
+
with:
|
|
97
|
+
name: gem-artifact
|
|
98
|
+
- name: Install Ruby
|
|
99
|
+
uses: ruby/setup-ruby@v1
|
|
100
|
+
with:
|
|
101
|
+
ruby-version: 'ruby'
|
|
102
|
+
- name: Wait for release to propagate
|
|
103
|
+
shell: bash
|
|
27
104
|
run: |
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
chmod 0600 ~/.gem/credentials
|
|
31
|
-
- name: Publish gem to GitHub packages
|
|
32
|
-
run: gem push --key github --host https://rubygems.pkg.github.com/voxpupuli *.gem
|
|
105
|
+
gem install rubygems-await
|
|
106
|
+
gem await *.gem
|
data/.github/workflows/test.yml
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
---
|
|
1
2
|
name: Test
|
|
2
3
|
|
|
3
4
|
on:
|
|
@@ -6,36 +7,33 @@ on:
|
|
|
6
7
|
branches:
|
|
7
8
|
- master
|
|
8
9
|
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
permissions:
|
|
11
|
+
contents: read
|
|
11
12
|
|
|
12
13
|
jobs:
|
|
13
|
-
|
|
14
|
-
runs-on: ubuntu-
|
|
14
|
+
rubocop_and_matrix:
|
|
15
|
+
runs-on: ubuntu-24.04
|
|
16
|
+
outputs:
|
|
17
|
+
ruby: ${{ steps.ruby.outputs.versions }}
|
|
15
18
|
steps:
|
|
16
19
|
- uses: actions/checkout@v4
|
|
17
|
-
- name: Install Ruby 3.
|
|
20
|
+
- name: Install Ruby 3.4
|
|
18
21
|
uses: ruby/setup-ruby@v1
|
|
19
22
|
with:
|
|
20
|
-
ruby-version: "3.
|
|
23
|
+
ruby-version: "3.4"
|
|
21
24
|
bundler-cache: true
|
|
22
25
|
- name: Run Rubocop
|
|
23
26
|
run: bundle exec rake rubocop
|
|
27
|
+
- id: ruby
|
|
28
|
+
uses: voxpupuli/ruby-version@v1
|
|
24
29
|
|
|
25
30
|
rspec:
|
|
26
|
-
runs-on: ubuntu-
|
|
31
|
+
runs-on: ubuntu-24.04
|
|
32
|
+
needs: rubocop_and_matrix
|
|
27
33
|
strategy:
|
|
28
34
|
fail-fast: false
|
|
29
35
|
matrix:
|
|
30
|
-
|
|
31
|
-
- ruby: "2.7"
|
|
32
|
-
- ruby: "3.0"
|
|
33
|
-
coverage: "yes"
|
|
34
|
-
- ruby: "3.1"
|
|
35
|
-
- ruby: "3.2"
|
|
36
|
-
- ruby: "3.3"
|
|
37
|
-
env:
|
|
38
|
-
COVERAGE: ${{ matrix.coverage }}
|
|
36
|
+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
|
|
39
37
|
name: RSpec - Ruby ${{ matrix.ruby }}
|
|
40
38
|
steps:
|
|
41
39
|
- uses: actions/checkout@v4
|
|
@@ -50,57 +48,74 @@ jobs:
|
|
|
50
48
|
run: gem build --strict --verbose *.gemspec
|
|
51
49
|
|
|
52
50
|
docker:
|
|
53
|
-
runs-on: ubuntu-
|
|
54
|
-
|
|
51
|
+
runs-on: ubuntu-24.04
|
|
52
|
+
needs: rubocop_and_matrix
|
|
53
|
+
strategy:
|
|
54
|
+
fail-fast: false
|
|
55
|
+
matrix:
|
|
56
|
+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
|
|
57
|
+
name: Docker on Ruby ${{ matrix.ruby }}
|
|
55
58
|
steps:
|
|
56
59
|
- uses: actions/checkout@v4
|
|
57
|
-
- name: Install Ruby
|
|
60
|
+
- name: Install Ruby ${{ matrix.ruby }}
|
|
58
61
|
uses: ruby/setup-ruby@v1
|
|
59
62
|
with:
|
|
60
|
-
ruby-version:
|
|
63
|
+
ruby-version: ${{ matrix.ruby }}
|
|
61
64
|
bundler-cache: true
|
|
62
65
|
- name: Run acceptance tests
|
|
63
66
|
run: bundle exec rake test:acceptance
|
|
64
67
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
68
|
+
# this job is currently broken because puppet/puppet-dev-tools:2023-02-24-1bca42e is too old
|
|
69
|
+
#beaker_in_container:
|
|
70
|
+
# runs-on: ubuntu-24.04
|
|
71
|
+
# needs: rubocop_and_matrix
|
|
72
|
+
# name: Docker - Beaker in container connection test
|
|
73
|
+
# steps:
|
|
74
|
+
# - uses: actions/checkout@v4
|
|
75
|
+
# # use this and not container key from gha to not have a docker network from github
|
|
76
|
+
# - name: Run Beaker in docker container
|
|
77
|
+
# uses: addnab/docker-run-action@v3
|
|
78
|
+
# with:
|
|
79
|
+
# image: puppet/puppet-dev-tools:2023-02-24-1bca42e
|
|
80
|
+
# options: -v ${{ github.workspace }}:/work
|
|
81
|
+
# run: |
|
|
82
|
+
# cd /work
|
|
83
|
+
# ls -la
|
|
84
|
+
# bundle install
|
|
85
|
+
# export DOCKER_IN_DOCKER=true
|
|
86
|
+
# bundle exec rake test:acceptance
|
|
82
87
|
|
|
88
|
+
# verifies that podman service is a dropin replacement for docker
|
|
83
89
|
podman:
|
|
84
|
-
runs-on: ubuntu-
|
|
85
|
-
|
|
90
|
+
runs-on: ubuntu-24.04
|
|
91
|
+
needs: rubocop_and_matrix
|
|
92
|
+
strategy:
|
|
93
|
+
fail-fast: false
|
|
94
|
+
matrix:
|
|
95
|
+
ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
|
|
96
|
+
name: Podman on Ruby ${{ matrix.ruby }}
|
|
86
97
|
steps:
|
|
98
|
+
- name: Start podman
|
|
99
|
+
run: |
|
|
100
|
+
sudo systemctl stop docker.service docker.socket && systemctl start --user podman.socket
|
|
101
|
+
echo "DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock" >> "$GITHUB_ENV"
|
|
87
102
|
- uses: actions/checkout@v4
|
|
88
|
-
- name: Install Ruby
|
|
103
|
+
- name: Install Ruby ${{ matrix.ruby }}
|
|
89
104
|
uses: ruby/setup-ruby@v1
|
|
90
105
|
with:
|
|
91
|
-
ruby-version:
|
|
106
|
+
ruby-version: ${{ matrix.ruby }}
|
|
92
107
|
bundler-cache: true
|
|
93
108
|
- name: Run acceptance tests
|
|
94
109
|
run: bundle exec rake test:acceptance
|
|
95
110
|
|
|
96
111
|
tests:
|
|
97
112
|
needs:
|
|
113
|
+
- rubocop_and_matrix
|
|
98
114
|
- docker
|
|
99
|
-
- beaker_in_container
|
|
115
|
+
# - beaker_in_container
|
|
100
116
|
- podman
|
|
101
|
-
- rubocop
|
|
102
117
|
- rspec
|
|
103
|
-
runs-on: ubuntu-
|
|
118
|
+
runs-on: ubuntu-24.04
|
|
104
119
|
name: Test suite
|
|
105
120
|
steps:
|
|
106
121
|
- run: echo Test suite completed
|
data/.rubocop.yml
CHANGED
data/.rubocop_todo.yml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# This configuration was generated by
|
|
2
|
-
# `rubocop --auto-gen-config`
|
|
3
|
-
#
|
|
2
|
+
# `rubocop --auto-gen-config --no-auto-gen-timestamp`
|
|
3
|
+
# using RuboCop version 1.75.8.
|
|
4
4
|
# The point is for the user to remove these configuration records
|
|
5
5
|
# one by one as the offenses are removed from the code base.
|
|
6
6
|
# Note that changes in the inspected code, or installation of new
|
|
@@ -17,11 +17,11 @@ RSpec/ExampleLength:
|
|
|
17
17
|
RSpec/MessageSpies:
|
|
18
18
|
EnforcedStyle: receive
|
|
19
19
|
|
|
20
|
-
# Offense count:
|
|
20
|
+
# Offense count: 14
|
|
21
21
|
RSpec/MultipleExpectations:
|
|
22
22
|
Max: 5
|
|
23
23
|
|
|
24
|
-
# Offense count:
|
|
24
|
+
# Offense count: 17
|
|
25
25
|
# Configuration parameters: AllowSubject.
|
|
26
26
|
RSpec/MultipleMemoizedHelpers:
|
|
27
27
|
Max: 12
|
|
@@ -32,9 +32,9 @@ RSpec/ReceiveMessages:
|
|
|
32
32
|
Exclude:
|
|
33
33
|
- 'spec/beaker/hypervisor/docker_spec.rb'
|
|
34
34
|
|
|
35
|
-
# Offense count:
|
|
35
|
+
# Offense count: 28
|
|
36
36
|
# This cop supports safe autocorrection (--autocorrect).
|
|
37
|
-
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
|
|
37
|
+
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
|
|
38
38
|
# URISchemes: http, https
|
|
39
39
|
Layout/LineLength:
|
|
40
40
|
Max: 198
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,32 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [3.0.0](https://github.com/voxpupuli/beaker-docker/tree/3.0.0) (2025-08-11)
|
|
4
|
+
|
|
5
|
+
[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.6.0...3.0.0)
|
|
6
|
+
|
|
7
|
+
**Breaking changes:**
|
|
8
|
+
|
|
9
|
+
- Require Ruby 3.2 or newer [\#163](https://github.com/voxpupuli/beaker-docker/pull/163) ([bastelfreak](https://github.com/bastelfreak))
|
|
10
|
+
|
|
11
|
+
**Implemented enhancements:**
|
|
12
|
+
|
|
13
|
+
- beaker: Allow 7.x [\#162](https://github.com/voxpupuli/beaker-docker/pull/162) ([bastelfreak](https://github.com/bastelfreak))
|
|
14
|
+
|
|
15
|
+
## [2.6.0](https://github.com/voxpupuli/beaker-docker/tree/2.6.0) (2025-05-28)
|
|
16
|
+
|
|
17
|
+
[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.5.2...2.6.0)
|
|
18
|
+
|
|
19
|
+
**Implemented enhancements:**
|
|
20
|
+
|
|
21
|
+
- CI: Run tests with podman and docker [\#160](https://github.com/voxpupuli/beaker-docker/pull/160) ([bastelfreak](https://github.com/bastelfreak))
|
|
22
|
+
- CI: Generate matrix automatically & drop unused coverage reporting [\#158](https://github.com/voxpupuli/beaker-docker/pull/158) ([bastelfreak](https://github.com/bastelfreak))
|
|
23
|
+
- voxpupuli-rubocop: 3.0.0-\>3.1.0 [\#157](https://github.com/voxpupuli/beaker-docker/pull/157) ([bastelfreak](https://github.com/bastelfreak))
|
|
24
|
+
- fakefs: Allow 3.x [\#155](https://github.com/voxpupuli/beaker-docker/pull/155) ([bastelfreak](https://github.com/bastelfreak))
|
|
25
|
+
|
|
26
|
+
**Fixed bugs:**
|
|
27
|
+
|
|
28
|
+
- excon: exclude 1.2.6 [\#156](https://github.com/voxpupuli/beaker-docker/pull/156) ([bastelfreak](https://github.com/bastelfreak))
|
|
29
|
+
|
|
3
30
|
## [2.5.2](https://github.com/voxpupuli/beaker-docker/tree/2.5.2) (2024-11-20)
|
|
4
31
|
|
|
5
32
|
[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.5.1...2.5.2)
|
data/Gemfile
CHANGED
|
@@ -4,12 +4,7 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
|
|
|
4
4
|
|
|
5
5
|
gemspec
|
|
6
6
|
|
|
7
|
-
group :
|
|
8
|
-
gem '
|
|
9
|
-
gem '
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
group :release do
|
|
13
|
-
gem 'faraday-retry', require: false
|
|
14
|
-
gem 'github_changelog_generator', require: false
|
|
7
|
+
group :release, optional: true do
|
|
8
|
+
gem 'faraday-retry', '~> 2.1', require: false
|
|
9
|
+
gem 'github_changelog_generator', '~> 1.16.4', require: false
|
|
15
10
|
end
|
data/Rakefile
CHANGED
|
@@ -15,13 +15,6 @@ namespace :test do
|
|
|
15
15
|
t.rspec_opts = ['--color', '--format documentation']
|
|
16
16
|
t.pattern = 'spec/'
|
|
17
17
|
end
|
|
18
|
-
|
|
19
|
-
desc 'Run spec tests with coverage'
|
|
20
|
-
RSpec::Core::RakeTask.new(:coverage) do |t|
|
|
21
|
-
ENV['BEAKER_DOCKER_COVERAGE'] = 'y'
|
|
22
|
-
t.rspec_opts = ['--color', '--format documentation']
|
|
23
|
-
t.pattern = 'spec/'
|
|
24
|
-
end
|
|
25
18
|
end
|
|
26
19
|
|
|
27
20
|
namespace :acceptance do
|
data/beaker-docker.gemspec
CHANGED
|
@@ -22,16 +22,19 @@ Gem::Specification.new do |s|
|
|
|
22
22
|
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
|
|
23
23
|
s.require_paths = ['lib']
|
|
24
24
|
|
|
25
|
-
s.required_ruby_version = '>= 2
|
|
25
|
+
s.required_ruby_version = '>= 3.2', '< 4'
|
|
26
26
|
|
|
27
27
|
# Testing dependencies
|
|
28
|
-
s.add_development_dependency 'fakefs', '>= 1.3', '<
|
|
28
|
+
s.add_development_dependency 'fakefs', '>= 1.3', '< 4'
|
|
29
29
|
s.add_development_dependency 'rake', '~> 13.0'
|
|
30
30
|
s.add_development_dependency 'rspec', '~> 3.0'
|
|
31
|
-
s.add_development_dependency 'voxpupuli-rubocop', '~>
|
|
31
|
+
s.add_development_dependency 'voxpupuli-rubocop', '~> 4.1.0'
|
|
32
32
|
|
|
33
33
|
# Run time dependencies
|
|
34
|
-
s.
|
|
35
|
-
s.
|
|
36
|
-
|
|
34
|
+
s.add_dependency 'beaker', '>= 4', '< 8'
|
|
35
|
+
s.add_dependency 'docker-api', '~> 2.3'
|
|
36
|
+
# excon is a docker-api dependency, 1.2.6 is broken
|
|
37
|
+
# https://github.com/excon/excon/issues/884
|
|
38
|
+
s.add_dependency 'excon', '>= 1.2.5', '< 2', '!= 1.2.6'
|
|
39
|
+
s.add_dependency 'stringify-hash', '~> 0.0.0'
|
|
37
40
|
end
|
|
@@ -268,7 +268,7 @@ module Beaker
|
|
|
268
268
|
container_opts['HostConfig']['CapAdd'] = host['docker_cap_add']
|
|
269
269
|
container_opts['HostConfig'].delete('Privileged')
|
|
270
270
|
else
|
|
271
|
-
container_opts['HostConfig']['Privileged'] = container_opts['HostConfig']['Privileged'].nil?
|
|
271
|
+
container_opts['HostConfig']['Privileged'] = container_opts['HostConfig']['Privileged'].nil? || container_opts['HostConfig']['Privileged']
|
|
272
272
|
end
|
|
273
273
|
|
|
274
274
|
container_opts['name'] = (host['docker_container_name'] || ['beaker', host.name, SecureRandom.uuid.split('-').last].join('-'))
|
data/spec/spec_helper.rb
CHANGED
|
@@ -2,31 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
require 'beaker'
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
require 'simplecov'
|
|
7
|
-
require 'simplecov-console'
|
|
8
|
-
require 'codecov'
|
|
9
|
-
rescue LoadError
|
|
10
|
-
# Do nothing if no required gem installed
|
|
11
|
-
else
|
|
12
|
-
SimpleCov.start do
|
|
13
|
-
track_files 'lib/**/*.rb'
|
|
14
|
-
|
|
15
|
-
add_filter '/spec'
|
|
16
|
-
# do not track vendored files
|
|
17
|
-
add_filter '/vendor'
|
|
18
|
-
add_filter '/.vendor'
|
|
19
|
-
|
|
20
|
-
enable_coverage :branch
|
|
21
|
-
end
|
|
22
|
-
|
|
23
|
-
SimpleCov.formatters = [
|
|
24
|
-
SimpleCov::Formatter::Console,
|
|
25
|
-
SimpleCov::Formatter::Codecov,
|
|
26
|
-
]
|
|
27
|
-
end
|
|
28
|
-
|
|
29
|
-
Dir['./lib/beaker/hypervisor/*.rb'].sort.each { |file| require file }
|
|
5
|
+
Dir['./lib/beaker/hypervisor/*.rb'].each { |file| require file }
|
|
30
6
|
|
|
31
7
|
# setup & require beaker's spec_helper.rb
|
|
32
8
|
beaker_gem_spec = Gem::Specification.find_by_name('beaker')
|
metadata
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: beaker-docker
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version:
|
|
4
|
+
version: 3.0.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Vox Pupuli
|
|
8
8
|
- Rishi Javia
|
|
9
9
|
- Kevin Imber
|
|
10
10
|
- Tony Vu
|
|
11
|
-
autorequire:
|
|
12
11
|
bindir: bin
|
|
13
12
|
cert_chain: []
|
|
14
|
-
date:
|
|
13
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
|
15
14
|
dependencies:
|
|
16
15
|
- !ruby/object:Gem::Dependency
|
|
17
16
|
name: fakefs
|
|
@@ -22,7 +21,7 @@ dependencies:
|
|
|
22
21
|
version: '1.3'
|
|
23
22
|
- - "<"
|
|
24
23
|
- !ruby/object:Gem::Version
|
|
25
|
-
version: '
|
|
24
|
+
version: '4'
|
|
26
25
|
type: :development
|
|
27
26
|
prerelease: false
|
|
28
27
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -32,7 +31,7 @@ dependencies:
|
|
|
32
31
|
version: '1.3'
|
|
33
32
|
- - "<"
|
|
34
33
|
- !ruby/object:Gem::Version
|
|
35
|
-
version: '
|
|
34
|
+
version: '4'
|
|
36
35
|
- !ruby/object:Gem::Dependency
|
|
37
36
|
name: rake
|
|
38
37
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -67,14 +66,14 @@ dependencies:
|
|
|
67
66
|
requirements:
|
|
68
67
|
- - "~>"
|
|
69
68
|
- !ruby/object:Gem::Version
|
|
70
|
-
version:
|
|
69
|
+
version: 4.1.0
|
|
71
70
|
type: :development
|
|
72
71
|
prerelease: false
|
|
73
72
|
version_requirements: !ruby/object:Gem::Requirement
|
|
74
73
|
requirements:
|
|
75
74
|
- - "~>"
|
|
76
75
|
- !ruby/object:Gem::Version
|
|
77
|
-
version:
|
|
76
|
+
version: 4.1.0
|
|
78
77
|
- !ruby/object:Gem::Dependency
|
|
79
78
|
name: beaker
|
|
80
79
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -84,7 +83,7 @@ dependencies:
|
|
|
84
83
|
version: '4'
|
|
85
84
|
- - "<"
|
|
86
85
|
- !ruby/object:Gem::Version
|
|
87
|
-
version: '
|
|
86
|
+
version: '8'
|
|
88
87
|
type: :runtime
|
|
89
88
|
prerelease: false
|
|
90
89
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -94,7 +93,7 @@ dependencies:
|
|
|
94
93
|
version: '4'
|
|
95
94
|
- - "<"
|
|
96
95
|
- !ruby/object:Gem::Version
|
|
97
|
-
version: '
|
|
96
|
+
version: '8'
|
|
98
97
|
- !ruby/object:Gem::Dependency
|
|
99
98
|
name: docker-api
|
|
100
99
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -109,6 +108,32 @@ dependencies:
|
|
|
109
108
|
- - "~>"
|
|
110
109
|
- !ruby/object:Gem::Version
|
|
111
110
|
version: '2.3'
|
|
111
|
+
- !ruby/object:Gem::Dependency
|
|
112
|
+
name: excon
|
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
|
114
|
+
requirements:
|
|
115
|
+
- - ">="
|
|
116
|
+
- !ruby/object:Gem::Version
|
|
117
|
+
version: 1.2.5
|
|
118
|
+
- - "<"
|
|
119
|
+
- !ruby/object:Gem::Version
|
|
120
|
+
version: '2'
|
|
121
|
+
- - "!="
|
|
122
|
+
- !ruby/object:Gem::Version
|
|
123
|
+
version: 1.2.6
|
|
124
|
+
type: :runtime
|
|
125
|
+
prerelease: false
|
|
126
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
127
|
+
requirements:
|
|
128
|
+
- - ">="
|
|
129
|
+
- !ruby/object:Gem::Version
|
|
130
|
+
version: 1.2.5
|
|
131
|
+
- - "<"
|
|
132
|
+
- !ruby/object:Gem::Version
|
|
133
|
+
version: '2'
|
|
134
|
+
- - "!="
|
|
135
|
+
- !ruby/object:Gem::Version
|
|
136
|
+
version: 1.2.6
|
|
112
137
|
- !ruby/object:Gem::Dependency
|
|
113
138
|
name: stringify-hash
|
|
114
139
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -133,12 +158,12 @@ extra_rdoc_files: []
|
|
|
133
158
|
files:
|
|
134
159
|
- ".editorconfig"
|
|
135
160
|
- ".github/dependabot.yml"
|
|
161
|
+
- ".github/release.yml"
|
|
136
162
|
- ".github/workflows/release.yml"
|
|
137
163
|
- ".github/workflows/test.yml"
|
|
138
164
|
- ".gitignore"
|
|
139
165
|
- ".rubocop.yml"
|
|
140
166
|
- ".rubocop_todo.yml"
|
|
141
|
-
- ".simplecov"
|
|
142
167
|
- CHANGELOG.md
|
|
143
168
|
- Gemfile
|
|
144
169
|
- LICENSE
|
|
@@ -162,7 +187,6 @@ homepage: https://github.com/voxpupuli/beaker-docker
|
|
|
162
187
|
licenses:
|
|
163
188
|
- Apache-2.0
|
|
164
189
|
metadata: {}
|
|
165
|
-
post_install_message:
|
|
166
190
|
rdoc_options: []
|
|
167
191
|
require_paths:
|
|
168
192
|
- lib
|
|
@@ -170,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
170
194
|
requirements:
|
|
171
195
|
- - ">="
|
|
172
196
|
- !ruby/object:Gem::Version
|
|
173
|
-
version: '2
|
|
197
|
+
version: '3.2'
|
|
174
198
|
- - "<"
|
|
175
199
|
- !ruby/object:Gem::Version
|
|
176
200
|
version: '4'
|
|
@@ -180,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
180
204
|
- !ruby/object:Gem::Version
|
|
181
205
|
version: '0'
|
|
182
206
|
requirements: []
|
|
183
|
-
rubygems_version: 3.
|
|
184
|
-
signing_key:
|
|
207
|
+
rubygems_version: 3.6.9
|
|
185
208
|
specification_version: 4
|
|
186
209
|
summary: Docker hypervisor for Beaker acceptance testing framework
|
|
187
210
|
test_files: []
|