beaker-docker 1.3.0 → 1.5.0

data/spec/beaker/hypervisor/docker_spec.rb

@@ -688,7 +688,7 @@ module Beaker
               'platform' => platform,
               'image' => 'foobar',
             })
-            expect( dockerfile ).to be =~ /ENV container docker/
+            expect( dockerfile ).to match(/ENV container docker/)
           end
         end
 
@@ -705,7 +705,7 @@ module Beaker
               ]
             })
 
-            expect( dockerfile ).to be =~ /RUN special one\nRUN special two\nRUN special three/
+            expect( dockerfile ).to match(/RUN special one\nRUN special two\nRUN special three/)
           end
         end
 
@@ -722,7 +722,7 @@ module Beaker
               ]
             })
 
-            expect( dockerfile ).to be =~ /RUN special one\nRUN special two\nRUN special three/
+            expect( dockerfile ).to match(/RUN special one\nRUN special two\nRUN special three/)
           end
         end
 
@@ -735,7 +735,7 @@ module Beaker
               'docker_image_entrypoint' => '/bin/bash'
             })
 
-            expect( dockerfile ).to be =~ %r{ENTRYPOINT /bin/bash}
+            expect( dockerfile ).to match(%r{ENTRYPOINT /bin/bash})
           end
         end
 
@@ -746,7 +746,7 @@ module Beaker
             'image' => 'foobar',
           })
 
-          expect( dockerfile ).to be =~ /RUN zypper -n in openssh/
+          expect( dockerfile ).to match(/zypper -n in openssh/)
         end
 
         (22..39).to_a.each do | fedora_release |
@@ -757,7 +757,7 @@ module Beaker
               'image' => 'foobar',
             })
 
-            expect( dockerfile ).to be =~ /RUN dnf install -y sudo/
+            expect( dockerfile ).to match(/dnf install -y sudo/)
           end
         end
 
@@ -768,9 +768,48 @@ module Beaker
             'image' => 'foobar',
           })
 
-          expect( dockerfile ).to match(/RUN pacman --sync --refresh --noconfirm archlinux-keyring/)
-          expect( dockerfile ).to match(/RUN pacman --sync --refresh --noconfirm --sysupgrade/)
-          expect( dockerfile ).to match(/RUN pacman --sync --noconfirm curl ntp net-tools openssh/)
+          expect( dockerfile ).to match(/pacman --sync --refresh --noconfirm archlinux-keyring/)
+          expect( dockerfile ).to match(/pacman --sync --refresh --noconfirm --sysupgrade/)
+          expect( dockerfile ).to match(/pacman --sync --noconfirm curl ntp net-tools openssh/)
+        end
+      end
+
+      describe '#fix_ssh' do
+        let(:test_container) { double('container') }
+        let(:host) { hosts[0] }
+        before :each do
+          expect(test_container).to receive(:id).and_return('abcdef')
+        end
+
+        it 'should call exec once when called without host' do
+          expect(test_container).to receive(:exec).once.with(
+            include(/PermitRootLogin/) &&
+            include(/PasswordAuthentication/) &&
+            include(/UseDNS/) &&
+            include(/MaxAuthTries/)
+          )
+          docker.send(:fix_ssh, test_container)
+        end
+
+        it 'should exec sshd on alpine' do
+          host['platform'] = 'alpine-3.8-x86_64'
+          expect(test_container).to receive(:exec).with(array_including('sed'))
+          expect(test_container).to receive(:exec).with(%w[/usr/sbin/sshd])
+          docker.send(:fix_ssh, test_container, host)
+        end
+
+        it 'should restart ssh service on ubuntu' do
+          host['platform'] = 'ubuntu-20.04-x86_64'
+          expect(test_container).to receive(:exec).with(array_including('sed'))
+          expect(test_container).to receive(:exec).with(%w[service ssh restart])
+          docker.send(:fix_ssh, test_container, host)
+        end
+
+        it 'should restart sshd service otherwise' do
+          host['platform'] = 'boogeyman-2000-x86_64'
+          expect(test_container).to receive(:exec).with(array_including('sed'))
+          expect(test_container).to receive(:exec).with(%w[service sshd restart])
+          docker.send(:fix_ssh, test_container, host)
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'rspec/its'
+# frozen_string_literal: true
+
 require 'beaker'
 
 begin
@@ -6,17 +7,17 @@ begin
   require 'simplecov-console'
   require 'codecov'
 rescue LoadError
+  # Do nothing if no required gem installed
 else
   SimpleCov.start do
     track_files 'lib/**/*.rb'
 
     add_filter '/spec'
-
-    enable_coverage :branch
-
     # do not track vendored files
     add_filter '/vendor'
     add_filter '/.vendor'
+
+    enable_coverage :branch
   end
 
   SimpleCov.formatters = [
@@ -25,7 +26,7 @@ else
   ]
 end
 
-Dir.glob(Dir.pwd + '/lib/beaker/hypervisor/*.rb') {|file| require file}
+Dir['./lib/beaker/hypervisor/*.rb'].sort.each { |file| require file }
 
 # setup & require beaker's spec_helper.rb
 beaker_gem_spec = Gem::Specification.find_by_name('beaker')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,8 +11,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -28,61 +62,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: stringify-hash
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        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:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: '4.34'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -98,20 +146,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: beaker
+  name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.34'
+        version: 0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.34'
-description: For use for the Beaker acceptance testing tool
+        version: 0.0.0
+description: Allows running Beaker tests using Docker
 email:
 - voxpupuli@groups.io
 executables:
@@ -119,14 +167,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".github/dependabot.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".simplecov"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.local
 - LICENSE
 - README.md
 - Rakefile
@@ -135,6 +185,7 @@ files:
 - beaker-docker.gemspec
 - bin/beaker-docker
 - docker.md
+- lib/beaker-docker.rb
 - lib/beaker-docker/version.rb
 - lib/beaker/hypervisor/docker.rb
 - spec/beaker/hypervisor/docker_spec.rb
@@ -151,7 +202,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -161,5 +215,5 @@ requirements: []
 rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
-summary: Beaker DSL Extension Helpers!
+summary: Docker hypervisor for Beaker acceptance testing framework
 test_files: []

data/Gemfile.local

@@ -1,3 +0,0 @@
-group :acceptance_testing do
-  gem "beaker-rspec"
-end