beaker_puppet_helpers 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860333658bb4763948199ffd7f44aa8d63f91f82e1433237e173646a7f846946
-  data.tar.gz: ab16c43125a9ad5a07bd3f84e0e48897fb759b0a79c2be4af36601126dd09942
+  metadata.gz: b001b9c348f8e6b21b1fb495af1163b6da37668267f3335cd43ef5227d47a7e1
+  data.tar.gz: 04ee8755335878f1e0f36905a403c38a971223e8ab3225efb2ae22d441b9fa97
 SHA512:
-  metadata.gz: 3e80f94672298bb94adf4aea463aa2dcfa0271d36a6e6e9916964cac8ba0944229888b7bf5c2cc9be42829ef19df8829caf28e1b3dd8dd0060f999d12be077de
-  data.tar.gz: 0360e4c00279e81aa205ca1933fbaa00288d3dc549b0f97ef247fd2990994cb5b2b9fadb73d6b7f531becf918ded29d6641a5bc4d55aed4807c10e51cb779f05
+  metadata.gz: 589ffd7e3989e29e1b593d7ece8b01e38763830ce14675fbcdc3aa54301a93eafe552150127c3ea0b0967334b3fbdc1bb8e3c71472292d2d7acf9ddaa9df7eac
+  data.tar.gz: f213200034c144418780365b1dbee9f4e3cc6b5179fda3efe28ca00f298ef7a1cc65194698e85da6226a42cdf007beefdc8c7bf02293af23271854fde253edfa

data/.gitignore

@@ -11,3 +11,4 @@ junit/
 tmp/
 vendor/
 .vendor/
+.bundle/

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-05-05 18:42:04 UTC using RuboCop version 1.50.2.
+# on 2024-05-28 10:04:32 UTC using RuboCop version 1.63.5.
 # 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
@@ -11,13 +11,13 @@
 RSpec/ExampleLength:
   Max: 9
 
-# Offense count: 72
+# Offense count: 77
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
   EnforcedStyle: receive
 
-# Offense count: 24
+# Offense count: 26
 RSpec/MultipleExpectations:
   Max: 7
 
@@ -25,3 +25,9 @@ RSpec/MultipleExpectations:
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 4
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/ReceiveMessages:
+  Exclude:
+    - 'spec/beaker_puppet_helpers/dsl_spec.rb'

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.4.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.4.0) (2024-05-28)
+
+[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.3.0...1.4.0)
+
+**Implemented enhancements:**
+
+- beaker: Allow 6.x [\#47](https://github.com/voxpupuli/beaker_puppet_helpers/pull/47) ([bastelfreak](https://github.com/bastelfreak))
+- Use tmpfile extension [\#3](https://github.com/voxpupuli/beaker_puppet_helpers/pull/3) ([ekohl](https://github.com/ekohl))
+
+**Merged pull requests:**
+
+- .gitignore: add .bundle [\#46](https://github.com/voxpupuli/beaker_puppet_helpers/pull/46) ([bastelfreak](https://github.com/bastelfreak))
+- voxpupuli-rubocop: Require 2.7.0 [\#45](https://github.com/voxpupuli/beaker_puppet_helpers/pull/45) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.3.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.3.0) (2024-05-02)
 
 [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.2.1...1.3.0)

data/Gemfile

@@ -13,7 +13,7 @@ group :development do
 end
 
 group :rubocop do
-  gem 'voxpupuli-rubocop', '~> 1.2'
+  gem 'voxpupuli-rubocop', '~> 2.7.0'
 end
 
 group :test do

data/beaker_puppet_helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'beaker_puppet_helpers'
-  s.version     = '1.3.0'
+  s.version     = '1.4.0'
   s.authors     = ['Vox Pupuli']
   s.email       = ['voxpupuli@groups.io']
   s.homepage    = 'https://github.com/voxpupuli/beaker_puppet_helpers'
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '>= 4', '< 6'
+  s.add_runtime_dependency 'beaker', '>= 5.8.1', '< 7'
   s.add_runtime_dependency 'puppet-modulebuilder', '>= 0.3', '< 2'
 end

data/lib/beaker_puppet_helpers/dsl.rb

@@ -173,7 +173,7 @@ module BeakerPuppetHelpers
 
         puppet_apply_opts = host[:default_apply_opts].merge(puppet_apply_opts) if host[:default_apply_opts].respond_to? :merge
 
-        file_path = host.tmpfile(%(apply_manifest_#{Time.now.strftime('%H%M%S%L')}.pp))
+        file_path = host.tmpfile(%(apply_manifest_#{Time.now.strftime('%H%M%S%L')}), '.pp')
         begin
           create_remote_file(host, file_path, "#{manifest}\n")
 

data/lib/beaker_puppet_helpers/install_utils.rb

@@ -80,14 +80,14 @@ module BeakerPuppetHelpers
       case host['packaging_platform'].split('-', 3).first
       when 'debian'
         # 12 started to ship puppet-agent with puppet as a legacy package
-        prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 12 ? 'puppet-agent' : 'puppet'
+        (prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 12) ? 'puppet-agent' : 'puppet'
       when /el|fedora|sles|cisco_/
         prefer_aio ? 'puppet-agent' : 'puppet'
       when /freebsd/
         'sysutils/puppet8'
       when 'ubuntu'
         # 23.04 started to ship puppet-agent with puppet as a legacy package
-        prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 2304 ? 'puppet-agent' : 'puppet'
+        (prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 2304) ? 'puppet-agent' : 'puppet'
       else
         'puppet'
       end
@@ -99,8 +99,7 @@ module BeakerPuppetHelpers
     def self.wget_on(host, url)
       extension = File.extname(url)
       name = File.basename(url, extension)
-      # Can't use host.tmpfile since we need to set an extension
-      target = host.exec(Beaker::Command.new("mktemp -t '#{name}-XXXXXX#{extension}'")).stdout.strip
+      target = host.tmpfile(name, extension)
       begin
         host.exec(Beaker::Command.new("wget -O '#{target}' '#{url}'"))
         yield target

data/lib/beaker_puppet_helpers/module_utils.rb

@@ -44,7 +44,7 @@ module BeakerPuppetHelpers
       source_path = builder.build
       begin
         block_on hosts do |host|
-          target_file = host.tmpfile('puppet_module')
+          target_file = host.tmpfile('puppet_module', '.tar.gz')
           begin
             host.do_scp_to(source_path, target_file, {})
             install_puppet_module_via_pmt_on(host, target_file)

data/spec/beaker_puppet_helpers/module_utils_spec.rb

@@ -97,7 +97,7 @@ describe BeakerPuppetHelpers::ModuleUtils do
       expect(Puppet::Modulebuilder::Builder).to receive(:new).with('/path/to/module').and_return(builder)
       expect(builder).to receive(:build).and_return('/path/to/tarball')
 
-      expect(host).to receive(:tmpfile).with('puppet_module').and_return('temp')
+      expect(host).to receive(:tmpfile).with('puppet_module', '.tar.gz').and_return('temp')
       expect(host).to receive(:do_scp_to).with('/path/to/tarball', 'temp', {})
       expect(dsl).to receive(:install_puppet_module_via_pmt_on).with(host, 'temp')
       expect(host).to receive(:rm_rf).with('temp')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker_puppet_helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-02 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 5.8.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 5.8.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: puppet-modulebuilder
   requirement: !ruby/object:Gem::Requirement