beaker-puppet 1.29.0 → 2.0.0

data/acceptance/tests/clone_git_repo_on_test.rb

@@ -1,34 +1,32 @@
 require 'beaker-puppet'
 
-confine :except, :platform => /^solaris-10/
+confine :except, platform: /^solaris-10/
 
 test_name 'Clone from git' do
-
   PACKAGES = {
-    :redhat => [
+    redhat: [
       'git',
     ],
-    :debian => [
-      ['git', 'git-core'],
+    debian: [
+      %w[git git-core],
     ],
-    :solaris_11 => [
+    solaris_11: [
       ['git', 'developer/versioning/git'],
     ],
-    :solaris_10 => [
+    solaris_10: [
       'coreutils',
       'curl', # update curl to fix "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!" issue
       'git',
     ],
-    :windows => [
+    windows: [
       'git',
     ],
-    :sles => [
+    sles: [
       'git-core',
-    ]
+    ],
   }
 
-
-  install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+  install_packages_on(hosts, PACKAGES, check_if_exists: true)
 
   # implicitly tests build_giturl() and lookup_in_env()
   hosts.each do |host|
@@ -37,7 +35,8 @@ test_name 'Clone from git' do
 
     step 'should be able to successfully clone a git repo' do
       results = clone_git_repo_on(host, "#{testdir}", extract_repo_info_from(build_git_url('hiera')))
-      assert_match( %r{From.*github\.com[:/]puppetlabs/hiera}, result.output, 'Did not find clone')
+
+      assert_match(%r{From.*github\.com[:/]puppetlabs/hiera}, result.output, 'Did not find clone')
     end
   end
 end

data/acceptance/tests/create_tmpdir_on_test.rb

@@ -1,43 +1,47 @@
-test_name "dsl::helpers::host_helpers #create_tmpdir_on" do
-  step "#create_tmpdir_on returns a temporary directory on the remote system" do
+test_name 'dsl::helpers::host_helpers #create_tmpdir_on' do
+  step '#create_tmpdir_on returns a temporary directory on the remote system' do
     tmpdir = create_tmpdir_on default
+
     assert_match %r{/}, tmpdir
     assert_equal 0, on(default, "touch #{tmpdir}/testfile").exit_code
   end
 
-  step "#create_tmpdir_on uses the specified path prefix when provided" do
-    tmpdir = create_tmpdir_on(default, "mypathprefix")
+  step '#create_tmpdir_on uses the specified path prefix when provided' do
+    tmpdir = create_tmpdir_on(default, 'mypathprefix')
+
     assert_match %r{/mypathprefix}, tmpdir
     assert_equal 0, on(default, "touch #{tmpdir}/testfile").exit_code
   end
 
-  step "#create_tmpdir_on fails if a non-existent user is specified" do
+  step '#create_tmpdir_on fails if a non-existent user is specified' do
     assert_raises Beaker::Host::CommandFailure do
       tmpdir = create_tmpdir_on default, '', 'fakeuser'
     end
   end
 
-  step "#create_tmpdir_on sets the user if specified" do
+  step '#create_tmpdir_on sets the user if specified' do
     default.user_present('tmpdirtestuser')
     tmpdir = create_tmpdir_on(default, nil, 'tmpdirtestuser', nil)
+
     assert_match /tmpdirtestuser/, on(default, "ls -ld #{tmpdir}").output
     default.user_absent('tmpdirtestuser')
   end
 
-  step "#create_tmpdir_on fails if a non-existent group is specified" do
+  step '#create_tmpdir_on fails if a non-existent group is specified' do
     assert_raises Beaker::Host::CommandFailure do
       tmpdir = create_tmpdir_on default, '', nil, 'fakegroup'
     end
   end
 
-  step "#create_tmpdir_on sets the group if specified" do
+  step '#create_tmpdir_on sets the group if specified' do
     default.group_present('tmpdirtestgroup')
     tmpdir = create_tmpdir_on(default, nil, nil, 'tmpdirtestgroup')
+
     assert_match /testgroup/, on(default, "ls -ld #{tmpdir}").output
     default.group_absent('tmpdirtestgroup')
   end
 
-  step "#create_tmpdir_on operates on all hosts if given a hosts array" do
+  step '#create_tmpdir_on operates on all hosts if given a hosts array' do
     tmpdirs = create_tmpdir_on hosts
     hosts.zip(tmpdirs).each do |(host, tmpdir)|
       assert_match %r{/}, tmpdir

data/acceptance/tests/install_smoke_test.rb

@@ -1,6 +1,6 @@
 require 'beaker-puppet'
 
-test_name "puppet install smoketest"
+test_name 'puppet install smoketest'
 
 step 'puppet install smoketest: verify \'facter --help\' can be successfully called on all hosts'
 hosts.each do |host|
@@ -17,7 +17,8 @@ hosts.each do |host|
   on host, puppet('help')
 end
 
-step "puppet install smoketest: can get a configprint of the puppet server setting on all hosts"
+step 'puppet install smoketest: can get a configprint of the puppet server setting on all hosts'
+
 hosts.each do |host|
-  assert(!host.puppet['server'].empty?, "can get a configprint of the puppet server setting")
-end
+  assert(!host.puppet['server'].empty?, 'can get a configprint of the puppet server setting')
+end

data/acceptance/tests/stub_host.rb

@@ -1,23 +1,22 @@
 require 'beaker-puppet'
 
-test_name "validate host stubbing behavior"
+test_name 'validate host stubbing behavior'
 
 def get_hosts_file(host)
   if host['platform'] =~ /win/
-    hosts_file = "C:\\\\Windows\\\\System32\\\\Drivers\\\\etc\\\\hosts"
+    'C:\\\\Windows\\\\System32\\\\Drivers\\\\etc\\\\hosts'
   else
-    hosts_file = '/etc/hosts'
+    '/etc/hosts'
   end
-  return hosts_file
 end
 
 step 'verify stub_host_on' do
   step 'should add entry to hosts file' do
     hosts.each do |host|
-      stub_hosts_on(host, { 'foo' => '1.1.1.1' }, { 'foo' => [ 'bar', 'baz' ] })
+      stub_hosts_on(host, { 'foo' => '1.1.1.1' }, { 'foo' => %w[bar baz] })
       hosts_file = get_hosts_file(host)
       result = on host, "cat #{hosts_file}"
-      assert_match %r{foo}, result.stdout
+      assert_match(/foo/, result.stdout)
     end
   end
 
@@ -25,7 +24,7 @@ step 'verify stub_host_on' do
     hosts.each do |host|
       hosts_file = get_hosts_file(host)
       result = on host, "cat #{hosts_file}"
-      assert_match %r{foo}, result.stdout
+      assert_match(/foo/, result.stdout)
     end
   end
 end
@@ -34,8 +33,10 @@ step 'verify with_stub_host_on' do
   step 'should add entry to hosts file' do
     hosts.each do |host|
       hosts_file = get_hosts_file(host)
-      result = with_host_stubbed_on(host, { 'sleepy' => '1.1.1.2' }, { 'sleepy' => [ 'grumpy', 'dopey' ] }) { on host, "cat #{hosts_file}" }
-      assert_match %r{sleepy}, result.stdout
+      result = with_host_stubbed_on(host, { 'sleepy' => '1.1.1.2' }, { 'sleepy' => %w[grumpy dopey] }) do
+        on host, "cat #{hosts_file}"
+      end
+      assert_match(/sleepy/, result.stdout)
     end
   end
 
@@ -43,7 +44,7 @@ step 'verify with_stub_host_on' do
     hosts.each do |host|
       hosts_file = get_hosts_file(host)
       result = on host, "cat #{hosts_file}"
-      assert_no_match %r{sleepy}, result.stdout
+      assert_no_match(/sleepy/, result.stdout)
     end
   end
 end

data/acceptance/tests/web_helpers_test.rb

@@ -5,22 +5,22 @@ require 'webrick/https'
 
 test_name 'dsl::helpers::web_helpers #link_exists?' do
   cert_name = [
-      %w[CN localhost],
+    %w[CN localhost],
   ]
   http_cmd = "ruby -rwebrick -e'WEBrick::HTTPServer.new(:Port => 80, :DocumentRoot => \"/tmp\").start' > /tmp/mylogfile 2>&1 &"
   https_cmd = "ruby -rwebrick/https -e'WEBrick::HTTPServer.new(:SSLEnable => true, :SSLCertName => #{cert_name}, :Port => 555,:DocumentRoot => \"/tmp\").start' > /tmp/mylogfile 2>&1 &"
   on(default, http_cmd)
   on(default, https_cmd)
-  #allow web servers to start up
+  # allow web servers to start up
   sleep(3)
   dir = default.tmpdir('test_dir')
   file = default.tmpfile('test_file')
-  dir.slice! "/tmp"
-  file.slice! "/tmp"
+  dir.slice! '/tmp'
+  file.slice! '/tmp'
   dst_dir = 'web_helpers'
 
   step '#port_open_within? can tell if a port is open' do
-    assert port_open_within?(default,80)
+    assert port_open_within?(default, 80)
   end
 
   step '#link_exists? can tell if a basic link exists' do
@@ -41,7 +41,8 @@ test_name 'dsl::helpers::web_helpers #link_exists?' do
 
   step '#fetch_http_dir will raise an error if unable fetch a dir' do
     exception = assert_raises(RuntimeError) { fetch_http_dir("http://#{default}/tmps", dst_dir) }
-    assert_match /Failed to fetch_remote_dir.*/, exception.message, "#fetch_http_dir raised an unexpected RuntimeError"
+
+    assert_match /Failed to fetch_remote_dir.*/, exception.message, '#fetch_http_dir raised an unexpected RuntimeError'
   end
 
   step '#fetch_http_file can fetch a file' do
@@ -49,8 +50,8 @@ test_name 'dsl::helpers::web_helpers #link_exists?' do
   end
 
   step '#fetch_http_file will raise an error if unable to fetch a file' do
-    exception = assert_raises(RuntimeError) { fetch_http_file("http://#{default}", "test2.txt", dst_dir) }
-    assert_match /Failed to fetch_remote_file.*/, exception.message, "#fetch_http_dir raised an unexpected RuntimeError"
-  end
+    exception = assert_raises(RuntimeError) { fetch_http_file("http://#{default}", 'test2.txt', dst_dir) }
 
-end
+    assert_match /Failed to fetch_remote_file.*/, exception.message, '#fetch_http_dir raised an unexpected RuntimeError'
+  end
+end

data/beaker-puppet.gemspec

@@ -1,41 +1,34 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'beaker-puppet/version'
 
 Gem::Specification.new do |s|
-  s.name        = "beaker-puppet"
+  s.name        = 'beaker-puppet'
   s.version     = BeakerPuppet::VERSION
-  s.authors     = ["Vox Pupuli"]
-  s.email       = ["voxpupuli@groups.io"]
-  s.homepage    = "https://github.com/voxpupuli/beaker-puppet"
-  s.summary     = %q{Beaker's Puppet DSL Extension Helpers!}
-  s.description = %q{For use for the Beaker acceptance testing tool}
+  s.authors     = ['Vox Pupuli']
+  s.email       = ['voxpupuli@groups.io']
+  s.homepage    = 'https://github.com/voxpupuli/beaker-puppet'
+  s.summary     = "Beaker's Puppet DSL Extension Helpers!"
+  s.description = 'For use for the Beaker acceptance testing tool'
   s.license     = 'Apache-2.0'
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.7'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   # Testing dependencies
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '>= 0.6', '< 2.0'
+  s.add_development_dependency 'fakefs', '>= 0.6', '< 3.0'
   s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec-its', '~> 1.3'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 1.2'
 
   # Acceptance Testing Dependencies
-  s.add_development_dependency 'beaker-vmpooler'
-
-  # Documentation dependencies
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'thin'
+  s.add_development_dependency 'beaker-vmpooler', '~> 1.4'
 
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '~> 4.1'
-  s.add_runtime_dependency 'in-parallel', '~> 0.1'
-  s.add_runtime_dependency 'oga'
-
+  s.add_runtime_dependency 'oga', '~> 3.4'
 end
-

data/bin/beaker-puppet

@@ -4,7 +4,7 @@ require 'rubygems' unless defined?(Gem)
 require 'beaker-puppet'
 
 VERSION_STRING =
-"
+  "
                                  _ .--.
                                 ( `    )
         beaker-puppet        .-'      `--,
@@ -25,8 +25,6 @@ VERSION_STRING =
                      '=='
 "
 
-
-
-puts VERSION_STRING % [BeakerPuppet::VERSION]
+puts format(VERSION_STRING, BeakerPuppet::VERSION)
 
 exit 0

data/lib/beaker-puppet/helpers/facter_helpers.rb

@@ -5,7 +5,6 @@ module Beaker
       # for these methods to execute correctly
       #
       module FacterHelpers
-
         # @!macro [new] common_opts
         #   @param [Hash{Symbol=>String}] opts Options to alter execution.
         #   @option opts [Boolean] :silent (false) Do not produce log output
@@ -13,7 +12,7 @@ module Beaker
         #     (or range) of integer exit codes that should be considered
         #     acceptable.  An error will be thrown if the exit code does not
         #     match one of the values in this list.
-        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all 
+        #   @option opts [Boolean] :accept_all_exit_codes (false) Consider all
         #     exit codes as passing.
         #   @option opts [Boolean] :dry_run (false) Do not actually execute any
         #     commands on the SUT
@@ -37,15 +36,19 @@ module Beaker
         # @return String The value of the fact 'name' on the provided host
         # @raise  [FailTest] Raises an exception if call to facter fails
         def fact_on(host, name, opts = {})
-          raise(ArgumentError, "fact_on's `name` option must be a String. You provided a #{name.class}: '#{name}'") unless name.is_a?(String)
-          if opts.kind_of?(Hash)
-            opts.merge!({json: nil})
+          unless name.is_a?(String)
+            raise(ArgumentError,
+                  "fact_on's `name` option must be a String. You provided a #{name.class}: '#{name}'")
+          end
+
+          if opts.is_a?(Hash)
+            opts.merge!({ json: nil })
           else
             opts << ' --json'
           end
 
           result = on host, facter("\"#{name}\"", opts)
-          if result.kind_of?(Array)
+          if result.is_a?(Array)
             result.map { |res| JSON.parse(res.stdout)[name] }
           else
             JSON.parse(result.stdout)[name]
@@ -57,7 +60,6 @@ module Beaker
         def fact(name, opts = {})
           fact_on(default, name, opts)
         end
-
       end
     end
   end

data/lib/beaker-puppet/helpers/host_helpers.rb

@@ -5,7 +5,6 @@ module Beaker
       # for these methods to execute correctly
       #
       module HostHelpers
-
         def ruby_command(host)
           if host['platform'] =~ /windows/ && !host.is_cygwin?
             "cmd /V /C \"set PATH=#{host['privatebindir']};!PATH! && ruby\""
@@ -20,8 +19,10 @@ module Beaker
         # S_IFDIR 0040000
         def beaker_stat(host, path)
           ruby = ruby_command(host)
-          owner = on(host, "#{ruby} -e 'require \"etc\"; puts (Etc.getpwuid(File.stat(\"#{path}\").uid).name)'").stdout.chomp
-          group = on(host, "#{ruby} -e 'require \"etc\"; puts (Etc.getgrgid(File.stat(\"#{path}\").gid).name)'").stdout.chomp
+          owner = on(host,
+                     "#{ruby} -e 'require \"etc\"; puts (Etc.getpwuid(File.stat(\"#{path}\").uid).name)'").stdout.chomp
+          group = on(host,
+                     "#{ruby} -e 'require \"etc\"; puts (Etc.getgrgid(File.stat(\"#{path}\").gid).name)'").stdout.chomp
           mode  = on(host, "#{ruby} -e 'puts (File.stat(\"#{path}\").mode & 0777).to_s(8)'").stdout.chomp.to_i
 
           [owner, group, mode]
@@ -29,12 +30,14 @@ module Beaker
 
         def assert_ownership_permissions(host, location, expected_user, expected_group, expected_permissions)
           permissions = beaker_stat(host, location)
-          assert_equal(expected_user, permissions[0], "Owner #{permissions[0]} does not match expected #{expected_user}")
-          assert_equal(expected_group, permissions[1], "Group #{permissions[1]} does not match expected #{expected_group}")
-          assert_equal(expected_permissions, permissions[2], "Permissions  #{permissions[2]} does not match expected #{expected_permissions}")
+          assert_equal(expected_user, permissions[0],
+                       "Owner #{permissions[0]} does not match expected #{expected_user}")
+          assert_equal(expected_group, permissions[1],
+                       "Group #{permissions[1]} does not match expected #{expected_group}")
+          assert_equal(expected_permissions, permissions[2],
+                       "Permissions  #{permissions[2]} does not match expected #{expected_permissions}")
         end
       end
     end
   end
 end
-