beaker-docker 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec5e8da1c0bde0ac2d4fb47e3aa6e895dfa64c847601eb8ee2a81b6e6ddbcb99
-  data.tar.gz: c9a290762c10c8353be0ac34c5d2d3a71560f2d872d04f6c524281518cf54c4b
+  metadata.gz: 68081b2882922ccbb645c18cd13793230a072aad07154d51da1fa5d1b2876186
+  data.tar.gz: 20894761944fb07007daacdaf6e466bc282a4a418d07d304776bdc77738a23d4
 SHA512:
-  metadata.gz: 74aab6d73118cfea7aa6a29c7f1159c900dd392fe5de144f5440d6f0e9b4630f7c87010903b0342e2ed3edd7626efcdcd1f96d5aa6226a5db27a92be54e89b60
-  data.tar.gz: 99a7fc569eea379541e5177432daa3e6c568773de88d6ba56047a69231fab107e76397167a024eae6192f296d9c09b235820df9d4c55f25f47050cbad9a25d5c
+  metadata.gz: 3d12134709510c8508550b7b1b33e68138632ce0c7bc3fe5ac5d72d3a2e5e106933c769f9e9901ce37f27bde1b52c2f6f5f183883246c2e5d96f71214a1f01eb
+  data.tar.gz: d075fae3a65f02084ebc54f6dd5059381d60849b603cb268d1d55dfe6ba46f50fb6345a21af05eca1f3652398bcafbf1100ffe7d966f69bd3f736f724caefd09

data/.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         env:
           BUNDLE_WITHOUT: release
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --strict --verbose *.gemspec
       - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:

data/.github/workflows/test.yml

@@ -46,7 +46,7 @@ jobs:
       - name: spec tests
         run: bundle exec rake test:spec
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --strict --verbose *.gemspec
 
   docker:
     runs-on: ubuntu-latest

data/.rubocop.yml

@@ -2,7 +2,7 @@
 inherit_from: .rubocop_todo.yml
 
 inherit_gem:
-  beaker: rubocop.yml
+  voxpupuli-rubocop: rubocop.yml
 
 Naming/FileName:
   Description: Some files violates the snake_case convention

data/.rubocop_todo.yml

@@ -1,16 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-03-28 10:44:07 UTC using RuboCop version 1.48.1.
+# on 2023-05-05 14:11:54 UTC using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-RSpec/AnyInstance:
-  Exclude:
-    - 'spec/beaker/hypervisor/docker_spec.rb'
-
 # Offense count: 23
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
@@ -31,12 +26,6 @@ RSpec/MultipleExpectations:
 RSpec/MultipleMemoizedHelpers:
   Max: 12
 
