beaker-docker 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d4e4b389614a36d04d058e43e4ff3dccbd4b0902d1848f7131d2185a41f6db
-  data.tar.gz: 476e807dc221163733a9bb2524c2d5f371d32a884379f16b252825cd5ec44237
+  metadata.gz: 03132260cd467ad7af518c89aaddc34d3c089e49d52480ef23ada59e5d36fece
+  data.tar.gz: '083787caad790afa68a1b9b9217679ace4fecc4f65d4428d73df275260cb9680'
 SHA512:
-  metadata.gz: 0d2b58be378b0837b800cf93fbacdc4ed1ebfb97451c3f0217ef3b9189eda1cdf3938e18706c3d1ccad831b9af2f089d517a77d20e09a91025bf4d07a52f5435
-  data.tar.gz: '080373c40a10808cd658bf585e2ab34768de2a3efc85e7a90180d694685c92e340c9746eae02674454e6a32b20dd314d66aa705b57e53984f521ee0e9db2470c'
+  metadata.gz: 239659877406dea0df91dc8f15b51d4d0380fc40aa5dd91eed939d8ed4fc11e6fe287990645977f622c26d16d356b94de668fa49ac369f1037aa25e4d61993ec
+  data.tar.gz: 297b9d6d9a8919873cf97055e9b072f36553f4efcee4e770155374f201fc23505cff52068e860ca0db387478ae1d3c8248ea343a1e47d9fbf626741166b47620

data/.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+tab_width = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

data/.github/dependabot.yml

@@ -1,8 +1,17 @@
 version: 2
 updates:
+# raise PRs for gem updates
 - package-ecosystem: bundler
   directory: "/"
   schedule:
     interval: daily
     time: "13:00"
   open-pull-requests-limit: 10
+
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'voxpupuli'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Ruby 3.0
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/test.yml

@@ -1,17 +1,31 @@
 name: Test
 
 on:
-  - pull_request
-  - push
+  pull_request: {}
+  push:
+    branches:
+      - master
 
 env:
   BUNDLE_WITHOUT: release
 
 jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Ruby 3.2
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+      - name: Run Rubocop
+        run: bundle exec rake rubocop
+
   rspec:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         include:
           - ruby: "2.4"
@@ -20,11 +34,13 @@ jobs:
           - ruby: "2.7"
           - ruby: "3.0"
             coverage: "yes"
+          - ruby: "3.1"
+          - ruby: "3.2"
     env:
       COVERAGE: ${{ matrix.coverage }}
     name: RSpec - Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -37,63 +53,56 @@ jobs:
 
   docker:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        ruby:
-          - "2.6"
-    name: Docker - Ruby ${{ matrix.ruby }}
+    name: Docker
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Ruby ${{ matrix.ruby }}
+      - uses: actions/checkout@v3
+      - name: Install Ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: "3.2"
           bundler-cache: true
-      - name: install bundler
-        run: |
-          gem install bundler -v '~> 1.17.3'
-          bundle update
-      - name: install container runtime
-        run: |
-          sudo apt-get remove -y docker docker-engine docker.io containerd runc ||:
-          sudo apt-get update -y
-          sudo apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-          sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-          sudo apt-get update -y
-          sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-          sudo systemctl start docker
       - name: Run acceptance tests
         run: bundle exec rake test:acceptance
 
+  beaker_in_container:
+    runs-on: ubuntu-latest
+    name: Docker - Beaker in container connection test
+    steps:
+      - uses: actions/checkout@v3
+      # use this and not container key from gha to not have a docker network from github
+      - name: Run Beaker in docker container
+        uses: addnab/docker-run-action@v3
+        with:
+            image: puppet/puppet-dev-tools:2023-02-24-1bca42e
+            options: -v ${{ github.workspace }}:/work
+            run: |
+              cd /work
+              ls -la
+              bundle install
+              export DOCKER_IN_DOCKER=true
+              bundle exec rake test:acceptance
+
   podman:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        ruby:
-          - "2.6"
-    name: Podman - Ruby ${{ matrix.ruby }}
+    name: Podman
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Ruby ${{ matrix.ruby }}
+      - uses: actions/checkout@v3
+      - name: Install Ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: "3.2"
           bundler-cache: true
-      - name: install bundler
-        run: |
-          gem install bundler -v '~> 1.17.3'
-          bundle update
-      # We need the latest version of podman for this to work
-      - name: install container runtime
-        run: |
-          . /etc/os-release
-          curl -L https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/Release.key | sudo apt-key add -
-          echo "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${VERSION_ID}/ /" | sudo tee /etc/apt/sources.list.d/podman.list > /dev/null
-          sudo apt-get update
-          sudo apt-get -y install podman
-          sudo systemctl start podman
       - name: Run acceptance tests
         run: bundle exec rake test:acceptance
+
+  tests:
+    needs:
+      - docker
+      - beaker_in_container
+      - podman
+      - rubocop
+      - rspec
+    runs-on: ubuntu-latest
+    name: Test suite
+    steps:
+      - run: echo Test suite completed

data/.gitignore

@@ -12,6 +12,7 @@ coverage
 .bundle
 .vendor
 _vendor
+vendor
 tmp/
 doc
 # JetBrains IDEA
@@ -23,3 +24,4 @@ doc
 # Vagrant folder
 .vagrant/
 .vagrant_files/
+vendor/bundle

data/.rubocop.yml

@@ -0,0 +1,48 @@
+# The behavior of RuboCop can be controlled via the .rubocop.yml
+# configuration file. It makes it possible to enable/disable
+# certain cops (checks) and to alter their behavior if they accept
+# any parameters. The file can be placed either in your home
+# directory or in some project directory.
+#
+# RuboCop will start looking for the configuration file in the directory
+# where the inspected file is and continue its way up to the root directory.
+#
+# See https://docs.rubocop.org/rubocop/configuration
+---
+inherit_from: .rubocop_todo.yml
+
+require:
+- rubocop-performance
+- rubocop-rake
+- rubocop-rspec
+
+AllCops:
+  NewCops: enable
+  DisplayCopNames: true
+  ExtraDetails: true
+  DisplayStyleGuide: true
+  TargetRubyVersion: '2.4'
+  Exclude:
+  - vendor/**/*
+
+Metrics:
+  Description: Metrics cops are rarely useful
+  Enabled: false
+
+Style/HashSyntax:
+  Description: Disable temporarily (FIXME)
+  EnforcedStyle: ruby19
+  Enabled: false
+
+Naming/FileName:
+  Description: Some files violates the snake_case convention
+  Exclude:
+    - 'lib/beaker-docker.rb'
+
+# Style enforcements
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+Style/IfUnlessModifier:
+  Enabled: false
+Style/StringLiterals:
+  Enabled: false