-# Offense count: 5
-# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
-RSpec/VerifiedDoubles:
-  Exclude:
-    - 'spec/beaker/hypervisor/docker_spec.rb'
-
 # Offense count: 26
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [2.1.0](https://github.com/voxpupuli/beaker-docker/tree/2.1.0) (2023-05-05)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.0.0...2.1.0)
+
+**Implemented enhancements:**
+
+- switch to voxpupuli-rubocop & restore beaker 4 support [\#120](https://github.com/voxpupuli/beaker-docker/pull/120) ([bastelfreak](https://github.com/bastelfreak))
+
+**Closed issues:**
+
+- Enable SSH Agent forwarding on MacOS [\#117](https://github.com/voxpupuli/beaker-docker/issues/117)
+
+**Merged pull requests:**
+
+- GCG: Add faraday-retry dep [\#119](https://github.com/voxpupuli/beaker-docker/pull/119) ([bastelfreak](https://github.com/bastelfreak))
+- CI: Build gems with strictness and verbosity [\#118](https://github.com/voxpupuli/beaker-docker/pull/118) ([bastelfreak](https://github.com/bastelfreak))
+- rubocop: Fix RSpec/AnyInstance [\#116](https://github.com/voxpupuli/beaker-docker/pull/116) ([jay7x](https://github.com/jay7x))
+- rubocop: Fix RSpec/VerifiedDoubles [\#115](https://github.com/voxpupuli/beaker-docker/pull/115) ([jay7x](https://github.com/jay7x))
+
 ## [2.0.0](https://github.com/voxpupuli/beaker-docker/tree/2.0.0) (2023-03-28)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.5.0...2.0.0)

data/Gemfile

@@ -10,5 +10,6 @@ group :coverage, optional: ENV['COVERAGE'] != 'yes' do
 end
 
 group :release do
+  gem 'faraday-retry', require: false
   gem 'github_changelog_generator', require: false
 end

data/beaker-docker.gemspec

@@ -28,13 +28,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '>= 1.3', '< 3.0'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rubocop', '~> 1.48.1'
-  s.add_development_dependency 'rubocop-performance', '~> 1.10'
-  s.add_development_dependency 'rubocop-rake', '~> 0.2'
-  s.add_development_dependency 'rubocop-rspec', '>= 1.44'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 1.2'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '~> 5.0'
+  s.add_runtime_dependency 'beaker', '>= 4', '< 6'
   s.add_runtime_dependency 'docker-api', '~> 2.1'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
 end

data/lib/beaker-docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeakerDocker
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -28,7 +28,7 @@ module Beaker
     end
 
     let(:logger) do
-      logger = double('logger')
+      logger = instance_double(Logger)
       allow(logger).to receive(:debug)
       allow(logger).to receive(:info)
       allow(logger).to receive(:warn)
@@ -52,7 +52,7 @@ module Beaker
     end
 
     let(:image) do
-      image = double('Docker::Image')
+      image = instance_double(::Docker::Image)
       allow(image).to receive(:id).and_return('zyxwvu')
       allow(image).to receive(:tag)
       image
@@ -87,7 +87,7 @@ module Beaker
     end
 
     let(:container) do
-      container = double('Docker::Container')
+      container = instance_double(::Docker::Container)
       allow(container).to receive(:id).and_return('abcdef')
       allow(container).to receive(:start)
       allow(container).to receive(:stats)
@@ -129,32 +129,16 @@ module Beaker
 
     context 'with a working connection' do
       before do
-        # Stub out all of the docker-api gem. we should never really call it
-        # from these tests
-        allow_any_instance_of(::Beaker::Docker).to receive(:require).with('docker')
+        # Stub out all of the docker-api gem. we should never really call it from these tests
         allow(::Docker).to receive(:options).and_return(docker_options)
-        allow(::Docker).to receive(:options=)
-        allow(::Docker).to receive(:logger=)
         allow(::Docker).to receive(:podman?).and_return(false)
         allow(::Docker).to receive(:version).and_return(version)
         allow(::Docker::Image).to receive(:build).and_return(image)
         allow(::Docker::Image).to receive(:create).and_return(image)
         allow(::Docker::Container).to receive(:create).and_return(container)
-        allow_any_instance_of(::Docker::Container).to receive(:start)
       end
 
       describe '#initialize' do
-        it 'requires the docker gem' do
-          expect_any_instance_of(::Beaker::Docker).to receive(:require).with('docker').once
-
-          docker
-        end
-
-        it 'fails when the gem is absent' do
-          allow_any_instance_of(::Beaker::Docker).to receive(:require).with('docker').and_raise(LoadError)
-          expect { docker }.to raise_error(LoadError)
-        end
-
         it 'sets Docker options' do
           expect(::Docker).to receive(:options=).with({ write_timeout: 300, read_timeout: 300 }).once
 
@@ -183,7 +167,7 @@ module Beaker
       end
 
       describe '#install_ssh_components' do
-        let(:test_container) { double('container') }
+        let(:test_container) { object_double(container) }
         let(:host) { hosts[0] }
 
         before do
@@ -756,7 +740,7 @@ module Beaker
       end
 
       describe '#fix_ssh' do
-        let(:test_container) { double('container') }
+        let(:test_container) { object_double(container) }
         let(:host) { hosts[0] }
 
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -62,75 +62,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.1
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.1
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.44'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.44'
-- !ruby/object:Gem::Dependency
-  name: beaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement